refactoring of the GrammarAccess

755 files changed, 34960 insertions, 33191 deletions

diff --git a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarUiModule.java b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarUiModule.java
index 2612799..ca2168e 100644
--- a/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarUiModule.java
+++ b/devtools/org.eclipse.xtext.reference.ui/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarUiModule.java
@@ -12,14 +12,14 @@ import org.eclipse.xtext.ui.common.service.DefaultUIModule;
 public abstract class AbstractReferenceGrammarUiModule extends DefaultUIModule {
 	
 
-	public Class<? extends org.eclipse.jface.text.rules.ITokenScanner> bindITokenScanner() {
-		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
-	}
-
 	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.ITokenColorer> bindITokenColorer() {
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.CommonAntlrTokenColorer.class;
 	}
 
+	public Class<? extends org.eclipse.jface.text.rules.ITokenScanner> bindITokenScanner() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.reference.ReferenceGrammarProposals.class;
 	}
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarRuntimeModule.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarRuntimeModule.java
index db2d99d..890de6c 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarRuntimeModule.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/AbstractReferenceGrammarRuntimeModule.java
@@ -34,23 +34,23 @@ public abstract class AbstractReferenceGrammarRuntimeModule extends DefaultRunti
 		return org.eclipse.xtext.reference.parseTreeConstruction.ReferenceGrammarParsetreeConstructor.class;
 	}
 
-	public Class<? extends org.eclipse.xtext.parser.antlr.Lexer> bindLexer() {
-		return org.eclipse.xtext.reference.parser.antlr.internal.InternalReferenceGrammarLexer.class;
-	}
-
 	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> bindIAntlrParser() {
 		return org.eclipse.xtext.reference.parser.antlr.ReferenceGrammarParser.class;
 	}
 
-	public Class<? extends org.eclipse.xtext.parser.antlr.ITokenDefProvider> bindITokenDefProvider() {
-		return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class;
+	public Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> bindITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
 	}
 
 	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> bindIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.reference.parser.antlr.ReferenceGrammarAntlrTokenFileProvider.class;
 	}
 
-	public Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> bindITokenToStringConverter() {
-		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	public Class<? extends org.eclipse.xtext.parser.antlr.Lexer> bindLexer() {
+		return org.eclipse.xtext.reference.parser.antlr.internal.InternalReferenceGrammarLexer.class;
+	}
+
+	public Class<? extends org.eclipse.xtext.parser.antlr.ITokenDefProvider> bindITokenDefProvider() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class;
 	}
 }
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi
index 4aff921..8d6675c 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/ReferenceGrammar.xmi
@@ -158,7 +158,7 @@
           <groups xsi:type="xtext:Keyword" value="ROT"/>
           <groups xsi:type="xtext:Keyword" value="BLAU"/>
           <groups xsi:type="xtext:Keyword" value="GELB"/>
-          <groups xsi:type="xtext:Keyword" value="GR&#xdc;N"/>
+          <groups xsi:type="xtext:Keyword" value="GR&#x2039;N"/>
         </terminal>
       </alternatives>
     </rules>
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java
index d618202..818a892 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parseTreeConstruction/ReferenceGrammarParsetreeConstructor.java
@@ -22,26 +22,26 @@ public class ReferenceGrammarParsetreeConstructor extends AbstractParseTreeConst
 	protected Solution internalSerialize(EObject obj) {
 		IInstanceDescription inst = getDescr(obj);
 		Solution s;
-		if(inst.isInstanceOf(grammarAccess.prSpielplatz().getRule().getType().getClassifier()) && (s = new Spielplatz_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prPerson().getRule().getType().getClassifier()) && (s = new Person_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prKind().getRule().getType().getClassifier()) && (s = new Kind_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prErwachsener().getRule().getType().getClassifier()) && (s = new Erwachsener_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prSpielzeug().getRule().getType().getClassifier()) && (s = new Spielzeug_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prFamilie().getRule().getType().getClassifier()) && (s = new Familie_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prFarbe().getRule().getType().getClassifier()) && (s = new Farbe_Assignment_wert(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prCustomTypeParserRule().getRule().getType().getClassifier()) && (s = new CustomTypeParserRule_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getSpielplatzRule().getType().getClassifier()) && (s = new Spielplatz_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getPersonRule().getType().getClassifier()) && (s = new Person_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getKindRule().getType().getClassifier()) && (s = new Kind_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getErwachsenerRule().getType().getClassifier()) && (s = new Erwachsener_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getSpielzeugRule().getType().getClassifier()) && (s = new Spielzeug_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getFamilieRule().getType().getClassifier()) && (s = new Familie_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getFarbeRule().getType().getClassifier()) && (s = new Farbe_Assignment_wert(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getCustomTypeParserRuleRule().getType().getClassifier()) && (s = new CustomTypeParserRule_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
 		return null;
 	}
 	
 
 /************ begin Rule Spielplatz ****************
  *
- * not supported
+ * Spielplatz:
+ *   ("spielplatz" groesse=INT (beschreibung=STRING)? "{" (kinder+=Kind|erzieher+=Erwachsener|spielzeuge+=Spielzeug|familie+=Familie|types+=CustomTypeParserRule)* "}")?;
  *
  **/
 
-
-// not supported
+// ("spielplatz" groesse=INT (beschreibung=STRING)? "{" (kinder+=Kind|erzieher+=Erwachsener|spielzeuge+=Spielzeug|familie+=Familie|types+=CustomTypeParserRule)* "}")?
 protected class Spielplatz_Group extends GroupToken {
 	
 	public Spielplatz_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -50,44 +50,42 @@ protected class Spielplatz_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prSpielplatz().eleGroup();
+		return grammarAccess.getSpielplatzAccess().getGroup();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new Spielplatz_5_Keyword(current, this).firstSolution();
 		while(s1 != null) {
 			Solution s2 = new Spielplatz_4_Alternatives(s1.getCurrent(), s1.getPredecessor()).firstSolution();
-		while(s2 != null) {
-			Solution s3 = new Spielplatz_3_Keyword(s2.getCurrent(), s2.getPredecessor()).firstSolution();
-		while(s3 != null) {
-			Solution s4 = new Spielplatz_2_Assignment_beschreibung(s3.getCurrent(), s3.getPredecessor()).firstSolution();
-		while(s4 != null) {
-			Solution s5 = new Spielplatz_1_Assignment_groesse(s4.getCurrent(), s4.getPredecessor()).firstSolution();
-		while(s5 != null) {
-			Solution s6 = new Spielplatz_0_Keyword_spielplatz(s5.getCurrent(), s5.getPredecessor()).firstSolution();
-			if(s6 != null) {
-				last = s6.getPredecessor();
-				return s6;
-			} else {
-				s5 = s5.getPredecessor().nextSolution(this,s5);
+			while(s2 != null) {
+				Solution s3 = new Spielplatz_3_Keyword(s2.getCurrent(), s2.getPredecessor()).firstSolution();
+				while(s3 != null) {
+					Solution s4 = new Spielplatz_2_Assignment_beschreibung(s3.getCurrent(), s3.getPredecessor()).firstSolution();
+					while(s4 != null) {
+						Solution s5 = new Spielplatz_1_Assignment_groesse(s4.getCurrent(), s4.getPredecessor()).firstSolution();
+						while(s5 != null) {
+							Solution s6 = new Spielplatz_0_Keyword_spielplatz(s5.getCurrent(), s5.getPredecessor()).firstSolution();
+							if(s6 != null) {
+								last = s6.getPredecessor();
+								return s6;
+							} else {
+								s5 = s5.getPredecessor().nextSolution(this,s5);
+							}
+						}
+						s4 = s4.getPredecessor().nextSolution(this,s4);
+					}
+					s3 = s3.getPredecessor().nextSolution(this,s3);
+				}
+				s2 = s2.getPredecessor().nextSolution(this,s2);
 			}
-		}
-			s4 = s4.getPredecessor().nextSolution(this,s4);
-		}
-			s3 = s3.getPredecessor().nextSolution(this,s3);
-		}
-			s2 = s2.getPredecessor().nextSolution(this,s2);
-		}
 			s1 = s1.getPredecessor().nextSolution(this,s1);
 		}
 		return null;
 	}
 }
 
-// not supported
+// "spielplatz"
 protected class Spielplatz_0_Keyword_spielplatz extends KeywordToken  {
 	
 	public Spielplatz_0_Keyword_spielplatz(IInstanceDescription curr, AbstractToken pred) {
@@ -95,11 +93,11 @@ protected class Spielplatz_0_Keyword_spielplatz extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prSpielplatz().ele0KeywordSpielplatz();
+		return grammarAccess.getSpielplatzAccess().getSpielplatzKeyword_0();
 	}	
 }
 
-// not supported
+// groesse=INT
 protected class Spielplatz_1_Assignment_groesse extends AssignmentToken  {
 	
 	public Spielplatz_1_Assignment_groesse(IInstanceDescription curr, AbstractToken pred) {
@@ -108,7 +106,7 @@ protected class Spielplatz_1_Assignment_groesse extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prSpielplatz().ele1AssignmentGroesse();
+		return grammarAccess.getSpielplatzAccess().getGroesseAssignment_1();
 	}
 	
 	@Override
@@ -117,14 +115,14 @@ protected class Spielplatz_1_Assignment_groesse extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("groesse");
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prSpielplatz().ele10TerminalRuleCallINT();
+			element = grammarAccess.getSpielplatzAccess().getGroesseINTTerminalRuleCall_1_0();
 			return new Solution(obj);
 		}
 		return null;
 	}
 }
 
-// not supported
+// (beschreibung=STRING)?
 protected class Spielplatz_2_Assignment_beschreibung extends AssignmentToken  {
 	
 	public Spielplatz_2_Assignment_beschreibung(IInstanceDescription curr, AbstractToken pred) {
@@ -133,7 +131,7 @@ protected class Spielplatz_2_Assignment_beschreibung extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prSpielplatz().ele2AssignmentBeschreibung();
+		return grammarAccess.getSpielplatzAccess().getBeschreibungAssignment_2();
 	}
 	
 	@Override
@@ -142,14 +140,14 @@ protected class Spielplatz_2_Assignment_beschreibung extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("beschreibung");
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prSpielplatz().ele20TerminalRuleCallSTRING();
+			element = grammarAccess.getSpielplatzAccess().getBeschreibungSTRINGTerminalRuleCall_2_0();
 			return new Solution(obj);
 		}
 		return null;
 	}
 }
 
-// not supported
+// "{"
 protected class Spielplatz_3_Keyword extends KeywordToken  {
 	
 	public Spielplatz_3_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -157,11 +155,11 @@ protected class Spielplatz_3_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prSpielplatz().ele3KeywordLeftCurlyBracket();
+		return grammarAccess.getSpielplatzAccess().getLeftCurlyBracketKeyword_3();
 	}	
 }
 
-// not supported
+// (kinder+=Kind|erzieher+=Erwachsener|spielzeuge+=Spielzeug|familie+=Familie|types+=CustomTypeParserRule)*
 protected class Spielplatz_4_Alternatives extends AlternativesToken {
 
 	public Spielplatz_4_Alternatives(IInstanceDescription curr, AbstractToken pred) {
@@ -170,7 +168,7 @@ protected class Spielplatz_4_Alternatives extends AlternativesToken {
 	
 	@Override
 	public Alternatives getGrammarElement() {
-		return grammarAccess.prSpielplatz().ele4Alternatives();
+		return grammarAccess.getSpielplatzAccess().getAlternatives_4();
 	}
 
 	protected AbstractToken createChild(int id) {
@@ -185,7 +183,7 @@ protected class Spielplatz_4_Alternatives extends AlternativesToken {
 	}
 }
 
-// not supported
+// kinder+=Kind
 protected class Spielplatz_4_0_Assignment_kinder extends AssignmentToken  {
 	
 	public Spielplatz_4_0_Assignment_kinder(IInstanceDescription curr, AbstractToken pred) {
@@ -194,7 +192,7 @@ protected class Spielplatz_4_0_Assignment_kinder extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prSpielplatz().ele40AssignmentKinder();
+		return grammarAccess.getSpielplatzAccess().getKinderAssignment_4_0();
 	}
 	
 	@Override
@@ -204,7 +202,7 @@ protected class Spielplatz_4_0_Assignment_kinder extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prKind().getRule().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getKindRule().getType().getClassifier())) {
 				Solution s = new Kind_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -218,7 +216,7 @@ protected class Spielplatz_4_0_Assignment_kinder extends AssignmentToken  {
 	}
 }
 
-// not supported
+// erzieher+=Erwachsener
 protected class Spielplatz_4_1_Assignment_erzieher extends AssignmentToken  {
 	
 	public Spielplatz_4_1_Assignment_erzieher(IInstanceDescription curr, AbstractToken pred) {
@@ -227,7 +225,7 @@ protected class Spielplatz_4_1_Assignment_erzieher extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prSpielplatz().ele41AssignmentErzieher();
+		return grammarAccess.getSpielplatzAccess().getErzieherAssignment_4_1();
 	}
 	
 	@Override
@@ -237,7 +235,7 @@ protected class Spielplatz_4_1_Assignment_erzieher extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prErwachsener().getRule().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getErwachsenerRule().getType().getClassifier())) {
 				Solution s = new Erwachsener_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -251,7 +249,7 @@ protected class Spielplatz_4_1_Assignment_erzieher extends AssignmentToken  {
 	}
 }
 
-// not supported
+// spielzeuge+=Spielzeug
 protected class Spielplatz_4_2_Assignment_spielzeuge extends AssignmentToken  {
 	
 	public Spielplatz_4_2_Assignment_spielzeuge(IInstanceDescription curr, AbstractToken pred) {
@@ -260,7 +258,7 @@ protected class Spielplatz_4_2_Assignment_spielzeuge extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prSpielplatz().ele42AssignmentSpielzeuge();
+		return grammarAccess.getSpielplatzAccess().getSpielzeugeAssignment_4_2();
 	}
 	
 	@Override
@@ -270,7 +268,7 @@ protected class Spielplatz_4_2_Assignment_spielzeuge extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prSpielzeug().getRule().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getSpielzeugRule().getType().getClassifier())) {
 				Solution s = new Spielzeug_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -284,7 +282,7 @@ protected class Spielplatz_4_2_Assignment_spielzeuge extends AssignmentToken  {
 	}
 }
 
-// not supported
+// familie+=Familie
 protected class Spielplatz_4_3_Assignment_familie extends AssignmentToken  {
 	
 	public Spielplatz_4_3_Assignment_familie(IInstanceDescription curr, AbstractToken pred) {
@@ -293,7 +291,7 @@ protected class Spielplatz_4_3_Assignment_familie extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prSpielplatz().ele43AssignmentFamilie();
+		return grammarAccess.getSpielplatzAccess().getFamilieAssignment_4_3();
 	}
 	
 	@Override
@@ -303,7 +301,7 @@ protected class Spielplatz_4_3_Assignment_familie extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prFamilie().getRule().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getFamilieRule().getType().getClassifier())) {
 				Solution s = new Familie_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -317,7 +315,7 @@ protected class Spielplatz_4_3_Assignment_familie extends AssignmentToken  {
 	}
 }
 
-// not supported
+// types+=CustomTypeParserRule
 protected class Spielplatz_4_4_Assignment_types extends AssignmentToken  {
 	
 	public Spielplatz_4_4_Assignment_types(IInstanceDescription curr, AbstractToken pred) {
@@ -326,7 +324,7 @@ protected class Spielplatz_4_4_Assignment_types extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prSpielplatz().ele44AssignmentTypes();
+		return grammarAccess.getSpielplatzAccess().getTypesAssignment_4_4();
 	}
 	
 	@Override
@@ -336,7 +334,7 @@ protected class Spielplatz_4_4_Assignment_types extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prCustomTypeParserRule().getRule().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getCustomTypeParserRuleRule().getType().getClassifier())) {
 				Solution s = new CustomTypeParserRule_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -351,7 +349,7 @@ protected class Spielplatz_4_4_Assignment_types extends AssignmentToken  {
 }
 
 
-// not supported
+// "}"
 protected class Spielplatz_5_Keyword extends KeywordToken  {
 	
 	public Spielplatz_5_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -359,7 +357,7 @@ protected class Spielplatz_5_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prSpielplatz().ele5KeywordRightCurlyBracket();
+		return grammarAccess.getSpielplatzAccess().getRightCurlyBracketKeyword_5();
 	}	
 }
 
@@ -369,12 +367,12 @@ protected class Spielplatz_5_Keyword extends KeywordToken  {
 
 /************ begin Rule Person ****************
  *
- * not supported
+ * Person:
+ *   Kind|Erwachsener;
  *
  **/
 
-
-// not supported
+// Kind|Erwachsener
 protected class Person_Alternatives extends AlternativesToken {
 
 	public Person_Alternatives(IInstanceDescription curr, AbstractToken pred) {
@@ -383,7 +381,7 @@ protected class Person_Alternatives extends AlternativesToken {
 	
 	@Override
 	public Alternatives getGrammarElement() {
-		return grammarAccess.prPerson().eleAlternatives();
+		return grammarAccess.getPersonAccess().getAlternatives();
 	}
 
 	protected AbstractToken createChild(int id) {
@@ -395,7 +393,7 @@ protected class Person_Alternatives extends AlternativesToken {
 	}
 }
 
-// not supported
+// Kind
 protected class Person_0_RuleCall_Kind extends RuleCallToken {
 	
 	public Person_0_RuleCall_Kind(IInstanceDescription curr, AbstractToken pred) {
@@ -404,18 +402,18 @@ protected class Person_0_RuleCall_Kind extends RuleCallToken {
 	
 	@Override
 	public RuleCall getGrammarElement() {
-		return grammarAccess.prPerson().ele0ParserRuleCallKind();
+		return grammarAccess.getPersonAccess().getKindParserRuleCall_0();
 	}
 	
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Kind_Group.class, current)) return null;
-		if(!current.isInstanceOf(grammarAccess.prKind().getRule().getType().getClassifier())) return null;
+		if(!current.isInstanceOf(grammarAccess.getKindRule().getType().getClassifier())) return null;
 		return new Kind_Group(current, this).firstSolution();
 	}
 }
 
-// not supported
+// Erwachsener
 protected class Person_1_RuleCall_Erwachsener extends RuleCallToken {
 	
 	public Person_1_RuleCall_Erwachsener(IInstanceDescription curr, AbstractToken pred) {
@@ -424,13 +422,13 @@ protected class Person_1_RuleCall_Erwachsener extends RuleCallToken {
 	
 	@Override
 	public RuleCall getGrammarElement() {
-		return grammarAccess.prPerson().ele1ParserRuleCallErwachsener();
+		return grammarAccess.getPersonAccess().getErwachsenerParserRuleCall_1();
 	}
 	
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Erwachsener_Group.class, current)) return null;
-		if(!current.isInstanceOf(grammarAccess.prErwachsener().getRule().getType().getClassifier())) return null;
+		if(!current.isInstanceOf(grammarAccess.getErwachsenerRule().getType().getClassifier())) return null;
 		return new Erwachsener_Group(current, this).firstSolution();
 	}
 }
@@ -441,12 +439,12 @@ protected class Person_1_RuleCall_Erwachsener extends RuleCallToken {
 
 /************ begin Rule Kind ****************
  *
- * not supported
+ * Kind:
+ *   "kind" "(" name=ID age=INT ")";
  *
  **/
 
-
-// not supported
+// "kind" "(" name=ID age=INT ")"
 protected class Kind_Group extends GroupToken {
 	
 	public Kind_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -455,40 +453,38 @@ protected class Kind_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prKind().eleGroup();
+		return grammarAccess.getKindAccess().getGroup();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new Kind_4_Keyword(current, this).firstSolution();
 		while(s1 != null) {
 			Solution s2 = new Kind_3_Assignment_age(s1.getCurrent(), s1.getPredecessor()).firstSolution();
-		while(s2 != null) {
-			Solution s3 = new Kind_2_Assignment_name(s2.getCurrent(), s2.getPredecessor()).firstSolution();
-		while(s3 != null) {
-			Solution s4 = new Kind_1_Keyword(s3.getCurrent(), s3.getPredecessor()).firstSolution();
-		while(s4 != null) {
-			Solution s5 = new Kind_0_Keyword_kind(s4.getCurrent(), s4.getPredecessor()).firstSolution();
-			if(s5 != null) {
-				last = s5.getPredecessor();
-				return s5;
-			} else {
-				s4 = s4.getPredecessor().nextSolution(this,s4);
+			while(s2 != null) {
+				Solution s3 = new Kind_2_Assignment_name(s2.getCurrent(), s2.getPredecessor()).firstSolution();
+				while(s3 != null) {
+					Solution s4 = new Kind_1_Keyword(s3.getCurrent(), s3.getPredecessor()).firstSolution();
+					while(s4 != null) {
+						Solution s5 = new Kind_0_Keyword_kind(s4.getCurrent(), s4.getPredecessor()).firstSolution();
+						if(s5 != null) {
+							last = s5.getPredecessor();
+							return s5;
+						} else {
+							s4 = s4.getPredecessor().nextSolution(this,s4);
+						}
+					}
+					s3 = s3.getPredecessor().nextSolution(this,s3);
+				}
+				s2 = s2.getPredecessor().nextSolution(this,s2);
 			}
-		}
-			s3 = s3.getPredecessor().nextSolution(this,s3);
-		}
-			s2 = s2.getPredecessor().nextSolution(this,s2);
-		}
 			s1 = s1.getPredecessor().nextSolution(this,s1);
 		}
 		return null;
 	}
 }
 
-// not supported
+// "kind"
 protected class Kind_0_Keyword_kind extends KeywordToken  {
 	
 	public Kind_0_Keyword_kind(IInstanceDescription curr, AbstractToken pred) {
@@ -496,11 +492,11 @@ protected class Kind_0_Keyword_kind extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prKind().ele0KeywordKind();
+		return grammarAccess.getKindAccess().getKindKeyword_0();
 	}	
 }
 
-// not supported
+// "("
 protected class Kind_1_Keyword extends KeywordToken  {
 	
 	public Kind_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -508,11 +504,11 @@ protected class Kind_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prKind().ele1KeywordLeftParenthesis();
+		return grammarAccess.getKindAccess().getLeftParenthesisKeyword_1();
 	}	
 }
 
-// not supported
+// name=ID
 protected class Kind_2_Assignment_name extends AssignmentToken  {
 	
 	public Kind_2_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -521,7 +517,7 @@ protected class Kind_2_Assignment_name extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prKind().ele2AssignmentName();
+		return grammarAccess.getKindAccess().getNameAssignment_2();
 	}
 	
 	@Override
@@ -530,14 +526,14 @@ protected class Kind_2_Assignment_name extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("name");
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prKind().ele20TerminalRuleCallID();
+			element = grammarAccess.getKindAccess().getNameIDTerminalRuleCall_2_0();
 			return new Solution(obj);
 		}
 		return null;
 	}
 }
 
-// not supported
+// age=INT
 protected class Kind_3_Assignment_age extends AssignmentToken  {
 	
 	public Kind_3_Assignment_age(IInstanceDescription curr, AbstractToken pred) {
@@ -546,7 +542,7 @@ protected class Kind_3_Assignment_age extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prKind().ele3AssignmentAge();
+		return grammarAccess.getKindAccess().getAgeAssignment_3();
 	}
 	
 	@Override
@@ -555,14 +551,14 @@ protected class Kind_3_Assignment_age extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("age");
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prKind().ele30TerminalRuleCallINT();
+			element = grammarAccess.getKindAccess().getAgeINTTerminalRuleCall_3_0();
 			return new Solution(obj);
 		}
 		return null;
 	}
 }
 
-// not supported
+// ")"
 protected class Kind_4_Keyword extends KeywordToken  {
 	
 	public Kind_4_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -570,7 +566,7 @@ protected class Kind_4_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prKind().ele4KeywordRightParenthesis();
+		return grammarAccess.getKindAccess().getRightParenthesisKeyword_4();
 	}	
 }
 
@@ -580,12 +576,12 @@ protected class Kind_4_Keyword extends KeywordToken  {
 
 /************ begin Rule Erwachsener ****************
  *
- * not supported
+ * Erwachsener:
+ *   "erwachsener" "(" name=ID age=INT ")";
  *
  **/
 
-
-// not supported
+// "erwachsener" "(" name=ID age=INT ")"
 protected class Erwachsener_Group extends GroupToken {
 	
 	public Erwachsener_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -594,40 +590,38 @@ protected class Erwachsener_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prErwachsener().eleGroup();
+		return grammarAccess.getErwachsenerAccess().getGroup();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new Erwachsener_4_Keyword(current, this).firstSolution();
 		while(s1 != null) {
 			Solution s2 = new Erwachsener_3_Assignment_age(s1.getCurrent(), s1.getPredecessor()).firstSolution();
-		while(s2 != null) {
-			Solution s3 = new Erwachsener_2_Assignment_name(s2.getCurrent(), s2.getPredecessor()).firstSolution();
-		while(s3 != null) {
-			Solution s4 = new Erwachsener_1_Keyword(s3.getCurrent(), s3.getPredecessor()).firstSolution();
-		while(s4 != null) {
-			Solution s5 = new Erwachsener_0_Keyword_erwachsener(s4.getCurrent(), s4.getPredecessor()).firstSolution();
-			if(s5 != null) {
-				last = s5.getPredecessor();
-				return s5;
-			} else {
-				s4 = s4.getPredecessor().nextSolution(this,s4);
+			while(s2 != null) {
+				Solution s3 = new Erwachsener_2_Assignment_name(s2.getCurrent(), s2.getPredecessor()).firstSolution();
+				while(s3 != null) {
+					Solution s4 = new Erwachsener_1_Keyword(s3.getCurrent(), s3.getPredecessor()).firstSolution();
+					while(s4 != null) {
+						Solution s5 = new Erwachsener_0_Keyword_erwachsener(s4.getCurrent(), s4.getPredecessor()).firstSolution();
+						if(s5 != null) {
+							last = s5.getPredecessor();
+							return s5;
+						} else {
+							s4 = s4.getPredecessor().nextSolution(this,s4);
+						}
+					}
+					s3 = s3.getPredecessor().nextSolution(this,s3);
+				}
+				s2 = s2.getPredecessor().nextSolution(this,s2);
 			}
-		}
-			s3 = s3.getPredecessor().nextSolution(this,s3);
-		}
-			s2 = s2.getPredecessor().nextSolution(this,s2);
-		}
 			s1 = s1.getPredecessor().nextSolution(this,s1);
 		}
 		return null;
 	}
 }
 
-// not supported
+// "erwachsener"
 protected class Erwachsener_0_Keyword_erwachsener extends KeywordToken  {
 	
 	public Erwachsener_0_Keyword_erwachsener(IInstanceDescription curr, AbstractToken pred) {
@@ -635,11 +629,11 @@ protected class Erwachsener_0_Keyword_erwachsener extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prErwachsener().ele0KeywordErwachsener();
+		return grammarAccess.getErwachsenerAccess().getErwachsenerKeyword_0();
 	}	
 }
 
-// not supported
+// "("
 protected class Erwachsener_1_Keyword extends KeywordToken  {
 	
 	public Erwachsener_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -647,11 +641,11 @@ protected class Erwachsener_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prErwachsener().ele1KeywordLeftParenthesis();
+		return grammarAccess.getErwachsenerAccess().getLeftParenthesisKeyword_1();
 	}	
 }
 
-// not supported
+// name=ID
 protected class Erwachsener_2_Assignment_name extends AssignmentToken  {
 	
 	public Erwachsener_2_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -660,7 +654,7 @@ protected class Erwachsener_2_Assignment_name extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prErwachsener().ele2AssignmentName();
+		return grammarAccess.getErwachsenerAccess().getNameAssignment_2();
 	}
 	
 	@Override
@@ -669,14 +663,14 @@ protected class Erwachsener_2_Assignment_name extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("name");
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prErwachsener().ele20TerminalRuleCallID();
+			element = grammarAccess.getErwachsenerAccess().getNameIDTerminalRuleCall_2_0();
 			return new Solution(obj);
 		}
 		return null;
 	}
 }
 
-// not supported
+// age=INT
 protected class Erwachsener_3_Assignment_age extends AssignmentToken  {
 	
 	public Erwachsener_3_Assignment_age(IInstanceDescription curr, AbstractToken pred) {
@@ -685,7 +679,7 @@ protected class Erwachsener_3_Assignment_age extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prErwachsener().ele3AssignmentAge();
+		return grammarAccess.getErwachsenerAccess().getAgeAssignment_3();
 	}
 	
 	@Override
@@ -694,14 +688,14 @@ protected class Erwachsener_3_Assignment_age extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("age");
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prErwachsener().ele30TerminalRuleCallINT();
+			element = grammarAccess.getErwachsenerAccess().getAgeINTTerminalRuleCall_3_0();
 			return new Solution(obj);
 		}
 		return null;
 	}
 }
 
-// not supported
+// ")"
 protected class Erwachsener_4_Keyword extends KeywordToken  {
 	
 	public Erwachsener_4_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -709,7 +703,7 @@ protected class Erwachsener_4_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prErwachsener().ele4KeywordRightParenthesis();
+		return grammarAccess.getErwachsenerAccess().getRightParenthesisKeyword_4();
 	}	
 }
 
@@ -719,12 +713,12 @@ protected class Erwachsener_4_Keyword extends KeywordToken  {
 
 /************ begin Rule Spielzeug ****************
  *
- * not supported
+ * Spielzeug:
+ *   "spielzeug" "(" name=ID farbe=Farbe ")";
  *
  **/
 
-
-// not supported
+// "spielzeug" "(" name=ID farbe=Farbe ")"
 protected class Spielzeug_Group extends GroupToken {
 	
 	public Spielzeug_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -733,40 +727,38 @@ protected class Spielzeug_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prSpielzeug().eleGroup();
+		return grammarAccess.getSpielzeugAccess().getGroup();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new Spielzeug_4_Keyword(current, this).firstSolution();
 		while(s1 != null) {
 			Solution s2 = new Spielzeug_3_Assignment_farbe(s1.getCurrent(), s1.getPredecessor()).firstSolution();
-		while(s2 != null) {
-			Solution s3 = new Spielzeug_2_Assignment_name(s2.getCurrent(), s2.getPredecessor()).firstSolution();
-		while(s3 != null) {
-			Solution s4 = new Spielzeug_1_Keyword(s3.getCurrent(), s3.getPredecessor()).firstSolution();
-		while(s4 != null) {
-			Solution s5 = new Spielzeug_0_Keyword_spielzeug(s4.getCurrent(), s4.getPredecessor()).firstSolution();
-			if(s5 != null) {
-				last = s5.getPredecessor();
-				return s5;
-			} else {
-				s4 = s4.getPredecessor().nextSolution(this,s4);
+			while(s2 != null) {
+				Solution s3 = new Spielzeug_2_Assignment_name(s2.getCurrent(), s2.getPredecessor()).firstSolution();
+				while(s3 != null) {
+					Solution s4 = new Spielzeug_1_Keyword(s3.getCurrent(), s3.getPredecessor()).firstSolution();
+					while(s4 != null) {
+						Solution s5 = new Spielzeug_0_Keyword_spielzeug(s4.getCurrent(), s4.getPredecessor()).firstSolution();
+						if(s5 != null) {
+							last = s5.getPredecessor();
+							return s5;
+						} else {
+							s4 = s4.getPredecessor().nextSolution(this,s4);
+						}
+					}
+					s3 = s3.getPredecessor().nextSolution(this,s3);
+				}
+				s2 = s2.getPredecessor().nextSolution(this,s2);
 			}
-		}
-			s3 = s3.getPredecessor().nextSolution(this,s3);
-		}
-			s2 = s2.getPredecessor().nextSolution(this,s2);
-		}
 			s1 = s1.getPredecessor().nextSolution(this,s1);
 		}
 		return null;
 	}
 }
 
-// not supported
+// "spielzeug"
 protected class Spielzeug_0_Keyword_spielzeug extends KeywordToken  {
 	
 	public Spielzeug_0_Keyword_spielzeug(IInstanceDescription curr, AbstractToken pred) {
@@ -774,11 +766,11 @@ protected class Spielzeug_0_Keyword_spielzeug extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prSpielzeug().ele0KeywordSpielzeug();
+		return grammarAccess.getSpielzeugAccess().getSpielzeugKeyword_0();
 	}	
 }
 
-// not supported
+// "("
 protected class Spielzeug_1_Keyword extends KeywordToken  {
 	
 	public Spielzeug_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -786,11 +778,11 @@ protected class Spielzeug_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prSpielzeug().ele1KeywordLeftParenthesis();
+		return grammarAccess.getSpielzeugAccess().getLeftParenthesisKeyword_1();
 	}	
 }
 
-// not supported
+// name=ID
 protected class Spielzeug_2_Assignment_name extends AssignmentToken  {
 	
 	public Spielzeug_2_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -799,7 +791,7 @@ protected class Spielzeug_2_Assignment_name extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prSpielzeug().ele2AssignmentName();
+		return grammarAccess.getSpielzeugAccess().getNameAssignment_2();
 	}
 	
 	@Override
@@ -808,14 +800,14 @@ protected class Spielzeug_2_Assignment_name extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("name");
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prSpielzeug().ele20TerminalRuleCallID();
+			element = grammarAccess.getSpielzeugAccess().getNameIDTerminalRuleCall_2_0();
 			return new Solution(obj);
 		}
 		return null;
 	}
 }
 
-// not supported
+// farbe=Farbe
 protected class Spielzeug_3_Assignment_farbe extends AssignmentToken  {
 	
 	public Spielzeug_3_Assignment_farbe(IInstanceDescription curr, AbstractToken pred) {
@@ -824,7 +816,7 @@ protected class Spielzeug_3_Assignment_farbe extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prSpielzeug().ele3AssignmentFarbe();
+		return grammarAccess.getSpielzeugAccess().getFarbeAssignment_3();
 	}
 	
 	@Override
@@ -834,7 +826,7 @@ protected class Spielzeug_3_Assignment_farbe extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prFarbe().getRule().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getFarbeRule().getType().getClassifier())) {
 				Solution s = new Farbe_Assignment_wert(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -848,7 +840,7 @@ protected class Spielzeug_3_Assignment_farbe extends AssignmentToken  {
 	}
 }
 
-// not supported
+// ")"
 protected class Spielzeug_4_Keyword extends KeywordToken  {
 	
 	public Spielzeug_4_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -856,7 +848,7 @@ protected class Spielzeug_4_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prSpielzeug().ele4KeywordRightParenthesis();
+		return grammarAccess.getSpielzeugAccess().getRightParenthesisKeyword_4();
 	}	
 }
 
@@ -866,12 +858,12 @@ protected class Spielzeug_4_Keyword extends KeywordToken  {
 
 /************ begin Rule Familie ****************
  *
- * not supported
+ * Familie:
+ *   "familie" "(" name=( "keyword" | STRING | ID ) mutter=[Erwachsener] vater=[Erwachsener] kinder+=[Kind] ("," kinder+=[Kind])* ")";
  *
  **/
 
-
-// not supported
+// "familie" "(" name=( "keyword" | STRING | ID ) mutter=[Erwachsener] vater=[Erwachsener] kinder+=[Kind] ("," kinder+=[Kind])* ")"
 protected class Familie_Group extends GroupToken {
 	
 	public Familie_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -880,52 +872,50 @@ protected class Familie_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prFamilie().eleGroup();
+		return grammarAccess.getFamilieAccess().getGroup();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new Familie_7_Keyword(current, this).firstSolution();
 		while(s1 != null) {
 			Solution s2 = new Familie_6_Group(s1.getCurrent(), s1.getPredecessor()).firstSolution();
-		while(s2 != null) {
-			Solution s3 = new Familie_5_Assignment_kinder(s2.getCurrent(), s2.getPredecessor()).firstSolution();
-		while(s3 != null) {
-			Solution s4 = new Familie_4_Assignment_vater(s3.getCurrent(), s3.getPredecessor()).firstSolution();
-		while(s4 != null) {
-			Solution s5 = new Familie_3_Assignment_mutter(s4.getCurrent(), s4.getPredecessor()).firstSolution();
-		while(s5 != null) {
-			Solution s6 = new Familie_2_Assignment_name(s5.getCurrent(), s5.getPredecessor()).firstSolution();
-		while(s6 != null) {
-			Solution s7 = new Familie_1_Keyword(s6.getCurrent(), s6.getPredecessor()).firstSolution();
-		while(s7 != null) {
-			Solution s8 = new Familie_0_Keyword_familie(s7.getCurrent(), s7.getPredecessor()).firstSolution();
-			if(s8 != null) {
-				last = s8.getPredecessor();
-				return s8;
-			} else {
-				s7 = s7.getPredecessor().nextSolution(this,s7);
+			while(s2 != null) {
+				Solution s3 = new Familie_5_Assignment_kinder(s2.getCurrent(), s2.getPredecessor()).firstSolution();
+				while(s3 != null) {
+					Solution s4 = new Familie_4_Assignment_vater(s3.getCurrent(), s3.getPredecessor()).firstSolution();
+					while(s4 != null) {
+						Solution s5 = new Familie_3_Assignment_mutter(s4.getCurrent(), s4.getPredecessor()).firstSolution();
+						while(s5 != null) {
+							Solution s6 = new Familie_2_Assignment_name(s5.getCurrent(), s5.getPredecessor()).firstSolution();
+							while(s6 != null) {
+								Solution s7 = new Familie_1_Keyword(s6.getCurrent(), s6.getPredecessor()).firstSolution();
+								while(s7 != null) {
+									Solution s8 = new Familie_0_Keyword_familie(s7.getCurrent(), s7.getPredecessor()).firstSolution();
+									if(s8 != null) {
+										last = s8.getPredecessor();
+										return s8;
+									} else {
+										s7 = s7.getPredecessor().nextSolution(this,s7);
+									}
+								}
+								s6 = s6.getPredecessor().nextSolution(this,s6);
+							}
+							s5 = s5.getPredecessor().nextSolution(this,s5);
+						}
+						s4 = s4.getPredecessor().nextSolution(this,s4);
+					}
+					s3 = s3.getPredecessor().nextSolution(this,s3);
+				}
+				s2 = s2.getPredecessor().nextSolution(this,s2);
 			}
-		}
-			s6 = s6.getPredecessor().nextSolution(this,s6);
-		}
-			s5 = s5.getPredecessor().nextSolution(this,s5);
-		}
-			s4 = s4.getPredecessor().nextSolution(this,s4);
-		}
-			s3 = s3.getPredecessor().nextSolution(this,s3);
-		}
-			s2 = s2.getPredecessor().nextSolution(this,s2);
-		}
 			s1 = s1.getPredecessor().nextSolution(this,s1);
 		}
 		return null;
 	}
 }
 
-// not supported
+// "familie"
 protected class Familie_0_Keyword_familie extends KeywordToken  {
 	
 	public Familie_0_Keyword_familie(IInstanceDescription curr, AbstractToken pred) {
@@ -933,11 +923,11 @@ protected class Familie_0_Keyword_familie extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prFamilie().ele0KeywordFamilie();
+		return grammarAccess.getFamilieAccess().getFamilieKeyword_0();
 	}	
 }
 
-// not supported
+// "("
 protected class Familie_1_Keyword extends KeywordToken  {
 	
 	public Familie_1_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -945,11 +935,11 @@ protected class Familie_1_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prFamilie().ele1KeywordLeftParenthesis();
+		return grammarAccess.getFamilieAccess().getLeftParenthesisKeyword_1();
 	}	
 }
 
-// not supported
+// name=( "keyword" | STRING | ID )
 protected class Familie_2_Assignment_name extends AssignmentToken  {
 	
 	public Familie_2_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -958,7 +948,7 @@ protected class Familie_2_Assignment_name extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prFamilie().ele2AssignmentName();
+		return grammarAccess.getFamilieAccess().getNameAssignment_2();
 	}
 	
 	@Override
@@ -968,25 +958,25 @@ protected class Familie_2_Assignment_name extends AssignmentToken  {
 
 		if("keyword".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = grammarAccess.prFamilie().ele200KeywordKeyword();
+			element = grammarAccess.getFamilieAccess().getNameKeywordKeyword_2_0_0();
 			return new Solution(obj);
 		}
 
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prFamilie().ele201TerminalRuleCallSTRING();
+			element = grammarAccess.getFamilieAccess().getNameSTRINGTerminalRuleCall_2_0_1();
 			return new Solution(obj);
 		}
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prFamilie().ele202TerminalRuleCallID();
+			element = grammarAccess.getFamilieAccess().getNameIDTerminalRuleCall_2_0_2();
 			return new Solution(obj);
 		}
 		return null;
 	}
 }
 
-// not supported
+// mutter=[Erwachsener]
 protected class Familie_3_Assignment_mutter extends AssignmentToken  {
 	
 	public Familie_3_Assignment_mutter(IInstanceDescription curr, AbstractToken pred) {
@@ -995,7 +985,7 @@ protected class Familie_3_Assignment_mutter extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prFamilie().ele3AssignmentMutter();
+		return grammarAccess.getFamilieAccess().getMutterAssignment_3();
 	}
 	
 	@Override
@@ -1004,9 +994,9 @@ protected class Familie_3_Assignment_mutter extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("mutter");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prFamilie().ele30CrossReferenceIDErwachsener().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getFamilieAccess().getMutterErwachsenerCrossReference_3_0().getType().getClassifier())) {
 				type = AssignmentType.CR;
-				element = grammarAccess.prFamilie().ele30CrossReferenceIDErwachsener(); 
+				element = grammarAccess.getFamilieAccess().getMutterErwachsenerCrossReference_3_0(); 
 				return new Solution(obj);
 			}
 		}
@@ -1014,7 +1004,7 @@ protected class Familie_3_Assignment_mutter extends AssignmentToken  {
 	}
 }
 
-// not supported
+// vater=[Erwachsener]
 protected class Familie_4_Assignment_vater extends AssignmentToken  {
 	
 	public Familie_4_Assignment_vater(IInstanceDescription curr, AbstractToken pred) {
@@ -1023,7 +1013,7 @@ protected class Familie_4_Assignment_vater extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prFamilie().ele4AssignmentVater();
+		return grammarAccess.getFamilieAccess().getVaterAssignment_4();
 	}
 	
 	@Override
@@ -1032,9 +1022,9 @@ protected class Familie_4_Assignment_vater extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("vater");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prFamilie().ele40CrossReferenceIDErwachsener().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getFamilieAccess().getVaterErwachsenerCrossReference_4_0().getType().getClassifier())) {
 				type = AssignmentType.CR;
-				element = grammarAccess.prFamilie().ele40CrossReferenceIDErwachsener(); 
+				element = grammarAccess.getFamilieAccess().getVaterErwachsenerCrossReference_4_0(); 
 				return new Solution(obj);
 			}
 		}
@@ -1042,7 +1032,7 @@ protected class Familie_4_Assignment_vater extends AssignmentToken  {
 	}
 }
 
-// not supported
+// kinder+=[Kind]
 protected class Familie_5_Assignment_kinder extends AssignmentToken  {
 	
 	public Familie_5_Assignment_kinder(IInstanceDescription curr, AbstractToken pred) {
@@ -1051,7 +1041,7 @@ protected class Familie_5_Assignment_kinder extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prFamilie().ele5AssignmentKinder();
+		return grammarAccess.getFamilieAccess().getKinderAssignment_5();
 	}
 	
 	@Override
@@ -1060,9 +1050,9 @@ protected class Familie_5_Assignment_kinder extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("kinder");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prFamilie().ele50CrossReferenceIDKind().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getFamilieAccess().getKinderKindCrossReference_5_0().getType().getClassifier())) {
 				type = AssignmentType.CR;
-				element = grammarAccess.prFamilie().ele50CrossReferenceIDKind(); 
+				element = grammarAccess.getFamilieAccess().getKinderKindCrossReference_5_0(); 
 				return new Solution(obj);
 			}
 		}
@@ -1070,7 +1060,7 @@ protected class Familie_5_Assignment_kinder extends AssignmentToken  {
 	}
 }
 
-// not supported
+// ("," kinder+=[Kind])*
 protected class Familie_6_Group extends GroupToken {
 	
 	public Familie_6_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1079,11 +1069,9 @@ protected class Familie_6_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prFamilie().ele6Group();
+		return grammarAccess.getFamilieAccess().getGroup_6();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new Familie_6_1_Assignment_kinder(current, this).firstSolution();
@@ -1100,7 +1088,7 @@ protected class Familie_6_Group extends GroupToken {
 	}
 }
 
-// not supported
+// ","
 protected class Familie_6_0_Keyword extends KeywordToken  {
 	
 	public Familie_6_0_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1108,11 +1096,11 @@ protected class Familie_6_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prFamilie().ele60KeywordComma();
+		return grammarAccess.getFamilieAccess().getCommaKeyword_6_0();
 	}	
 }
 
-// not supported
+// kinder+=[Kind]
 protected class Familie_6_1_Assignment_kinder extends AssignmentToken  {
 	
 	public Familie_6_1_Assignment_kinder(IInstanceDescription curr, AbstractToken pred) {
@@ -1121,7 +1109,7 @@ protected class Familie_6_1_Assignment_kinder extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prFamilie().ele61AssignmentKinder();
+		return grammarAccess.getFamilieAccess().getKinderAssignment_6_1();
 	}
 	
 	@Override
@@ -1130,9 +1118,9 @@ protected class Familie_6_1_Assignment_kinder extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("kinder");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prFamilie().ele610CrossReferenceIDKind().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getFamilieAccess().getKinderKindCrossReference_6_1_0().getType().getClassifier())) {
 				type = AssignmentType.CR;
-				element = grammarAccess.prFamilie().ele610CrossReferenceIDKind(); 
+				element = grammarAccess.getFamilieAccess().getKinderKindCrossReference_6_1_0(); 
 				return new Solution(obj);
 			}
 		}
@@ -1141,7 +1129,7 @@ protected class Familie_6_1_Assignment_kinder extends AssignmentToken  {
 }
 
 
-// not supported
+// ")"
 protected class Familie_7_Keyword extends KeywordToken  {
 	
 	public Familie_7_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1149,7 +1137,7 @@ protected class Familie_7_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prFamilie().ele7KeywordRightParenthesis();
+		return grammarAccess.getFamilieAccess().getRightParenthesisKeyword_7();
 	}	
 }
 
@@ -1159,12 +1147,12 @@ protected class Familie_7_Keyword extends KeywordToken  {
 
 /************ begin Rule Farbe ****************
  *
- * not supported
+ * Farbe:
+ *   wert=( "ROT" | "BLAU" | "GELB" | "GR\u2039N" );
  *
  **/
 
-
-// not supported
+// wert=( "ROT" | "BLAU" | "GELB" | "GR\u2039N" )
 protected class Farbe_Assignment_wert extends AssignmentToken  {
 	
 	public Farbe_Assignment_wert(IInstanceDescription curr, AbstractToken pred) {
@@ -1173,7 +1161,7 @@ protected class Farbe_Assignment_wert extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prFarbe().eleAssignmentWert();
+		return grammarAccess.getFarbeAccess().getWertAssignment();
 	}
 	
 	@Override
@@ -1183,28 +1171,28 @@ protected class Farbe_Assignment_wert extends AssignmentToken  {
 
 		if("ROT".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = grammarAccess.prFarbe().ele00KeywordROT();
+			element = grammarAccess.getFarbeAccess().getWertROTKeyword_0_0();
 			return new Solution(obj);
 		}
 
 
 		if("BLAU".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = grammarAccess.prFarbe().ele01KeywordBLAU();
+			element = grammarAccess.getFarbeAccess().getWertBLAUKeyword_0_1();
 			return new Solution(obj);
 		}
 
 
 		if("GELB".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = grammarAccess.prFarbe().ele02KeywordGELB();
+			element = grammarAccess.getFarbeAccess().getWertGELBKeyword_0_2();
 			return new Solution(obj);
 		}
 
 
 		if("GRÜN".equals(value)) { // xtext::Keyword
 			type = AssignmentType.KW;
-			element = grammarAccess.prFarbe().ele03KeywordGRÜN();
+			element = grammarAccess.getFarbeAccess().getWertGRNKeyword_0_3();
 			return new Solution(obj);
 		}
 
@@ -1217,12 +1205,12 @@ protected class Farbe_Assignment_wert extends AssignmentToken  {
 
 /************ begin Rule CustomTypeParserRule ****************
  *
- * not supported
+ * CustomTypeParserRule returns ReferenceModel::CustomType:
+ *   "type" name=ID;
  *
  **/
 
-
-// not supported
+// "type" name=ID
 protected class CustomTypeParserRule_Group extends GroupToken {
 	
 	public CustomTypeParserRule_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1231,11 +1219,9 @@ protected class CustomTypeParserRule_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prCustomTypeParserRule().eleGroup();
+		return grammarAccess.getCustomTypeParserRuleAccess().getGroup();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new CustomTypeParserRule_1_Assignment_name(current, this).firstSolution();
@@ -1252,7 +1238,7 @@ protected class CustomTypeParserRule_Group extends GroupToken {
 	}
 }
 
-// not supported
+// "type"
 protected class CustomTypeParserRule_0_Keyword_type extends KeywordToken  {
 	
 	public CustomTypeParserRule_0_Keyword_type(IInstanceDescription curr, AbstractToken pred) {
@@ -1260,11 +1246,11 @@ protected class CustomTypeParserRule_0_Keyword_type extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prCustomTypeParserRule().ele0KeywordType();
+		return grammarAccess.getCustomTypeParserRuleAccess().getTypeKeyword_0();
 	}	
 }
 
-// not supported
+// name=ID
 protected class CustomTypeParserRule_1_Assignment_name extends AssignmentToken  {
 	
 	public CustomTypeParserRule_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -1273,7 +1259,7 @@ protected class CustomTypeParserRule_1_Assignment_name extends AssignmentToken
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prCustomTypeParserRule().ele1AssignmentName();
+		return grammarAccess.getCustomTypeParserRuleAccess().getNameAssignment_1();
 	}
 	
 	@Override
@@ -1282,7 +1268,7 @@ protected class CustomTypeParserRule_1_Assignment_name extends AssignmentToken
 		IInstanceDescription obj = current.cloneAndConsume("name");
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prCustomTypeParserRule().ele10TerminalRuleCallID();
+			element = grammarAccess.getCustomTypeParserRuleAccess().getNameIDTerminalRuleCall_1_0();
 			return new Solution(obj);
 		}
 		return null;
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g
index e8f7b9d..7ded1c1 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g
@@ -67,7 +67,7 @@ import org.eclipse.xtext.reference.services.ReferenceGrammarGrammarAccess;
 
 // Entry rule entryRuleSpielplatz
 entryRuleSpielplatz returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prSpielplatz().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getSpielplatzRule(), currentNode); }
 	 iv_ruleSpielplatz=ruleSpielplatz 
 	 { $current=$iv_ruleSpielplatz.current; } 
 	 EOF 
@@ -82,18 +82,18 @@ ruleSpielplatz returns [EObject current=null]
     }:
 ('spielplatz' 
     {
-        createLeafNode(grammarAccess.prSpielplatz().ele0KeywordSpielplatz(), null); 
+        createLeafNode(grammarAccess.getSpielplatzAccess().getSpielplatzKeyword_0(), null); 
     }
 (	
 	
 	    lv_groesse_1=	RULE_INT
 	{
-		createLeafNode(grammarAccess.prSpielplatz().ele10TerminalRuleCallINT(), "groesse"); 
+		createLeafNode(grammarAccess.getSpielplatzAccess().getGroesseINTTerminalRuleCall_1_0(), "groesse"); 
 	}
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getSpielplatzRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -108,12 +108,12 @@ ruleSpielplatz returns [EObject current=null]
 	
 	    lv_beschreibung_2=	RULE_STRING
 	{
-		createLeafNode(grammarAccess.prSpielplatz().ele20TerminalRuleCallSTRING(), "beschreibung"); 
+		createLeafNode(grammarAccess.getSpielplatzAccess().getBeschreibungSTRINGTerminalRuleCall_2_0(), "beschreibung"); 
 	}
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getSpielplatzRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -126,18 +126,18 @@ ruleSpielplatz returns [EObject current=null]
 	
 )?'{' 
     {
-        createLeafNode(grammarAccess.prSpielplatz().ele3KeywordLeftCurlyBracket(), null); 
+        createLeafNode(grammarAccess.getSpielplatzAccess().getLeftCurlyBracketKeyword_3(), null); 
     }
 ((	
 	
 	    
 	    { 
-	        currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele400ParserRuleCallKind(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.getSpielplatzAccess().getKinderKindParserRuleCall_4_0_0(), currentNode); 
 	    }
 	    lv_kinder_4=ruleKind 
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getSpielplatzRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -154,12 +154,12 @@ ruleSpielplatz returns [EObject current=null]
 	
 	    
 	    { 
-	        currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele410ParserRuleCallErwachsener(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.getSpielplatzAccess().getErzieherErwachsenerParserRuleCall_4_1_0(), currentNode); 
 	    }
 	    lv_erzieher_5=ruleErwachsener 
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getSpielplatzRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -176,12 +176,12 @@ ruleSpielplatz returns [EObject current=null]
 	
 	    
 	    { 
-	        currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele420ParserRuleCallSpielzeug(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.getSpielplatzAccess().getSpielzeugeSpielzeugParserRuleCall_4_2_0(), currentNode); 
 	    }
 	    lv_spielzeuge_6=ruleSpielzeug 
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getSpielplatzRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -198,12 +198,12 @@ ruleSpielplatz returns [EObject current=null]
 	
 	    
 	    { 
-	        currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele430ParserRuleCallFamilie(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.getSpielplatzAccess().getFamilieFamilieParserRuleCall_4_3_0(), currentNode); 
 	    }
 	    lv_familie_7=ruleFamilie 
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getSpielplatzRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -220,12 +220,12 @@ ruleSpielplatz returns [EObject current=null]
 	
 	    
 	    { 
-	        currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele440ParserRuleCallCustomTypeParserRule(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.getSpielplatzAccess().getTypesCustomTypeParserRuleParserRuleCall_4_4_0(), currentNode); 
 	    }
 	    lv_types_8=ruleCustomTypeParserRule 
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getSpielplatzRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -239,7 +239,7 @@ ruleSpielplatz returns [EObject current=null]
 	
 ))*'}' 
     {
-        createLeafNode(grammarAccess.prSpielplatz().ele5KeywordRightCurlyBracket(), null); 
+        createLeafNode(grammarAccess.getSpielplatzAccess().getRightCurlyBracketKeyword_5(), null); 
     }
 )?;
 
@@ -251,7 +251,7 @@ ruleSpielplatz returns [EObject current=null]
 
 // Entry rule entryRuleKind
 entryRuleKind returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prKind().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getKindRule(), currentNode); }
 	 iv_ruleKind=ruleKind 
 	 { $current=$iv_ruleKind.current; } 
 	 EOF 
@@ -266,22 +266,22 @@ ruleKind returns [EObject current=null]
     }:
 ('kind' 
     {
-        createLeafNode(grammarAccess.prKind().ele0KeywordKind(), null); 
+        createLeafNode(grammarAccess.getKindAccess().getKindKeyword_0(), null); 
     }
 '(' 
     {
-        createLeafNode(grammarAccess.prKind().ele1KeywordLeftParenthesis(), null); 
+        createLeafNode(grammarAccess.getKindAccess().getLeftParenthesisKeyword_1(), null); 
     }
 (	
 	
 	    lv_name_2=	RULE_ID
 	{
-		createLeafNode(grammarAccess.prKind().ele20TerminalRuleCallID(), "name"); 
+		createLeafNode(grammarAccess.getKindAccess().getNameIDTerminalRuleCall_2_0(), "name"); 
 	}
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prKind().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getKindRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -296,12 +296,12 @@ ruleKind returns [EObject current=null]
 	
 	    lv_age_3=	RULE_INT
 	{
-		createLeafNode(grammarAccess.prKind().ele30TerminalRuleCallINT(), "age"); 
+		createLeafNode(grammarAccess.getKindAccess().getAgeINTTerminalRuleCall_3_0(), "age"); 
 	}
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prKind().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getKindRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -314,7 +314,7 @@ ruleKind returns [EObject current=null]
 	
 )')' 
     {
-        createLeafNode(grammarAccess.prKind().ele4KeywordRightParenthesis(), null); 
+        createLeafNode(grammarAccess.getKindAccess().getRightParenthesisKeyword_4(), null); 
     }
 );
 
@@ -324,7 +324,7 @@ ruleKind returns [EObject current=null]
 
 // Entry rule entryRuleErwachsener
 entryRuleErwachsener returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prErwachsener().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getErwachsenerRule(), currentNode); }
 	 iv_ruleErwachsener=ruleErwachsener 
 	 { $current=$iv_ruleErwachsener.current; } 
 	 EOF 
@@ -339,22 +339,22 @@ ruleErwachsener returns [EObject current=null]
     }:
 ('erwachsener' 
     {
-        createLeafNode(grammarAccess.prErwachsener().ele0KeywordErwachsener(), null); 
+        createLeafNode(grammarAccess.getErwachsenerAccess().getErwachsenerKeyword_0(), null); 
     }
 '(' 
     {
-        createLeafNode(grammarAccess.prErwachsener().ele1KeywordLeftParenthesis(), null); 
+        createLeafNode(grammarAccess.getErwachsenerAccess().getLeftParenthesisKeyword_1(), null); 
     }
 (	
 	
 	    lv_name_2=	RULE_ID
 	{
-		createLeafNode(grammarAccess.prErwachsener().ele20TerminalRuleCallID(), "name"); 
+		createLeafNode(grammarAccess.getErwachsenerAccess().getNameIDTerminalRuleCall_2_0(), "name"); 
 	}
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prErwachsener().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getErwachsenerRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -369,12 +369,12 @@ ruleErwachsener returns [EObject current=null]
 	
 	    lv_age_3=	RULE_INT
 	{
-		createLeafNode(grammarAccess.prErwachsener().ele30TerminalRuleCallINT(), "age"); 
+		createLeafNode(grammarAccess.getErwachsenerAccess().getAgeINTTerminalRuleCall_3_0(), "age"); 
 	}
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prErwachsener().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getErwachsenerRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -387,7 +387,7 @@ ruleErwachsener returns [EObject current=null]
 	
 )')' 
     {
-        createLeafNode(grammarAccess.prErwachsener().ele4KeywordRightParenthesis(), null); 
+        createLeafNode(grammarAccess.getErwachsenerAccess().getRightParenthesisKeyword_4(), null); 
     }
 );
 
@@ -397,7 +397,7 @@ ruleErwachsener returns [EObject current=null]
 
 // Entry rule entryRuleSpielzeug
 entryRuleSpielzeug returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prSpielzeug().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getSpielzeugRule(), currentNode); }
 	 iv_ruleSpielzeug=ruleSpielzeug 
 	 { $current=$iv_ruleSpielzeug.current; } 
 	 EOF 
@@ -412,22 +412,22 @@ ruleSpielzeug returns [EObject current=null]
     }:
 ('spielzeug' 
     {
-        createLeafNode(grammarAccess.prSpielzeug().ele0KeywordSpielzeug(), null); 
+        createLeafNode(grammarAccess.getSpielzeugAccess().getSpielzeugKeyword_0(), null); 
     }
 '(' 
     {
-        createLeafNode(grammarAccess.prSpielzeug().ele1KeywordLeftParenthesis(), null); 
+        createLeafNode(grammarAccess.getSpielzeugAccess().getLeftParenthesisKeyword_1(), null); 
     }
 (	
 	
 	    lv_name_2=	RULE_ID
 	{
-		createLeafNode(grammarAccess.prSpielzeug().ele20TerminalRuleCallID(), "name"); 
+		createLeafNode(grammarAccess.getSpielzeugAccess().getNameIDTerminalRuleCall_2_0(), "name"); 
 	}
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prSpielzeug().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getSpielzeugRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -442,12 +442,12 @@ ruleSpielzeug returns [EObject current=null]
 	
 	    
 	    { 
-	        currentNode=createCompositeNode(grammarAccess.prSpielzeug().ele30ParserRuleCallFarbe(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.getSpielzeugAccess().getFarbeFarbeParserRuleCall_3_0(), currentNode); 
 	    }
 	    lv_farbe_3=ruleFarbe 
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prSpielzeug().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getSpielzeugRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -461,7 +461,7 @@ ruleSpielzeug returns [EObject current=null]
 	
 )')' 
     {
-        createLeafNode(grammarAccess.prSpielzeug().ele4KeywordRightParenthesis(), null); 
+        createLeafNode(grammarAccess.getSpielzeugAccess().getRightParenthesisKeyword_4(), null); 
     }
 );
 
@@ -471,7 +471,7 @@ ruleSpielzeug returns [EObject current=null]
 
 // Entry rule entryRuleFamilie
 entryRuleFamilie returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prFamilie().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getFamilieRule(), currentNode); }
 	 iv_ruleFamilie=ruleFamilie 
 	 { $current=$iv_ruleFamilie.current; } 
 	 EOF 
@@ -486,34 +486,34 @@ ruleFamilie returns [EObject current=null]
     }:
 ('familie' 
     {
-        createLeafNode(grammarAccess.prFamilie().ele0KeywordFamilie(), null); 
+        createLeafNode(grammarAccess.getFamilieAccess().getFamilieKeyword_0(), null); 
     }
 '(' 
     {
-        createLeafNode(grammarAccess.prFamilie().ele1KeywordLeftParenthesis(), null); 
+        createLeafNode(grammarAccess.getFamilieAccess().getLeftParenthesisKeyword_1(), null); 
     }
 (	
 	
 	    lv_name_2=('keyword' 
     {
-        createLeafNode(grammarAccess.prFamilie().ele200KeywordKeyword(), "name"); 
+        createLeafNode(grammarAccess.getFamilieAccess().getNameKeywordKeyword_2_0_0(), "name"); 
     }
 
 
     |	RULE_STRING
 	{
-		createLeafNode(grammarAccess.prFamilie().ele201TerminalRuleCallSTRING(), "name"); 
+		createLeafNode(grammarAccess.getFamilieAccess().getNameSTRINGTerminalRuleCall_2_0_1(), "name"); 
 	}
 
     |	RULE_ID
 	{
-		createLeafNode(grammarAccess.prFamilie().ele202TerminalRuleCallID(), "name"); 
+		createLeafNode(grammarAccess.getFamilieAccess().getNameIDTerminalRuleCall_2_0_2(), "name"); 
 	}
 )
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getFamilieRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -529,13 +529,13 @@ ruleFamilie returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getFamilieRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
 	RULE_ID
 	{
-		createLeafNode(grammarAccess.prFamilie().ele30CrossReferenceIDErwachsener(), "mutter"); 
+		createLeafNode(grammarAccess.getFamilieAccess().getMutterErwachsenerCrossReference_3_0(), "mutter"); 
 	}
 
 		// TODO assign feature to currentNode
@@ -545,13 +545,13 @@ ruleFamilie returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getFamilieRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
 	RULE_ID
 	{
-		createLeafNode(grammarAccess.prFamilie().ele40CrossReferenceIDErwachsener(), "vater"); 
+		createLeafNode(grammarAccess.getFamilieAccess().getVaterErwachsenerCrossReference_4_0(), "vater"); 
 	}
 
 		// TODO assign feature to currentNode
@@ -561,40 +561,40 @@ ruleFamilie returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getFamilieRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
 	RULE_ID
 	{
-		createLeafNode(grammarAccess.prFamilie().ele50CrossReferenceIDKind(), "kinder"); 
+		createLeafNode(grammarAccess.getFamilieAccess().getKinderKindCrossReference_5_0(), "kinder"); 
 	}
 
 		// TODO assign feature to currentNode
 	
 )(',' 
     {
-        createLeafNode(grammarAccess.prFamilie().ele60KeywordComma(), null); 
+        createLeafNode(grammarAccess.getFamilieAccess().getCommaKeyword_6_0(), null); 
     }
 (	
 	
 		
 		{
 			if ($current==null) {
-	            $current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getFamilieRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
 	RULE_ID
 	{
-		createLeafNode(grammarAccess.prFamilie().ele610CrossReferenceIDKind(), "kinder"); 
+		createLeafNode(grammarAccess.getFamilieAccess().getKinderKindCrossReference_6_1_0(), "kinder"); 
 	}
 
 		// TODO assign feature to currentNode
 	
 ))*')' 
     {
-        createLeafNode(grammarAccess.prFamilie().ele7KeywordRightParenthesis(), null); 
+        createLeafNode(grammarAccess.getFamilieAccess().getRightParenthesisKeyword_7(), null); 
     }
 );
 
@@ -604,7 +604,7 @@ ruleFamilie returns [EObject current=null]
 
 // Entry rule entryRuleFarbe
 entryRuleFarbe returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prFarbe().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getFarbeRule(), currentNode); }
 	 iv_ruleFarbe=ruleFarbe 
 	 { $current=$iv_ruleFarbe.current; } 
 	 EOF 
@@ -621,32 +621,32 @@ ruleFarbe returns [EObject current=null]
 	
 	    lv_wert_0=('ROT' 
     {
-        createLeafNode(grammarAccess.prFarbe().ele00KeywordROT(), "wert"); 
+        createLeafNode(grammarAccess.getFarbeAccess().getWertROTKeyword_0_0(), "wert"); 
     }
 
 
     |'BLAU' 
     {
-        createLeafNode(grammarAccess.prFarbe().ele01KeywordBLAU(), "wert"); 
+        createLeafNode(grammarAccess.getFarbeAccess().getWertBLAUKeyword_0_1(), "wert"); 
     }
 
 
     |'GELB' 
     {
-        createLeafNode(grammarAccess.prFarbe().ele02KeywordGELB(), "wert"); 
+        createLeafNode(grammarAccess.getFarbeAccess().getWertGELBKeyword_0_2(), "wert"); 
     }
 
 
-    |'GR\u00DCN' 
+    |'GR\u2039N' 
     {
-        createLeafNode(grammarAccess.prFarbe().ele03KeywordGRÜN(), "wert"); 
+        createLeafNode(grammarAccess.getFarbeAccess().getWertGRNKeyword_0_3(), "wert"); 
     }
 
 )
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prFarbe().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getFarbeRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -665,7 +665,7 @@ ruleFarbe returns [EObject current=null]
 
 // Entry rule entryRuleCustomTypeParserRule
 entryRuleCustomTypeParserRule returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prCustomTypeParserRule().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getCustomTypeParserRuleRule(), currentNode); }
 	 iv_ruleCustomTypeParserRule=ruleCustomTypeParserRule 
 	 { $current=$iv_ruleCustomTypeParserRule.current; } 
 	 EOF 
@@ -680,18 +680,18 @@ ruleCustomTypeParserRule returns [EObject current=null]
     }:
 ('type' 
     {
-        createLeafNode(grammarAccess.prCustomTypeParserRule().ele0KeywordType(), null); 
+        createLeafNode(grammarAccess.getCustomTypeParserRuleAccess().getTypeKeyword_0(), null); 
     }
 (	
 	
 	    lv_name_1=	RULE_ID
 	{
-		createLeafNode(grammarAccess.prCustomTypeParserRule().ele10TerminalRuleCallID(), "name"); 
+		createLeafNode(grammarAccess.getCustomTypeParserRuleAccess().getNameIDTerminalRuleCall_1_0(), "name"); 
 	}
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prCustomTypeParserRule().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getCustomTypeParserRuleRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.tokens b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.tokens
index cdbc2b6..812efac 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.tokens
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.tokens
@@ -5,8 +5,8 @@ RULE_INT=4
 RULE_STRING=5
 RULE_ANY_OTHER=10
 RULE_SL_COMMENT=8
-'GR\u00DCN'=25
 'ROT'=22
+'GR\u2039N'=25
 'spielzeug'=18
 'spielplatz'=11
 ')'=16
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarLexer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarLexer.java
index f163da2..149872f 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarLexer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarLexer.java
@@ -307,10 +307,10 @@ public class InternalReferenceGrammarLexer extends Lexer {
     public final void mT25() throws RecognitionException {
         try {
             int _type = T25;
-            // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:24:5: ( 'GR\\u00DCN' )
-            // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:24:7: 'GR\\u00DCN'
+            // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:24:5: ( 'GR\\u2039N' )
+            // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:24:7: 'GR\\u2039N'
             {
-            match("GR\u00DCN"); 
+            match("GR\u2039N"); 
 
 
             }
@@ -1201,7 +1201,7 @@ public class InternalReferenceGrammarLexer extends Lexer {
                 {
                 int LA12_35 = input.LA(3);
 
-                if ( (LA12_35=='\u00DC') ) {
+                if ( (LA12_35=='\u2039') ) {
                     alt12=15;
                 }
                 else {
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java
index 9f6a135..9cecde8 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammarParser.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
 
 public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_STRING", "RULE_ID", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'spielplatz'", "'{'", "'}'", "'kind'", "'('", "')'", "'erwachsener'", "'spielzeug'", "'familie'", "'keyword'", "','", "'ROT'", "'BLAU'", "'GELB'", "'GR\\u00DCN'", "'type'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_STRING", "RULE_ID", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'spielplatz'", "'{'", "'}'", "'kind'", "'('", "')'", "'erwachsener'", "'spielzeug'", "'familie'", "'keyword'", "','", "'ROT'", "'BLAU'", "'GELB'", "'GR\\u2039N'", "'type'"
     };
     public static final int RULE_ML_COMMENT=7;
     public static final int RULE_ID=6;
@@ -76,7 +76,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:69:52: (iv_ruleSpielplatz= ruleSpielplatz EOF )
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:70:2: iv_ruleSpielplatz= ruleSpielplatz EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prSpielplatz().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getSpielplatzRule(), currentNode); 
             pushFollow(FOLLOW_ruleSpielplatz_in_entryRuleSpielplatz71);
             iv_ruleSpielplatz=ruleSpielplatz();
             _fsp--;
@@ -136,7 +136,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
                     {
                     match(input,11,FOLLOW_11_in_ruleSpielplatz115); 
 
-                            createLeafNode(grammarAccess.prSpielplatz().ele0KeywordSpielplatz(), null); 
+                            createLeafNode(grammarAccess.getSpielplatzAccess().getSpielplatzKeyword_0(), null); 
                         
                     // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:87:1: (lv_groesse_1= RULE_INT )
                     // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:89:6: lv_groesse_1= RULE_INT
@@ -144,11 +144,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
                     lv_groesse_1=(Token)input.LT(1);
                     match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleSpielplatz137); 
 
-                    		createLeafNode(grammarAccess.prSpielplatz().ele10TerminalRuleCallINT(), "groesse"); 
+                    		createLeafNode(grammarAccess.getSpielplatzAccess().getGroesseINTTerminalRuleCall_1_0(), "groesse"); 
                     	
 
                     	        if (current==null) {
-                    	            current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier());
+                    	            current = factory.create(grammarAccess.getSpielplatzRule().getType().getClassifier());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                     	        
@@ -175,11 +175,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
                             lv_beschreibung_2=(Token)input.LT(1);
                             match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleSpielplatz167); 
 
-                            		createLeafNode(grammarAccess.prSpielplatz().ele20TerminalRuleCallSTRING(), "beschreibung"); 
+                            		createLeafNode(grammarAccess.getSpielplatzAccess().getBeschreibungSTRINGTerminalRuleCall_2_0(), "beschreibung"); 
                             	
 
                             	        if (current==null) {
-                            	            current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier());
+                            	            current = factory.create(grammarAccess.getSpielplatzRule().getType().getClassifier());
                             	            associateNodeWithAstElement(currentNode, current);
                             	        }
                             	        
@@ -197,7 +197,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
                     match(input,12,FOLLOW_12_in_ruleSpielplatz185); 
 
-                            createLeafNode(grammarAccess.prSpielplatz().ele3KeywordLeftCurlyBracket(), null); 
+                            createLeafNode(grammarAccess.getSpielplatzAccess().getLeftCurlyBracketKeyword_3(), null); 
                         
                     // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:131:1: ( (lv_kinder_4= ruleKind ) | (lv_erzieher_5= ruleErwachsener ) | (lv_spielzeuge_6= ruleSpielzeug ) | (lv_familie_7= ruleFamilie ) | (lv_types_8= ruleCustomTypeParserRule ) )*
                     loop2:
@@ -240,7 +240,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
                     	    // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:134:6: lv_kinder_4= ruleKind
                     	    {
                     	     
-                    	    	        currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele400ParserRuleCallKind(), currentNode); 
+                    	    	        currentNode=createCompositeNode(grammarAccess.getSpielplatzAccess().getKinderKindParserRuleCall_4_0_0(), currentNode); 
                     	    	    
                     	    pushFollow(FOLLOW_ruleKind_in_ruleSpielplatz220);
                     	    lv_kinder_4=ruleKind();
@@ -248,7 +248,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
 
                     	    	        if (current==null) {
-                    	    	            current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier());
+                    	    	            current = factory.create(grammarAccess.getSpielplatzRule().getType().getClassifier());
                     	    	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	    	        }
                     	    	        
@@ -272,7 +272,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
                     	    // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:156:6: lv_erzieher_5= ruleErwachsener
                     	    {
                     	     
-                    	    	        currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele410ParserRuleCallErwachsener(), currentNode); 
+                    	    	        currentNode=createCompositeNode(grammarAccess.getSpielplatzAccess().getErzieherErwachsenerParserRuleCall_4_1_0(), currentNode); 
                     	    	    
                     	    pushFollow(FOLLOW_ruleErwachsener_in_ruleSpielplatz264);
                     	    lv_erzieher_5=ruleErwachsener();
@@ -280,7 +280,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
 
                     	    	        if (current==null) {
-                    	    	            current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier());
+                    	    	            current = factory.create(grammarAccess.getSpielplatzRule().getType().getClassifier());
                     	    	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	    	        }
                     	    	        
@@ -304,7 +304,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
                     	    // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:178:6: lv_spielzeuge_6= ruleSpielzeug
                     	    {
                     	     
-                    	    	        currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele420ParserRuleCallSpielzeug(), currentNode); 
+                    	    	        currentNode=createCompositeNode(grammarAccess.getSpielplatzAccess().getSpielzeugeSpielzeugParserRuleCall_4_2_0(), currentNode); 
                     	    	    
                     	    pushFollow(FOLLOW_ruleSpielzeug_in_ruleSpielplatz308);
                     	    lv_spielzeuge_6=ruleSpielzeug();
@@ -312,7 +312,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
 
                     	    	        if (current==null) {
-                    	    	            current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier());
+                    	    	            current = factory.create(grammarAccess.getSpielplatzRule().getType().getClassifier());
                     	    	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	    	        }
                     	    	        
@@ -336,7 +336,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
                     	    // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:200:6: lv_familie_7= ruleFamilie
                     	    {
                     	     
-                    	    	        currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele430ParserRuleCallFamilie(), currentNode); 
+                    	    	        currentNode=createCompositeNode(grammarAccess.getSpielplatzAccess().getFamilieFamilieParserRuleCall_4_3_0(), currentNode); 
                     	    	    
                     	    pushFollow(FOLLOW_ruleFamilie_in_ruleSpielplatz352);
                     	    lv_familie_7=ruleFamilie();
@@ -344,7 +344,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
 
                     	    	        if (current==null) {
-                    	    	            current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier());
+                    	    	            current = factory.create(grammarAccess.getSpielplatzRule().getType().getClassifier());
                     	    	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	    	        }
                     	    	        
@@ -368,7 +368,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
                     	    // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:222:6: lv_types_8= ruleCustomTypeParserRule
                     	    {
                     	     
-                    	    	        currentNode=createCompositeNode(grammarAccess.prSpielplatz().ele440ParserRuleCallCustomTypeParserRule(), currentNode); 
+                    	    	        currentNode=createCompositeNode(grammarAccess.getSpielplatzAccess().getTypesCustomTypeParserRuleParserRuleCall_4_4_0(), currentNode); 
                     	    	    
                     	    pushFollow(FOLLOW_ruleCustomTypeParserRule_in_ruleSpielplatz396);
                     	    lv_types_8=ruleCustomTypeParserRule();
@@ -376,7 +376,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
 
                     	    	        if (current==null) {
-                    	    	            current = factory.create(grammarAccess.prSpielplatz().getRule().getType().getClassifier());
+                    	    	            current = factory.create(grammarAccess.getSpielplatzRule().getType().getClassifier());
                     	    	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	    	        }
                     	    	        
@@ -401,7 +401,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
                     match(input,13,FOLLOW_13_in_ruleSpielplatz411); 
 
-                            createLeafNode(grammarAccess.prSpielplatz().ele5KeywordRightCurlyBracket(), null); 
+                            createLeafNode(grammarAccess.getSpielplatzAccess().getRightCurlyBracketKeyword_5(), null); 
                         
 
                     }
@@ -440,7 +440,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:253:46: (iv_ruleKind= ruleKind EOF )
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:254:2: iv_ruleKind= ruleKind EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prKind().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getKindRule(), currentNode); 
             pushFollow(FOLLOW_ruleKind_in_entryRuleKind447);
             iv_ruleKind=ruleKind();
             _fsp--;
@@ -482,11 +482,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             {
             match(input,14,FOLLOW_14_in_ruleKind491); 
 
-                    createLeafNode(grammarAccess.prKind().ele0KeywordKind(), null); 
+                    createLeafNode(grammarAccess.getKindAccess().getKindKeyword_0(), null); 
                 
             match(input,15,FOLLOW_15_in_ruleKind500); 
 
-                    createLeafNode(grammarAccess.prKind().ele1KeywordLeftParenthesis(), null); 
+                    createLeafNode(grammarAccess.getKindAccess().getLeftParenthesisKeyword_1(), null); 
                 
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:275:1: (lv_name_2= RULE_ID )
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:277:6: lv_name_2= RULE_ID
@@ -494,11 +494,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             lv_name_2=(Token)input.LT(1);
             match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleKind522); 
 
-            		createLeafNode(grammarAccess.prKind().ele20TerminalRuleCallID(), "name"); 
+            		createLeafNode(grammarAccess.getKindAccess().getNameIDTerminalRuleCall_2_0(), "name"); 
             	
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prKind().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getKindRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -517,11 +517,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             lv_age_3=(Token)input.LT(1);
             match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleKind552); 
 
-            		createLeafNode(grammarAccess.prKind().ele30TerminalRuleCallINT(), "age"); 
+            		createLeafNode(grammarAccess.getKindAccess().getAgeINTTerminalRuleCall_3_0(), "age"); 
             	
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prKind().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getKindRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -536,7 +536,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
             match(input,16,FOLLOW_16_in_ruleKind569); 
 
-                    createLeafNode(grammarAccess.prKind().ele4KeywordRightParenthesis(), null); 
+                    createLeafNode(grammarAccess.getKindAccess().getRightParenthesisKeyword_4(), null); 
                 
 
             }
@@ -572,7 +572,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:326:53: (iv_ruleErwachsener= ruleErwachsener EOF )
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:327:2: iv_ruleErwachsener= ruleErwachsener EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prErwachsener().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getErwachsenerRule(), currentNode); 
             pushFollow(FOLLOW_ruleErwachsener_in_entryRuleErwachsener602);
             iv_ruleErwachsener=ruleErwachsener();
             _fsp--;
@@ -614,11 +614,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             {
             match(input,17,FOLLOW_17_in_ruleErwachsener646); 
 
-                    createLeafNode(grammarAccess.prErwachsener().ele0KeywordErwachsener(), null); 
+                    createLeafNode(grammarAccess.getErwachsenerAccess().getErwachsenerKeyword_0(), null); 
                 
             match(input,15,FOLLOW_15_in_ruleErwachsener655); 
 
-                    createLeafNode(grammarAccess.prErwachsener().ele1KeywordLeftParenthesis(), null); 
+                    createLeafNode(grammarAccess.getErwachsenerAccess().getLeftParenthesisKeyword_1(), null); 
                 
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:348:1: (lv_name_2= RULE_ID )
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:350:6: lv_name_2= RULE_ID
@@ -626,11 +626,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             lv_name_2=(Token)input.LT(1);
             match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleErwachsener677); 
 
-            		createLeafNode(grammarAccess.prErwachsener().ele20TerminalRuleCallID(), "name"); 
+            		createLeafNode(grammarAccess.getErwachsenerAccess().getNameIDTerminalRuleCall_2_0(), "name"); 
             	
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prErwachsener().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getErwachsenerRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -649,11 +649,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             lv_age_3=(Token)input.LT(1);
             match(input,RULE_INT,FOLLOW_RULE_INT_in_ruleErwachsener707); 
 
-            		createLeafNode(grammarAccess.prErwachsener().ele30TerminalRuleCallINT(), "age"); 
+            		createLeafNode(grammarAccess.getErwachsenerAccess().getAgeINTTerminalRuleCall_3_0(), "age"); 
             	
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prErwachsener().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getErwachsenerRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -668,7 +668,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
             match(input,16,FOLLOW_16_in_ruleErwachsener724); 
 
-                    createLeafNode(grammarAccess.prErwachsener().ele4KeywordRightParenthesis(), null); 
+                    createLeafNode(grammarAccess.getErwachsenerAccess().getRightParenthesisKeyword_4(), null); 
                 
 
             }
@@ -704,7 +704,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:399:51: (iv_ruleSpielzeug= ruleSpielzeug EOF )
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:400:2: iv_ruleSpielzeug= ruleSpielzeug EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prSpielzeug().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getSpielzeugRule(), currentNode); 
             pushFollow(FOLLOW_ruleSpielzeug_in_entryRuleSpielzeug757);
             iv_ruleSpielzeug=ruleSpielzeug();
             _fsp--;
@@ -747,11 +747,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             {
             match(input,18,FOLLOW_18_in_ruleSpielzeug801); 
 
-                    createLeafNode(grammarAccess.prSpielzeug().ele0KeywordSpielzeug(), null); 
+                    createLeafNode(grammarAccess.getSpielzeugAccess().getSpielzeugKeyword_0(), null); 
                 
             match(input,15,FOLLOW_15_in_ruleSpielzeug810); 
 
-                    createLeafNode(grammarAccess.prSpielzeug().ele1KeywordLeftParenthesis(), null); 
+                    createLeafNode(grammarAccess.getSpielzeugAccess().getLeftParenthesisKeyword_1(), null); 
                 
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:421:1: (lv_name_2= RULE_ID )
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:423:6: lv_name_2= RULE_ID
@@ -759,11 +759,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             lv_name_2=(Token)input.LT(1);
             match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleSpielzeug832); 
 
-            		createLeafNode(grammarAccess.prSpielzeug().ele20TerminalRuleCallID(), "name"); 
+            		createLeafNode(grammarAccess.getSpielzeugAccess().getNameIDTerminalRuleCall_2_0(), "name"); 
             	
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prSpielzeug().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getSpielzeugRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -780,7 +780,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:444:6: lv_farbe_3= ruleFarbe
             {
              
-            	        currentNode=createCompositeNode(grammarAccess.prSpielzeug().ele30ParserRuleCallFarbe(), currentNode); 
+            	        currentNode=createCompositeNode(grammarAccess.getSpielzeugAccess().getFarbeFarbeParserRuleCall_3_0(), currentNode); 
             	    
             pushFollow(FOLLOW_ruleFarbe_in_ruleSpielzeug874);
             lv_farbe_3=ruleFarbe();
@@ -788,7 +788,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prSpielzeug().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getSpielzeugRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -804,7 +804,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
             match(input,16,FOLLOW_16_in_ruleSpielzeug887); 
 
-                    createLeafNode(grammarAccess.prSpielzeug().ele4KeywordRightParenthesis(), null); 
+                    createLeafNode(grammarAccess.getSpielzeugAccess().getRightParenthesisKeyword_4(), null); 
                 
 
             }
@@ -840,7 +840,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:473:49: (iv_ruleFamilie= ruleFamilie EOF )
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:474:2: iv_ruleFamilie= ruleFamilie EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prFamilie().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getFamilieRule(), currentNode); 
             pushFollow(FOLLOW_ruleFamilie_in_entryRuleFamilie920);
             iv_ruleFamilie=ruleFamilie();
             _fsp--;
@@ -881,11 +881,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             {
             match(input,19,FOLLOW_19_in_ruleFamilie964); 
 
-                    createLeafNode(grammarAccess.prFamilie().ele0KeywordFamilie(), null); 
+                    createLeafNode(grammarAccess.getFamilieAccess().getFamilieKeyword_0(), null); 
                 
             match(input,15,FOLLOW_15_in_ruleFamilie973); 
 
-                    createLeafNode(grammarAccess.prFamilie().ele1KeywordLeftParenthesis(), null); 
+                    createLeafNode(grammarAccess.getFamilieAccess().getLeftParenthesisKeyword_1(), null); 
                 
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:495:1: (lv_name_2= ( 'keyword' | RULE_STRING | RULE_ID ) )
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:497:6: lv_name_2= ( 'keyword' | RULE_STRING | RULE_ID )
@@ -921,7 +921,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
                     {
                     match(input,20,FOLLOW_20_in_ruleFamilie995); 
 
-                            createLeafNode(grammarAccess.prFamilie().ele200KeywordKeyword(), "name"); 
+                            createLeafNode(grammarAccess.getFamilieAccess().getNameKeywordKeyword_2_0_0(), "name"); 
                         
 
                     }
@@ -931,7 +931,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
                     {
                     match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleFamilie1012); 
 
-                    		createLeafNode(grammarAccess.prFamilie().ele201TerminalRuleCallSTRING(), "name"); 
+                    		createLeafNode(grammarAccess.getFamilieAccess().getNameSTRINGTerminalRuleCall_2_0_1(), "name"); 
                     	
 
                     }
@@ -941,7 +941,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
                     {
                     match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1024); 
 
-                    		createLeafNode(grammarAccess.prFamilie().ele202TerminalRuleCallID(), "name"); 
+                    		createLeafNode(grammarAccess.getFamilieAccess().getNameIDTerminalRuleCall_2_0_2(), "name"); 
                     	
 
                     }
@@ -951,7 +951,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getFamilieRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -969,13 +969,13 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             {
 
             			if (current==null) {
-            	            current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getFamilieRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
                     
             match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1056); 
 
-            		createLeafNode(grammarAccess.prFamilie().ele30CrossReferenceIDErwachsener(), "mutter"); 
+            		createLeafNode(grammarAccess.getFamilieAccess().getMutterErwachsenerCrossReference_3_0(), "mutter"); 
             	
 
             }
@@ -985,13 +985,13 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             {
 
             			if (current==null) {
-            	            current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getFamilieRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
                     
             match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1081); 
 
-            		createLeafNode(grammarAccess.prFamilie().ele40CrossReferenceIDErwachsener(), "vater"); 
+            		createLeafNode(grammarAccess.getFamilieAccess().getVaterErwachsenerCrossReference_4_0(), "vater"); 
             	
 
             }
@@ -1001,13 +1001,13 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             {
 
             			if (current==null) {
-            	            current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getFamilieRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
                     
             match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1106); 
 
-            		createLeafNode(grammarAccess.prFamilie().ele50CrossReferenceIDKind(), "kinder"); 
+            		createLeafNode(grammarAccess.getFamilieAccess().getKinderKindCrossReference_5_0(), "kinder"); 
             	
 
             }
@@ -1029,20 +1029,20 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             	    {
             	    match(input,21,FOLLOW_21_in_ruleFamilie1119); 
 
-            	            createLeafNode(grammarAccess.prFamilie().ele60KeywordComma(), null); 
+            	            createLeafNode(grammarAccess.getFamilieAccess().getCommaKeyword_6_0(), null); 
             	        
             	    // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:579:1: ( RULE_ID )
             	    // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:582:3: RULE_ID
             	    {
 
             	    			if (current==null) {
-            	    	            current = factory.create(grammarAccess.prFamilie().getRule().getType().getClassifier());
+            	    	            current = factory.create(grammarAccess.getFamilieRule().getType().getClassifier());
             	    	            associateNodeWithAstElement(currentNode, current);
             	    	        }
             	            
             	    match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleFamilie1141); 
 
-            	    		createLeafNode(grammarAccess.prFamilie().ele610CrossReferenceIDKind(), "kinder"); 
+            	    		createLeafNode(grammarAccess.getFamilieAccess().getKinderKindCrossReference_6_1_0(), "kinder"); 
             	    	
 
             	    }
@@ -1058,7 +1058,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
             match(input,16,FOLLOW_16_in_ruleFamilie1155); 
 
-                    createLeafNode(grammarAccess.prFamilie().ele7KeywordRightParenthesis(), null); 
+                    createLeafNode(grammarAccess.getFamilieAccess().getRightParenthesisKeyword_7(), null); 
                 
 
             }
@@ -1094,7 +1094,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:606:47: (iv_ruleFarbe= ruleFarbe EOF )
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:607:2: iv_ruleFarbe= ruleFarbe EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prFarbe().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getFarbeRule(), currentNode); 
             pushFollow(FOLLOW_ruleFarbe_in_entryRuleFarbe1188);
             iv_ruleFarbe=ruleFarbe();
             _fsp--;
@@ -1118,7 +1118,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
 
     // $ANTLR start ruleFarbe
-    // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:614:1: ruleFarbe returns [EObject current=null] : (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) ) ;
+    // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:614:1: ruleFarbe returns [EObject current=null] : (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) ) ;
     public final EObject ruleFarbe() throws RecognitionException {
         EObject current = null;
 
@@ -1127,13 +1127,13 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
          EObject temp=null; setCurrentLookahead(); resetLookahead(); 
             
         try {
-            // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:619:6: ( (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) ) )
-            // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:620:1: (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) )
+            // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:619:6: ( (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) ) )
+            // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:620:1: (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) )
             {
-            // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:620:1: (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' ) )
-            // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:622:6: lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' )
+            // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:620:1: (lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' ) )
+            // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:622:6: lv_wert_0= ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' )
             {
-            // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:622:16: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' )
+            // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:622:16: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' )
             int alt6=4;
             switch ( input.LA(1) ) {
             case 22:
@@ -1158,7 +1158,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("622:16: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u00DCN' )", 6, 0, input);
+                    new NoViableAltException("622:16: ( 'ROT' | 'BLAU' | 'GELB' | 'GR\\u2039N' )", 6, 0, input);
 
                 throw nvae;
             }
@@ -1169,7 +1169,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
                     {
                     match(input,22,FOLLOW_22_in_ruleFarbe1244); 
 
-                            createLeafNode(grammarAccess.prFarbe().ele00KeywordROT(), "wert"); 
+                            createLeafNode(grammarAccess.getFarbeAccess().getWertROTKeyword_0_0(), "wert"); 
                         
 
                     }
@@ -1179,7 +1179,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
                     {
                     match(input,23,FOLLOW_23_in_ruleFarbe1260); 
 
-                            createLeafNode(grammarAccess.prFarbe().ele01KeywordBLAU(), "wert"); 
+                            createLeafNode(grammarAccess.getFarbeAccess().getWertBLAUKeyword_0_1(), "wert"); 
                         
 
                     }
@@ -1189,17 +1189,17 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
                     {
                     match(input,24,FOLLOW_24_in_ruleFarbe1276); 
 
-                            createLeafNode(grammarAccess.prFarbe().ele02KeywordGELB(), "wert"); 
+                            createLeafNode(grammarAccess.getFarbeAccess().getWertGELBKeyword_0_2(), "wert"); 
                         
 
                     }
                     break;
                 case 4 :
-                    // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:640:6: 'GR\\u00DCN'
+                    // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:640:6: 'GR\\u2039N'
                     {
                     match(input,25,FOLLOW_25_in_ruleFarbe1292); 
 
-                            createLeafNode(grammarAccess.prFarbe().ele03KeywordGRÜN(), "wert"); 
+                            createLeafNode(grammarAccess.getFarbeAccess().getWertGRNKeyword_0_3(), "wert"); 
                         
 
                     }
@@ -1209,7 +1209,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
 
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prFarbe().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getFarbeRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -1253,7 +1253,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:667:62: (iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF )
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:668:2: iv_ruleCustomTypeParserRule= ruleCustomTypeParserRule EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prCustomTypeParserRule().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getCustomTypeParserRuleRule(), currentNode); 
             pushFollow(FOLLOW_ruleCustomTypeParserRule_in_entryRuleCustomTypeParserRule1339);
             iv_ruleCustomTypeParserRule=ruleCustomTypeParserRule();
             _fsp--;
@@ -1294,7 +1294,7 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             {
             match(input,26,FOLLOW_26_in_ruleCustomTypeParserRule1383); 
 
-                    createLeafNode(grammarAccess.prCustomTypeParserRule().ele0KeywordType(), null); 
+                    createLeafNode(grammarAccess.getCustomTypeParserRuleAccess().getTypeKeyword_0(), null); 
                 
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:685:1: (lv_name_1= RULE_ID )
             // ../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g:687:6: lv_name_1= RULE_ID
@@ -1302,11 +1302,11 @@ public class InternalReferenceGrammarParser extends AbstractInternalAntlrParser
             lv_name_1=(Token)input.LT(1);
             match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleCustomTypeParserRule1405); 
 
-            		createLeafNode(grammarAccess.prCustomTypeParserRule().ele10TerminalRuleCallID(), "name"); 
+            		createLeafNode(grammarAccess.getCustomTypeParserRuleAccess().getNameIDTerminalRuleCall_1_0(), "name"); 
             	
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prCustomTypeParserRule().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getCustomTypeParserRuleRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g
index 274ba27..a7a7d47 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar__.g
@@ -21,7 +21,7 @@ T21 : ',' ;
 T22 : 'ROT' ;
 T23 : 'BLAU' ;
 T24 : 'GELB' ;
-T25 : 'GR\u00DCN' ;
+T25 : 'GR\u2039N' ;
 T26 : 'type' ;
 
 // $ANTLR src "../org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/antlr/internal/InternalReferenceGrammar.g" 710
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java
index 56c537e..ca780a7 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/ReferenceGrammarParserConfiguration.java
@@ -84,21 +84,21 @@ public class ReferenceGrammarParserConfiguration extends AbstractParserConfigura
 	public void configureConsumers() {
 		if (grammarAccess == null)
 			throw new NullPointerException("grammarAccess may not be null, you call configureConsumers");
-		getSpielplatzConsumer().setRule(grammarAccess.prSpielplatz());
-		getPersonConsumer().setRule(grammarAccess.prPerson());
-		getKindConsumer().setRule(grammarAccess.prKind());
-		getErwachsenerConsumer().setRule(grammarAccess.prErwachsener());
-		getSpielzeugConsumer().setRule(grammarAccess.prSpielzeug());
-		getFamilieConsumer().setRule(grammarAccess.prFamilie());
-		getFarbeConsumer().setRule(grammarAccess.prFarbe());
-		getCustomTypeParserRuleConsumer().setRule(grammarAccess.prCustomTypeParserRule());
-		getIdConsumer().setRule(grammarAccess.trID());
-		getIntConsumer().setRule(grammarAccess.trINT());
-		getStringConsumer().setRule(grammarAccess.trSTRING());
-		getMlCommentConsumer().setRule(grammarAccess.trML_COMMENT());
-		getSlCommentConsumer().setRule(grammarAccess.trSL_COMMENT());
-		getWsConsumer().setRule(grammarAccess.trWS());
-		getAnyOtherConsumer().setRule(grammarAccess.trANY_OTHER());
+		getSpielplatzConsumer().setRule(grammarAccess.getSpielplatzAccess());
+		getPersonConsumer().setRule(grammarAccess.getPersonAccess());
+		getKindConsumer().setRule(grammarAccess.getKindAccess());
+		getErwachsenerConsumer().setRule(grammarAccess.getErwachsenerAccess());
+		getSpielzeugConsumer().setRule(grammarAccess.getSpielzeugAccess());
+		getFamilieConsumer().setRule(grammarAccess.getFamilieAccess());
+		getFarbeConsumer().setRule(grammarAccess.getFarbeAccess());
+		getCustomTypeParserRuleConsumer().setRule(grammarAccess.getCustomTypeParserRuleAccess());
+		getIdConsumer().setRule(grammarAccess.getIDRule());
+		getIntConsumer().setRule(grammarAccess.getINTRule());
+		getStringConsumer().setRule(grammarAccess.getSTRINGRule());
+		getMlCommentConsumer().setRule(grammarAccess.getML_COMMENTRule());
+		getSlCommentConsumer().setRule(grammarAccess.getSL_COMMENTRule());
+		getWsConsumer().setRule(grammarAccess.getWSRule());
+		getAnyOtherConsumer().setRule(grammarAccess.getANY_OTHERRule());
 
 
 		getSpielplatzConsumer().setCustomTypeParserRuleConsumer(getCustomTypeParserRuleConsumer());
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java
index 578f7f4..010bbc7 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarCustomTypeParserRuleConsumer.java
@@ -105,10 +105,10 @@ public final class ReferenceGrammarCustomTypeParserRuleConsumer extends NonTermi
 	public void setRule(CustomTypeParserRuleElements rule) {
 		this.rule = rule;
 		
-		group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
-		keyword$2$Consumer = new Keyword$2$Consumer(rule.ele0KeywordType());
-		assignment$3$Consumer = new Assignment$3$Consumer(rule.ele1AssignmentName());
-		ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.ele10TerminalRuleCallID());
+		group$1$Consumer = new Group$1$Consumer(rule.getGroup());
+		keyword$2$Consumer = new Keyword$2$Consumer(rule.getTypeKeyword_0());
+		assignment$3$Consumer = new Assignment$3$Consumer(rule.getNameAssignment_1());
+		ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.getNameIDTerminalRuleCall_1_0());
 	}
 	
 	@Override
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java
index f8b857a..b9e9476 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarErwachsenerConsumer.java
@@ -175,14 +175,14 @@ public final class ReferenceGrammarErwachsenerConsumer extends NonTerminalConsum
 	public void setRule(ErwachsenerElements rule) {
 		this.rule = rule;
 		
-		group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
-		keyword$2$Consumer = new Keyword$2$Consumer(rule.ele0KeywordErwachsener());
-		keyword$3$Consumer = new Keyword$3$Consumer(rule.ele1KeywordLeftParenthesis());
-		assignment$4$Consumer = new Assignment$4$Consumer(rule.ele2AssignmentName());
-		ruleCall$5$Consumer = new RuleCall$5$Consumer(rule.ele20TerminalRuleCallID());
-		assignment$6$Consumer = new Assignment$6$Consumer(rule.ele3AssignmentAge());
-		ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.ele30TerminalRuleCallINT());
-		keyword$8$Consumer = new Keyword$8$Consumer(rule.ele4KeywordRightParenthesis());
+		group$1$Consumer = new Group$1$Consumer(rule.getGroup());
+		keyword$2$Consumer = new Keyword$2$Consumer(rule.getErwachsenerKeyword_0());
+		keyword$3$Consumer = new Keyword$3$Consumer(rule.getLeftParenthesisKeyword_1());
+		assignment$4$Consumer = new Assignment$4$Consumer(rule.getNameAssignment_2());
+		ruleCall$5$Consumer = new RuleCall$5$Consumer(rule.getNameIDTerminalRuleCall_2_0());
+		assignment$6$Consumer = new Assignment$6$Consumer(rule.getAgeAssignment_3());
+		ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.getAgeINTTerminalRuleCall_3_0());
+		keyword$8$Consumer = new Keyword$8$Consumer(rule.getRightParenthesisKeyword_4());
 	}
 	
 	@Override
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java
index d70f4dc..61b9fb8 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFamilieConsumer.java
@@ -355,28 +355,28 @@ public final class ReferenceGrammarFamilieConsumer extends NonTerminalConsumer {
 	public void setRule(FamilieElements rule) {
 		this.rule = rule;
 		
-		group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
-		keyword$2$Consumer = new Keyword$2$Consumer(rule.ele0KeywordFamilie());
-		keyword$3$Consumer = new Keyword$3$Consumer(rule.ele1KeywordLeftParenthesis());
-		assignment$4$Consumer = new Assignment$4$Consumer(rule.ele2AssignmentName());
-		alternatives$5$Consumer = new Alternatives$5$Consumer(rule.ele20Alternatives());
-		keyword$6$Consumer = new Keyword$6$Consumer(rule.ele200KeywordKeyword());
-		ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.ele201TerminalRuleCallSTRING());
-		ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele202TerminalRuleCallID());
-		keyword$6$Consumer = new Keyword$6$Consumer(rule.ele200KeywordKeyword());
-		ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.ele201TerminalRuleCallSTRING());
-		ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.ele202TerminalRuleCallID());
-		assignment$9$Consumer = new Assignment$9$Consumer(rule.ele3AssignmentMutter());
-		crossReference$10$Consumer = new CrossReference$10$Consumer(rule.ele30CrossReferenceIDErwachsener());
-		assignment$13$Consumer = new Assignment$13$Consumer(rule.ele4AssignmentVater());
-		crossReference$14$Consumer = new CrossReference$14$Consumer(rule.ele40CrossReferenceIDErwachsener());
-		assignment$17$Consumer = new Assignment$17$Consumer(rule.ele5AssignmentKinder());
-		crossReference$18$Consumer = new CrossReference$18$Consumer(rule.ele50CrossReferenceIDKind());
-		group$21$Consumer = new Group$21$Consumer(rule.ele6Group());
-		keyword$22$Consumer = new Keyword$22$Consumer(rule.ele60KeywordComma());
-		assignment$23$Consumer = new Assignment$23$Consumer(rule.ele61AssignmentKinder());
-		crossReference$24$Consumer = new CrossReference$24$Consumer(rule.ele610CrossReferenceIDKind());
-		keyword$27$Consumer = new Keyword$27$Consumer(rule.ele7KeywordRightParenthesis());
+		group$1$Consumer = new Group$1$Consumer(rule.getGroup());
+		keyword$2$Consumer = new Keyword$2$Consumer(rule.getFamilieKeyword_0());
+		keyword$3$Consumer = new Keyword$3$Consumer(rule.getLeftParenthesisKeyword_1());
+		assignment$4$Consumer = new Assignment$4$Consumer(rule.getNameAssignment_2());
+		alternatives$5$Consumer = new Alternatives$5$Consumer(rule.getNameAlternatives_2_0());
+		keyword$6$Consumer = new Keyword$6$Consumer(rule.getNameKeywordKeyword_2_0_0());
+		ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.getNameSTRINGTerminalRuleCall_2_0_1());
+		ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.getNameIDTerminalRuleCall_2_0_2());
+		keyword$6$Consumer = new Keyword$6$Consumer(rule.getNameKeywordKeyword_2_0_0());
+		ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.getNameSTRINGTerminalRuleCall_2_0_1());
+		ruleCall$8$Consumer = new RuleCall$8$Consumer(rule.getNameIDTerminalRuleCall_2_0_2());
+		assignment$9$Consumer = new Assignment$9$Consumer(rule.getMutterAssignment_3());
+		crossReference$10$Consumer = new CrossReference$10$Consumer(rule.getMutterErwachsenerCrossReference_3_0());
+		assignment$13$Consumer = new Assignment$13$Consumer(rule.getVaterAssignment_4());
+		crossReference$14$Consumer = new CrossReference$14$Consumer(rule.getVaterErwachsenerCrossReference_4_0());
+		assignment$17$Consumer = new Assignment$17$Consumer(rule.getKinderAssignment_5());
+		crossReference$18$Consumer = new CrossReference$18$Consumer(rule.getKinderKindCrossReference_5_0());
+		group$21$Consumer = new Group$21$Consumer(rule.getGroup_6());
+		keyword$22$Consumer = new Keyword$22$Consumer(rule.getCommaKeyword_6_0());
+		assignment$23$Consumer = new Assignment$23$Consumer(rule.getKinderAssignment_6_1());
+		crossReference$24$Consumer = new CrossReference$24$Consumer(rule.getKinderKindCrossReference_6_1_0());
+		keyword$27$Consumer = new Keyword$27$Consumer(rule.getRightParenthesisKeyword_7());
 	}
 	
 	@Override
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java
index 1a3d258..b4ca334 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarFarbeConsumer.java
@@ -137,16 +137,16 @@ public final class ReferenceGrammarFarbeConsumer extends NonTerminalConsumer {
 	public void setRule(FarbeElements rule) {
 		this.rule = rule;
 		
-		assignment$1$Consumer = new Assignment$1$Consumer(rule.eleAssignmentWert());
-		alternatives$2$Consumer = new Alternatives$2$Consumer(rule.ele0Alternatives());
-		keyword$3$Consumer = new Keyword$3$Consumer(rule.ele00KeywordROT());
-		keyword$4$Consumer = new Keyword$4$Consumer(rule.ele01KeywordBLAU());
-		keyword$5$Consumer = new Keyword$5$Consumer(rule.ele02KeywordGELB());
-		keyword$6$Consumer = new Keyword$6$Consumer(rule.ele03KeywordGRÜN());
-		keyword$3$Consumer = new Keyword$3$Consumer(rule.ele00KeywordROT());
-		keyword$4$Consumer = new Keyword$4$Consumer(rule.ele01KeywordBLAU());
-		keyword$5$Consumer = new Keyword$5$Consumer(rule.ele02KeywordGELB());
-		keyword$6$Consumer = new Keyword$6$Consumer(rule.ele03KeywordGRÜN());
+		assignment$1$Consumer = new Assignment$1$Consumer(rule.getWertAssignment());
+		alternatives$2$Consumer = new Alternatives$2$Consumer(rule.getWertAlternatives_0());
+		keyword$3$Consumer = new Keyword$3$Consumer(rule.getWertROTKeyword_0_0());
+		keyword$4$Consumer = new Keyword$4$Consumer(rule.getWertBLAUKeyword_0_1());
+		keyword$5$Consumer = new Keyword$5$Consumer(rule.getWertGELBKeyword_0_2());
+		keyword$6$Consumer = new Keyword$6$Consumer(rule.getWertGRNKeyword_0_3());
+		keyword$3$Consumer = new Keyword$3$Consumer(rule.getWertROTKeyword_0_0());
+		keyword$4$Consumer = new Keyword$4$Consumer(rule.getWertBLAUKeyword_0_1());
+		keyword$5$Consumer = new Keyword$5$Consumer(rule.getWertGELBKeyword_0_2());
+		keyword$6$Consumer = new Keyword$6$Consumer(rule.getWertGRNKeyword_0_3());
 	}
 	
 	@Override
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java
index f7d9918..bab203f 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarKindConsumer.java
@@ -175,14 +175,14 @@ public final class ReferenceGrammarKindConsumer extends NonTerminalConsumer {
 	public void setRule(KindElements rule) {
 		this.rule = rule;
 		
-		group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
-		keyword$2$Consumer = new Keyword$2$Consumer(rule.ele0KeywordKind());
-		keyword$3$Consumer = new Keyword$3$Consumer(rule.ele1KeywordLeftParenthesis());
-		assignment$4$Consumer = new Assignment$4$Consumer(rule.ele2AssignmentName());
-		ruleCall$5$Consumer = new RuleCall$5$Consumer(rule.ele20TerminalRuleCallID());
-		assignment$6$Consumer = new Assignment$6$Consumer(rule.ele3AssignmentAge());
-		ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.ele30TerminalRuleCallINT());
-		keyword$8$Consumer = new Keyword$8$Consumer(rule.ele4KeywordRightParenthesis());
+		group$1$Consumer = new Group$1$Consumer(rule.getGroup());
+		keyword$2$Consumer = new Keyword$2$Consumer(rule.getKindKeyword_0());
+		keyword$3$Consumer = new Keyword$3$Consumer(rule.getLeftParenthesisKeyword_1());
+		assignment$4$Consumer = new Assignment$4$Consumer(rule.getNameAssignment_2());
+		ruleCall$5$Consumer = new RuleCall$5$Consumer(rule.getNameIDTerminalRuleCall_2_0());
+		assignment$6$Consumer = new Assignment$6$Consumer(rule.getAgeAssignment_3());
+		ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.getAgeINTTerminalRuleCall_3_0());
+		keyword$8$Consumer = new Keyword$8$Consumer(rule.getRightParenthesisKeyword_4());
 	}
 	
 	@Override
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java
index ece438f..c231994 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarPersonConsumer.java
@@ -84,9 +84,9 @@ public final class ReferenceGrammarPersonConsumer extends NonTerminalConsumer {
 	public void setRule(PersonElements rule) {
 		this.rule = rule;
 		
-		alternatives$1$Consumer = new Alternatives$1$Consumer(rule.eleAlternatives());
-		ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.ele0ParserRuleCallKind());
-		ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.ele1ParserRuleCallErwachsener());
+		alternatives$1$Consumer = new Alternatives$1$Consumer(rule.getAlternatives());
+		ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getKindParserRuleCall_0());
+		ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.getErwachsenerParserRuleCall_1());
 	}
 	
 	@Override
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java
index dde92a9..6bcca91 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielplatzConsumer.java
@@ -346,25 +346,25 @@ public final class ReferenceGrammarSpielplatzConsumer extends NonTerminalConsume
 	public void setRule(SpielplatzElements rule) {
 		this.rule = rule;
 		
-		group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
-		keyword$2$Consumer = new Keyword$2$Consumer(rule.ele0KeywordSpielplatz());
-		assignment$3$Consumer = new Assignment$3$Consumer(rule.ele1AssignmentGroesse());
-		ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.ele10TerminalRuleCallINT());
-		assignment$5$Consumer = new Assignment$5$Consumer(rule.ele2AssignmentBeschreibung());
-		ruleCall$6$Consumer = new RuleCall$6$Consumer(rule.ele20TerminalRuleCallSTRING());
-		keyword$7$Consumer = new Keyword$7$Consumer(rule.ele3KeywordLeftCurlyBracket());
-		alternatives$8$Consumer = new Alternatives$8$Consumer(rule.ele4Alternatives());
-		assignment$9$Consumer = new Assignment$9$Consumer(rule.ele40AssignmentKinder());
-		ruleCall$10$Consumer = new RuleCall$10$Consumer(rule.ele400ParserRuleCallKind());
-		assignment$11$Consumer = new Assignment$11$Consumer(rule.ele41AssignmentErzieher());
-		ruleCall$12$Consumer = new RuleCall$12$Consumer(rule.ele410ParserRuleCallErwachsener());
-		assignment$13$Consumer = new Assignment$13$Consumer(rule.ele42AssignmentSpielzeuge());
-		ruleCall$14$Consumer = new RuleCall$14$Consumer(rule.ele420ParserRuleCallSpielzeug());
-		assignment$15$Consumer = new Assignment$15$Consumer(rule.ele43AssignmentFamilie());
-		ruleCall$16$Consumer = new RuleCall$16$Consumer(rule.ele430ParserRuleCallFamilie());
-		assignment$17$Consumer = new Assignment$17$Consumer(rule.ele44AssignmentTypes());
-		ruleCall$18$Consumer = new RuleCall$18$Consumer(rule.ele440ParserRuleCallCustomTypeParserRule());
-		keyword$19$Consumer = new Keyword$19$Consumer(rule.ele5KeywordRightCurlyBracket());
+		group$1$Consumer = new Group$1$Consumer(rule.getGroup());
+		keyword$2$Consumer = new Keyword$2$Consumer(rule.getSpielplatzKeyword_0());
+		assignment$3$Consumer = new Assignment$3$Consumer(rule.getGroesseAssignment_1());
+		ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.getGroesseINTTerminalRuleCall_1_0());
+		assignment$5$Consumer = new Assignment$5$Consumer(rule.getBeschreibungAssignment_2());
+		ruleCall$6$Consumer = new RuleCall$6$Consumer(rule.getBeschreibungSTRINGTerminalRuleCall_2_0());
+		keyword$7$Consumer = new Keyword$7$Consumer(rule.getLeftCurlyBracketKeyword_3());
+		alternatives$8$Consumer = new Alternatives$8$Consumer(rule.getAlternatives_4());
+		assignment$9$Consumer = new Assignment$9$Consumer(rule.getKinderAssignment_4_0());
+		ruleCall$10$Consumer = new RuleCall$10$Consumer(rule.getKinderKindParserRuleCall_4_0_0());
+		assignment$11$Consumer = new Assignment$11$Consumer(rule.getErzieherAssignment_4_1());
+		ruleCall$12$Consumer = new RuleCall$12$Consumer(rule.getErzieherErwachsenerParserRuleCall_4_1_0());
+		assignment$13$Consumer = new Assignment$13$Consumer(rule.getSpielzeugeAssignment_4_2());
+		ruleCall$14$Consumer = new RuleCall$14$Consumer(rule.getSpielzeugeSpielzeugParserRuleCall_4_2_0());
+		assignment$15$Consumer = new Assignment$15$Consumer(rule.getFamilieAssignment_4_3());
+		ruleCall$16$Consumer = new RuleCall$16$Consumer(rule.getFamilieFamilieParserRuleCall_4_3_0());
+		assignment$17$Consumer = new Assignment$17$Consumer(rule.getTypesAssignment_4_4());
+		ruleCall$18$Consumer = new RuleCall$18$Consumer(rule.getTypesCustomTypeParserRuleParserRuleCall_4_4_0());
+		keyword$19$Consumer = new Keyword$19$Consumer(rule.getRightCurlyBracketKeyword_5());
 	}
 	
 	@Override
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java
index ad401f1..8bf41a3 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/parser/packrat/consumers/ReferenceGrammarSpielzeugConsumer.java
@@ -173,14 +173,14 @@ public final class ReferenceGrammarSpielzeugConsumer extends NonTerminalConsumer
 	public void setRule(SpielzeugElements rule) {
 		this.rule = rule;
 		
-		group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
-		keyword$2$Consumer = new Keyword$2$Consumer(rule.ele0KeywordSpielzeug());
-		keyword$3$Consumer = new Keyword$3$Consumer(rule.ele1KeywordLeftParenthesis());
-		assignment$4$Consumer = new Assignment$4$Consumer(rule.ele2AssignmentName());
-		ruleCall$5$Consumer = new RuleCall$5$Consumer(rule.ele20TerminalRuleCallID());
-		assignment$6$Consumer = new Assignment$6$Consumer(rule.ele3AssignmentFarbe());
-		ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.ele30ParserRuleCallFarbe());
-		keyword$8$Consumer = new Keyword$8$Consumer(rule.ele4KeywordRightParenthesis());
+		group$1$Consumer = new Group$1$Consumer(rule.getGroup());
+		keyword$2$Consumer = new Keyword$2$Consumer(rule.getSpielzeugKeyword_0());
+		keyword$3$Consumer = new Keyword$3$Consumer(rule.getLeftParenthesisKeyword_1());
+		assignment$4$Consumer = new Assignment$4$Consumer(rule.getNameAssignment_2());
+		ruleCall$5$Consumer = new RuleCall$5$Consumer(rule.getNameIDTerminalRuleCall_2_0());
+		assignment$6$Consumer = new Assignment$6$Consumer(rule.getFarbeAssignment_3());
+		ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.getFarbeFarbeParserRuleCall_3_0());
+		keyword$8$Consumer = new Keyword$8$Consumer(rule.getRightParenthesisKeyword_4());
 	}
 	
 	@Override
diff --git a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java
index 8dc29bd..4934825 100644
--- a/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java
+++ b/devtools/org.eclipse.xtext.reference/src-gen/org/eclipse/xtext/reference/services/ReferenceGrammarGrammarAccess.java
@@ -20,373 +20,381 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
 	public class SpielplatzElements implements IParserRuleAccess {
 		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Spielplatz");
 		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Keyword c0KeywordSpielplatz = (Keyword)cGroup.eContents().get(0);
-		private final Assignment c1AssignmentGroesse = (Assignment)cGroup.eContents().get(1);
-		private final RuleCall c10TerminalRuleCallINT = (RuleCall)c1AssignmentGroesse.eContents().get(0);
-		private final Assignment c2AssignmentBeschreibung = (Assignment)cGroup.eContents().get(2);
-		private final RuleCall c20TerminalRuleCallSTRING = (RuleCall)c2AssignmentBeschreibung.eContents().get(0);
-		private final Keyword c3KeywordLeftCurlyBracket = (Keyword)cGroup.eContents().get(3);
-		private final Alternatives c4Alternatives = (Alternatives)cGroup.eContents().get(4);
-		private final Assignment c40AssignmentKinder = (Assignment)c4Alternatives.eContents().get(0);
-		private final RuleCall c400ParserRuleCallKind = (RuleCall)c40AssignmentKinder.eContents().get(0);
-		private final Assignment c41AssignmentErzieher = (Assignment)c4Alternatives.eContents().get(1);
-		private final RuleCall c410ParserRuleCallErwachsener = (RuleCall)c41AssignmentErzieher.eContents().get(0);
-		private final Assignment c42AssignmentSpielzeuge = (Assignment)c4Alternatives.eContents().get(2);
-		private final RuleCall c420ParserRuleCallSpielzeug = (RuleCall)c42AssignmentSpielzeuge.eContents().get(0);
-		private final Assignment c43AssignmentFamilie = (Assignment)c4Alternatives.eContents().get(3);
-		private final RuleCall c430ParserRuleCallFamilie = (RuleCall)c43AssignmentFamilie.eContents().get(0);
-		private final Assignment c44AssignmentTypes = (Assignment)c4Alternatives.eContents().get(4);
-		private final RuleCall c440ParserRuleCallCustomTypeParserRule = (RuleCall)c44AssignmentTypes.eContents().get(0);
-		private final Keyword c5KeywordRightCurlyBracket = (Keyword)cGroup.eContents().get(5);
+		private final Keyword cSpielplatzKeyword_0 = (Keyword)cGroup.eContents().get(0);
+		private final Assignment cGroesseAssignment_1 = (Assignment)cGroup.eContents().get(1);
+		private final RuleCall cGroesseINTTerminalRuleCall_1_0 = (RuleCall)cGroesseAssignment_1.eContents().get(0);
+		private final Assignment cBeschreibungAssignment_2 = (Assignment)cGroup.eContents().get(2);
+		private final RuleCall cBeschreibungSTRINGTerminalRuleCall_2_0 = (RuleCall)cBeschreibungAssignment_2.eContents().get(0);
+		private final Keyword cLeftCurlyBracketKeyword_3 = (Keyword)cGroup.eContents().get(3);
+		private final Alternatives cAlternatives_4 = (Alternatives)cGroup.eContents().get(4);
+		private final Assignment cKinderAssignment_4_0 = (Assignment)cAlternatives_4.eContents().get(0);
+		private final RuleCall cKinderKindParserRuleCall_4_0_0 = (RuleCall)cKinderAssignment_4_0.eContents().get(0);
+		private final Assignment cErzieherAssignment_4_1 = (Assignment)cAlternatives_4.eContents().get(1);
+		private final RuleCall cErzieherErwachsenerParserRuleCall_4_1_0 = (RuleCall)cErzieherAssignment_4_1.eContents().get(0);
+		private final Assignment cSpielzeugeAssignment_4_2 = (Assignment)cAlternatives_4.eContents().get(2);
+		private final RuleCall cSpielzeugeSpielzeugParserRuleCall_4_2_0 = (RuleCall)cSpielzeugeAssignment_4_2.eContents().get(0);
+		private final Assignment cFamilieAssignment_4_3 = (Assignment)cAlternatives_4.eContents().get(3);
+		private final RuleCall cFamilieFamilieParserRuleCall_4_3_0 = (RuleCall)cFamilieAssignment_4_3.eContents().get(0);
+		private final Assignment cTypesAssignment_4_4 = (Assignment)cAlternatives_4.eContents().get(4);
+		private final RuleCall cTypesCustomTypeParserRuleParserRuleCall_4_4_0 = (RuleCall)cTypesAssignment_4_4.eContents().get(0);
+		private final Keyword cRightCurlyBracketKeyword_5 = (Keyword)cGroup.eContents().get(5);
 		
-		// not supported
+		//Spielplatz:
+		//  ("spielplatz" groesse=INT (beschreibung=STRING)? "{" (kinder+=Kind|erzieher+=Erwachsener|spielzeuge+=Spielzeug|familie+=Familie|types+=CustomTypeParserRule)* "}")?;
 		public ParserRule getRule() { return rule; }
 
-		// not supported
-		public Group eleGroup() { return cGroup; }
+		//("spielplatz" groesse=INT (beschreibung=STRING)? "{" (kinder+=Kind|erzieher+=Erwachsener|spielzeuge+=Spielzeug|familie+=Familie|types+=CustomTypeParserRule)* "}")?
+		public Group getGroup() { return cGroup; }
 
-		// not supported
-		public Keyword ele0KeywordSpielplatz() { return c0KeywordSpielplatz; }
+		//"spielplatz"
+		public Keyword getSpielplatzKeyword_0() { return cSpielplatzKeyword_0; }
 
-		// not supported
-		public Assignment ele1AssignmentGroesse() { return c1AssignmentGroesse; }
+		//groesse=INT
+		public Assignment getGroesseAssignment_1() { return cGroesseAssignment_1; }
 
-		// not supported
-		public RuleCall ele10TerminalRuleCallINT() { return c10TerminalRuleCallINT; }
+		//INT
+		public RuleCall getGroesseINTTerminalRuleCall_1_0() { return cGroesseINTTerminalRuleCall_1_0; }
 
-		// not supported
-		public Assignment ele2AssignmentBeschreibung() { return c2AssignmentBeschreibung; }
+		//(beschreibung=STRING)?
+		public Assignment getBeschreibungAssignment_2() { return cBeschreibungAssignment_2; }
 
-		// not supported
-		public RuleCall ele20TerminalRuleCallSTRING() { return c20TerminalRuleCallSTRING; }
+		//STRING
+		public RuleCall getBeschreibungSTRINGTerminalRuleCall_2_0() { return cBeschreibungSTRINGTerminalRuleCall_2_0; }
 
-		// not supported
-		public Keyword ele3KeywordLeftCurlyBracket() { return c3KeywordLeftCurlyBracket; }
+		//"{"
+		public Keyword getLeftCurlyBracketKeyword_3() { return cLeftCurlyBracketKeyword_3; }
 
-		// not supported
-		public Alternatives ele4Alternatives() { return c4Alternatives; }
+		//(kinder+=Kind|erzieher+=Erwachsener|spielzeuge+=Spielzeug|familie+=Familie|types+=CustomTypeParserRule)*
+		public Alternatives getAlternatives_4() { return cAlternatives_4; }
 
-		// not supported
-		public Assignment ele40AssignmentKinder() { return c40AssignmentKinder; }
+		//kinder+=Kind
+		public Assignment getKinderAssignment_4_0() { return cKinderAssignment_4_0; }
 
-		// not supported
-		public RuleCall ele400ParserRuleCallKind() { return c400ParserRuleCallKind; }
+		//Kind
+		public RuleCall getKinderKindParserRuleCall_4_0_0() { return cKinderKindParserRuleCall_4_0_0; }
 
-		// not supported
-		public Assignment ele41AssignmentErzieher() { return c41AssignmentErzieher; }
+		//erzieher+=Erwachsener
+		public Assignment getErzieherAssignment_4_1() { return cErzieherAssignment_4_1; }
 
-		// not supported
-		public RuleCall ele410ParserRuleCallErwachsener() { return c410ParserRuleCallErwachsener; }
+		//Erwachsener
+		public RuleCall getErzieherErwachsenerParserRuleCall_4_1_0() { return cErzieherErwachsenerParserRuleCall_4_1_0; }
 
-		// not supported
-		public Assignment ele42AssignmentSpielzeuge() { return c42AssignmentSpielzeuge; }
+		//spielzeuge+=Spielzeug
+		public Assignment getSpielzeugeAssignment_4_2() { return cSpielzeugeAssignment_4_2; }
 
-		// not supported
-		public RuleCall ele420ParserRuleCallSpielzeug() { return c420ParserRuleCallSpielzeug; }
+		//Spielzeug
+		public RuleCall getSpielzeugeSpielzeugParserRuleCall_4_2_0() { return cSpielzeugeSpielzeugParserRuleCall_4_2_0; }
 
-		// not supported
-		public Assignment ele43AssignmentFamilie() { return c43AssignmentFamilie; }
+		//familie+=Familie
+		public Assignment getFamilieAssignment_4_3() { return cFamilieAssignment_4_3; }
 
-		// not supported
-		public RuleCall ele430ParserRuleCallFamilie() { return c430ParserRuleCallFamilie; }
+		//Familie
+		public RuleCall getFamilieFamilieParserRuleCall_4_3_0() { return cFamilieFamilieParserRuleCall_4_3_0; }
 
-		// not supported
-		public Assignment ele44AssignmentTypes() { return c44AssignmentTypes; }
+		//types+=CustomTypeParserRule
+		public Assignment getTypesAssignment_4_4() { return cTypesAssignment_4_4; }
 
-		// not supported
-		public RuleCall ele440ParserRuleCallCustomTypeParserRule() { return c440ParserRuleCallCustomTypeParserRule; }
+		//CustomTypeParserRule
+		public RuleCall getTypesCustomTypeParserRuleParserRuleCall_4_4_0() { return cTypesCustomTypeParserRuleParserRuleCall_4_4_0; }
 
-		// not supported
-		public Keyword ele5KeywordRightCurlyBracket() { return c5KeywordRightCurlyBracket; }
+		//"}"
+		public Keyword getRightCurlyBracketKeyword_5() { return cRightCurlyBracketKeyword_5; }
 	}
 
 	public class PersonElements implements IParserRuleAccess {
 		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Person");
 		private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
-		private final RuleCall c0ParserRuleCallKind = (RuleCall)cAlternatives.eContents().get(0);
-		private final RuleCall c1ParserRuleCallErwachsener = (RuleCall)cAlternatives.eContents().get(1);
+		private final RuleCall cKindParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+		private final RuleCall cErwachsenerParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
 		
-		// not supported
+		//Person:
+		//  Kind|Erwachsener;
 		public ParserRule getRule() { return rule; }
 
-		// not supported
-		public Alternatives eleAlternatives() { return cAlternatives; }
+		//Kind|Erwachsener
+		public Alternatives getAlternatives() { return cAlternatives; }
 
-		// not supported
-		public RuleCall ele0ParserRuleCallKind() { return c0ParserRuleCallKind; }
+		//Kind
+		public RuleCall getKindParserRuleCall_0() { return cKindParserRuleCall_0; }
 
-		// not supported
-		public RuleCall ele1ParserRuleCallErwachsener() { return c1ParserRuleCallErwachsener; }
+		//Erwachsener
+		public RuleCall getErwachsenerParserRuleCall_1() { return cErwachsenerParserRuleCall_1; }
 	}
 
 	public class KindElements implements IParserRuleAccess {
 		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Kind");
 		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Keyword c0KeywordKind = (Keyword)cGroup.eContents().get(0);
-		private final Keyword c1KeywordLeftParenthesis = (Keyword)cGroup.eContents().get(1);
-		private final Assignment c2AssignmentName = (Assignment)cGroup.eContents().get(2);
-		private final RuleCall c20TerminalRuleCallID = (RuleCall)c2AssignmentName.eContents().get(0);
-		private final Assignment c3AssignmentAge = (Assignment)cGroup.eContents().get(3);
-		private final RuleCall c30TerminalRuleCallINT = (RuleCall)c3AssignmentAge.eContents().get(0);
-		private final Keyword c4KeywordRightParenthesis = (Keyword)cGroup.eContents().get(4);
+		private final Keyword cKindKeyword_0 = (Keyword)cGroup.eContents().get(0);
+		private final Keyword cLeftParenthesisKeyword_1 = (Keyword)cGroup.eContents().get(1);
+		private final Assignment cNameAssignment_2 = (Assignment)cGroup.eContents().get(2);
+		private final RuleCall cNameIDTerminalRuleCall_2_0 = (RuleCall)cNameAssignment_2.eContents().get(0);
+		private final Assignment cAgeAssignment_3 = (Assignment)cGroup.eContents().get(3);
+		private final RuleCall cAgeINTTerminalRuleCall_3_0 = (RuleCall)cAgeAssignment_3.eContents().get(0);
+		private final Keyword cRightParenthesisKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
-		// not supported
+		//Kind:
+		//  "kind" "(" name=ID age=INT ")";
 		public ParserRule getRule() { return rule; }
 
-		// not supported
-		public Group eleGroup() { return cGroup; }
+		//"kind" "(" name=ID age=INT ")"
+		public Group getGroup() { return cGroup; }
 
-		// not supported
-		public Keyword ele0KeywordKind() { return c0KeywordKind; }
+		//"kind"
+		public Keyword getKindKeyword_0() { return cKindKeyword_0; }
 
-		// not supported
-		public Keyword ele1KeywordLeftParenthesis() { return c1KeywordLeftParenthesis; }
+		//"("
+		public Keyword getLeftParenthesisKeyword_1() { return cLeftParenthesisKeyword_1; }
 
-		// not supported
-		public Assignment ele2AssignmentName() { return c2AssignmentName; }
+		//name=ID
+		public Assignment getNameAssignment_2() { return cNameAssignment_2; }
 
-		// not supported
-		public RuleCall ele20TerminalRuleCallID() { return c20TerminalRuleCallID; }
+		//ID
+		public RuleCall getNameIDTerminalRuleCall_2_0() { return cNameIDTerminalRuleCall_2_0; }
 
-		// not supported
-		public Assignment ele3AssignmentAge() { return c3AssignmentAge; }
+		//age=INT
+		public Assignment getAgeAssignment_3() { return cAgeAssignment_3; }
 
-		// not supported
-		public RuleCall ele30TerminalRuleCallINT() { return c30TerminalRuleCallINT; }
+		//INT
+		public RuleCall getAgeINTTerminalRuleCall_3_0() { return cAgeINTTerminalRuleCall_3_0; }
 
-		// not supported
-		public Keyword ele4KeywordRightParenthesis() { return c4KeywordRightParenthesis; }
+		//")"
+		public Keyword getRightParenthesisKeyword_4() { return cRightParenthesisKeyword_4; }
 	}
 
 	public class ErwachsenerElements implements IParserRuleAccess {
 		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Erwachsener");
 		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Keyword c0KeywordErwachsener = (Keyword)cGroup.eContents().get(0);
-		private final Keyword c1KeywordLeftParenthesis = (Keyword)cGroup.eContents().get(1);
-		private final Assignment c2AssignmentName = (Assignment)cGroup.eContents().get(2);
-		private final RuleCall c20TerminalRuleCallID = (RuleCall)c2AssignmentName.eContents().get(0);
-		private final Assignment c3AssignmentAge = (Assignment)cGroup.eContents().get(3);
-		private final RuleCall c30TerminalRuleCallINT = (RuleCall)c3AssignmentAge.eContents().get(0);
-		private final Keyword c4KeywordRightParenthesis = (Keyword)cGroup.eContents().get(4);
+		private final Keyword cErwachsenerKeyword_0 = (Keyword)cGroup.eContents().get(0);
+		private final Keyword cLeftParenthesisKeyword_1 = (Keyword)cGroup.eContents().get(1);
+		private final Assignment cNameAssignment_2 = (Assignment)cGroup.eContents().get(2);
+		private final RuleCall cNameIDTerminalRuleCall_2_0 = (RuleCall)cNameAssignment_2.eContents().get(0);
+		private final Assignment cAgeAssignment_3 = (Assignment)cGroup.eContents().get(3);
+		private final RuleCall cAgeINTTerminalRuleCall_3_0 = (RuleCall)cAgeAssignment_3.eContents().get(0);
+		private final Keyword cRightParenthesisKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
-		// not supported
+		//Erwachsener:
+		//  "erwachsener" "(" name=ID age=INT ")";
 		public ParserRule getRule() { return rule; }
 
-		// not supported
-		public Group eleGroup() { return cGroup; }
+		//"erwachsener" "(" name=ID age=INT ")"
+		public Group getGroup() { return cGroup; }
 
-		// not supported
-		public Keyword ele0KeywordErwachsener() { return c0KeywordErwachsener; }
+		//"erwachsener"
+		public Keyword getErwachsenerKeyword_0() { return cErwachsenerKeyword_0; }
 
-		// not supported
-		public Keyword ele1KeywordLeftParenthesis() { return c1KeywordLeftParenthesis; }
+		//"("
+		public Keyword getLeftParenthesisKeyword_1() { return cLeftParenthesisKeyword_1; }
 
-		// not supported
-		public Assignment ele2AssignmentName() { return c2AssignmentName; }
+		//name=ID
+		public Assignment getNameAssignment_2() { return cNameAssignment_2; }
 
-		// not supported
-		public RuleCall ele20TerminalRuleCallID() { return c20TerminalRuleCallID; }
+		//ID
+		public RuleCall getNameIDTerminalRuleCall_2_0() { return cNameIDTerminalRuleCall_2_0; }
 
-		// not supported
-		public Assignment ele3AssignmentAge() { return c3AssignmentAge; }
+		//age=INT
+		public Assignment getAgeAssignment_3() { return cAgeAssignment_3; }
 
-		// not supported
-		public RuleCall ele30TerminalRuleCallINT() { return c30TerminalRuleCallINT; }
+		//INT
+		public RuleCall getAgeINTTerminalRuleCall_3_0() { return cAgeINTTerminalRuleCall_3_0; }
 
-		// not supported
-		public Keyword ele4KeywordRightParenthesis() { return c4KeywordRightParenthesis; }
+		//")"
+		public Keyword getRightParenthesisKeyword_4() { return cRightParenthesisKeyword_4; }
 	}
 
 	public class SpielzeugElements implements IParserRuleAccess {
 		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Spielzeug");
 		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Keyword c0KeywordSpielzeug = (Keyword)cGroup.eContents().get(0);
-		private final Keyword c1KeywordLeftParenthesis = (Keyword)cGroup.eContents().get(1);
-		private final Assignment c2AssignmentName = (Assignment)cGroup.eContents().get(2);
-		private final RuleCall c20TerminalRuleCallID = (RuleCall)c2AssignmentName.eContents().get(0);
-		private final Assignment c3AssignmentFarbe = (Assignment)cGroup.eContents().get(3);
-		private final RuleCall c30ParserRuleCallFarbe = (RuleCall)c3AssignmentFarbe.eContents().get(0);
-		private final Keyword c4KeywordRightParenthesis = (Keyword)cGroup.eContents().get(4);
+		private final Keyword cSpielzeugKeyword_0 = (Keyword)cGroup.eContents().get(0);
+		private final Keyword cLeftParenthesisKeyword_1 = (Keyword)cGroup.eContents().get(1);
+		private final Assignment cNameAssignment_2 = (Assignment)cGroup.eContents().get(2);
+		private final RuleCall cNameIDTerminalRuleCall_2_0 = (RuleCall)cNameAssignment_2.eContents().get(0);
+		private final Assignment cFarbeAssignment_3 = (Assignment)cGroup.eContents().get(3);
+		private final RuleCall cFarbeFarbeParserRuleCall_3_0 = (RuleCall)cFarbeAssignment_3.eContents().get(0);
+		private final Keyword cRightParenthesisKeyword_4 = (Keyword)cGroup.eContents().get(4);
 		
-		// not supported
+		//Spielzeug:
+		//  "spielzeug" "(" name=ID farbe=Farbe ")";
 		public ParserRule getRule() { return rule; }
 
-		// not supported
-		public Group eleGroup() { return cGroup; }
+		//"spielzeug" "(" name=ID farbe=Farbe ")"
+		public Group getGroup() { return cGroup; }
 
-		// not supported
-		public Keyword ele0KeywordSpielzeug() { return c0KeywordSpielzeug; }
+		//"spielzeug"
+		public Keyword getSpielzeugKeyword_0() { return cSpielzeugKeyword_0; }
 
-		// not supported
-		public Keyword ele1KeywordLeftParenthesis() { return c1KeywordLeftParenthesis; }
+		//"("
+		public Keyword getLeftParenthesisKeyword_1() { return cLeftParenthesisKeyword_1; }
 
-		// not supported
-		public Assignment ele2AssignmentName() { return c2AssignmentName; }
+		//name=ID
+		public Assignment getNameAssignment_2() { return cNameAssignment_2; }
 
-		// not supported
-		public RuleCall ele20TerminalRuleCallID() { return c20TerminalRuleCallID; }
+		//ID
+		public RuleCall getNameIDTerminalRuleCall_2_0() { return cNameIDTerminalRuleCall_2_0; }
 
-		// not supported
-		public Assignment ele3AssignmentFarbe() { return c3AssignmentFarbe; }
+		//farbe=Farbe
+		public Assignment getFarbeAssignment_3() { return cFarbeAssignment_3; }
 
-		// not supported
-		public RuleCall ele30ParserRuleCallFarbe() { return c30ParserRuleCallFarbe; }
+		//Farbe
+		public RuleCall getFarbeFarbeParserRuleCall_3_0() { return cFarbeFarbeParserRuleCall_3_0; }
 
-		// not supported
-		public Keyword ele4KeywordRightParenthesis() { return c4KeywordRightParenthesis; }
+		//")"
+		public Keyword getRightParenthesisKeyword_4() { return cRightParenthesisKeyword_4; }
 	}
 
 	public class FamilieElements implements IParserRuleAccess {
 		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Familie");
 		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Keyword c0KeywordFamilie = (Keyword)cGroup.eContents().get(0);
-		private final Keyword c1KeywordLeftParenthesis = (Keyword)cGroup.eContents().get(1);
-		private final Assignment c2AssignmentName = (Assignment)cGroup.eContents().get(2);
-		private final Alternatives c20Alternatives = (Alternatives)c2AssignmentName.eContents().get(0);
-		private final Keyword c200KeywordKeyword = (Keyword)c20Alternatives.eContents().get(0);
-		private final RuleCall c201TerminalRuleCallSTRING = (RuleCall)c20Alternatives.eContents().get(1);
-		private final RuleCall c202TerminalRuleCallID = (RuleCall)c20Alternatives.eContents().get(2);
-		private final Assignment c3AssignmentMutter = (Assignment)cGroup.eContents().get(3);
-		private final CrossReference c30CrossReferenceIDErwachsener = (CrossReference)c3AssignmentMutter.eContents().get(0);
-		private final RuleCall c301TerminalRuleCallID = (RuleCall)c30CrossReferenceIDErwachsener.eContents().get(1);
-		private final Assignment c4AssignmentVater = (Assignment)cGroup.eContents().get(4);
-		private final CrossReference c40CrossReferenceIDErwachsener = (CrossReference)c4AssignmentVater.eContents().get(0);
-		private final RuleCall c401TerminalRuleCallID = (RuleCall)c40CrossReferenceIDErwachsener.eContents().get(1);
-		private final Assignment c5AssignmentKinder = (Assignment)cGroup.eContents().get(5);
-		private final CrossReference c50CrossReferenceIDKind = (CrossReference)c5AssignmentKinder.eContents().get(0);
-		private final RuleCall c501TerminalRuleCallID = (RuleCall)c50CrossReferenceIDKind.eContents().get(1);
-		private final Group c6Group = (Group)cGroup.eContents().get(6);
-		private final Keyword c60KeywordComma = (Keyword)c6Group.eContents().get(0);
-		private final Assignment c61AssignmentKinder = (Assignment)c6Group.eContents().get(1);
-		private final CrossReference c610CrossReferenceIDKind = (CrossReference)c61AssignmentKinder.eContents().get(0);
-		private final RuleCall c6101TerminalRuleCallID = (RuleCall)c610CrossReferenceIDKind.eContents().get(1);
-		private final Keyword c7KeywordRightParenthesis = (Keyword)cGroup.eContents().get(7);
+		private final Keyword cFamilieKeyword_0 = (Keyword)cGroup.eContents().get(0);
+		private final Keyword cLeftParenthesisKeyword_1 = (Keyword)cGroup.eContents().get(1);
+		private final Assignment cNameAssignment_2 = (Assignment)cGroup.eContents().get(2);
+		private final Alternatives cNameAlternatives_2_0 = (Alternatives)cNameAssignment_2.eContents().get(0);
+		private final Keyword cNameKeywordKeyword_2_0_0 = (Keyword)cNameAlternatives_2_0.eContents().get(0);
+		private final RuleCall cNameSTRINGTerminalRuleCall_2_0_1 = (RuleCall)cNameAlternatives_2_0.eContents().get(1);
+		private final RuleCall cNameIDTerminalRuleCall_2_0_2 = (RuleCall)cNameAlternatives_2_0.eContents().get(2);
+		private final Assignment cMutterAssignment_3 = (Assignment)cGroup.eContents().get(3);
+		private final CrossReference cMutterErwachsenerCrossReference_3_0 = (CrossReference)cMutterAssignment_3.eContents().get(0);
+		private final RuleCall cMutterErwachsenerIDTerminalRuleCall_3_0_1 = (RuleCall)cMutterErwachsenerCrossReference_3_0.eContents().get(1);
+		private final Assignment cVaterAssignment_4 = (Assignment)cGroup.eContents().get(4);
+		private final CrossReference cVaterErwachsenerCrossReference_4_0 = (CrossReference)cVaterAssignment_4.eContents().get(0);
+		private final RuleCall cVaterErwachsenerIDTerminalRuleCall_4_0_1 = (RuleCall)cVaterErwachsenerCrossReference_4_0.eContents().get(1);
+		private final Assignment cKinderAssignment_5 = (Assignment)cGroup.eContents().get(5);
+		private final CrossReference cKinderKindCrossReference_5_0 = (CrossReference)cKinderAssignment_5.eContents().get(0);
+		private final RuleCall cKinderKindIDTerminalRuleCall_5_0_1 = (RuleCall)cKinderKindCrossReference_5_0.eContents().get(1);
+		private final Group cGroup_6 = (Group)cGroup.eContents().get(6);
+		private final Keyword cCommaKeyword_6_0 = (Keyword)cGroup_6.eContents().get(0);
+		private final Assignment cKinderAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1);
+		private final CrossReference cKinderKindCrossReference_6_1_0 = (CrossReference)cKinderAssignment_6_1.eContents().get(0);
+		private final RuleCall cKinderKindIDTerminalRuleCall_6_1_0_1 = (RuleCall)cKinderKindCrossReference_6_1_0.eContents().get(1);
+		private final Keyword cRightParenthesisKeyword_7 = (Keyword)cGroup.eContents().get(7);
 		
-		// not supported
+		//Familie:
+		//  "familie" "(" name=( "keyword" | STRING | ID ) mutter=[Erwachsener] vater=[Erwachsener] kinder+=[Kind] ("," kinder+=[Kind])* ")";
 		public ParserRule getRule() { return rule; }
 
-		// not supported
-		public Group eleGroup() { return cGroup; }
+		//"familie" "(" name=( "keyword" | STRING | ID ) mutter=[Erwachsener] vater=[Erwachsener] kinder+=[Kind] ("," kinder+=[Kind])* ")"
+		public Group getGroup() { return cGroup; }
 
-		// not supported
-		public Keyword ele0KeywordFamilie() { return c0KeywordFamilie; }
+		//"familie"
+		public Keyword getFamilieKeyword_0() { return cFamilieKeyword_0; }
 
-		// not supported
-		public Keyword ele1KeywordLeftParenthesis() { return c1KeywordLeftParenthesis; }
+		//"("
+		public Keyword getLeftParenthesisKeyword_1() { return cLeftParenthesisKeyword_1; }
 
-		// not supported
-		public Assignment ele2AssignmentName() { return c2AssignmentName; }
+		//name=( "keyword" | STRING | ID )
+		public Assignment getNameAssignment_2() { return cNameAssignment_2; }
 
-		// not supported
-		public Alternatives ele20Alternatives() { return c20Alternatives; }
+		//"keyword"|STRING|ID
+		public Alternatives getNameAlternatives_2_0() { return cNameAlternatives_2_0; }
 
-		// not supported
-		public Keyword ele200KeywordKeyword() { return c200KeywordKeyword; }
+		//"keyword"
+		public Keyword getNameKeywordKeyword_2_0_0() { return cNameKeywordKeyword_2_0_0; }
 
-		// not supported
-		public RuleCall ele201TerminalRuleCallSTRING() { return c201TerminalRuleCallSTRING; }
+		//STRING
+		public RuleCall getNameSTRINGTerminalRuleCall_2_0_1() { return cNameSTRINGTerminalRuleCall_2_0_1; }
 
-		// not supported
-		public RuleCall ele202TerminalRuleCallID() { return c202TerminalRuleCallID; }
+		//ID
+		public RuleCall getNameIDTerminalRuleCall_2_0_2() { return cNameIDTerminalRuleCall_2_0_2; }
 
-		// not supported
-		public Assignment ele3AssignmentMutter() { return c3AssignmentMutter; }
+		//mutter=[Erwachsener]
+		public Assignment getMutterAssignment_3() { return cMutterAssignment_3; }
 
-		// not supported
-		public CrossReference ele30CrossReferenceIDErwachsener() { return c30CrossReferenceIDErwachsener; }
+		//[Erwachsener]
+		public CrossReference getMutterErwachsenerCrossReference_3_0() { return cMutterErwachsenerCrossReference_3_0; }
 
-		// not supported
-		public RuleCall ele301TerminalRuleCallID() { return c301TerminalRuleCallID; }
+		//ID
+		public RuleCall getMutterErwachsenerIDTerminalRuleCall_3_0_1() { return cMutterErwachsenerIDTerminalRuleCall_3_0_1; }
 
-		// not supported
-		public Assignment ele4AssignmentVater() { return c4AssignmentVater; }
+		//vater=[Erwachsener]
+		public Assignment getVaterAssignment_4() { return cVaterAssignment_4; }
 
-		// not supported
-		public CrossReference ele40CrossReferenceIDErwachsener() { return c40CrossReferenceIDErwachsener; }
+		//[Erwachsener]
+		public CrossReference getVaterErwachsenerCrossReference_4_0() { return cVaterErwachsenerCrossReference_4_0; }
 
-		// not supported
-		public RuleCall ele401TerminalRuleCallID() { return c401TerminalRuleCallID; }
+		//ID
+		public RuleCall getVaterErwachsenerIDTerminalRuleCall_4_0_1() { return cVaterErwachsenerIDTerminalRuleCall_4_0_1; }
 
-		// not supported
-		public Assignment ele5AssignmentKinder() { return c5AssignmentKinder; }
+		//kinder+=[Kind]
+		public Assignment getKinderAssignment_5() { return cKinderAssignment_5; }
 
-		// not supported
-		public CrossReference ele50CrossReferenceIDKind() { return c50CrossReferenceIDKind; }
+		//[Kind]
+		public CrossReference getKinderKindCrossReference_5_0() { return cKinderKindCrossReference_5_0; }
 
-		// not supported
-		public RuleCall ele501TerminalRuleCallID() { return c501TerminalRuleCallID; }
+		//ID
+		public RuleCall getKinderKindIDTerminalRuleCall_5_0_1() { return cKinderKindIDTerminalRuleCall_5_0_1; }
 
-		// not supported
-		public Group ele6Group() { return c6Group; }
+		//("," kinder+=[Kind])*
+		public Group getGroup_6() { return cGroup_6; }
 
-		// not supported
-		public Keyword ele60KeywordComma() { return c60KeywordComma; }
+		//","
+		public Keyword getCommaKeyword_6_0() { return cCommaKeyword_6_0; }
 
-		// not supported
-		public Assignment ele61AssignmentKinder() { return c61AssignmentKinder; }
+		//kinder+=[Kind]
+		public Assignment getKinderAssignment_6_1() { return cKinderAssignment_6_1; }
 
-		// not supported
-		public CrossReference ele610CrossReferenceIDKind() { return c610CrossReferenceIDKind; }
+		//[Kind]
+		public CrossReference getKinderKindCrossReference_6_1_0() { return cKinderKindCrossReference_6_1_0; }
 
-		// not supported
-		public RuleCall ele6101TerminalRuleCallID() { return c6101TerminalRuleCallID; }
+		//ID
+		public RuleCall getKinderKindIDTerminalRuleCall_6_1_0_1() { return cKinderKindIDTerminalRuleCall_6_1_0_1; }
 
-		// not supported
-		public Keyword ele7KeywordRightParenthesis() { return c7KeywordRightParenthesis; }
+		//")"
+		public Keyword getRightParenthesisKeyword_7() { return cRightParenthesisKeyword_7; }
 	}
 
 	public class FarbeElements implements IParserRuleAccess {
 		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "Farbe");
-		private final Assignment cAssignmentWert = (Assignment)rule.eContents().get(1);
-		private final Alternatives c0Alternatives = (Alternatives)cAssignmentWert.eContents().get(0);
-		private final Keyword c00KeywordROT = (Keyword)c0Alternatives.eContents().get(0);
-		private final Keyword c01KeywordBLAU = (Keyword)c0Alternatives.eContents().get(1);
-		private final Keyword c02KeywordGELB = (Keyword)c0Alternatives.eContents().get(2);
-		private final Keyword c03KeywordGRÜN = (Keyword)c0Alternatives.eContents().get(3);
+		private final Assignment cWertAssignment = (Assignment)rule.eContents().get(1);
+		private final Alternatives cWertAlternatives_0 = (Alternatives)cWertAssignment.eContents().get(0);
+		private final Keyword cWertROTKeyword_0_0 = (Keyword)cWertAlternatives_0.eContents().get(0);
+		private final Keyword cWertBLAUKeyword_0_1 = (Keyword)cWertAlternatives_0.eContents().get(1);
+		private final Keyword cWertGELBKeyword_0_2 = (Keyword)cWertAlternatives_0.eContents().get(2);
+		private final Keyword cWertGRNKeyword_0_3 = (Keyword)cWertAlternatives_0.eContents().get(3);
 		
-		// not supported
+		//Farbe:
+		//  wert=( "ROT" | "BLAU" | "GELB" | "GR\u2039N" );
 		public ParserRule getRule() { return rule; }
 
-		// not supported
-		public Assignment eleAssignmentWert() { return cAssignmentWert; }
+		//wert=( "ROT" | "BLAU" | "GELB" | "GR\u2039N" )
+		public Assignment getWertAssignment() { return cWertAssignment; }
 
-		// not supported
-		public Alternatives ele0Alternatives() { return c0Alternatives; }
+		//"ROT"|"BLAU"|"GELB"|"GR\u2039N"
+		public Alternatives getWertAlternatives_0() { return cWertAlternatives_0; }
 
-		// not supported
-		public Keyword ele00KeywordROT() { return c00KeywordROT; }
+		//"ROT"
+		public Keyword getWertROTKeyword_0_0() { return cWertROTKeyword_0_0; }
 
-		// not supported
-		public Keyword ele01KeywordBLAU() { return c01KeywordBLAU; }
+		//"BLAU"
+		public Keyword getWertBLAUKeyword_0_1() { return cWertBLAUKeyword_0_1; }
 
-		// not supported
-		public Keyword ele02KeywordGELB() { return c02KeywordGELB; }
+		//"GELB"
+		public Keyword getWertGELBKeyword_0_2() { return cWertGELBKeyword_0_2; }
 
-		// not supported
-		public Keyword ele03KeywordGRÜN() { return c03KeywordGRÜN; }
+		//"GR\u2039N"
+		public Keyword getWertGRNKeyword_0_3() { return cWertGRNKeyword_0_3; }
 	}
 
 	public class CustomTypeParserRuleElements implements IParserRuleAccess {
 		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "CustomTypeParserRule");
 		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Keyword c0KeywordType = (Keyword)cGroup.eContents().get(0);
-		private final Assignment c1AssignmentName = (Assignment)cGroup.eContents().get(1);
-		private final RuleCall c10TerminalRuleCallID = (RuleCall)c1AssignmentName.eContents().get(0);
+		private final Keyword cTypeKeyword_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);
 		
-		// not supported
+		//CustomTypeParserRule returns ReferenceModel::CustomType:
+		//  "type" name=ID;
 		public ParserRule getRule() { return rule; }
 
-		// not supported
-		public Group eleGroup() { return cGroup; }
+		//"type" name=ID
+		public Group getGroup() { return cGroup; }
 
-		// not supported
-		public Keyword ele0KeywordType() { return c0KeywordType; }
+		//"type"
+		public Keyword getTypeKeyword_0() { return cTypeKeyword_0; }
 
-		// not supported
-		public Assignment ele1AssignmentName() { return c1AssignmentName; }
+		//name=ID
+		public Assignment getNameAssignment_1() { return cNameAssignment_1; }
 
-		// not supported
-		public RuleCall ele10TerminalRuleCallID() { return c10TerminalRuleCallID; }
+		//ID
+		public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
 	}
 	
 	private SpielplatzElements pSpielplatz;
@@ -400,13 +408,13 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
 	
 	private final GrammarProvider grammarProvider;
 
-	private TerminalsGrammarAccess terminalsGrammarAccess;
+	private TerminalsGrammarAccess gaTerminals;
 
 	@Inject
 	public ReferenceGrammarGrammarAccess(GrammarProvider grammarProvider,
-		TerminalsGrammarAccess terminalsGrammarAccess) {
+		TerminalsGrammarAccess gaTerminals) {
 		this.grammarProvider = grammarProvider;
-		this.terminalsGrammarAccess = terminalsGrammarAccess;
+		this.gaTerminals = gaTerminals;
 	}
 	
 	public Grammar getGrammar() {	
@@ -415,82 +423,128 @@ public class ReferenceGrammarGrammarAccess implements IGrammarAccess {
 	
 
 	public TerminalsGrammarAccess getTerminalsGrammarAccess() {
-		return terminalsGrammarAccess;
+		return gaTerminals;
 	}
 
 	
-	// not supported
-	public SpielplatzElements prSpielplatz() {
+	//Spielplatz:
+	//  ("spielplatz" groesse=INT (beschreibung=STRING)? "{" (kinder+=Kind|erzieher+=Erwachsener|spielzeuge+=Spielzeug|familie+=Familie|types+=CustomTypeParserRule)* "}")?;
+	public SpielplatzElements getSpielplatzAccess() {
 		return (pSpielplatz != null) ? pSpielplatz : (pSpielplatz = new SpielplatzElements());
-	} 
+	}
+	
+	public ParserRule getSpielplatzRule() {
+		return getSpielplatzAccess().getRule();
+	}
 
-	// not supported
-	public PersonElements prPerson() {
+	//Person:
+	//  Kind|Erwachsener;
+	public PersonElements getPersonAccess() {
 		return (pPerson != null) ? pPerson : (pPerson = new PersonElements());
-	} 
+	}
+	
+	public ParserRule getPersonRule() {
+		return getPersonAccess().getRule();
+	}
 
-	// not supported
-	public KindElements prKind() {
+	//Kind:
+	//  "kind" "(" name=ID age=INT ")";
+	public KindElements getKindAccess() {
 		return (pKind != null) ? pKind : (pKind = new KindElements());
-	} 
+	}
+	
+	public ParserRule getKindRule() {
+		return getKindAccess().getRule();
+	}
 
-	// not supported
-	public ErwachsenerElements prErwachsener() {
+	//Erwachsener:
+	//  "erwachsener" "(" name=ID age=INT ")";
+	public ErwachsenerElements getErwachsenerAccess() {
 		return (pErwachsener != null) ? pErwachsener : (pErwachsener = new ErwachsenerElements());
-	} 
+	}
+	
+	public ParserRule getErwachsenerRule() {
+		return getErwachsenerAccess().getRule();
+	}
 
-	// not supported
-	public SpielzeugElements prSpielzeug() {
+	//Spielzeug:
+	//  "spielzeug" "(" name=ID farbe=Farbe ")";
+	public SpielzeugElements getSpielzeugAccess() {
 		return (pSpielzeug != null) ? pSpielzeug : (pSpielzeug = new SpielzeugElements());
-	} 
+	}
+	
+	public ParserRule getSpielzeugRule() {
+		return getSpielzeugAccess().getRule();
+	}
 
-	// not supported
-	public FamilieElements prFamilie() {
+	//Familie:
+	//  "familie" "(" name=( "keyword" | STRING | ID ) mutter=[Erwachsener] vater=[Erwachsener] kinder+=[Kind] ("," kinder+=[Kind])* ")";
+	public FamilieElements getFamilieAccess() {
 		return (pFamilie != null) ? pFamilie : (pFamilie = new FamilieElements());
-	} 
+	}
+	
+	public ParserRule getFamilieRule() {
+		return getFamilieAccess().getRule();
+	}
 
-	// not supported
-	public FarbeElements prFarbe() {
+	//Farbe:
+	//  wert=( "ROT" | "BLAU" | "GELB" | "GR\u2039N" );
+	public FarbeElements getFarbeAccess() {
 		return (pFarbe != null) ? pFarbe : (pFarbe = new FarbeElements());
-	} 
+	}
+	
+	public ParserRule getFarbeRule() {
+		return getFarbeAccess().getRule();
+	}
 
-	// not supported
-	public CustomTypeParserRuleElements prCustomTypeParserRule() {
+	//CustomTypeParserRule returns ReferenceModel::CustomType:
+	//  "type" name=ID;
+	public CustomTypeParserRuleElements getCustomTypeParserRuleAccess() {
 		return (pCustomTypeParserRule != null) ? pCustomTypeParserRule : (pCustomTypeParserRule = new CustomTypeParserRuleElements());
-	} 
+	}
+	
+	public ParserRule getCustomTypeParserRuleRule() {
+		return getCustomTypeParserRuleAccess().getRule();
+	}
 
-	// not supported
-	public TerminalRule trID() {
-		return terminalsGrammarAccess.trID();
+	//terminal ID:
+	//  "^" ? ( "a" .. "z" | "A" .. "Z" | "_" ) ( "a" .. "z" | "A" .. "Z" | "_" | "0" .. "9" ) *;
+	public TerminalRule getIDRule() {
+		return gaTerminals.getIDRule();
 	} 
 
-	// not supported
-	public TerminalRule trINT() {
-		return terminalsGrammarAccess.trINT();
+	//terminal INT returns ecore::EInt:
+	//  "0" .. "9" +;
+	public TerminalRule getINTRule() {
+		return gaTerminals.getINTRule();
 	} 
 
-	// not supported
-	public TerminalRule trSTRING() {
-		return terminalsGrammarAccess.trSTRING();
+	//terminal STRING:
+	//  "\"" ( "\\" ( "b" | "t" | "n" | "f" | "r" | "\"" | "\'" | "\\" ) | ! ( "\\" | "\"" ) ) * "\"" | "\'" ( "\\" ( "b" | "t" | "n" | "f" | "r" | "\"" | "\'" | "\\" ) | ! ( "\\" | "\'" ) ) * "\'";
+	public TerminalRule getSTRINGRule() {
+		return gaTerminals.getSTRINGRule();
 	} 
 
-	// not supported
-	public TerminalRule trML_COMMENT() {
-		return terminalsGrammarAccess.trML_COMMENT();
+	//terminal ML_COMMENT:
+	//  "/*" -> "*/";
+	public TerminalRule getML_COMMENTRule() {
+		return gaTerminals.getML_COMMENTRule();
 	} 
 
-	// not supported
-	public TerminalRule trSL_COMMENT() {
-		return terminalsGrammarAccess.trSL_COMMENT();
+	//terminal SL_COMMENT:
+	//  "//" ! ( "\n" | "\r" ) * ( "\r" ? "\n" ) ?;
+	public TerminalRule getSL_COMMENTRule() {
+		return gaTerminals.getSL_COMMENTRule();
 	} 
 
-	// not supported
-	public TerminalRule trWS() {
-		return terminalsGrammarAccess.trWS();
+	//terminal WS:
+	//  ( " " | "\t" | "\r" | "\n" ) +;
+	public TerminalRule getWSRule() {
+		return gaTerminals.getWSRule();
 	} 
 
-	// not supported
-	public TerminalRule trANY_OTHER() {
-		return terminalsGrammarAccess.trANY_OTHER();
+	//org.eclipse.xtext.parsetree.reconstr.XtextSerializationException: Serialization of TerminalRule failed.
+	public TerminalRule getANY_OTHERRule() {
+		return gaTerminals.getANY_OTHERRule();
 	} 
 }
diff --git a/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/AbstractDomainmodelUiModule.java b/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/AbstractDomainmodelUiModule.java
index 4e2840d..b9b8646 100644
--- a/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/AbstractDomainmodelUiModule.java
+++ b/examples/org.eclipse.xtext.example.domainmodel.ui/src-gen/org/eclipse/xtext/example/AbstractDomainmodelUiModule.java
@@ -12,14 +12,14 @@ import org.eclipse.xtext.ui.common.service.DefaultUIModule;
 public abstract class AbstractDomainmodelUiModule extends DefaultUIModule {
 	
 
-	public Class<? extends org.eclipse.jface.text.rules.ITokenScanner> bindITokenScanner() {
-		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
-	}
-
 	public Class<? extends org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.ITokenColorer> bindITokenColorer() {
 		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.CommonAntlrTokenColorer.class;
 	}
 
+	public Class<? extends org.eclipse.jface.text.rules.ITokenScanner> bindITokenScanner() {
+		return org.eclipse.xtext.ui.common.editor.syntaxcoloring.antlr.AntlrTokenScanner.class;
+	}
+
 	public Class<? extends org.eclipse.xtext.ui.common.editor.contentassist.IProposalProvider> bindIProposalProvider() {
 		return org.eclipse.xtext.example.DomainmodelProposals.class;
 	}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/AbstractDomainmodelRuntimeModule.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/AbstractDomainmodelRuntimeModule.java
index 27ae3ed..52dfc5f 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/AbstractDomainmodelRuntimeModule.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/AbstractDomainmodelRuntimeModule.java
@@ -34,23 +34,23 @@ public abstract class AbstractDomainmodelRuntimeModule extends DefaultRuntimeMod
 		return org.eclipse.xtext.example.parseTreeConstruction.DomainmodelParsetreeConstructor.class;
 	}
 
-	public Class<? extends org.eclipse.xtext.parser.antlr.Lexer> bindLexer() {
-		return org.eclipse.xtext.example.parser.antlr.internal.InternalDomainmodelLexer.class;
-	}
-
 	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrParser> bindIAntlrParser() {
 		return org.eclipse.xtext.example.parser.antlr.DomainmodelParser.class;
 	}
 
-	public Class<? extends org.eclipse.xtext.parser.antlr.ITokenDefProvider> bindITokenDefProvider() {
-		return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class;
+	public Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> bindITokenToStringConverter() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
 	}
 
 	public Class<? extends org.eclipse.xtext.parser.antlr.IAntlrTokenFileProvider> bindIAntlrTokenFileProvider() {
 		return org.eclipse.xtext.example.parser.antlr.DomainmodelAntlrTokenFileProvider.class;
 	}
 
-	public Class<? extends org.eclipse.xtext.parser.ITokenToStringConverter> bindITokenToStringConverter() {
-		return org.eclipse.xtext.parser.antlr.AntlrTokenToStringConverter.class;
+	public Class<? extends org.eclipse.xtext.parser.antlr.Lexer> bindLexer() {
+		return org.eclipse.xtext.example.parser.antlr.internal.InternalDomainmodelLexer.class;
+	}
+
+	public Class<? extends org.eclipse.xtext.parser.antlr.ITokenDefProvider> bindITokenDefProvider() {
+		return org.eclipse.xtext.parser.antlr.AntlrTokenDefProvider.class;
 	}
 }
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parseTreeConstruction/DomainmodelParsetreeConstructor.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parseTreeConstruction/DomainmodelParsetreeConstructor.java
index 6827ecd..a80c819 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parseTreeConstruction/DomainmodelParsetreeConstructor.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parseTreeConstruction/DomainmodelParsetreeConstructor.java
@@ -22,33 +22,33 @@ public class DomainmodelParsetreeConstructor extends AbstractParseTreeConstructo
 	protected Solution internalSerialize(EObject obj) {
 		IInstanceDescription inst = getDescr(obj);
 		Solution s;
-		if(inst.isInstanceOf(grammarAccess.prFile().getRule().getType().getClassifier()) && (s = new File_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prImport().getRule().getType().getClassifier()) && (s = new Import_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prNamedElement().getRule().getType().getClassifier()) && (s = new NamedElement_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prPackage().getRule().getType().getClassifier()) && (s = new Package_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prType().getRule().getType().getClassifier()) && (s = new Type_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prDataType().getRule().getType().getClassifier()) && (s = new DataType_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prEntity().getRule().getType().getClassifier()) && (s = new Entity_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prFeature().getRule().getType().getClassifier()) && (s = new Feature_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prStructuralFeature().getRule().getType().getClassifier()) && (s = new StructuralFeature_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prAttribute().getRule().getType().getClassifier()) && (s = new Attribute_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prReference().getRule().getType().getClassifier()) && (s = new Reference_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prOperation().getRule().getType().getClassifier()) && (s = new Operation_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prParameter().getRule().getType().getClassifier()) && (s = new Parameter_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prTypedElement().getRule().getType().getClassifier()) && (s = new TypedElement_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
-		if(inst.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getClassifier()) && (s = new TypeRef_Assignment_referenced(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getFileRule().getType().getClassifier()) && (s = new File_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getImportRule().getType().getClassifier()) && (s = new Import_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getNamedElementRule().getType().getClassifier()) && (s = new NamedElement_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getPackageRule().getType().getClassifier()) && (s = new Package_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getTypeRule().getType().getClassifier()) && (s = new Type_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getDataTypeRule().getType().getClassifier()) && (s = new DataType_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getEntityRule().getType().getClassifier()) && (s = new Entity_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getFeatureRule().getType().getClassifier()) && (s = new Feature_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getStructuralFeatureRule().getType().getClassifier()) && (s = new StructuralFeature_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getAttributeRule().getType().getClassifier()) && (s = new Attribute_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getReferenceRule().getType().getClassifier()) && (s = new Reference_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getOperationRule().getType().getClassifier()) && (s = new Operation_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getParameterRule().getType().getClassifier()) && (s = new Parameter_Group(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getTypedElementRule().getType().getClassifier()) && (s = new TypedElement_Alternatives(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
+		if(inst.isInstanceOf(grammarAccess.getTypeRefRule().getType().getClassifier()) && (s = new TypeRef_Assignment_referenced(inst, null).firstSolution()) != null && isConsumed(s,null)) return s;
 		return null;
 	}
 	
 
 /************ begin Rule File ****************
  *
- * not supported
+ * File:
+ *   (imports+=Import)* (namedElements+=NamedElement)*;
  *
  **/
 
-
-// not supported
+// (imports+=Import)* (namedElements+=NamedElement)*
 protected class File_Group extends GroupToken {
 	
 	public File_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -57,11 +57,9 @@ protected class File_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prFile().eleGroup();
+		return grammarAccess.getFileAccess().getGroup();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new File_1_Assignment_namedElements(current, this).firstSolution();
@@ -78,7 +76,7 @@ protected class File_Group extends GroupToken {
 	}
 }
 
-// not supported
+// (imports+=Import)*
 protected class File_0_Assignment_imports extends AssignmentToken  {
 	
 	public File_0_Assignment_imports(IInstanceDescription curr, AbstractToken pred) {
@@ -87,7 +85,7 @@ protected class File_0_Assignment_imports extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prFile().ele0AssignmentImports();
+		return grammarAccess.getFileAccess().getImportsAssignment_0();
 	}
 	
 	@Override
@@ -97,7 +95,7 @@ protected class File_0_Assignment_imports extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prImport().getRule().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getImportRule().getType().getClassifier())) {
 				Solution s = new Import_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -111,7 +109,7 @@ protected class File_0_Assignment_imports extends AssignmentToken  {
 	}
 }
 
-// not supported
+// (namedElements+=NamedElement)*
 protected class File_1_Assignment_namedElements extends AssignmentToken  {
 	
 	public File_1_Assignment_namedElements(IInstanceDescription curr, AbstractToken pred) {
@@ -120,7 +118,7 @@ protected class File_1_Assignment_namedElements extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prFile().ele1AssignmentNamedElements();
+		return grammarAccess.getFileAccess().getNamedElementsAssignment_1();
 	}
 	
 	@Override
@@ -130,7 +128,7 @@ protected class File_1_Assignment_namedElements extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prNamedElement().getRule().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getNamedElementRule().getType().getClassifier())) {
 				Solution s = new NamedElement_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -150,12 +148,12 @@ protected class File_1_Assignment_namedElements extends AssignmentToken  {
 
 /************ begin Rule Import ****************
  *
- * not supported
+ * Import:
+ *   "import" importURI=STRING;
  *
  **/
 
-
-// not supported
+// "import" importURI=STRING
 protected class Import_Group extends GroupToken {
 	
 	public Import_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -164,11 +162,9 @@ protected class Import_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prImport().eleGroup();
+		return grammarAccess.getImportAccess().getGroup();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new Import_1_Assignment_importURI(current, this).firstSolution();
@@ -185,7 +181,7 @@ protected class Import_Group extends GroupToken {
 	}
 }
 
-// not supported
+// "import"
 protected class Import_0_Keyword_import extends KeywordToken  {
 	
 	public Import_0_Keyword_import(IInstanceDescription curr, AbstractToken pred) {
@@ -193,11 +189,11 @@ protected class Import_0_Keyword_import extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prImport().ele0KeywordImport();
+		return grammarAccess.getImportAccess().getImportKeyword_0();
 	}	
 }
 
-// not supported
+// importURI=STRING
 protected class Import_1_Assignment_importURI extends AssignmentToken  {
 	
 	public Import_1_Assignment_importURI(IInstanceDescription curr, AbstractToken pred) {
@@ -206,7 +202,7 @@ protected class Import_1_Assignment_importURI extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prImport().ele1AssignmentImportURI();
+		return grammarAccess.getImportAccess().getImportURIAssignment_1();
 	}
 	
 	@Override
@@ -215,7 +211,7 @@ protected class Import_1_Assignment_importURI extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("importURI");
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prImport().ele10TerminalRuleCallSTRING();
+			element = grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_1_0();
 			return new Solution(obj);
 		}
 		return null;
@@ -228,12 +224,12 @@ protected class Import_1_Assignment_importURI extends AssignmentToken  {
 
 /************ begin Rule NamedElement ****************
  *
- * not supported
+ * NamedElement:
+ *   Package|Type;
  *
  **/
 
-
-// not supported
+// Package|Type
 protected class NamedElement_Alternatives extends AlternativesToken {
 
 	public NamedElement_Alternatives(IInstanceDescription curr, AbstractToken pred) {
@@ -242,7 +238,7 @@ protected class NamedElement_Alternatives extends AlternativesToken {
 	
 	@Override
 	public Alternatives getGrammarElement() {
-		return grammarAccess.prNamedElement().eleAlternatives();
+		return grammarAccess.getNamedElementAccess().getAlternatives();
 	}
 
 	protected AbstractToken createChild(int id) {
@@ -254,7 +250,7 @@ protected class NamedElement_Alternatives extends AlternativesToken {
 	}
 }
 
-// not supported
+// Package
 protected class NamedElement_0_RuleCall_Package extends RuleCallToken {
 	
 	public NamedElement_0_RuleCall_Package(IInstanceDescription curr, AbstractToken pred) {
@@ -263,18 +259,18 @@ protected class NamedElement_0_RuleCall_Package extends RuleCallToken {
 	
 	@Override
 	public RuleCall getGrammarElement() {
-		return grammarAccess.prNamedElement().ele0ParserRuleCallPackage();
+		return grammarAccess.getNamedElementAccess().getPackageParserRuleCall_0();
 	}
 	
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Package_Group.class, current)) return null;
-		if(!current.isInstanceOf(grammarAccess.prPackage().getRule().getType().getClassifier())) return null;
+		if(!current.isInstanceOf(grammarAccess.getPackageRule().getType().getClassifier())) return null;
 		return new Package_Group(current, this).firstSolution();
 	}
 }
 
-// not supported
+// Type
 protected class NamedElement_1_RuleCall_Type extends RuleCallToken {
 	
 	public NamedElement_1_RuleCall_Type(IInstanceDescription curr, AbstractToken pred) {
@@ -283,13 +279,13 @@ protected class NamedElement_1_RuleCall_Type extends RuleCallToken {
 	
 	@Override
 	public RuleCall getGrammarElement() {
-		return grammarAccess.prNamedElement().ele1ParserRuleCallType();
+		return grammarAccess.getNamedElementAccess().getTypeParserRuleCall_1();
 	}
 	
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Type_Alternatives.class, current)) return null;
-		if(!current.isInstanceOf(grammarAccess.prType().getRule().getType().getClassifier())) return null;
+		if(!current.isInstanceOf(grammarAccess.getTypeRule().getType().getClassifier())) return null;
 		return new Type_Alternatives(current, this).firstSolution();
 	}
 }
@@ -300,12 +296,12 @@ protected class NamedElement_1_RuleCall_Type extends RuleCallToken {
 
 /************ begin Rule Package ****************
  *
- * not supported
+ * Package:
+ *   "package" name=QualifiedName "{" (namedElements+=NamedElement)* "}";
  *
  **/
 
-
-// not supported
+// "package" name=QualifiedName "{" (namedElements+=NamedElement)* "}"
 protected class Package_Group extends GroupToken {
 	
 	public Package_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -314,40 +310,38 @@ protected class Package_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prPackage().eleGroup();
+		return grammarAccess.getPackageAccess().getGroup();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new Package_4_Keyword(current, this).firstSolution();
 		while(s1 != null) {
 			Solution s2 = new Package_3_Assignment_namedElements(s1.getCurrent(), s1.getPredecessor()).firstSolution();
-		while(s2 != null) {
-			Solution s3 = new Package_2_Keyword(s2.getCurrent(), s2.getPredecessor()).firstSolution();
-		while(s3 != null) {
-			Solution s4 = new Package_1_Assignment_name(s3.getCurrent(), s3.getPredecessor()).firstSolution();
-		while(s4 != null) {
-			Solution s5 = new Package_0_Keyword_package(s4.getCurrent(), s4.getPredecessor()).firstSolution();
-			if(s5 != null) {
-				last = s5.getPredecessor();
-				return s5;
-			} else {
-				s4 = s4.getPredecessor().nextSolution(this,s4);
+			while(s2 != null) {
+				Solution s3 = new Package_2_Keyword(s2.getCurrent(), s2.getPredecessor()).firstSolution();
+				while(s3 != null) {
+					Solution s4 = new Package_1_Assignment_name(s3.getCurrent(), s3.getPredecessor()).firstSolution();
+					while(s4 != null) {
+						Solution s5 = new Package_0_Keyword_package(s4.getCurrent(), s4.getPredecessor()).firstSolution();
+						if(s5 != null) {
+							last = s5.getPredecessor();
+							return s5;
+						} else {
+							s4 = s4.getPredecessor().nextSolution(this,s4);
+						}
+					}
+					s3 = s3.getPredecessor().nextSolution(this,s3);
+				}
+				s2 = s2.getPredecessor().nextSolution(this,s2);
 			}
-		}
-			s3 = s3.getPredecessor().nextSolution(this,s3);
-		}
-			s2 = s2.getPredecessor().nextSolution(this,s2);
-		}
 			s1 = s1.getPredecessor().nextSolution(this,s1);
 		}
 		return null;
 	}
 }
 
-// not supported
+// "package"
 protected class Package_0_Keyword_package extends KeywordToken  {
 	
 	public Package_0_Keyword_package(IInstanceDescription curr, AbstractToken pred) {
@@ -355,11 +349,11 @@ protected class Package_0_Keyword_package extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prPackage().ele0KeywordPackage();
+		return grammarAccess.getPackageAccess().getPackageKeyword_0();
 	}	
 }
 
-// not supported
+// name=QualifiedName
 protected class Package_1_Assignment_name extends AssignmentToken  {
 	
 	public Package_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -368,7 +362,7 @@ protected class Package_1_Assignment_name extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prPackage().ele1AssignmentName();
+		return grammarAccess.getPackageAccess().getNameAssignment_1();
 	}
 	
 	@Override
@@ -378,7 +372,7 @@ protected class Package_1_Assignment_name extends AssignmentToken  {
 
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for datatype rule
 			type = AssignmentType.PRC;
-			element = grammarAccess.prPackage().ele10ParserRuleCallQualifiedName();
+			element = grammarAccess.getPackageAccess().getNameQualifiedNameParserRuleCall_1_0();
 			return new Solution(obj);
 		}
 
@@ -386,7 +380,7 @@ protected class Package_1_Assignment_name extends AssignmentToken  {
 	}
 }
 
-// not supported
+// "{"
 protected class Package_2_Keyword extends KeywordToken  {
 	
 	public Package_2_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -394,11 +388,11 @@ protected class Package_2_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prPackage().ele2KeywordLeftCurlyBracket();
+		return grammarAccess.getPackageAccess().getLeftCurlyBracketKeyword_2();
 	}	
 }
 
-// not supported
+// (namedElements+=NamedElement)*
 protected class Package_3_Assignment_namedElements extends AssignmentToken  {
 	
 	public Package_3_Assignment_namedElements(IInstanceDescription curr, AbstractToken pred) {
@@ -407,7 +401,7 @@ protected class Package_3_Assignment_namedElements extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prPackage().ele3AssignmentNamedElements();
+		return grammarAccess.getPackageAccess().getNamedElementsAssignment_3();
 	}
 	
 	@Override
@@ -417,7 +411,7 @@ protected class Package_3_Assignment_namedElements extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prNamedElement().getRule().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getNamedElementRule().getType().getClassifier())) {
 				Solution s = new NamedElement_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -431,7 +425,7 @@ protected class Package_3_Assignment_namedElements extends AssignmentToken  {
 	}
 }
 
-// not supported
+// "}"
 protected class Package_4_Keyword extends KeywordToken  {
 	
 	public Package_4_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -439,7 +433,7 @@ protected class Package_4_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prPackage().ele4KeywordRightCurlyBracket();
+		return grammarAccess.getPackageAccess().getRightCurlyBracketKeyword_4();
 	}	
 }
 
@@ -449,12 +443,12 @@ protected class Package_4_Keyword extends KeywordToken  {
 
 /************ begin Rule Type ****************
  *
- * not supported
+ * Type:
+ *   Entity|DataType;
  *
  **/
 
-
-// not supported
+// Entity|DataType
 protected class Type_Alternatives extends AlternativesToken {
 
 	public Type_Alternatives(IInstanceDescription curr, AbstractToken pred) {
@@ -463,7 +457,7 @@ protected class Type_Alternatives extends AlternativesToken {
 	
 	@Override
 	public Alternatives getGrammarElement() {
-		return grammarAccess.prType().eleAlternatives();
+		return grammarAccess.getTypeAccess().getAlternatives();
 	}
 
 	protected AbstractToken createChild(int id) {
@@ -475,7 +469,7 @@ protected class Type_Alternatives extends AlternativesToken {
 	}
 }
 
-// not supported
+// Entity
 protected class Type_0_RuleCall_Entity extends RuleCallToken {
 	
 	public Type_0_RuleCall_Entity(IInstanceDescription curr, AbstractToken pred) {
@@ -484,18 +478,18 @@ protected class Type_0_RuleCall_Entity extends RuleCallToken {
 	
 	@Override
 	public RuleCall getGrammarElement() {
-		return grammarAccess.prType().ele0ParserRuleCallEntity();
+		return grammarAccess.getTypeAccess().getEntityParserRuleCall_0();
 	}
 	
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Entity_Group.class, current)) return null;
-		if(!current.isInstanceOf(grammarAccess.prEntity().getRule().getType().getClassifier())) return null;
+		if(!current.isInstanceOf(grammarAccess.getEntityRule().getType().getClassifier())) return null;
 		return new Entity_Group(current, this).firstSolution();
 	}
 }
 
-// not supported
+// DataType
 protected class Type_1_RuleCall_DataType extends RuleCallToken {
 	
 	public Type_1_RuleCall_DataType(IInstanceDescription curr, AbstractToken pred) {
@@ -504,13 +498,13 @@ protected class Type_1_RuleCall_DataType extends RuleCallToken {
 	
 	@Override
 	public RuleCall getGrammarElement() {
-		return grammarAccess.prType().ele1ParserRuleCallDataType();
+		return grammarAccess.getTypeAccess().getDataTypeParserRuleCall_1();
 	}
 	
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(DataType_Group.class, current)) return null;
-		if(!current.isInstanceOf(grammarAccess.prDataType().getRule().getType().getClassifier())) return null;
+		if(!current.isInstanceOf(grammarAccess.getDataTypeRule().getType().getClassifier())) return null;
 		return new DataType_Group(current, this).firstSolution();
 	}
 }
@@ -521,12 +515,12 @@ protected class Type_1_RuleCall_DataType extends RuleCallToken {
 
 /************ begin Rule DataType ****************
  *
- * not supported
+ * DataType:
+ *   "datatype" name=ID;
  *
  **/
 
-
-// not supported
+// "datatype" name=ID
 protected class DataType_Group extends GroupToken {
 	
 	public DataType_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -535,11 +529,9 @@ protected class DataType_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prDataType().eleGroup();
+		return grammarAccess.getDataTypeAccess().getGroup();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new DataType_1_Assignment_name(current, this).firstSolution();
@@ -556,7 +548,7 @@ protected class DataType_Group extends GroupToken {
 	}
 }
 
-// not supported
+// "datatype"
 protected class DataType_0_Keyword_datatype extends KeywordToken  {
 	
 	public DataType_0_Keyword_datatype(IInstanceDescription curr, AbstractToken pred) {
@@ -564,11 +556,11 @@ protected class DataType_0_Keyword_datatype extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prDataType().ele0KeywordDatatype();
+		return grammarAccess.getDataTypeAccess().getDatatypeKeyword_0();
 	}	
 }
 
-// not supported
+// name=ID
 protected class DataType_1_Assignment_name extends AssignmentToken  {
 	
 	public DataType_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -577,7 +569,7 @@ protected class DataType_1_Assignment_name extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prDataType().ele1AssignmentName();
+		return grammarAccess.getDataTypeAccess().getNameAssignment_1();
 	}
 	
 	@Override
@@ -586,7 +578,7 @@ protected class DataType_1_Assignment_name extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("name");
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prDataType().ele10TerminalRuleCallID();
+			element = grammarAccess.getDataTypeAccess().getNameIDTerminalRuleCall_1_0();
 			return new Solution(obj);
 		}
 		return null;
@@ -599,12 +591,12 @@ protected class DataType_1_Assignment_name extends AssignmentToken  {
 
 /************ begin Rule Entity ****************
  *
- * not supported
+ * Entity:
+ *   "entity" name=ID ("extends" superType=[Entity])? "{" (features+=Feature)* "}";
  *
  **/
 
-
-// not supported
+// "entity" name=ID ("extends" superType=[Entity])? "{" (features+=Feature)* "}"
 protected class Entity_Group extends GroupToken {
 	
 	public Entity_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -613,44 +605,42 @@ protected class Entity_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prEntity().eleGroup();
+		return grammarAccess.getEntityAccess().getGroup();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new Entity_5_Keyword(current, this).firstSolution();
 		while(s1 != null) {
 			Solution s2 = new Entity_4_Assignment_features(s1.getCurrent(), s1.getPredecessor()).firstSolution();
-		while(s2 != null) {
-			Solution s3 = new Entity_3_Keyword(s2.getCurrent(), s2.getPredecessor()).firstSolution();
-		while(s3 != null) {
-			Solution s4 = new Entity_2_Group(s3.getCurrent(), s3.getPredecessor()).firstSolution();
-		while(s4 != null) {
-			Solution s5 = new Entity_1_Assignment_name(s4.getCurrent(), s4.getPredecessor()).firstSolution();
-		while(s5 != null) {
-			Solution s6 = new Entity_0_Keyword_entity(s5.getCurrent(), s5.getPredecessor()).firstSolution();
-			if(s6 != null) {
-				last = s6.getPredecessor();
-				return s6;
-			} else {
-				s5 = s5.getPredecessor().nextSolution(this,s5);
+			while(s2 != null) {
+				Solution s3 = new Entity_3_Keyword(s2.getCurrent(), s2.getPredecessor()).firstSolution();
+				while(s3 != null) {
+					Solution s4 = new Entity_2_Group(s3.getCurrent(), s3.getPredecessor()).firstSolution();
+					while(s4 != null) {
+						Solution s5 = new Entity_1_Assignment_name(s4.getCurrent(), s4.getPredecessor()).firstSolution();
+						while(s5 != null) {
+							Solution s6 = new Entity_0_Keyword_entity(s5.getCurrent(), s5.getPredecessor()).firstSolution();
+							if(s6 != null) {
+								last = s6.getPredecessor();
+								return s6;
+							} else {
+								s5 = s5.getPredecessor().nextSolution(this,s5);
+							}
+						}
+						s4 = s4.getPredecessor().nextSolution(this,s4);
+					}
+					s3 = s3.getPredecessor().nextSolution(this,s3);
+				}
+				s2 = s2.getPredecessor().nextSolution(this,s2);
 			}
-		}
-			s4 = s4.getPredecessor().nextSolution(this,s4);
-		}
-			s3 = s3.getPredecessor().nextSolution(this,s3);
-		}
-			s2 = s2.getPredecessor().nextSolution(this,s2);
-		}
 			s1 = s1.getPredecessor().nextSolution(this,s1);
 		}
 		return null;
 	}
 }
 
-// not supported
+// "entity"
 protected class Entity_0_Keyword_entity extends KeywordToken  {
 	
 	public Entity_0_Keyword_entity(IInstanceDescription curr, AbstractToken pred) {
@@ -658,11 +648,11 @@ protected class Entity_0_Keyword_entity extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prEntity().ele0KeywordEntity();
+		return grammarAccess.getEntityAccess().getEntityKeyword_0();
 	}	
 }
 
-// not supported
+// name=ID
 protected class Entity_1_Assignment_name extends AssignmentToken  {
 	
 	public Entity_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -671,7 +661,7 @@ protected class Entity_1_Assignment_name extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prEntity().ele1AssignmentName();
+		return grammarAccess.getEntityAccess().getNameAssignment_1();
 	}
 	
 	@Override
@@ -680,14 +670,14 @@ protected class Entity_1_Assignment_name extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("name");
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prEntity().ele10TerminalRuleCallID();
+			element = grammarAccess.getEntityAccess().getNameIDTerminalRuleCall_1_0();
 			return new Solution(obj);
 		}
 		return null;
 	}
 }
 
-// not supported
+// ("extends" superType=[Entity])?
 protected class Entity_2_Group extends GroupToken {
 	
 	public Entity_2_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -696,11 +686,9 @@ protected class Entity_2_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prEntity().ele2Group();
+		return grammarAccess.getEntityAccess().getGroup_2();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new Entity_2_1_Assignment_superType(current, this).firstSolution();
@@ -717,7 +705,7 @@ protected class Entity_2_Group extends GroupToken {
 	}
 }
 
-// not supported
+// "extends"
 protected class Entity_2_0_Keyword_extends extends KeywordToken  {
 	
 	public Entity_2_0_Keyword_extends(IInstanceDescription curr, AbstractToken pred) {
@@ -725,11 +713,11 @@ protected class Entity_2_0_Keyword_extends extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prEntity().ele20KeywordExtends();
+		return grammarAccess.getEntityAccess().getExtendsKeyword_2_0();
 	}	
 }
 
-// not supported
+// superType=[Entity]
 protected class Entity_2_1_Assignment_superType extends AssignmentToken  {
 	
 	public Entity_2_1_Assignment_superType(IInstanceDescription curr, AbstractToken pred) {
@@ -738,7 +726,7 @@ protected class Entity_2_1_Assignment_superType extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prEntity().ele21AssignmentSuperType();
+		return grammarAccess.getEntityAccess().getSuperTypeAssignment_2_1();
 	}
 	
 	@Override
@@ -747,9 +735,9 @@ protected class Entity_2_1_Assignment_superType extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("superType");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prEntity().ele210CrossReferenceIDEntity().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getEntityAccess().getSuperTypeEntityCrossReference_2_1_0().getType().getClassifier())) {
 				type = AssignmentType.CR;
-				element = grammarAccess.prEntity().ele210CrossReferenceIDEntity(); 
+				element = grammarAccess.getEntityAccess().getSuperTypeEntityCrossReference_2_1_0(); 
 				return new Solution(obj);
 			}
 		}
@@ -758,7 +746,7 @@ protected class Entity_2_1_Assignment_superType extends AssignmentToken  {
 }
 
 
-// not supported
+// "{"
 protected class Entity_3_Keyword extends KeywordToken  {
 	
 	public Entity_3_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -766,11 +754,11 @@ protected class Entity_3_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prEntity().ele3KeywordLeftCurlyBracket();
+		return grammarAccess.getEntityAccess().getLeftCurlyBracketKeyword_3();
 	}	
 }
 
-// not supported
+// (features+=Feature)*
 protected class Entity_4_Assignment_features extends AssignmentToken  {
 	
 	public Entity_4_Assignment_features(IInstanceDescription curr, AbstractToken pred) {
@@ -779,7 +767,7 @@ protected class Entity_4_Assignment_features extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prEntity().ele4AssignmentFeatures();
+		return grammarAccess.getEntityAccess().getFeaturesAssignment_4();
 	}
 	
 	@Override
@@ -789,7 +777,7 @@ protected class Entity_4_Assignment_features extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prFeature().getRule().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getFeatureRule().getType().getClassifier())) {
 				Solution s = new Feature_Alternatives(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -803,7 +791,7 @@ protected class Entity_4_Assignment_features extends AssignmentToken  {
 	}
 }
 
-// not supported
+// "}"
 protected class Entity_5_Keyword extends KeywordToken  {
 	
 	public Entity_5_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -811,7 +799,7 @@ protected class Entity_5_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prEntity().ele5KeywordRightCurlyBracket();
+		return grammarAccess.getEntityAccess().getRightCurlyBracketKeyword_5();
 	}	
 }
 
@@ -821,12 +809,12 @@ protected class Entity_5_Keyword extends KeywordToken  {
 
 /************ begin Rule Feature ****************
  *
- * not supported
+ * Feature:
+ *   StructuralFeature|Operation;
  *
  **/
 
-
-// not supported
+// StructuralFeature|Operation
 protected class Feature_Alternatives extends AlternativesToken {
 
 	public Feature_Alternatives(IInstanceDescription curr, AbstractToken pred) {
@@ -835,7 +823,7 @@ protected class Feature_Alternatives extends AlternativesToken {
 	
 	@Override
 	public Alternatives getGrammarElement() {
-		return grammarAccess.prFeature().eleAlternatives();
+		return grammarAccess.getFeatureAccess().getAlternatives();
 	}
 
 	protected AbstractToken createChild(int id) {
@@ -847,7 +835,7 @@ protected class Feature_Alternatives extends AlternativesToken {
 	}
 }
 
-// not supported
+// StructuralFeature
 protected class Feature_0_RuleCall_StructuralFeature extends RuleCallToken {
 	
 	public Feature_0_RuleCall_StructuralFeature(IInstanceDescription curr, AbstractToken pred) {
@@ -856,18 +844,18 @@ protected class Feature_0_RuleCall_StructuralFeature extends RuleCallToken {
 	
 	@Override
 	public RuleCall getGrammarElement() {
-		return grammarAccess.prFeature().ele0ParserRuleCallStructuralFeature();
+		return grammarAccess.getFeatureAccess().getStructuralFeatureParserRuleCall_0();
 	}
 	
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(StructuralFeature_Alternatives.class, current)) return null;
-		if(!current.isInstanceOf(grammarAccess.prStructuralFeature().getRule().getType().getClassifier())) return null;
+		if(!current.isInstanceOf(grammarAccess.getStructuralFeatureRule().getType().getClassifier())) return null;
 		return new StructuralFeature_Alternatives(current, this).firstSolution();
 	}
 }
 
-// not supported
+// Operation
 protected class Feature_1_RuleCall_Operation extends RuleCallToken {
 	
 	public Feature_1_RuleCall_Operation(IInstanceDescription curr, AbstractToken pred) {
@@ -876,13 +864,13 @@ protected class Feature_1_RuleCall_Operation extends RuleCallToken {
 	
 	@Override
 	public RuleCall getGrammarElement() {
-		return grammarAccess.prFeature().ele1ParserRuleCallOperation();
+		return grammarAccess.getFeatureAccess().getOperationParserRuleCall_1();
 	}
 	
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Operation_Group.class, current)) return null;
-		if(!current.isInstanceOf(grammarAccess.prOperation().getRule().getType().getClassifier())) return null;
+		if(!current.isInstanceOf(grammarAccess.getOperationRule().getType().getClassifier())) return null;
 		return new Operation_Group(current, this).firstSolution();
 	}
 }
@@ -893,12 +881,12 @@ protected class Feature_1_RuleCall_Operation extends RuleCallToken {
 
 /************ begin Rule StructuralFeature ****************
  *
- * not supported
+ * StructuralFeature:
+ *   Attribute|Reference;
  *
  **/
 
-
-// not supported
+// Attribute|Reference
 protected class StructuralFeature_Alternatives extends AlternativesToken {
 
 	public StructuralFeature_Alternatives(IInstanceDescription curr, AbstractToken pred) {
@@ -907,7 +895,7 @@ protected class StructuralFeature_Alternatives extends AlternativesToken {
 	
 	@Override
 	public Alternatives getGrammarElement() {
-		return grammarAccess.prStructuralFeature().eleAlternatives();
+		return grammarAccess.getStructuralFeatureAccess().getAlternatives();
 	}
 
 	protected AbstractToken createChild(int id) {
@@ -919,7 +907,7 @@ protected class StructuralFeature_Alternatives extends AlternativesToken {
 	}
 }
 
-// not supported
+// Attribute
 protected class StructuralFeature_0_RuleCall_Attribute extends RuleCallToken {
 	
 	public StructuralFeature_0_RuleCall_Attribute(IInstanceDescription curr, AbstractToken pred) {
@@ -928,18 +916,18 @@ protected class StructuralFeature_0_RuleCall_Attribute extends RuleCallToken {
 	
 	@Override
 	public RuleCall getGrammarElement() {
-		return grammarAccess.prStructuralFeature().ele0ParserRuleCallAttribute();
+		return grammarAccess.getStructuralFeatureAccess().getAttributeParserRuleCall_0();
 	}
 	
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Attribute_Group.class, current)) return null;
-		if(!current.isInstanceOf(grammarAccess.prAttribute().getRule().getType().getClassifier())) return null;
+		if(!current.isInstanceOf(grammarAccess.getAttributeRule().getType().getClassifier())) return null;
 		return new Attribute_Group(current, this).firstSolution();
 	}
 }
 
-// not supported
+// Reference
 protected class StructuralFeature_1_RuleCall_Reference extends RuleCallToken {
 	
 	public StructuralFeature_1_RuleCall_Reference(IInstanceDescription curr, AbstractToken pred) {
@@ -948,13 +936,13 @@ protected class StructuralFeature_1_RuleCall_Reference extends RuleCallToken {
 	
 	@Override
 	public RuleCall getGrammarElement() {
-		return grammarAccess.prStructuralFeature().ele1ParserRuleCallReference();
+		return grammarAccess.getStructuralFeatureAccess().getReferenceParserRuleCall_1();
 	}
 	
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Reference_Group.class, current)) return null;
-		if(!current.isInstanceOf(grammarAccess.prReference().getRule().getType().getClassifier())) return null;
+		if(!current.isInstanceOf(grammarAccess.getReferenceRule().getType().getClassifier())) return null;
 		return new Reference_Group(current, this).firstSolution();
 	}
 }
@@ -965,12 +953,12 @@ protected class StructuralFeature_1_RuleCall_Reference extends RuleCallToken {
 
 /************ begin Rule Attribute ****************
  *
- * not supported
+ * Attribute:
+ *   "attr" name=ID ":" type=TypeRef;
  *
  **/
 
-
-// not supported
+// "attr" name=ID ":" type=TypeRef
 protected class Attribute_Group extends GroupToken {
 	
 	public Attribute_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -979,36 +967,34 @@ protected class Attribute_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prAttribute().eleGroup();
+		return grammarAccess.getAttributeAccess().getGroup();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new Attribute_3_Assignment_type(current, this).firstSolution();
 		while(s1 != null) {
 			Solution s2 = new Attribute_2_Keyword(s1.getCurrent(), s1.getPredecessor()).firstSolution();
-		while(s2 != null) {
-			Solution s3 = new Attribute_1_Assignment_name(s2.getCurrent(), s2.getPredecessor()).firstSolution();
-		while(s3 != null) {
-			Solution s4 = new Attribute_0_Keyword_attr(s3.getCurrent(), s3.getPredecessor()).firstSolution();
-			if(s4 != null) {
-				last = s4.getPredecessor();
-				return s4;
-			} else {
-				s3 = s3.getPredecessor().nextSolution(this,s3);
+			while(s2 != null) {
+				Solution s3 = new Attribute_1_Assignment_name(s2.getCurrent(), s2.getPredecessor()).firstSolution();
+				while(s3 != null) {
+					Solution s4 = new Attribute_0_Keyword_attr(s3.getCurrent(), s3.getPredecessor()).firstSolution();
+					if(s4 != null) {
+						last = s4.getPredecessor();
+						return s4;
+					} else {
+						s3 = s3.getPredecessor().nextSolution(this,s3);
+					}
+				}
+				s2 = s2.getPredecessor().nextSolution(this,s2);
 			}
-		}
-			s2 = s2.getPredecessor().nextSolution(this,s2);
-		}
 			s1 = s1.getPredecessor().nextSolution(this,s1);
 		}
 		return null;
 	}
 }
 
-// not supported
+// "attr"
 protected class Attribute_0_Keyword_attr extends KeywordToken  {
 	
 	public Attribute_0_Keyword_attr(IInstanceDescription curr, AbstractToken pred) {
@@ -1016,11 +1002,11 @@ protected class Attribute_0_Keyword_attr extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prAttribute().ele0KeywordAttr();
+		return grammarAccess.getAttributeAccess().getAttrKeyword_0();
 	}	
 }
 
-// not supported
+// name=ID
 protected class Attribute_1_Assignment_name extends AssignmentToken  {
 	
 	public Attribute_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -1029,7 +1015,7 @@ protected class Attribute_1_Assignment_name extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prAttribute().ele1AssignmentName();
+		return grammarAccess.getAttributeAccess().getNameAssignment_1();
 	}
 	
 	@Override
@@ -1038,14 +1024,14 @@ protected class Attribute_1_Assignment_name extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("name");
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prAttribute().ele10TerminalRuleCallID();
+			element = grammarAccess.getAttributeAccess().getNameIDTerminalRuleCall_1_0();
 			return new Solution(obj);
 		}
 		return null;
 	}
 }
 
-// not supported
+// ":"
 protected class Attribute_2_Keyword extends KeywordToken  {
 	
 	public Attribute_2_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1053,11 +1039,11 @@ protected class Attribute_2_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prAttribute().ele2KeywordColon();
+		return grammarAccess.getAttributeAccess().getColonKeyword_2();
 	}	
 }
 
-// not supported
+// type=TypeRef
 protected class Attribute_3_Assignment_type extends AssignmentToken  {
 	
 	public Attribute_3_Assignment_type(IInstanceDescription curr, AbstractToken pred) {
@@ -1066,7 +1052,7 @@ protected class Attribute_3_Assignment_type extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prAttribute().ele3AssignmentType();
+		return grammarAccess.getAttributeAccess().getTypeAssignment_3();
 	}
 	
 	@Override
@@ -1076,7 +1062,7 @@ protected class Attribute_3_Assignment_type extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getTypeRefRule().getType().getClassifier())) {
 				Solution s = new TypeRef_Assignment_referenced(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -1096,12 +1082,12 @@ protected class Attribute_3_Assignment_type extends AssignmentToken  {
 
 /************ begin Rule Reference ****************
  *
- * not supported
+ * Reference:
+ *   "ref" name=ID ":" type=TypeRef ("opposite" opposite=[Reference])?;
  *
  **/
 
-
-// not supported
+// "ref" name=ID ":" type=TypeRef ("opposite" opposite=[Reference])?
 protected class Reference_Group extends GroupToken {
 	
 	public Reference_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1110,40 +1096,38 @@ protected class Reference_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prReference().eleGroup();
+		return grammarAccess.getReferenceAccess().getGroup();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new Reference_4_Group(current, this).firstSolution();
 		while(s1 != null) {
 			Solution s2 = new Reference_3_Assignment_type(s1.getCurrent(), s1.getPredecessor()).firstSolution();
-		while(s2 != null) {
-			Solution s3 = new Reference_2_Keyword(s2.getCurrent(), s2.getPredecessor()).firstSolution();
-		while(s3 != null) {
-			Solution s4 = new Reference_1_Assignment_name(s3.getCurrent(), s3.getPredecessor()).firstSolution();
-		while(s4 != null) {
-			Solution s5 = new Reference_0_Keyword_ref(s4.getCurrent(), s4.getPredecessor()).firstSolution();
-			if(s5 != null) {
-				last = s5.getPredecessor();
-				return s5;
-			} else {
-				s4 = s4.getPredecessor().nextSolution(this,s4);
+			while(s2 != null) {
+				Solution s3 = new Reference_2_Keyword(s2.getCurrent(), s2.getPredecessor()).firstSolution();
+				while(s3 != null) {
+					Solution s4 = new Reference_1_Assignment_name(s3.getCurrent(), s3.getPredecessor()).firstSolution();
+					while(s4 != null) {
+						Solution s5 = new Reference_0_Keyword_ref(s4.getCurrent(), s4.getPredecessor()).firstSolution();
+						if(s5 != null) {
+							last = s5.getPredecessor();
+							return s5;
+						} else {
+							s4 = s4.getPredecessor().nextSolution(this,s4);
+						}
+					}
+					s3 = s3.getPredecessor().nextSolution(this,s3);
+				}
+				s2 = s2.getPredecessor().nextSolution(this,s2);
 			}
-		}
-			s3 = s3.getPredecessor().nextSolution(this,s3);
-		}
-			s2 = s2.getPredecessor().nextSolution(this,s2);
-		}
 			s1 = s1.getPredecessor().nextSolution(this,s1);
 		}
 		return null;
 	}
 }
 
-// not supported
+// "ref"
 protected class Reference_0_Keyword_ref extends KeywordToken  {
 	
 	public Reference_0_Keyword_ref(IInstanceDescription curr, AbstractToken pred) {
@@ -1151,11 +1135,11 @@ protected class Reference_0_Keyword_ref extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prReference().ele0KeywordRef();
+		return grammarAccess.getReferenceAccess().getRefKeyword_0();
 	}	
 }
 
-// not supported
+// name=ID
 protected class Reference_1_Assignment_name extends AssignmentToken  {
 	
 	public Reference_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -1164,7 +1148,7 @@ protected class Reference_1_Assignment_name extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prReference().ele1AssignmentName();
+		return grammarAccess.getReferenceAccess().getNameAssignment_1();
 	}
 	
 	@Override
@@ -1173,14 +1157,14 @@ protected class Reference_1_Assignment_name extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("name");
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prReference().ele10TerminalRuleCallID();
+			element = grammarAccess.getReferenceAccess().getNameIDTerminalRuleCall_1_0();
 			return new Solution(obj);
 		}
 		return null;
 	}
 }
 
-// not supported
+// ":"
 protected class Reference_2_Keyword extends KeywordToken  {
 	
 	public Reference_2_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1188,11 +1172,11 @@ protected class Reference_2_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prReference().ele2KeywordColon();
+		return grammarAccess.getReferenceAccess().getColonKeyword_2();
 	}	
 }
 
-// not supported
+// type=TypeRef
 protected class Reference_3_Assignment_type extends AssignmentToken  {
 	
 	public Reference_3_Assignment_type(IInstanceDescription curr, AbstractToken pred) {
@@ -1201,7 +1185,7 @@ protected class Reference_3_Assignment_type extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prReference().ele3AssignmentType();
+		return grammarAccess.getReferenceAccess().getTypeAssignment_3();
 	}
 	
 	@Override
@@ -1211,7 +1195,7 @@ protected class Reference_3_Assignment_type extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getTypeRefRule().getType().getClassifier())) {
 				Solution s = new TypeRef_Assignment_referenced(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -1225,7 +1209,7 @@ protected class Reference_3_Assignment_type extends AssignmentToken  {
 	}
 }
 
-// not supported
+// ("opposite" opposite=[Reference])?
 protected class Reference_4_Group extends GroupToken {
 	
 	public Reference_4_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1234,11 +1218,9 @@ protected class Reference_4_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prReference().ele4Group();
+		return grammarAccess.getReferenceAccess().getGroup_4();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new Reference_4_1_Assignment_opposite(current, this).firstSolution();
@@ -1255,7 +1237,7 @@ protected class Reference_4_Group extends GroupToken {
 	}
 }
 
-// not supported
+// "opposite"
 protected class Reference_4_0_Keyword_opposite extends KeywordToken  {
 	
 	public Reference_4_0_Keyword_opposite(IInstanceDescription curr, AbstractToken pred) {
@@ -1263,11 +1245,11 @@ protected class Reference_4_0_Keyword_opposite extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prReference().ele40KeywordOpposite();
+		return grammarAccess.getReferenceAccess().getOppositeKeyword_4_0();
 	}	
 }
 
-// not supported
+// opposite=[Reference]
 protected class Reference_4_1_Assignment_opposite extends AssignmentToken  {
 	
 	public Reference_4_1_Assignment_opposite(IInstanceDescription curr, AbstractToken pred) {
@@ -1276,7 +1258,7 @@ protected class Reference_4_1_Assignment_opposite extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prReference().ele41AssignmentOpposite();
+		return grammarAccess.getReferenceAccess().getOppositeAssignment_4_1();
 	}
 	
 	@Override
@@ -1285,9 +1267,9 @@ protected class Reference_4_1_Assignment_opposite extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("opposite");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prReference().ele410CrossReferenceIDReference().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getReferenceAccess().getOppositeReferenceCrossReference_4_1_0().getType().getClassifier())) {
 				type = AssignmentType.CR;
-				element = grammarAccess.prReference().ele410CrossReferenceIDReference(); 
+				element = grammarAccess.getReferenceAccess().getOppositeReferenceCrossReference_4_1_0(); 
 				return new Solution(obj);
 			}
 		}
@@ -1302,12 +1284,12 @@ protected class Reference_4_1_Assignment_opposite extends AssignmentToken  {
 
 /************ begin Rule Operation ****************
  *
- * not supported
+ * Operation:
+ *   "op" name=ID "(" (params+=Parameter ("," params+=Parameter)*)? ")" ":" type=TypeRef;
  *
  **/
 
-
-// not supported
+// "op" name=ID "(" (params+=Parameter ("," params+=Parameter)*)? ")" ":" type=TypeRef
 protected class Operation_Group extends GroupToken {
 	
 	public Operation_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1316,48 +1298,46 @@ protected class Operation_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prOperation().eleGroup();
+		return grammarAccess.getOperationAccess().getGroup();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new Operation_6_Assignment_type(current, this).firstSolution();
 		while(s1 != null) {
 			Solution s2 = new Operation_5_Keyword(s1.getCurrent(), s1.getPredecessor()).firstSolution();
-		while(s2 != null) {
-			Solution s3 = new Operation_4_Keyword(s2.getCurrent(), s2.getPredecessor()).firstSolution();
-		while(s3 != null) {
-			Solution s4 = new Operation_3_Group(s3.getCurrent(), s3.getPredecessor()).firstSolution();
-		while(s4 != null) {
-			Solution s5 = new Operation_2_Keyword(s4.getCurrent(), s4.getPredecessor()).firstSolution();
-		while(s5 != null) {
-			Solution s6 = new Operation_1_Assignment_name(s5.getCurrent(), s5.getPredecessor()).firstSolution();
-		while(s6 != null) {
-			Solution s7 = new Operation_0_Keyword_op(s6.getCurrent(), s6.getPredecessor()).firstSolution();
-			if(s7 != null) {
-				last = s7.getPredecessor();
-				return s7;
-			} else {
-				s6 = s6.getPredecessor().nextSolution(this,s6);
+			while(s2 != null) {
+				Solution s3 = new Operation_4_Keyword(s2.getCurrent(), s2.getPredecessor()).firstSolution();
+				while(s3 != null) {
+					Solution s4 = new Operation_3_Group(s3.getCurrent(), s3.getPredecessor()).firstSolution();
+					while(s4 != null) {
+						Solution s5 = new Operation_2_Keyword(s4.getCurrent(), s4.getPredecessor()).firstSolution();
+						while(s5 != null) {
+							Solution s6 = new Operation_1_Assignment_name(s5.getCurrent(), s5.getPredecessor()).firstSolution();
+							while(s6 != null) {
+								Solution s7 = new Operation_0_Keyword_op(s6.getCurrent(), s6.getPredecessor()).firstSolution();
+								if(s7 != null) {
+									last = s7.getPredecessor();
+									return s7;
+								} else {
+									s6 = s6.getPredecessor().nextSolution(this,s6);
+								}
+							}
+							s5 = s5.getPredecessor().nextSolution(this,s5);
+						}
+						s4 = s4.getPredecessor().nextSolution(this,s4);
+					}
+					s3 = s3.getPredecessor().nextSolution(this,s3);
+				}
+				s2 = s2.getPredecessor().nextSolution(this,s2);
 			}
-		}
-			s5 = s5.getPredecessor().nextSolution(this,s5);
-		}
-			s4 = s4.getPredecessor().nextSolution(this,s4);
-		}
-			s3 = s3.getPredecessor().nextSolution(this,s3);
-		}
-			s2 = s2.getPredecessor().nextSolution(this,s2);
-		}
 			s1 = s1.getPredecessor().nextSolution(this,s1);
 		}
 		return null;
 	}
 }
 
-// not supported
+// "op"
 protected class Operation_0_Keyword_op extends KeywordToken  {
 	
 	public Operation_0_Keyword_op(IInstanceDescription curr, AbstractToken pred) {
@@ -1365,11 +1345,11 @@ protected class Operation_0_Keyword_op extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prOperation().ele0KeywordOp();
+		return grammarAccess.getOperationAccess().getOpKeyword_0();
 	}	
 }
 
-// not supported
+// name=ID
 protected class Operation_1_Assignment_name extends AssignmentToken  {
 	
 	public Operation_1_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -1378,7 +1358,7 @@ protected class Operation_1_Assignment_name extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prOperation().ele1AssignmentName();
+		return grammarAccess.getOperationAccess().getNameAssignment_1();
 	}
 	
 	@Override
@@ -1387,14 +1367,14 @@ protected class Operation_1_Assignment_name extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("name");
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prOperation().ele10TerminalRuleCallID();
+			element = grammarAccess.getOperationAccess().getNameIDTerminalRuleCall_1_0();
 			return new Solution(obj);
 		}
 		return null;
 	}
 }
 
-// not supported
+// "("
 protected class Operation_2_Keyword extends KeywordToken  {
 	
 	public Operation_2_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1402,11 +1382,11 @@ protected class Operation_2_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prOperation().ele2KeywordLeftParenthesis();
+		return grammarAccess.getOperationAccess().getLeftParenthesisKeyword_2();
 	}	
 }
 
-// not supported
+// (params+=Parameter ("," params+=Parameter)*)?
 protected class Operation_3_Group extends GroupToken {
 	
 	public Operation_3_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1415,11 +1395,9 @@ protected class Operation_3_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prOperation().ele3Group();
+		return grammarAccess.getOperationAccess().getGroup_3();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new Operation_3_1_Group(current, this).firstSolution();
@@ -1436,7 +1414,7 @@ protected class Operation_3_Group extends GroupToken {
 	}
 }
 
-// not supported
+// params+=Parameter
 protected class Operation_3_0_Assignment_params extends AssignmentToken  {
 	
 	public Operation_3_0_Assignment_params(IInstanceDescription curr, AbstractToken pred) {
@@ -1445,7 +1423,7 @@ protected class Operation_3_0_Assignment_params extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prOperation().ele30AssignmentParams();
+		return grammarAccess.getOperationAccess().getParamsAssignment_3_0();
 	}
 	
 	@Override
@@ -1455,7 +1433,7 @@ protected class Operation_3_0_Assignment_params extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prParameter().getRule().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getParameterRule().getType().getClassifier())) {
 				Solution s = new Parameter_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -1469,7 +1447,7 @@ protected class Operation_3_0_Assignment_params extends AssignmentToken  {
 	}
 }
 
-// not supported
+// ("," params+=Parameter)*
 protected class Operation_3_1_Group extends GroupToken {
 	
 	public Operation_3_1_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1478,11 +1456,9 @@ protected class Operation_3_1_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prOperation().ele31Group();
+		return grammarAccess.getOperationAccess().getGroup_3_1();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new Operation_3_1_1_Assignment_params(current, this).firstSolution();
@@ -1499,7 +1475,7 @@ protected class Operation_3_1_Group extends GroupToken {
 	}
 }
 
-// not supported
+// ","
 protected class Operation_3_1_0_Keyword extends KeywordToken  {
 	
 	public Operation_3_1_0_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1507,11 +1483,11 @@ protected class Operation_3_1_0_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prOperation().ele310KeywordComma();
+		return grammarAccess.getOperationAccess().getCommaKeyword_3_1_0();
 	}	
 }
 
-// not supported
+// params+=Parameter
 protected class Operation_3_1_1_Assignment_params extends AssignmentToken  {
 	
 	public Operation_3_1_1_Assignment_params(IInstanceDescription curr, AbstractToken pred) {
@@ -1520,7 +1496,7 @@ protected class Operation_3_1_1_Assignment_params extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prOperation().ele311AssignmentParams();
+		return grammarAccess.getOperationAccess().getParamsAssignment_3_1_1();
 	}
 	
 	@Override
@@ -1530,7 +1506,7 @@ protected class Operation_3_1_1_Assignment_params extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prParameter().getRule().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getParameterRule().getType().getClassifier())) {
 				Solution s = new Parameter_Group(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -1546,7 +1522,7 @@ protected class Operation_3_1_1_Assignment_params extends AssignmentToken  {
 
 
 
-// not supported
+// ")"
 protected class Operation_4_Keyword extends KeywordToken  {
 	
 	public Operation_4_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1554,11 +1530,11 @@ protected class Operation_4_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prOperation().ele4KeywordRightParenthesis();
+		return grammarAccess.getOperationAccess().getRightParenthesisKeyword_4();
 	}	
 }
 
-// not supported
+// ":"
 protected class Operation_5_Keyword extends KeywordToken  {
 	
 	public Operation_5_Keyword(IInstanceDescription curr, AbstractToken pred) {
@@ -1566,11 +1542,11 @@ protected class Operation_5_Keyword extends KeywordToken  {
 	}
 	
 	public Keyword getGrammarElement() {
-		return grammarAccess.prOperation().ele5KeywordColon();
+		return grammarAccess.getOperationAccess().getColonKeyword_5();
 	}	
 }
 
-// not supported
+// type=TypeRef
 protected class Operation_6_Assignment_type extends AssignmentToken  {
 	
 	public Operation_6_Assignment_type(IInstanceDescription curr, AbstractToken pred) {
@@ -1579,7 +1555,7 @@ protected class Operation_6_Assignment_type extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prOperation().ele6AssignmentType();
+		return grammarAccess.getOperationAccess().getTypeAssignment_6();
 	}
 	
 	@Override
@@ -1589,7 +1565,7 @@ protected class Operation_6_Assignment_type extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getTypeRefRule().getType().getClassifier())) {
 				Solution s = new TypeRef_Assignment_referenced(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -1609,12 +1585,12 @@ protected class Operation_6_Assignment_type extends AssignmentToken  {
 
 /************ begin Rule Parameter ****************
  *
- * not supported
+ * Parameter:
+ *   name=ID type=TypeRef;
  *
  **/
 
-
-// not supported
+// name=ID type=TypeRef
 protected class Parameter_Group extends GroupToken {
 	
 	public Parameter_Group(IInstanceDescription curr, AbstractToken pred) {
@@ -1623,11 +1599,9 @@ protected class Parameter_Group extends GroupToken {
 	
 	@Override
 	public Group getGrammarElement() {
-		return grammarAccess.prParameter().eleGroup();
+		return grammarAccess.getParameterAccess().getGroup();
 	}
 
-	
-
 	@Override
 	protected Solution createSolution() {	
 		Solution s1 = new Parameter_1_Assignment_type(current, this).firstSolution();
@@ -1644,7 +1618,7 @@ protected class Parameter_Group extends GroupToken {
 	}
 }
 
-// not supported
+// name=ID
 protected class Parameter_0_Assignment_name extends AssignmentToken  {
 	
 	public Parameter_0_Assignment_name(IInstanceDescription curr, AbstractToken pred) {
@@ -1653,7 +1627,7 @@ protected class Parameter_0_Assignment_name extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prParameter().ele0AssignmentName();
+		return grammarAccess.getParameterAccess().getNameAssignment_0();
 	}
 	
 	@Override
@@ -1662,14 +1636,14 @@ protected class Parameter_0_Assignment_name extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("name");
 		if(Boolean.TRUE.booleanValue()) { // xtext::RuleCall FIXME: check if value is valid for lexer rule
 			type = AssignmentType.LRC;
-			element = grammarAccess.prParameter().ele00TerminalRuleCallID();
+			element = grammarAccess.getParameterAccess().getNameIDTerminalRuleCall_0_0();
 			return new Solution(obj);
 		}
 		return null;
 	}
 }
 
-// not supported
+// type=TypeRef
 protected class Parameter_1_Assignment_type extends AssignmentToken  {
 	
 	public Parameter_1_Assignment_type(IInstanceDescription curr, AbstractToken pred) {
@@ -1678,7 +1652,7 @@ protected class Parameter_1_Assignment_type extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prParameter().ele1AssignmentType();
+		return grammarAccess.getParameterAccess().getTypeAssignment_1();
 	}
 	
 	@Override
@@ -1688,7 +1662,7 @@ protected class Parameter_1_Assignment_type extends AssignmentToken  {
 
 		if(value instanceof EObject) { // xtext::RuleCall
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prTypeRef().getRule().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getTypeRefRule().getType().getClassifier())) {
 				Solution s = new TypeRef_Assignment_referenced(param, this).firstSolution();
 				while(s != null && !isConsumed(s,this)) s = s.getPredecessor().nextSolution(this,s);
 				if(s != null) {
@@ -1708,12 +1682,12 @@ protected class Parameter_1_Assignment_type extends AssignmentToken  {
 
 /************ begin Rule TypedElement ****************
  *
- * not supported
+ * TypedElement:
+ *   Feature|Parameter;
  *
  **/
 
-
-// not supported
+// Feature|Parameter
 protected class TypedElement_Alternatives extends AlternativesToken {
 
 	public TypedElement_Alternatives(IInstanceDescription curr, AbstractToken pred) {
@@ -1722,7 +1696,7 @@ protected class TypedElement_Alternatives extends AlternativesToken {
 	
 	@Override
 	public Alternatives getGrammarElement() {
-		return grammarAccess.prTypedElement().eleAlternatives();
+		return grammarAccess.getTypedElementAccess().getAlternatives();
 	}
 
 	protected AbstractToken createChild(int id) {
@@ -1734,7 +1708,7 @@ protected class TypedElement_Alternatives extends AlternativesToken {
 	}
 }
 
-// not supported
+// Feature
 protected class TypedElement_0_RuleCall_Feature extends RuleCallToken {
 	
 	public TypedElement_0_RuleCall_Feature(IInstanceDescription curr, AbstractToken pred) {
@@ -1743,18 +1717,18 @@ protected class TypedElement_0_RuleCall_Feature extends RuleCallToken {
 	
 	@Override
 	public RuleCall getGrammarElement() {
-		return grammarAccess.prTypedElement().ele0ParserRuleCallFeature();
+		return grammarAccess.getTypedElementAccess().getFeatureParserRuleCall_0();
 	}
 	
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Feature_Alternatives.class, current)) return null;
-		if(!current.isInstanceOf(grammarAccess.prFeature().getRule().getType().getClassifier())) return null;
+		if(!current.isInstanceOf(grammarAccess.getFeatureRule().getType().getClassifier())) return null;
 		return new Feature_Alternatives(current, this).firstSolution();
 	}
 }
 
-// not supported
+// Parameter
 protected class TypedElement_1_RuleCall_Parameter extends RuleCallToken {
 	
 	public TypedElement_1_RuleCall_Parameter(IInstanceDescription curr, AbstractToken pred) {
@@ -1763,13 +1737,13 @@ protected class TypedElement_1_RuleCall_Parameter extends RuleCallToken {
 	
 	@Override
 	public RuleCall getGrammarElement() {
-		return grammarAccess.prTypedElement().ele1ParserRuleCallParameter();
+		return grammarAccess.getTypedElementAccess().getParameterParserRuleCall_1();
 	}
 	
 	@Override
 	protected Solution createSolution() {
 		if(checkForRecursion(Parameter_Group.class, current)) return null;
-		if(!current.isInstanceOf(grammarAccess.prParameter().getRule().getType().getClassifier())) return null;
+		if(!current.isInstanceOf(grammarAccess.getParameterRule().getType().getClassifier())) return null;
 		return new Parameter_Group(current, this).firstSolution();
 	}
 }
@@ -1780,12 +1754,12 @@ protected class TypedElement_1_RuleCall_Parameter extends RuleCallToken {
 
 /************ begin Rule TypeRef ****************
  *
- * not supported
+ * TypeRef:
+ *   referenced=[Type];
  *
  **/
 
-
-// not supported
+// referenced=[Type]
 protected class TypeRef_Assignment_referenced extends AssignmentToken  {
 	
 	public TypeRef_Assignment_referenced(IInstanceDescription curr, AbstractToken pred) {
@@ -1794,7 +1768,7 @@ protected class TypeRef_Assignment_referenced extends AssignmentToken  {
 	
 	@Override
 	public Assignment getGrammarElement() {
-		return grammarAccess.prTypeRef().eleAssignmentReferenced();
+		return grammarAccess.getTypeRefAccess().getReferencedAssignment();
 	}
 	
 	@Override
@@ -1803,9 +1777,9 @@ protected class TypeRef_Assignment_referenced extends AssignmentToken  {
 		IInstanceDescription obj = current.cloneAndConsume("referenced");
 		if(value instanceof EObject) { // xtext::CrossReference
 			IInstanceDescription param = getDescr((EObject)value);
-			if(param.isInstanceOf(grammarAccess.prTypeRef().ele0CrossReferenceIDType().getType().getClassifier())) {
+			if(param.isInstanceOf(grammarAccess.getTypeRefAccess().getReferencedTypeCrossReference_0().getType().getClassifier())) {
 				type = AssignmentType.CR;
-				element = grammarAccess.prTypeRef().ele0CrossReferenceIDType(); 
+				element = grammarAccess.getTypeRefAccess().getReferencedTypeCrossReference_0(); 
 				return new Solution(obj);
 			}
 		}
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g
index c6f6576..f95d31d 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g
@@ -67,7 +67,7 @@ import org.eclipse.xtext.example.services.DomainmodelGrammarAccess;
 
 // Entry rule entryRuleFile
 entryRuleFile returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prFile().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getFileRule(), currentNode); }
 	 iv_ruleFile=ruleFile 
 	 { $current=$iv_ruleFile.current; } 
 	 EOF 
@@ -84,12 +84,12 @@ ruleFile returns [EObject current=null]
 	
 	    
 	    { 
-	        currentNode=createCompositeNode(grammarAccess.prFile().ele00ParserRuleCallImport(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.getFileAccess().getImportsImportParserRuleCall_0_0(), currentNode); 
 	    }
 	    lv_imports_0=ruleImport 
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prFile().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getFileRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -105,12 +105,12 @@ ruleFile returns [EObject current=null]
 	
 	    
 	    { 
-	        currentNode=createCompositeNode(grammarAccess.prFile().ele10ParserRuleCallNamedElement(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.getFileAccess().getNamedElementsNamedElementParserRuleCall_1_0(), currentNode); 
 	    }
 	    lv_namedElements_1=ruleNamedElement 
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prFile().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getFileRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -130,7 +130,7 @@ ruleFile returns [EObject current=null]
 
 // Entry rule entryRuleImport
 entryRuleImport returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prImport().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getImportRule(), currentNode); }
 	 iv_ruleImport=ruleImport 
 	 { $current=$iv_ruleImport.current; } 
 	 EOF 
@@ -145,18 +145,18 @@ ruleImport returns [EObject current=null]
     }:
 ('import' 
     {
-        createLeafNode(grammarAccess.prImport().ele0KeywordImport(), null); 
+        createLeafNode(grammarAccess.getImportAccess().getImportKeyword_0(), null); 
     }
 (	
 	
 	    lv_importURI_1=	RULE_STRING
 	{
-		createLeafNode(grammarAccess.prImport().ele10TerminalRuleCallSTRING(), "importURI"); 
+		createLeafNode(grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_1_0(), "importURI"); 
 	}
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prImport().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getImportRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -175,7 +175,7 @@ ruleImport returns [EObject current=null]
 
 // Entry rule entryRuleNamedElement
 entryRuleNamedElement returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prNamedElement().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getNamedElementRule(), currentNode); }
 	 iv_ruleNamedElement=ruleNamedElement 
 	 { $current=$iv_ruleNamedElement.current; } 
 	 EOF 
@@ -190,7 +190,7 @@ ruleNamedElement returns [EObject current=null]
     }:
 (
     { 
-        currentNode=createCompositeNode(grammarAccess.prNamedElement().ele0ParserRuleCallPackage(), currentNode); 
+        currentNode=createCompositeNode(grammarAccess.getNamedElementAccess().getPackageParserRuleCall_0(), currentNode); 
     }
     this_Package_0=rulePackage
     { 
@@ -199,12 +199,12 @@ ruleNamedElement returns [EObject current=null]
     }
 
     { 
-    createLeafNode(grammarAccess.prNamedElement().ele0ParserRuleCallPackage(), null); 
+    createLeafNode(grammarAccess.getNamedElementAccess().getPackageParserRuleCall_0(), null); 
     }
 
     |
     { 
-        currentNode=createCompositeNode(grammarAccess.prNamedElement().ele1ParserRuleCallType(), currentNode); 
+        currentNode=createCompositeNode(grammarAccess.getNamedElementAccess().getTypeParserRuleCall_1(), currentNode); 
     }
     this_Type_1=ruleType
     { 
@@ -213,7 +213,7 @@ ruleNamedElement returns [EObject current=null]
     }
 
     { 
-    createLeafNode(grammarAccess.prNamedElement().ele1ParserRuleCallType(), null); 
+    createLeafNode(grammarAccess.getNamedElementAccess().getTypeParserRuleCall_1(), null); 
     }
 );
 
@@ -223,7 +223,7 @@ ruleNamedElement returns [EObject current=null]
 
 // Entry rule entryRulePackage
 entryRulePackage returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prPackage().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getPackageRule(), currentNode); }
 	 iv_rulePackage=rulePackage 
 	 { $current=$iv_rulePackage.current; } 
 	 EOF 
@@ -238,18 +238,18 @@ rulePackage returns [EObject current=null]
     }:
 ('package' 
     {
-        createLeafNode(grammarAccess.prPackage().ele0KeywordPackage(), null); 
+        createLeafNode(grammarAccess.getPackageAccess().getPackageKeyword_0(), null); 
     }
 (	
 	
 	    
 	    { 
-	        currentNode=createCompositeNode(grammarAccess.prPackage().ele10ParserRuleCallQualifiedName(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.getPackageAccess().getNameQualifiedNameParserRuleCall_1_0(), currentNode); 
 	    }
 	    lv_name_1=ruleQualifiedName 
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prPackage().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getPackageRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -263,18 +263,18 @@ rulePackage returns [EObject current=null]
 	
 )'{' 
     {
-        createLeafNode(grammarAccess.prPackage().ele2KeywordLeftCurlyBracket(), null); 
+        createLeafNode(grammarAccess.getPackageAccess().getLeftCurlyBracketKeyword_2(), null); 
     }
 (	
 	
 	    
 	    { 
-	        currentNode=createCompositeNode(grammarAccess.prPackage().ele30ParserRuleCallNamedElement(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.getPackageAccess().getNamedElementsNamedElementParserRuleCall_3_0(), currentNode); 
 	    }
 	    lv_namedElements_3=ruleNamedElement 
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prPackage().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getPackageRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -288,7 +288,7 @@ rulePackage returns [EObject current=null]
 	
 )*'}' 
     {
-        createLeafNode(grammarAccess.prPackage().ele4KeywordRightCurlyBracket(), null); 
+        createLeafNode(grammarAccess.getPackageAccess().getRightCurlyBracketKeyword_4(), null); 
     }
 );
 
@@ -298,7 +298,7 @@ rulePackage returns [EObject current=null]
 
 // Entry rule entryRuleType
 entryRuleType returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prType().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getTypeRule(), currentNode); }
 	 iv_ruleType=ruleType 
 	 { $current=$iv_ruleType.current; } 
 	 EOF 
@@ -313,7 +313,7 @@ ruleType returns [EObject current=null]
     }:
 (
     { 
-        currentNode=createCompositeNode(grammarAccess.prType().ele0ParserRuleCallEntity(), currentNode); 
+        currentNode=createCompositeNode(grammarAccess.getTypeAccess().getEntityParserRuleCall_0(), currentNode); 
     }
     this_Entity_0=ruleEntity
     { 
@@ -322,12 +322,12 @@ ruleType returns [EObject current=null]
     }
 
     { 
-    createLeafNode(grammarAccess.prType().ele0ParserRuleCallEntity(), null); 
+    createLeafNode(grammarAccess.getTypeAccess().getEntityParserRuleCall_0(), null); 
     }
 
     |
     { 
-        currentNode=createCompositeNode(grammarAccess.prType().ele1ParserRuleCallDataType(), currentNode); 
+        currentNode=createCompositeNode(grammarAccess.getTypeAccess().getDataTypeParserRuleCall_1(), currentNode); 
     }
     this_DataType_1=ruleDataType
     { 
@@ -336,7 +336,7 @@ ruleType returns [EObject current=null]
     }
 
     { 
-    createLeafNode(grammarAccess.prType().ele1ParserRuleCallDataType(), null); 
+    createLeafNode(grammarAccess.getTypeAccess().getDataTypeParserRuleCall_1(), null); 
     }
 );
 
@@ -346,7 +346,7 @@ ruleType returns [EObject current=null]
 
 // Entry rule entryRuleDataType
 entryRuleDataType returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prDataType().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getDataTypeRule(), currentNode); }
 	 iv_ruleDataType=ruleDataType 
 	 { $current=$iv_ruleDataType.current; } 
 	 EOF 
@@ -361,18 +361,18 @@ ruleDataType returns [EObject current=null]
     }:
 ('datatype' 
     {
-        createLeafNode(grammarAccess.prDataType().ele0KeywordDatatype(), null); 
+        createLeafNode(grammarAccess.getDataTypeAccess().getDatatypeKeyword_0(), null); 
     }
 (	
 	
 	    lv_name_1=	RULE_ID
 	{
-		createLeafNode(grammarAccess.prDataType().ele10TerminalRuleCallID(), "name"); 
+		createLeafNode(grammarAccess.getDataTypeAccess().getNameIDTerminalRuleCall_1_0(), "name"); 
 	}
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prDataType().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getDataTypeRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -391,7 +391,7 @@ ruleDataType returns [EObject current=null]
 
 // Entry rule entryRuleEntity
 entryRuleEntity returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prEntity().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getEntityRule(), currentNode); }
 	 iv_ruleEntity=ruleEntity 
 	 { $current=$iv_ruleEntity.current; } 
 	 EOF 
@@ -406,18 +406,18 @@ ruleEntity returns [EObject current=null]
     }:
 ('entity' 
     {
-        createLeafNode(grammarAccess.prEntity().ele0KeywordEntity(), null); 
+        createLeafNode(grammarAccess.getEntityAccess().getEntityKeyword_0(), null); 
     }
 (	
 	
 	    lv_name_1=	RULE_ID
 	{
-		createLeafNode(grammarAccess.prEntity().ele10TerminalRuleCallID(), "name"); 
+		createLeafNode(grammarAccess.getEntityAccess().getNameIDTerminalRuleCall_1_0(), "name"); 
 	}
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prEntity().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getEntityRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -430,38 +430,38 @@ ruleEntity returns [EObject current=null]
 	
 )('extends' 
     {
-        createLeafNode(grammarAccess.prEntity().ele20KeywordExtends(), null); 
+        createLeafNode(grammarAccess.getEntityAccess().getExtendsKeyword_2_0(), null); 
     }
 (	
 	
 		
 		{
 			if ($current==null) {
-	            $current = factory.create(grammarAccess.prEntity().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getEntityRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
 	RULE_ID
 	{
-		createLeafNode(grammarAccess.prEntity().ele210CrossReferenceIDEntity(), "superType"); 
+		createLeafNode(grammarAccess.getEntityAccess().getSuperTypeEntityCrossReference_2_1_0(), "superType"); 
 	}
 
 		// TODO assign feature to currentNode
 	
 ))?'{' 
     {
-        createLeafNode(grammarAccess.prEntity().ele3KeywordLeftCurlyBracket(), null); 
+        createLeafNode(grammarAccess.getEntityAccess().getLeftCurlyBracketKeyword_3(), null); 
     }
 (	
 	
 	    
 	    { 
-	        currentNode=createCompositeNode(grammarAccess.prEntity().ele40ParserRuleCallFeature(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.getEntityAccess().getFeaturesFeatureParserRuleCall_4_0(), currentNode); 
 	    }
 	    lv_features_5=ruleFeature 
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prEntity().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getEntityRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -475,7 +475,7 @@ ruleEntity returns [EObject current=null]
 	
 )*'}' 
     {
-        createLeafNode(grammarAccess.prEntity().ele5KeywordRightCurlyBracket(), null); 
+        createLeafNode(grammarAccess.getEntityAccess().getRightCurlyBracketKeyword_5(), null); 
     }
 );
 
@@ -485,7 +485,7 @@ ruleEntity returns [EObject current=null]
 
 // Entry rule entryRuleFeature
 entryRuleFeature returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prFeature().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getFeatureRule(), currentNode); }
 	 iv_ruleFeature=ruleFeature 
 	 { $current=$iv_ruleFeature.current; } 
 	 EOF 
@@ -500,7 +500,7 @@ ruleFeature returns [EObject current=null]
     }:
 (
     { 
-        currentNode=createCompositeNode(grammarAccess.prFeature().ele0ParserRuleCallStructuralFeature(), currentNode); 
+        currentNode=createCompositeNode(grammarAccess.getFeatureAccess().getStructuralFeatureParserRuleCall_0(), currentNode); 
     }
     this_StructuralFeature_0=ruleStructuralFeature
     { 
@@ -509,12 +509,12 @@ ruleFeature returns [EObject current=null]
     }
 
     { 
-    createLeafNode(grammarAccess.prFeature().ele0ParserRuleCallStructuralFeature(), null); 
+    createLeafNode(grammarAccess.getFeatureAccess().getStructuralFeatureParserRuleCall_0(), null); 
     }
 
     |
     { 
-        currentNode=createCompositeNode(grammarAccess.prFeature().ele1ParserRuleCallOperation(), currentNode); 
+        currentNode=createCompositeNode(grammarAccess.getFeatureAccess().getOperationParserRuleCall_1(), currentNode); 
     }
     this_Operation_1=ruleOperation
     { 
@@ -523,7 +523,7 @@ ruleFeature returns [EObject current=null]
     }
 
     { 
-    createLeafNode(grammarAccess.prFeature().ele1ParserRuleCallOperation(), null); 
+    createLeafNode(grammarAccess.getFeatureAccess().getOperationParserRuleCall_1(), null); 
     }
 );
 
@@ -533,7 +533,7 @@ ruleFeature returns [EObject current=null]
 
 // Entry rule entryRuleStructuralFeature
 entryRuleStructuralFeature returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prStructuralFeature().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getStructuralFeatureRule(), currentNode); }
 	 iv_ruleStructuralFeature=ruleStructuralFeature 
 	 { $current=$iv_ruleStructuralFeature.current; } 
 	 EOF 
@@ -548,7 +548,7 @@ ruleStructuralFeature returns [EObject current=null]
     }:
 (
     { 
-        currentNode=createCompositeNode(grammarAccess.prStructuralFeature().ele0ParserRuleCallAttribute(), currentNode); 
+        currentNode=createCompositeNode(grammarAccess.getStructuralFeatureAccess().getAttributeParserRuleCall_0(), currentNode); 
     }
     this_Attribute_0=ruleAttribute
     { 
@@ -557,12 +557,12 @@ ruleStructuralFeature returns [EObject current=null]
     }
 
     { 
-    createLeafNode(grammarAccess.prStructuralFeature().ele0ParserRuleCallAttribute(), null); 
+    createLeafNode(grammarAccess.getStructuralFeatureAccess().getAttributeParserRuleCall_0(), null); 
     }
 
     |
     { 
-        currentNode=createCompositeNode(grammarAccess.prStructuralFeature().ele1ParserRuleCallReference(), currentNode); 
+        currentNode=createCompositeNode(grammarAccess.getStructuralFeatureAccess().getReferenceParserRuleCall_1(), currentNode); 
     }
     this_Reference_1=ruleReference
     { 
@@ -571,7 +571,7 @@ ruleStructuralFeature returns [EObject current=null]
     }
 
     { 
-    createLeafNode(grammarAccess.prStructuralFeature().ele1ParserRuleCallReference(), null); 
+    createLeafNode(grammarAccess.getStructuralFeatureAccess().getReferenceParserRuleCall_1(), null); 
     }
 );
 
@@ -581,7 +581,7 @@ ruleStructuralFeature returns [EObject current=null]
 
 // Entry rule entryRuleAttribute
 entryRuleAttribute returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prAttribute().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getAttributeRule(), currentNode); }
 	 iv_ruleAttribute=ruleAttribute 
 	 { $current=$iv_ruleAttribute.current; } 
 	 EOF 
@@ -596,18 +596,18 @@ ruleAttribute returns [EObject current=null]
     }:
 ('attr' 
     {
-        createLeafNode(grammarAccess.prAttribute().ele0KeywordAttr(), null); 
+        createLeafNode(grammarAccess.getAttributeAccess().getAttrKeyword_0(), null); 
     }
 (	
 	
 	    lv_name_1=	RULE_ID
 	{
-		createLeafNode(grammarAccess.prAttribute().ele10TerminalRuleCallID(), "name"); 
+		createLeafNode(grammarAccess.getAttributeAccess().getNameIDTerminalRuleCall_1_0(), "name"); 
 	}
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prAttribute().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getAttributeRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -620,18 +620,18 @@ ruleAttribute returns [EObject current=null]
 	
 )':' 
     {
-        createLeafNode(grammarAccess.prAttribute().ele2KeywordColon(), null); 
+        createLeafNode(grammarAccess.getAttributeAccess().getColonKeyword_2(), null); 
     }
 (	
 	
 	    
 	    { 
-	        currentNode=createCompositeNode(grammarAccess.prAttribute().ele30ParserRuleCallTypeRef(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.getAttributeAccess().getTypeTypeRefParserRuleCall_3_0(), currentNode); 
 	    }
 	    lv_type_3=ruleTypeRef 
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prAttribute().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getAttributeRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -651,7 +651,7 @@ ruleAttribute returns [EObject current=null]
 
 // Entry rule entryRuleReference
 entryRuleReference returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prReference().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getReferenceRule(), currentNode); }
 	 iv_ruleReference=ruleReference 
 	 { $current=$iv_ruleReference.current; } 
 	 EOF 
@@ -666,18 +666,18 @@ ruleReference returns [EObject current=null]
     }:
 ('ref' 
     {
-        createLeafNode(grammarAccess.prReference().ele0KeywordRef(), null); 
+        createLeafNode(grammarAccess.getReferenceAccess().getRefKeyword_0(), null); 
     }
 (	
 	
 	    lv_name_1=	RULE_ID
 	{
-		createLeafNode(grammarAccess.prReference().ele10TerminalRuleCallID(), "name"); 
+		createLeafNode(grammarAccess.getReferenceAccess().getNameIDTerminalRuleCall_1_0(), "name"); 
 	}
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prReference().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getReferenceRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -690,18 +690,18 @@ ruleReference returns [EObject current=null]
 	
 )':' 
     {
-        createLeafNode(grammarAccess.prReference().ele2KeywordColon(), null); 
+        createLeafNode(grammarAccess.getReferenceAccess().getColonKeyword_2(), null); 
     }
 (	
 	
 	    
 	    { 
-	        currentNode=createCompositeNode(grammarAccess.prReference().ele30ParserRuleCallTypeRef(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.getReferenceAccess().getTypeTypeRefParserRuleCall_3_0(), currentNode); 
 	    }
 	    lv_type_3=ruleTypeRef 
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prReference().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getReferenceRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -715,20 +715,20 @@ ruleReference returns [EObject current=null]
 	
 )('opposite' 
     {
-        createLeafNode(grammarAccess.prReference().ele40KeywordOpposite(), null); 
+        createLeafNode(grammarAccess.getReferenceAccess().getOppositeKeyword_4_0(), null); 
     }
 (	
 	
 		
 		{
 			if ($current==null) {
-	            $current = factory.create(grammarAccess.prReference().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getReferenceRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
 	RULE_ID
 	{
-		createLeafNode(grammarAccess.prReference().ele410CrossReferenceIDReference(), "opposite"); 
+		createLeafNode(grammarAccess.getReferenceAccess().getOppositeReferenceCrossReference_4_1_0(), "opposite"); 
 	}
 
 		// TODO assign feature to currentNode
@@ -741,7 +741,7 @@ ruleReference returns [EObject current=null]
 
 // Entry rule entryRuleOperation
 entryRuleOperation returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prOperation().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getOperationRule(), currentNode); }
 	 iv_ruleOperation=ruleOperation 
 	 { $current=$iv_ruleOperation.current; } 
 	 EOF 
@@ -756,18 +756,18 @@ ruleOperation returns [EObject current=null]
     }:
 ('op' 
     {
-        createLeafNode(grammarAccess.prOperation().ele0KeywordOp(), null); 
+        createLeafNode(grammarAccess.getOperationAccess().getOpKeyword_0(), null); 
     }
 (	
 	
 	    lv_name_1=	RULE_ID
 	{
-		createLeafNode(grammarAccess.prOperation().ele10TerminalRuleCallID(), "name"); 
+		createLeafNode(grammarAccess.getOperationAccess().getNameIDTerminalRuleCall_1_0(), "name"); 
 	}
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prOperation().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getOperationRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -780,18 +780,18 @@ ruleOperation returns [EObject current=null]
 	
 )'(' 
     {
-        createLeafNode(grammarAccess.prOperation().ele2KeywordLeftParenthesis(), null); 
+        createLeafNode(grammarAccess.getOperationAccess().getLeftParenthesisKeyword_2(), null); 
     }
 ((	
 	
 	    
 	    { 
-	        currentNode=createCompositeNode(grammarAccess.prOperation().ele300ParserRuleCallParameter(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.getOperationAccess().getParamsParameterParserRuleCall_3_0_0(), currentNode); 
 	    }
 	    lv_params_3=ruleParameter 
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prOperation().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getOperationRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -805,18 +805,18 @@ ruleOperation returns [EObject current=null]
 	
 )(',' 
     {
-        createLeafNode(grammarAccess.prOperation().ele310KeywordComma(), null); 
+        createLeafNode(grammarAccess.getOperationAccess().getCommaKeyword_3_1_0(), null); 
     }
 (	
 	
 	    
 	    { 
-	        currentNode=createCompositeNode(grammarAccess.prOperation().ele3110ParserRuleCallParameter(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.getOperationAccess().getParamsParameterParserRuleCall_3_1_1_0(), currentNode); 
 	    }
 	    lv_params_5=ruleParameter 
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prOperation().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getOperationRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -830,22 +830,22 @@ ruleOperation returns [EObject current=null]
 	
 ))*)?')' 
     {
-        createLeafNode(grammarAccess.prOperation().ele4KeywordRightParenthesis(), null); 
+        createLeafNode(grammarAccess.getOperationAccess().getRightParenthesisKeyword_4(), null); 
     }
 ':' 
     {
-        createLeafNode(grammarAccess.prOperation().ele5KeywordColon(), null); 
+        createLeafNode(grammarAccess.getOperationAccess().getColonKeyword_5(), null); 
     }
 (	
 	
 	    
 	    { 
-	        currentNode=createCompositeNode(grammarAccess.prOperation().ele60ParserRuleCallTypeRef(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.getOperationAccess().getTypeTypeRefParserRuleCall_6_0(), currentNode); 
 	    }
 	    lv_type_8=ruleTypeRef 
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prOperation().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getOperationRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -865,7 +865,7 @@ ruleOperation returns [EObject current=null]
 
 // Entry rule entryRuleParameter
 entryRuleParameter returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prParameter().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getParameterRule(), currentNode); }
 	 iv_ruleParameter=ruleParameter 
 	 { $current=$iv_ruleParameter.current; } 
 	 EOF 
@@ -882,12 +882,12 @@ ruleParameter returns [EObject current=null]
 	
 	    lv_name_0=	RULE_ID
 	{
-		createLeafNode(grammarAccess.prParameter().ele00TerminalRuleCallID(), "name"); 
+		createLeafNode(grammarAccess.getParameterAccess().getNameIDTerminalRuleCall_0_0(), "name"); 
 	}
  
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prParameter().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getParameterRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
 	        
@@ -902,12 +902,12 @@ ruleParameter returns [EObject current=null]
 	
 	    
 	    { 
-	        currentNode=createCompositeNode(grammarAccess.prParameter().ele10ParserRuleCallTypeRef(), currentNode); 
+	        currentNode=createCompositeNode(grammarAccess.getParameterAccess().getTypeTypeRefParserRuleCall_1_0(), currentNode); 
 	    }
 	    lv_type_1=ruleTypeRef 
 	    {
 	        if ($current==null) {
-	            $current = factory.create(grammarAccess.prParameter().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getParameterRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode.getParent(), $current);
 	        }
 	        
@@ -929,7 +929,7 @@ ruleParameter returns [EObject current=null]
 
 // Entry rule entryRuleTypeRef
 entryRuleTypeRef returns [EObject current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prTypeRef().getRule(), currentNode); }
+	{ currentNode = createCompositeNode(grammarAccess.getTypeRefRule(), currentNode); }
 	 iv_ruleTypeRef=ruleTypeRef 
 	 { $current=$iv_ruleTypeRef.current; } 
 	 EOF 
@@ -947,13 +947,13 @@ ruleTypeRef returns [EObject current=null]
 		
 		{
 			if ($current==null) {
-	            $current = factory.create(grammarAccess.prTypeRef().getRule().getType().getClassifier());
+	            $current = factory.create(grammarAccess.getTypeRefRule().getType().getClassifier());
 	            associateNodeWithAstElement(currentNode, $current);
 	        }
         }
 	RULE_ID
 	{
-		createLeafNode(grammarAccess.prTypeRef().ele0CrossReferenceIDType(), "referenced"); 
+		createLeafNode(grammarAccess.getTypeRefAccess().getReferencedTypeCrossReference_0(), "referenced"); 
 	}
 
 		// TODO assign feature to currentNode
@@ -966,7 +966,7 @@ ruleTypeRef returns [EObject current=null]
 
 // Entry rule entryRuleQualifiedName
 entryRuleQualifiedName returns [String current=null] :
-	{ currentNode = createCompositeNode(grammarAccess.prQualifiedName().getRule(), currentNode); } 
+	{ currentNode = createCompositeNode(grammarAccess.getQualifiedNameRule(), currentNode); } 
 	 iv_ruleQualifiedName=ruleQualifiedName 
 	 { $current=$iv_ruleQualifiedName.current.getText(); }  
 	 EOF 
@@ -985,20 +985,20 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT
     }
 
     { 
-    createLeafNode(grammarAccess.prQualifiedName().ele0TerminalRuleCallID(), null); 
+    createLeafNode(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_0(), null); 
     }
 (
 	kw='.' 
     {
         $current.merge(kw);
-        createLeafNode(grammarAccess.prQualifiedName().ele10KeywordFullStop(), null); 
+        createLeafNode(grammarAccess.getQualifiedNameAccess().getFullStopKeyword_1_0(), null); 
     }
     this_ID_2=RULE_ID    {
 		$current.merge(this_ID_2);
     }
 
     { 
-    createLeafNode(grammarAccess.prQualifiedName().ele11TerminalRuleCallID(), null); 
+    createLeafNode(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1(), null); 
     }
 )*)
     ;
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java
index 79e17b0..202b6b5 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodelParser.java
@@ -76,7 +76,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:69:46: (iv_ruleFile= ruleFile EOF )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:70:2: iv_ruleFile= ruleFile EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prFile().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getFileRule(), currentNode); 
             pushFollow(FOLLOW_ruleFile_in_entryRuleFile71);
             iv_ruleFile=ruleFile();
             _fsp--;
@@ -134,7 +134,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             	    // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:86:6: lv_imports_0= ruleImport
             	    {
             	     
-            	    	        currentNode=createCompositeNode(grammarAccess.prFile().ele00ParserRuleCallImport(), currentNode); 
+            	    	        currentNode=createCompositeNode(grammarAccess.getFileAccess().getImportsImportParserRuleCall_0_0(), currentNode); 
             	    	    
             	    pushFollow(FOLLOW_ruleImport_in_ruleFile140);
             	    lv_imports_0=ruleImport();
@@ -142,7 +142,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create(grammarAccess.prFile().getRule().getType().getClassifier());
+            	    	            current = factory.create(grammarAccess.getFileRule().getType().getClassifier());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -178,7 +178,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             	    // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:107:6: lv_namedElements_1= ruleNamedElement
             	    {
             	     
-            	    	        currentNode=createCompositeNode(grammarAccess.prFile().ele10ParserRuleCallNamedElement(), currentNode); 
+            	    	        currentNode=createCompositeNode(grammarAccess.getFileAccess().getNamedElementsNamedElementParserRuleCall_1_0(), currentNode); 
             	    	    
             	    pushFollow(FOLLOW_ruleNamedElement_in_ruleFile179);
             	    lv_namedElements_1=ruleNamedElement();
@@ -186,7 +186,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create(grammarAccess.prFile().getRule().getType().getClassifier());
+            	    	            current = factory.create(grammarAccess.getFileRule().getType().getClassifier());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -240,7 +240,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:132:48: (iv_ruleImport= ruleImport EOF )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:133:2: iv_ruleImport= ruleImport EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prImport().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getImportRule(), currentNode); 
             pushFollow(FOLLOW_ruleImport_in_entryRuleImport217);
             iv_ruleImport=ruleImport();
             _fsp--;
@@ -281,7 +281,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             {
             match(input,11,FOLLOW_11_in_ruleImport261); 
 
-                    createLeafNode(grammarAccess.prImport().ele0KeywordImport(), null); 
+                    createLeafNode(grammarAccess.getImportAccess().getImportKeyword_0(), null); 
                 
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:150:1: (lv_importURI_1= RULE_STRING )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:152:6: lv_importURI_1= RULE_STRING
@@ -289,11 +289,11 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             lv_importURI_1=(Token)input.LT(1);
             match(input,RULE_STRING,FOLLOW_RULE_STRING_in_ruleImport283); 
 
-            		createLeafNode(grammarAccess.prImport().ele10TerminalRuleCallSTRING(), "importURI"); 
+            		createLeafNode(grammarAccess.getImportAccess().getImportURISTRINGTerminalRuleCall_1_0(), "importURI"); 
             	
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prImport().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getImportRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -340,7 +340,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:177:54: (iv_ruleNamedElement= ruleNamedElement EOF )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:178:2: iv_ruleNamedElement= ruleNamedElement EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prNamedElement().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getNamedElementRule(), currentNode); 
             pushFollow(FOLLOW_ruleNamedElement_in_entryRuleNamedElement324);
             iv_ruleNamedElement=ruleNamedElement();
             _fsp--;
@@ -400,7 +400,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                     // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:192:5: this_Package_0= rulePackage
                     {
                      
-                            currentNode=createCompositeNode(grammarAccess.prNamedElement().ele0ParserRuleCallPackage(), currentNode); 
+                            currentNode=createCompositeNode(grammarAccess.getNamedElementAccess().getPackageParserRuleCall_0(), currentNode); 
                         
                     pushFollow(FOLLOW_rulePackage_in_ruleNamedElement381);
                     this_Package_0=rulePackage();
@@ -411,7 +411,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                             currentNode = currentNode.getParent();
                         
                      
-                        createLeafNode(grammarAccess.prNamedElement().ele0ParserRuleCallPackage(), null); 
+                        createLeafNode(grammarAccess.getNamedElementAccess().getPackageParserRuleCall_0(), null); 
                         
 
                     }
@@ -420,7 +420,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                     // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:206:5: this_Type_1= ruleType
                     {
                      
-                            currentNode=createCompositeNode(grammarAccess.prNamedElement().ele1ParserRuleCallType(), currentNode); 
+                            currentNode=createCompositeNode(grammarAccess.getNamedElementAccess().getTypeParserRuleCall_1(), currentNode); 
                         
                     pushFollow(FOLLOW_ruleType_in_ruleNamedElement415);
                     this_Type_1=ruleType();
@@ -431,7 +431,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                             currentNode = currentNode.getParent();
                         
                      
-                        createLeafNode(grammarAccess.prNamedElement().ele1ParserRuleCallType(), null); 
+                        createLeafNode(grammarAccess.getNamedElementAccess().getTypeParserRuleCall_1(), null); 
                         
 
                     }
@@ -470,7 +470,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:225:49: (iv_rulePackage= rulePackage EOF )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:226:2: iv_rulePackage= rulePackage EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prPackage().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getPackageRule(), currentNode); 
             pushFollow(FOLLOW_rulePackage_in_entryRulePackage454);
             iv_rulePackage=rulePackage();
             _fsp--;
@@ -514,13 +514,13 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             {
             match(input,12,FOLLOW_12_in_rulePackage498); 
 
-                    createLeafNode(grammarAccess.prPackage().ele0KeywordPackage(), null); 
+                    createLeafNode(grammarAccess.getPackageAccess().getPackageKeyword_0(), null); 
                 
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:243:1: (lv_name_1= ruleQualifiedName )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:246:6: lv_name_1= ruleQualifiedName
             {
              
-            	        currentNode=createCompositeNode(grammarAccess.prPackage().ele10ParserRuleCallQualifiedName(), currentNode); 
+            	        currentNode=createCompositeNode(grammarAccess.getPackageAccess().getNameQualifiedNameParserRuleCall_1_0(), currentNode); 
             	    
             pushFollow(FOLLOW_ruleQualifiedName_in_rulePackage532);
             lv_name_1=ruleQualifiedName();
@@ -528,7 +528,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prPackage().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getPackageRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -544,7 +544,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
             match(input,13,FOLLOW_13_in_rulePackage545); 
 
-                    createLeafNode(grammarAccess.prPackage().ele2KeywordLeftCurlyBracket(), null); 
+                    createLeafNode(grammarAccess.getPackageAccess().getLeftCurlyBracketKeyword_2(), null); 
                 
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:268:1: (lv_namedElements_3= ruleNamedElement )*
             loop4:
@@ -562,7 +562,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             	    // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:271:6: lv_namedElements_3= ruleNamedElement
             	    {
             	     
-            	    	        currentNode=createCompositeNode(grammarAccess.prPackage().ele30ParserRuleCallNamedElement(), currentNode); 
+            	    	        currentNode=createCompositeNode(grammarAccess.getPackageAccess().getNamedElementsNamedElementParserRuleCall_3_0(), currentNode); 
             	    	    
             	    pushFollow(FOLLOW_ruleNamedElement_in_rulePackage579);
             	    lv_namedElements_3=ruleNamedElement();
@@ -570,7 +570,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create(grammarAccess.prPackage().getRule().getType().getClassifier());
+            	    	            current = factory.create(grammarAccess.getPackageRule().getType().getClassifier());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -592,7 +592,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
             match(input,14,FOLLOW_14_in_rulePackage593); 
 
-                    createLeafNode(grammarAccess.prPackage().ele4KeywordRightCurlyBracket(), null); 
+                    createLeafNode(grammarAccess.getPackageAccess().getRightCurlyBracketKeyword_4(), null); 
                 
 
             }
@@ -628,7 +628,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:300:46: (iv_ruleType= ruleType EOF )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:301:2: iv_ruleType= ruleType EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prType().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getTypeRule(), currentNode); 
             pushFollow(FOLLOW_ruleType_in_entryRuleType626);
             iv_ruleType=ruleType();
             _fsp--;
@@ -688,7 +688,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                     // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:315:5: this_Entity_0= ruleEntity
                     {
                      
-                            currentNode=createCompositeNode(grammarAccess.prType().ele0ParserRuleCallEntity(), currentNode); 
+                            currentNode=createCompositeNode(grammarAccess.getTypeAccess().getEntityParserRuleCall_0(), currentNode); 
                         
                     pushFollow(FOLLOW_ruleEntity_in_ruleType683);
                     this_Entity_0=ruleEntity();
@@ -699,7 +699,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                             currentNode = currentNode.getParent();
                         
                      
-                        createLeafNode(grammarAccess.prType().ele0ParserRuleCallEntity(), null); 
+                        createLeafNode(grammarAccess.getTypeAccess().getEntityParserRuleCall_0(), null); 
                         
 
                     }
@@ -708,7 +708,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                     // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:329:5: this_DataType_1= ruleDataType
                     {
                      
-                            currentNode=createCompositeNode(grammarAccess.prType().ele1ParserRuleCallDataType(), currentNode); 
+                            currentNode=createCompositeNode(grammarAccess.getTypeAccess().getDataTypeParserRuleCall_1(), currentNode); 
                         
                     pushFollow(FOLLOW_ruleDataType_in_ruleType717);
                     this_DataType_1=ruleDataType();
@@ -719,7 +719,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                             currentNode = currentNode.getParent();
                         
                      
-                        createLeafNode(grammarAccess.prType().ele1ParserRuleCallDataType(), null); 
+                        createLeafNode(grammarAccess.getTypeAccess().getDataTypeParserRuleCall_1(), null); 
                         
 
                     }
@@ -758,7 +758,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:348:50: (iv_ruleDataType= ruleDataType EOF )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:349:2: iv_ruleDataType= ruleDataType EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prDataType().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getDataTypeRule(), currentNode); 
             pushFollow(FOLLOW_ruleDataType_in_entryRuleDataType756);
             iv_ruleDataType=ruleDataType();
             _fsp--;
@@ -799,7 +799,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             {
             match(input,15,FOLLOW_15_in_ruleDataType800); 
 
-                    createLeafNode(grammarAccess.prDataType().ele0KeywordDatatype(), null); 
+                    createLeafNode(grammarAccess.getDataTypeAccess().getDatatypeKeyword_0(), null); 
                 
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:366:1: (lv_name_1= RULE_ID )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:368:6: lv_name_1= RULE_ID
@@ -807,11 +807,11 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             lv_name_1=(Token)input.LT(1);
             match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleDataType822); 
 
-            		createLeafNode(grammarAccess.prDataType().ele10TerminalRuleCallID(), "name"); 
+            		createLeafNode(grammarAccess.getDataTypeAccess().getNameIDTerminalRuleCall_1_0(), "name"); 
             	
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prDataType().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getDataTypeRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -858,7 +858,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:393:48: (iv_ruleEntity= ruleEntity EOF )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:394:2: iv_ruleEntity= ruleEntity EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prEntity().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getEntityRule(), currentNode); 
             pushFollow(FOLLOW_ruleEntity_in_entryRuleEntity863);
             iv_ruleEntity=ruleEntity();
             _fsp--;
@@ -901,7 +901,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             {
             match(input,16,FOLLOW_16_in_ruleEntity907); 
 
-                    createLeafNode(grammarAccess.prEntity().ele0KeywordEntity(), null); 
+                    createLeafNode(grammarAccess.getEntityAccess().getEntityKeyword_0(), null); 
                 
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:411:1: (lv_name_1= RULE_ID )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:413:6: lv_name_1= RULE_ID
@@ -909,11 +909,11 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             lv_name_1=(Token)input.LT(1);
             match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity929); 
 
-            		createLeafNode(grammarAccess.prEntity().ele10TerminalRuleCallID(), "name"); 
+            		createLeafNode(grammarAccess.getEntityAccess().getNameIDTerminalRuleCall_1_0(), "name"); 
             	
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prEntity().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getEntityRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -939,20 +939,20 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                     {
                     match(input,17,FOLLOW_17_in_ruleEntity947); 
 
-                            createLeafNode(grammarAccess.prEntity().ele20KeywordExtends(), null); 
+                            createLeafNode(grammarAccess.getEntityAccess().getExtendsKeyword_2_0(), null); 
                         
                     // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:435:1: ( RULE_ID )
                     // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:438:3: RULE_ID
                     {
 
                     			if (current==null) {
-                    	            current = factory.create(grammarAccess.prEntity().getRule().getType().getClassifier());
+                    	            current = factory.create(grammarAccess.getEntityRule().getType().getClassifier());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                             
                     match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleEntity969); 
 
-                    		createLeafNode(grammarAccess.prEntity().ele210CrossReferenceIDEntity(), "superType"); 
+                    		createLeafNode(grammarAccess.getEntityAccess().getSuperTypeEntityCrossReference_2_1_0(), "superType"); 
                     	
 
                     }
@@ -965,7 +965,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
             match(input,13,FOLLOW_13_in_ruleEntity983); 
 
-                    createLeafNode(grammarAccess.prEntity().ele3KeywordLeftCurlyBracket(), null); 
+                    createLeafNode(grammarAccess.getEntityAccess().getLeftCurlyBracketKeyword_3(), null); 
                 
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:455:1: (lv_features_5= ruleFeature )*
             loop7:
@@ -983,7 +983,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             	    // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:458:6: lv_features_5= ruleFeature
             	    {
             	     
-            	    	        currentNode=createCompositeNode(grammarAccess.prEntity().ele40ParserRuleCallFeature(), currentNode); 
+            	    	        currentNode=createCompositeNode(grammarAccess.getEntityAccess().getFeaturesFeatureParserRuleCall_4_0(), currentNode); 
             	    	    
             	    pushFollow(FOLLOW_ruleFeature_in_ruleEntity1017);
             	    lv_features_5=ruleFeature();
@@ -991,7 +991,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
             	    	        if (current==null) {
-            	    	            current = factory.create(grammarAccess.prEntity().getRule().getType().getClassifier());
+            	    	            current = factory.create(grammarAccess.getEntityRule().getType().getClassifier());
             	    	            associateNodeWithAstElement(currentNode.getParent(), current);
             	    	        }
             	    	        
@@ -1013,7 +1013,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
             match(input,14,FOLLOW_14_in_ruleEntity1031); 
 
-                    createLeafNode(grammarAccess.prEntity().ele5KeywordRightCurlyBracket(), null); 
+                    createLeafNode(grammarAccess.getEntityAccess().getRightCurlyBracketKeyword_5(), null); 
                 
 
             }
@@ -1049,7 +1049,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:487:49: (iv_ruleFeature= ruleFeature EOF )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:488:2: iv_ruleFeature= ruleFeature EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prFeature().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getFeatureRule(), currentNode); 
             pushFollow(FOLLOW_ruleFeature_in_entryRuleFeature1064);
             iv_ruleFeature=ruleFeature();
             _fsp--;
@@ -1109,7 +1109,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                     // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:502:5: this_StructuralFeature_0= ruleStructuralFeature
                     {
                      
-                            currentNode=createCompositeNode(grammarAccess.prFeature().ele0ParserRuleCallStructuralFeature(), currentNode); 
+                            currentNode=createCompositeNode(grammarAccess.getFeatureAccess().getStructuralFeatureParserRuleCall_0(), currentNode); 
                         
                     pushFollow(FOLLOW_ruleStructuralFeature_in_ruleFeature1121);
                     this_StructuralFeature_0=ruleStructuralFeature();
@@ -1120,7 +1120,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                             currentNode = currentNode.getParent();
                         
                      
-                        createLeafNode(grammarAccess.prFeature().ele0ParserRuleCallStructuralFeature(), null); 
+                        createLeafNode(grammarAccess.getFeatureAccess().getStructuralFeatureParserRuleCall_0(), null); 
                         
 
                     }
@@ -1129,7 +1129,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                     // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:516:5: this_Operation_1= ruleOperation
                     {
                      
-                            currentNode=createCompositeNode(grammarAccess.prFeature().ele1ParserRuleCallOperation(), currentNode); 
+                            currentNode=createCompositeNode(grammarAccess.getFeatureAccess().getOperationParserRuleCall_1(), currentNode); 
                         
                     pushFollow(FOLLOW_ruleOperation_in_ruleFeature1155);
                     this_Operation_1=ruleOperation();
@@ -1140,7 +1140,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                             currentNode = currentNode.getParent();
                         
                      
-                        createLeafNode(grammarAccess.prFeature().ele1ParserRuleCallOperation(), null); 
+                        createLeafNode(grammarAccess.getFeatureAccess().getOperationParserRuleCall_1(), null); 
                         
 
                     }
@@ -1179,7 +1179,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:535:59: (iv_ruleStructuralFeature= ruleStructuralFeature EOF )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:536:2: iv_ruleStructuralFeature= ruleStructuralFeature EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prStructuralFeature().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getStructuralFeatureRule(), currentNode); 
             pushFollow(FOLLOW_ruleStructuralFeature_in_entryRuleStructuralFeature1194);
             iv_ruleStructuralFeature=ruleStructuralFeature();
             _fsp--;
@@ -1239,7 +1239,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                     // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:550:5: this_Attribute_0= ruleAttribute
                     {
                      
-                            currentNode=createCompositeNode(grammarAccess.prStructuralFeature().ele0ParserRuleCallAttribute(), currentNode); 
+                            currentNode=createCompositeNode(grammarAccess.getStructuralFeatureAccess().getAttributeParserRuleCall_0(), currentNode); 
                         
                     pushFollow(FOLLOW_ruleAttribute_in_ruleStructuralFeature1251);
                     this_Attribute_0=ruleAttribute();
@@ -1250,7 +1250,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                             currentNode = currentNode.getParent();
                         
                      
-                        createLeafNode(grammarAccess.prStructuralFeature().ele0ParserRuleCallAttribute(), null); 
+                        createLeafNode(grammarAccess.getStructuralFeatureAccess().getAttributeParserRuleCall_0(), null); 
                         
 
                     }
@@ -1259,7 +1259,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                     // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:564:5: this_Reference_1= ruleReference
                     {
                      
-                            currentNode=createCompositeNode(grammarAccess.prStructuralFeature().ele1ParserRuleCallReference(), currentNode); 
+                            currentNode=createCompositeNode(grammarAccess.getStructuralFeatureAccess().getReferenceParserRuleCall_1(), currentNode); 
                         
                     pushFollow(FOLLOW_ruleReference_in_ruleStructuralFeature1285);
                     this_Reference_1=ruleReference();
@@ -1270,7 +1270,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                             currentNode = currentNode.getParent();
                         
                      
-                        createLeafNode(grammarAccess.prStructuralFeature().ele1ParserRuleCallReference(), null); 
+                        createLeafNode(grammarAccess.getStructuralFeatureAccess().getReferenceParserRuleCall_1(), null); 
                         
 
                     }
@@ -1309,7 +1309,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:583:51: (iv_ruleAttribute= ruleAttribute EOF )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:584:2: iv_ruleAttribute= ruleAttribute EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prAttribute().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getAttributeRule(), currentNode); 
             pushFollow(FOLLOW_ruleAttribute_in_entryRuleAttribute1324);
             iv_ruleAttribute=ruleAttribute();
             _fsp--;
@@ -1352,7 +1352,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             {
             match(input,18,FOLLOW_18_in_ruleAttribute1368); 
 
-                    createLeafNode(grammarAccess.prAttribute().ele0KeywordAttr(), null); 
+                    createLeafNode(grammarAccess.getAttributeAccess().getAttrKeyword_0(), null); 
                 
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:601:1: (lv_name_1= RULE_ID )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:603:6: lv_name_1= RULE_ID
@@ -1360,11 +1360,11 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             lv_name_1=(Token)input.LT(1);
             match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleAttribute1390); 
 
-            		createLeafNode(grammarAccess.prAttribute().ele10TerminalRuleCallID(), "name"); 
+            		createLeafNode(grammarAccess.getAttributeAccess().getNameIDTerminalRuleCall_1_0(), "name"); 
             	
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prAttribute().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getAttributeRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -1379,13 +1379,13 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
             match(input,19,FOLLOW_19_in_ruleAttribute1407); 
 
-                    createLeafNode(grammarAccess.prAttribute().ele2KeywordColon(), null); 
+                    createLeafNode(grammarAccess.getAttributeAccess().getColonKeyword_2(), null); 
                 
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:625:1: (lv_type_3= ruleTypeRef )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:628:6: lv_type_3= ruleTypeRef
             {
              
-            	        currentNode=createCompositeNode(grammarAccess.prAttribute().ele30ParserRuleCallTypeRef(), currentNode); 
+            	        currentNode=createCompositeNode(grammarAccess.getAttributeAccess().getTypeTypeRefParserRuleCall_3_0(), currentNode); 
             	    
             pushFollow(FOLLOW_ruleTypeRef_in_ruleAttribute1441);
             lv_type_3=ruleTypeRef();
@@ -1393,7 +1393,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prAttribute().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getAttributeRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -1441,7 +1441,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:653:51: (iv_ruleReference= ruleReference EOF )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:654:2: iv_ruleReference= ruleReference EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prReference().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getReferenceRule(), currentNode); 
             pushFollow(FOLLOW_ruleReference_in_entryRuleReference1478);
             iv_ruleReference=ruleReference();
             _fsp--;
@@ -1484,7 +1484,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             {
             match(input,20,FOLLOW_20_in_ruleReference1522); 
 
-                    createLeafNode(grammarAccess.prReference().ele0KeywordRef(), null); 
+                    createLeafNode(grammarAccess.getReferenceAccess().getRefKeyword_0(), null); 
                 
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:671:1: (lv_name_1= RULE_ID )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:673:6: lv_name_1= RULE_ID
@@ -1492,11 +1492,11 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             lv_name_1=(Token)input.LT(1);
             match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1544); 
 
-            		createLeafNode(grammarAccess.prReference().ele10TerminalRuleCallID(), "name"); 
+            		createLeafNode(grammarAccess.getReferenceAccess().getNameIDTerminalRuleCall_1_0(), "name"); 
             	
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prReference().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getReferenceRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -1511,13 +1511,13 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
             match(input,19,FOLLOW_19_in_ruleReference1561); 
 
-                    createLeafNode(grammarAccess.prReference().ele2KeywordColon(), null); 
+                    createLeafNode(grammarAccess.getReferenceAccess().getColonKeyword_2(), null); 
                 
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:695:1: (lv_type_3= ruleTypeRef )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:698:6: lv_type_3= ruleTypeRef
             {
              
-            	        currentNode=createCompositeNode(grammarAccess.prReference().ele30ParserRuleCallTypeRef(), currentNode); 
+            	        currentNode=createCompositeNode(grammarAccess.getReferenceAccess().getTypeTypeRefParserRuleCall_3_0(), currentNode); 
             	    
             pushFollow(FOLLOW_ruleTypeRef_in_ruleReference1595);
             lv_type_3=ruleTypeRef();
@@ -1525,7 +1525,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prReference().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getReferenceRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -1552,20 +1552,20 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                     {
                     match(input,21,FOLLOW_21_in_ruleReference1609); 
 
-                            createLeafNode(grammarAccess.prReference().ele40KeywordOpposite(), null); 
+                            createLeafNode(grammarAccess.getReferenceAccess().getOppositeKeyword_4_0(), null); 
                         
                     // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:720:1: ( RULE_ID )
                     // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:723:3: RULE_ID
                     {
 
                     			if (current==null) {
-                    	            current = factory.create(grammarAccess.prReference().getRule().getType().getClassifier());
+                    	            current = factory.create(grammarAccess.getReferenceRule().getType().getClassifier());
                     	            associateNodeWithAstElement(currentNode, current);
                     	        }
                             
                     match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleReference1631); 
 
-                    		createLeafNode(grammarAccess.prReference().ele410CrossReferenceIDReference(), "opposite"); 
+                    		createLeafNode(grammarAccess.getReferenceAccess().getOppositeReferenceCrossReference_4_1_0(), "opposite"); 
                     	
 
                     }
@@ -1610,7 +1610,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:743:51: (iv_ruleOperation= ruleOperation EOF )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:744:2: iv_ruleOperation= ruleOperation EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prOperation().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getOperationRule(), currentNode); 
             pushFollow(FOLLOW_ruleOperation_in_entryRuleOperation1669);
             iv_ruleOperation=ruleOperation();
             _fsp--;
@@ -1657,7 +1657,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             {
             match(input,22,FOLLOW_22_in_ruleOperation1713); 
 
-                    createLeafNode(grammarAccess.prOperation().ele0KeywordOp(), null); 
+                    createLeafNode(grammarAccess.getOperationAccess().getOpKeyword_0(), null); 
                 
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:761:1: (lv_name_1= RULE_ID )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:763:6: lv_name_1= RULE_ID
@@ -1665,11 +1665,11 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             lv_name_1=(Token)input.LT(1);
             match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleOperation1735); 
 
-            		createLeafNode(grammarAccess.prOperation().ele10TerminalRuleCallID(), "name"); 
+            		createLeafNode(grammarAccess.getOperationAccess().getNameIDTerminalRuleCall_1_0(), "name"); 
             	
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prOperation().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getOperationRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -1684,7 +1684,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
             match(input,23,FOLLOW_23_in_ruleOperation1752); 
 
-                    createLeafNode(grammarAccess.prOperation().ele2KeywordLeftParenthesis(), null); 
+                    createLeafNode(grammarAccess.getOperationAccess().getLeftParenthesisKeyword_2(), null); 
                 
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:785:1: ( (lv_params_3= ruleParameter ) ( ',' (lv_params_5= ruleParameter ) )* )?
             int alt12=2;
@@ -1701,7 +1701,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                     // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:788:6: lv_params_3= ruleParameter
                     {
                      
-                    	        currentNode=createCompositeNode(grammarAccess.prOperation().ele300ParserRuleCallParameter(), currentNode); 
+                    	        currentNode=createCompositeNode(grammarAccess.getOperationAccess().getParamsParameterParserRuleCall_3_0_0(), currentNode); 
                     	    
                     pushFollow(FOLLOW_ruleParameter_in_ruleOperation1787);
                     lv_params_3=ruleParameter();
@@ -1709,7 +1709,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
                     	        if (current==null) {
-                    	            current = factory.create(grammarAccess.prOperation().getRule().getType().getClassifier());
+                    	            current = factory.create(grammarAccess.getOperationRule().getType().getClassifier());
                     	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	        }
                     	        
@@ -1740,13 +1740,13 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
                     	    {
                     	    match(input,24,FOLLOW_24_in_ruleOperation1801); 
 
-                    	            createLeafNode(grammarAccess.prOperation().ele310KeywordComma(), null); 
+                    	            createLeafNode(grammarAccess.getOperationAccess().getCommaKeyword_3_1_0(), null); 
                     	        
                     	    // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:810:1: (lv_params_5= ruleParameter )
                     	    // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:813:6: lv_params_5= ruleParameter
                     	    {
                     	     
-                    	    	        currentNode=createCompositeNode(grammarAccess.prOperation().ele3110ParserRuleCallParameter(), currentNode); 
+                    	    	        currentNode=createCompositeNode(grammarAccess.getOperationAccess().getParamsParameterParserRuleCall_3_1_1_0(), currentNode); 
                     	    	    
                     	    pushFollow(FOLLOW_ruleParameter_in_ruleOperation1835);
                     	    lv_params_5=ruleParameter();
@@ -1754,7 +1754,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
                     	    	        if (current==null) {
-                    	    	            current = factory.create(grammarAccess.prOperation().getRule().getType().getClassifier());
+                    	    	            current = factory.create(grammarAccess.getOperationRule().getType().getClassifier());
                     	    	            associateNodeWithAstElement(currentNode.getParent(), current);
                     	    	        }
                     	    	        
@@ -1785,17 +1785,17 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
             match(input,25,FOLLOW_25_in_ruleOperation1852); 
 
-                    createLeafNode(grammarAccess.prOperation().ele4KeywordRightParenthesis(), null); 
+                    createLeafNode(grammarAccess.getOperationAccess().getRightParenthesisKeyword_4(), null); 
                 
             match(input,19,FOLLOW_19_in_ruleOperation1861); 
 
-                    createLeafNode(grammarAccess.prOperation().ele5KeywordColon(), null); 
+                    createLeafNode(grammarAccess.getOperationAccess().getColonKeyword_5(), null); 
                 
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:839:1: (lv_type_8= ruleTypeRef )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:842:6: lv_type_8= ruleTypeRef
             {
              
-            	        currentNode=createCompositeNode(grammarAccess.prOperation().ele60ParserRuleCallTypeRef(), currentNode); 
+            	        currentNode=createCompositeNode(grammarAccess.getOperationAccess().getTypeTypeRefParserRuleCall_6_0(), currentNode); 
             	    
             pushFollow(FOLLOW_ruleTypeRef_in_ruleOperation1895);
             lv_type_8=ruleTypeRef();
@@ -1803,7 +1803,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prOperation().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getOperationRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -1851,7 +1851,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:867:51: (iv_ruleParameter= ruleParameter EOF )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:868:2: iv_ruleParameter= ruleParameter EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prParameter().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getParameterRule(), currentNode); 
             pushFollow(FOLLOW_ruleParameter_in_entryRuleParameter1932);
             iv_ruleParameter=ruleParameter();
             _fsp--;
@@ -1898,11 +1898,11 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             lv_name_0=(Token)input.LT(1);
             match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleParameter1989); 
 
-            		createLeafNode(grammarAccess.prParameter().ele00TerminalRuleCallID(), "name"); 
+            		createLeafNode(grammarAccess.getParameterAccess().getNameIDTerminalRuleCall_0_0(), "name"); 
             	
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prParameter().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getParameterRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
             	        
@@ -1919,7 +1919,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:904:6: lv_type_1= ruleTypeRef
             {
              
-            	        currentNode=createCompositeNode(grammarAccess.prParameter().ele10ParserRuleCallTypeRef(), currentNode); 
+            	        currentNode=createCompositeNode(grammarAccess.getParameterAccess().getTypeTypeRefParserRuleCall_1_0(), currentNode); 
             	    
             pushFollow(FOLLOW_ruleTypeRef_in_ruleParameter2031);
             lv_type_1=ruleTypeRef();
@@ -1927,7 +1927,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
 
 
             	        if (current==null) {
-            	            current = factory.create(grammarAccess.prParameter().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getParameterRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode.getParent(), current);
             	        }
             	        
@@ -1975,7 +1975,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:931:49: (iv_ruleTypeRef= ruleTypeRef EOF )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:932:2: iv_ruleTypeRef= ruleTypeRef EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prTypeRef().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getTypeRefRule(), currentNode); 
             pushFollow(FOLLOW_ruleTypeRef_in_entryRuleTypeRef2070);
             iv_ruleTypeRef=ruleTypeRef();
             _fsp--;
@@ -2014,13 +2014,13 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             {
 
             			if (current==null) {
-            	            current = factory.create(grammarAccess.prTypeRef().getRule().getType().getClassifier());
+            	            current = factory.create(grammarAccess.getTypeRefRule().getType().getClassifier());
             	            associateNodeWithAstElement(currentNode, current);
             	        }
                     
             match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleTypeRef2126); 
 
-            		createLeafNode(grammarAccess.prTypeRef().ele0CrossReferenceIDType(), "referenced"); 
+            		createLeafNode(grammarAccess.getTypeRefAccess().getReferencedTypeCrossReference_0(), "referenced"); 
             	
 
             }
@@ -2056,7 +2056,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:968:54: (iv_ruleQualifiedName= ruleQualifiedName EOF )
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:969:2: iv_ruleQualifiedName= ruleQualifiedName EOF
             {
-             currentNode = createCompositeNode(grammarAccess.prQualifiedName().getRule(), currentNode); 
+             currentNode = createCompositeNode(grammarAccess.getQualifiedNameRule(), currentNode); 
             pushFollow(FOLLOW_ruleQualifiedName_in_entryRuleQualifiedName2162);
             iv_ruleQualifiedName=ruleQualifiedName();
             _fsp--;
@@ -2103,7 +2103,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             		current.merge(this_ID_0);
                 
              
-                createLeafNode(grammarAccess.prQualifiedName().ele0TerminalRuleCallID(), null); 
+                createLeafNode(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_0(), null); 
                 
             // ../org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/antlr/internal/InternalDomainmodel.g:990:1: (kw= '.' this_ID_2= RULE_ID )*
             loop13:
@@ -2124,7 +2124,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             	    match(input,26,FOLLOW_26_in_ruleQualifiedName2232); 
 
             	            current.merge(kw);
-            	            createLeafNode(grammarAccess.prQualifiedName().ele10KeywordFullStop(), null); 
+            	            createLeafNode(grammarAccess.getQualifiedNameAccess().getFullStopKeyword_1_0(), null); 
             	        
             	    this_ID_2=(Token)input.LT(1);
             	    match(input,RULE_ID,FOLLOW_RULE_ID_in_ruleQualifiedName2247); 
@@ -2132,7 +2132,7 @@ public class InternalDomainmodelParser extends AbstractInternalAntlrParser {
             	    		current.merge(this_ID_2);
             	        
             	     
-            	        createLeafNode(grammarAccess.prQualifiedName().ele11TerminalRuleCallID(), null); 
+            	        createLeafNode(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1(), null); 
             	        
 
             	    }
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java
index a163cc6..d4d53ed2 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/DomainmodelParserConfiguration.java
@@ -124,29 +124,29 @@ public class DomainmodelParserConfiguration extends AbstractParserConfiguration
 	public void configureConsumers() {
 		if (grammarAccess == null)
 			throw new NullPointerException("grammarAccess may not be null, you call configureConsumers");
-		getFileConsumer().setRule(grammarAccess.prFile());
-		getImportConsumer().setRule(grammarAccess.prImport());
-		getNamedElementConsumer().setRule(grammarAccess.prNamedElement());
-		getPackageConsumer().setRule(grammarAccess.prPackage());
-		getTypeConsumer().setRule(grammarAccess.prType());
-		getDataTypeConsumer().setRule(grammarAccess.prDataType());
-		getEntityConsumer().setRule(grammarAccess.prEntity());
-		getFeatureConsumer().setRule(grammarAccess.prFeature());
-		getStructuralFeatureConsumer().setRule(grammarAccess.prStructuralFeature());
-		getAttributeConsumer().setRule(grammarAccess.prAttribute());
-		getReferenceConsumer().setRule(grammarAccess.prReference());
-		getOperationConsumer().setRule(grammarAccess.prOperation());
-		getParameterConsumer().setRule(grammarAccess.prParameter());
-		getTypedElementConsumer().setRule(grammarAccess.prTypedElement());
-		getTypeRefConsumer().setRule(grammarAccess.prTypeRef());
-		getQualifiedNameConsumer().setRule(grammarAccess.prQualifiedName());
-		getIdConsumer().setRule(grammarAccess.trID());
-		getIntConsumer().setRule(grammarAccess.trINT());
-		getStringConsumer().setRule(grammarAccess.trSTRING());
-		getMlCommentConsumer().setRule(grammarAccess.trML_COMMENT());
-		getSlCommentConsumer().setRule(grammarAccess.trSL_COMMENT());
-		getWsConsumer().setRule(grammarAccess.trWS());
-		getAnyOtherConsumer().setRule(grammarAccess.trANY_OTHER());
+		getFileConsumer().setRule(grammarAccess.getFileAccess());
+		getImportConsumer().setRule(grammarAccess.getImportAccess());
+		getNamedElementConsumer().setRule(grammarAccess.getNamedElementAccess());
+		getPackageConsumer().setRule(grammarAccess.getPackageAccess());
+		getTypeConsumer().setRule(grammarAccess.getTypeAccess());
+		getDataTypeConsumer().setRule(grammarAccess.getDataTypeAccess());
+		getEntityConsumer().setRule(grammarAccess.getEntityAccess());
+		getFeatureConsumer().setRule(grammarAccess.getFeatureAccess());
+		getStructuralFeatureConsumer().setRule(grammarAccess.getStructuralFeatureAccess());
+		getAttributeConsumer().setRule(grammarAccess.getAttributeAccess());
+		getReferenceConsumer().setRule(grammarAccess.getReferenceAccess());
+		getOperationConsumer().setRule(grammarAccess.getOperationAccess());
+		getParameterConsumer().setRule(grammarAccess.getParameterAccess());
+		getTypedElementConsumer().setRule(grammarAccess.getTypedElementAccess());
+		getTypeRefConsumer().setRule(grammarAccess.getTypeRefAccess());
+		getQualifiedNameConsumer().setRule(grammarAccess.getQualifiedNameAccess());
+		getIdConsumer().setRule(grammarAccess.getIDRule());
+		getIntConsumer().setRule(grammarAccess.getINTRule());
+		getStringConsumer().setRule(grammarAccess.getSTRINGRule());
+		getMlCommentConsumer().setRule(grammarAccess.getML_COMMENTRule());
+		getSlCommentConsumer().setRule(grammarAccess.getSL_COMMENTRule());
+		getWsConsumer().setRule(grammarAccess.getWSRule());
+		getAnyOtherConsumer().setRule(grammarAccess.getANY_OTHERRule());
 
 
 		getFileConsumer().setImportConsumer(getImportConsumer());
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java
index f3ee478..699ebe5 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelAttributeConsumer.java
@@ -155,13 +155,13 @@ public final class DomainmodelAttributeConsumer extends NonTerminalConsumer {
 	public void setRule(AttributeElements rule) {
 		this.rule = rule;
 		
-		group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
-		keyword$2$Consumer = new Keyword$2$Consumer(rule.ele0KeywordAttr());
-		assignment$3$Consumer = new Assignment$3$Consumer(rule.ele1AssignmentName());
-		ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.ele10TerminalRuleCallID());
-		keyword$5$Consumer = new Keyword$5$Consumer(rule.ele2KeywordColon());
-		assignment$6$Consumer = new Assignment$6$Consumer(rule.ele3AssignmentType());
-		ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.ele30ParserRuleCallTypeRef());
+		group$1$Consumer = new Group$1$Consumer(rule.getGroup());
+		keyword$2$Consumer = new Keyword$2$Consumer(rule.getAttrKeyword_0());
+		assignment$3$Consumer = new Assignment$3$Consumer(rule.getNameAssignment_1());
+		ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.getNameIDTerminalRuleCall_1_0());
+		keyword$5$Consumer = new Keyword$5$Consumer(rule.getColonKeyword_2());
+		assignment$6$Consumer = new Assignment$6$Consumer(rule.getTypeAssignment_3());
+		ruleCall$7$Consumer = new RuleCall$7$Consumer(rule.getTypeTypeRefParserRuleCall_3_0());
 	}
 	
 	@Override
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java
index 182b087..9d4be92 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelDataTypeConsumer.java
@@ -105,10 +105,10 @@ public final class DomainmodelDataTypeConsumer extends NonTerminalConsumer {
 	public void setRule(DataTypeElements rule) {
 		this.rule = rule;
 		
-		group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
-		keyword$2$Consumer = new Keyword$2$Consumer(rule.ele0KeywordDatatype());
-		assignment$3$Consumer = new Assignment$3$Consumer(rule.ele1AssignmentName());
-		ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.ele10TerminalRuleCallID());
+		group$1$Consumer = new Group$1$Consumer(rule.getGroup());
+		keyword$2$Consumer = new Keyword$2$Consumer(rule.getDatatypeKeyword_0());
+		assignment$3$Consumer = new Assignment$3$Consumer(rule.getNameAssignment_1());
+		ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.getNameIDTerminalRuleCall_1_0());
 	}
 	
 	@Override
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
index b6053d3..a348308 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelEntityConsumer.java
@@ -238,18 +238,18 @@ public final class DomainmodelEntityConsumer extends NonTerminalConsumer {
 	public void setRule(EntityElements rule) {
 		this.rule = rule;
 		
-		group$1$Consumer = new Group$1$Consumer(rule.eleGroup());
-		keyword$2$Consumer = new Keyword$2$Consumer(rule.ele0KeywordEntity());
-		assignment$3$Consumer = new Assignment$3$Consumer(rule.ele1AssignmentName());
-		ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.ele10TerminalRuleCallID());
-		group$5$Consumer = new Group$5$Consumer(rule.ele2Group());
-		keyword$6$Consumer = new Keyword$6$Consumer(rule.ele20KeywordExtends());
-		assignment$7$Consumer = new Assignment$7$Consumer(rule.ele21AssignmentSuperType());
-		crossReference$8$Consumer = new CrossReference$8$Consumer(rule.ele210CrossReferenceIDEntity());
-		keyword$11$Consumer = new Keyword$11$Consumer(rule.ele3KeywordLeftCurlyBracket());
-		assignment$12$Consumer = new Assignment$12$Consumer(rule.ele4AssignmentFeatures());
-		ruleCall$13$Consumer = new RuleCall$13$Consumer(rule.ele40ParserRuleCallFeature());
-		keyword$14$Consumer = new Keyword$14$Consumer(rule.ele5KeywordRightCurlyBracket());
+		group$1$Consumer = new Group$1$Consumer(rule.getGroup());
+		keyword$2$Consumer = new Keyword$2$Consumer(rule.getEntityKeyword_0());
+		assignment$3$Consumer = new Assignment$3$Consumer(rule.getNameAssignment_1());
+		ruleCall$4$Consumer = new RuleCall$4$Consumer(rule.getNameIDTerminalRuleCall_1_0());
+		group$5$Consumer = new Group$5$Consumer(rule.getGroup_2());
+		keyword$6$Consumer = new Keyword$6$Consumer(rule.getExtendsKeyword_2_0());
+		assignment$7$Consumer = new Assignment$7$Consumer(rule.getSuperTypeAssignment_2_1());
+		crossReference$8$Consumer = new CrossReference$8$Consumer(rule.getSuperTypeEntityCrossReference_2_1_0());
+		keyword$11$Consumer = new Keyword$11$Consumer(rule.getLeftCurlyBracketKeyword_3());
+		assignment$12$Consumer = new Assignment$12$Consumer(rule.getFeaturesAssignment_4());
+		ruleCall$13$Consumer = new RuleCall$13$Consumer(rule.getFeaturesFeatureParserRuleCall_4_0());
+		keyword$14$Consumer = new Keyword$14$Consumer(rule.getRightCurlyBracketKeyword_5());
 	}
 	
 	@Override
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java
index 6484ad9..381585e 100644
--- a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java
+++ b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFeatureConsumer.java
@@ -84,9 +84,9 @@ public final class DomainmodelFeatureConsumer extends NonTerminalConsumer {
 	public void setRule(FeatureElements rule) {
 		this.rule = rule;
 		
-		alternatives$1$Consumer = new Alternatives$1$Consumer(rule.eleAlternatives());
-		ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.ele0ParserRuleCallStructuralFeature());
-		ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.ele1ParserRuleCallOperation());
+		alternatives$1$Consumer = new Alternatives$1$Consumer(rule.getAlternatives());
+		ruleCall$2$Consumer = new RuleCall$2$Consumer(rule.getStructuralFeatureParserRuleCall_0());
+		ruleCall$3$Consumer = new RuleCall$3$Consumer(rule.getOperationParserRuleCall_1());
 	}
 	
 	@Override
diff --git a/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/DomainmodelFileConsumer.java b/examples/org.eclipse.xtext.example.domainmodel/src-gen/org/eclipse/xtext/example/parser/packrat/consumers/