49 files changed, 8656 insertions, 4076 deletions

diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/java/org/eclipse/viatra/solver/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/java/org/eclipse/viatra/solver/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
index 2f69e946..eee5070b 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/java/org/eclipse/viatra/solver/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/java/org/eclipse/viatra/solver/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
@@ -9,6 +9,7 @@ import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.viatra.solver.language.ProblemUtil;
 import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration;
+import org.eclipse.viatra.solver.language.model.problem.EnumDeclaration;
 import org.eclipse.viatra.solver.language.model.problem.Node;
 import org.eclipse.viatra.solver.language.model.problem.Parameter;
 import org.eclipse.viatra.solver.language.model.problem.PredicateDefinition;
@@ -30,6 +31,7 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
         private static final String BUILTIN_CLASS = "cm-keyword";
         private static final String CLASS_CLASS = "problem-class";
         private static final String ABSTRACT_CLASS = "problem-abstract";
+        private static final String ENUM_CLASS = "problem-enum";
         private static final String REFERENCE_CLASS = "problem-reference";
         private static final String CONTAINMENT_CLASS = "problem-containment";
         private static final String PREDICATE_CLASS = "problem-predicate";
@@ -105,6 +107,9 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
                                 classesBuilder.add(ABSTRACT_CLASS);
                         }
                 }
+                if (eObject instanceof EnumDeclaration) {
+                        classesBuilder.add(ENUM_CLASS);
+                }
                 if (eObject instanceof ReferenceDeclaration) {
                         classesBuilder.add(REFERENCE_CLASS);
                         ReferenceDeclaration referenceDeclaration = (ReferenceDeclaration) eObject;
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/ProblemParser.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/ProblemParser.java
index 2adb1a82..e4142d9f 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/ProblemParser.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/ProblemParser.java
@@ -33,6 +33,8 @@ public class ProblemParser extends AbstractContentAssistParser {
                 private static void init(ImmutableMap.Builder<AbstractElement, String> builder, ProblemGrammarAccess grammarAccess) {
                         builder.put(grammarAccess.getStatementAccess().getAlternatives(), "rule__Statement__Alternatives");
                         builder.put(grammarAccess.getClassDeclarationAccess().getAlternatives_4(), "rule__ClassDeclaration__Alternatives_4");
+                        builder.put(grammarAccess.getEnumDeclarationAccess().getAlternatives_2(), "rule__EnumDeclaration__Alternatives_2");
+                        builder.put(grammarAccess.getEnumDeclarationAccess().getAlternatives_2_0_1_2(), "rule__EnumDeclaration__Alternatives_2_0_1_2");
                         builder.put(grammarAccess.getReferenceDeclarationAccess().getAlternatives_0(), "rule__ReferenceDeclaration__Alternatives_0");
                         builder.put(grammarAccess.getPredicateDefinitionAccess().getAlternatives_0(), "rule__PredicateDefinition__Alternatives_0");
                         builder.put(grammarAccess.getLiteralAccess().getAlternatives(), "rule__Literal__Alternatives");
@@ -41,7 +43,9 @@ public class ProblemParser extends AbstractContentAssistParser {
                         builder.put(grammarAccess.getMultiplicityAccess().getAlternatives(), "rule__Multiplicity__Alternatives");
                         builder.put(grammarAccess.getDefiniteMultiplicityAccess().getAlternatives(), "rule__DefiniteMultiplicity__Alternatives");
                         builder.put(grammarAccess.getUpperBoundAccess().getAlternatives(), "rule__UpperBound__Alternatives");
+                        builder.put(grammarAccess.getQuotedOrUnquotedIdAccess().getAlternatives(), "rule__QuotedOrUnquotedId__Alternatives");
                         builder.put(grammarAccess.getQualifiedNameAccess().getAlternatives(), "rule__QualifiedName__Alternatives");
+                        builder.put(grammarAccess.getIdentifierAccess().getAlternatives(), "rule__Identifier__Alternatives");
                         builder.put(grammarAccess.getLogicValueAccess().getAlternatives(), "rule__LogicValue__Alternatives");
                         builder.put(grammarAccess.getShortLogicValueAccess().getAlternatives(), "rule__ShortLogicValue__Alternatives");
                         builder.put(grammarAccess.getProblemAccess().getGroup(), "rule__Problem__Group__0");
@@ -51,6 +55,10 @@ public class ProblemParser extends AbstractContentAssistParser {
                         builder.put(grammarAccess.getClassDeclarationAccess().getGroup_3_2(), "rule__ClassDeclaration__Group_3_2__0");
                         builder.put(grammarAccess.getClassDeclarationAccess().getGroup_4_0(), "rule__ClassDeclaration__Group_4_0__0");
                         builder.put(grammarAccess.getClassDeclarationAccess().getGroup_4_0_1(), "rule__ClassDeclaration__Group_4_0_1__0");
+                        builder.put(grammarAccess.getEnumDeclarationAccess().getGroup(), "rule__EnumDeclaration__Group__0");
+                        builder.put(grammarAccess.getEnumDeclarationAccess().getGroup_2_0(), "rule__EnumDeclaration__Group_2_0__0");
+                        builder.put(grammarAccess.getEnumDeclarationAccess().getGroup_2_0_1(), "rule__EnumDeclaration__Group_2_0_1__0");
+                        builder.put(grammarAccess.getEnumDeclarationAccess().getGroup_2_0_1_1(), "rule__EnumDeclaration__Group_2_0_1_1__0");
                         builder.put(grammarAccess.getReferenceDeclarationAccess().getGroup(), "rule__ReferenceDeclaration__Group__0");
                         builder.put(grammarAccess.getReferenceDeclarationAccess().getGroup_2(), "rule__ReferenceDeclaration__Group_2__0");
                         builder.put(grammarAccess.getReferenceDeclarationAccess().getGroup_4(), "rule__ReferenceDeclaration__Group_4__0");
@@ -88,6 +96,10 @@ public class ProblemParser extends AbstractContentAssistParser {
                         builder.put(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_1(), "rule__ClassDeclaration__SuperTypesAssignment_3_1");
                         builder.put(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_2_1(), "rule__ClassDeclaration__SuperTypesAssignment_3_2_1");
                         builder.put(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsAssignment_4_0_1_0(), "rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0");
+                        builder.put(grammarAccess.getEnumDeclarationAccess().getNameAssignment_1(), "rule__EnumDeclaration__NameAssignment_1");
+                        builder.put(grammarAccess.getEnumDeclarationAccess().getLiteralsAssignment_2_0_1_0(), "rule__EnumDeclaration__LiteralsAssignment_2_0_1_0");
+                        builder.put(grammarAccess.getEnumDeclarationAccess().getLiteralsAssignment_2_0_1_1_1(), "rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1");
+                        builder.put(grammarAccess.getEnumLiteralAccess().getNameAssignment(), "rule__EnumLiteral__NameAssignment");
                         builder.put(grammarAccess.getReferenceDeclarationAccess().getContainmentAssignment_0_0(), "rule__ReferenceDeclaration__ContainmentAssignment_0_0");
                         builder.put(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeAssignment_1(), "rule__ReferenceDeclaration__ReferenceTypeAssignment_1");
                         builder.put(grammarAccess.getReferenceDeclarationAccess().getMultiplicityAssignment_2_1(), "rule__ReferenceDeclaration__MultiplicityAssignment_2_1");
@@ -108,7 +120,7 @@ public class ProblemParser extends AbstractContentAssistParser {
                         builder.put(grammarAccess.getAtomAccess().getTransitiveClosureAssignment_1(), "rule__Atom__TransitiveClosureAssignment_1");
                         builder.put(grammarAccess.getAtomAccess().getArgumentsAssignment_3_0(), "rule__Atom__ArgumentsAssignment_3_0");
                         builder.put(grammarAccess.getAtomAccess().getArgumentsAssignment_3_1_1(), "rule__Atom__ArgumentsAssignment_3_1_1");
-                        builder.put(grammarAccess.getArgumentAccess().getVariableAssignment(), "rule__Argument__VariableAssignment");
+                        builder.put(grammarAccess.getArgumentAccess().getVariableOrNodeAssignment(), "rule__Argument__VariableOrNodeAssignment");
                         builder.put(grammarAccess.getAssertionAccess().getRelationAssignment_0_0_0(), "rule__Assertion__RelationAssignment_0_0_0");
                         builder.put(grammarAccess.getAssertionAccess().getArgumentsAssignment_0_0_2_0(), "rule__Assertion__ArgumentsAssignment_0_0_2_0");
                         builder.put(grammarAccess.getAssertionAccess().getArgumentsAssignment_0_0_2_1_1(), "rule__Assertion__ArgumentsAssignment_0_0_2_1_1");
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.g b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.g
index 01a6fd6e..0a7c03ba 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.g
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.g
@@ -124,6 +124,56 @@ finally {
         restoreStackSize(stackSize);
 }
 
+// Entry rule entryRuleEnumDeclaration
+entryRuleEnumDeclaration
+:
+{ before(grammarAccess.getEnumDeclarationRule()); }
+         ruleEnumDeclaration
+{ after(grammarAccess.getEnumDeclarationRule()); } 
+         EOF 
+;
+
+// Rule EnumDeclaration
+ruleEnumDeclaration 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getEnumDeclarationAccess().getGroup()); }
+                (rule__EnumDeclaration__Group__0)
+                { after(grammarAccess.getEnumDeclarationAccess().getGroup()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+// Entry rule entryRuleEnumLiteral
+entryRuleEnumLiteral
+:
+{ before(grammarAccess.getEnumLiteralRule()); }
+         ruleEnumLiteral
+{ after(grammarAccess.getEnumLiteralRule()); } 
+         EOF 
+;
+
+// Rule EnumLiteral
+ruleEnumLiteral 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getEnumLiteralAccess().getNameAssignment()); }
+                (rule__EnumLiteral__NameAssignment)
+                { after(grammarAccess.getEnumLiteralAccess().getNameAssignment()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
 // Entry rule entryRuleReferenceDeclaration
 entryRuleReferenceDeclaration
 :
@@ -315,9 +365,9 @@ ruleArgument
         }
         :
         (
-                { before(grammarAccess.getArgumentAccess().getVariableAssignment()); }
-                (rule__Argument__VariableAssignment)
-                { after(grammarAccess.getArgumentAccess().getVariableAssignment()); }
+                { before(grammarAccess.getArgumentAccess().getVariableOrNodeAssignment()); }
+                (rule__Argument__VariableOrNodeAssignment)
+                { after(grammarAccess.getArgumentAccess().getVariableOrNodeAssignment()); }
         )
 ;
 finally {
@@ -549,6 +599,31 @@ finally {
         restoreStackSize(stackSize);
 }
 
+// Entry rule entryRuleQuotedOrUnquotedId
+entryRuleQuotedOrUnquotedId
+:
+{ before(grammarAccess.getQuotedOrUnquotedIdRule()); }
+         ruleQuotedOrUnquotedId
+{ after(grammarAccess.getQuotedOrUnquotedIdRule()); } 
+         EOF 
+;
+
+// Rule QuotedOrUnquotedId
+ruleQuotedOrUnquotedId 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getQuotedOrUnquotedIdAccess().getAlternatives()); }
+                (rule__QuotedOrUnquotedId__Alternatives)
+                { after(grammarAccess.getQuotedOrUnquotedIdAccess().getAlternatives()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
 // Entry rule entryRuleQualifiedName
 entryRuleQualifiedName
 :
@@ -574,6 +649,31 @@ finally {
         restoreStackSize(stackSize);
 }
 
+// Entry rule entryRuleIdentifier
+entryRuleIdentifier
+:
+{ before(grammarAccess.getIdentifierRule()); }
+         ruleIdentifier
+{ after(grammarAccess.getIdentifierRule()); } 
+         EOF 
+;
+
+// Rule Identifier
+ruleIdentifier 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getIdentifierAccess().getAlternatives()); }
+                (rule__Identifier__Alternatives)
+                { after(grammarAccess.getIdentifierAccess().getAlternatives()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
 // Rule LogicValue
 ruleLogicValue
         @init {
@@ -618,21 +718,27 @@ rule__Statement__Alternatives
         )
         |
         (
-                { before(grammarAccess.getStatementAccess().getPredicateDefinitionParserRuleCall_1()); }
+                { before(grammarAccess.getStatementAccess().getEnumDeclarationParserRuleCall_1()); }
+                ruleEnumDeclaration
+                { after(grammarAccess.getStatementAccess().getEnumDeclarationParserRuleCall_1()); }
+        )
+        |
+        (
+                { before(grammarAccess.getStatementAccess().getPredicateDefinitionParserRuleCall_2()); }
                 rulePredicateDefinition
-                { after(grammarAccess.getStatementAccess().getPredicateDefinitionParserRuleCall_1()); }
+                { after(grammarAccess.getStatementAccess().getPredicateDefinitionParserRuleCall_2()); }
         )
         |
         (
-                { before(grammarAccess.getStatementAccess().getAssertionParserRuleCall_2()); }
+                { before(grammarAccess.getStatementAccess().getAssertionParserRuleCall_3()); }
                 ruleAssertion
-                { after(grammarAccess.getStatementAccess().getAssertionParserRuleCall_2()); }
+                { after(grammarAccess.getStatementAccess().getAssertionParserRuleCall_3()); }
         )
         |
         (
-                { before(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_3()); }
+                { before(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_4()); }
                 ruleScopeDeclaration
-                { after(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_3()); }
+                { after(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_4()); }
         )
 ;
 finally {
@@ -660,6 +766,48 @@ finally {
         restoreStackSize(stackSize);
 }
 
+rule__EnumDeclaration__Alternatives_2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getEnumDeclarationAccess().getGroup_2_0()); }
+                (rule__EnumDeclaration__Group_2_0__0)
+                { after(grammarAccess.getEnumDeclarationAccess().getGroup_2_0()); }
+        )
+        |
+        (
+                { before(grammarAccess.getEnumDeclarationAccess().getFullStopKeyword_2_1()); }
+                '.'
+                { after(grammarAccess.getEnumDeclarationAccess().getFullStopKeyword_2_1()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Alternatives_2_0_1_2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getEnumDeclarationAccess().getCommaKeyword_2_0_1_2_0()); }
+                ','
+                { after(grammarAccess.getEnumDeclarationAccess().getCommaKeyword_2_0_1_2_0()); }
+        )
+        |
+        (
+                { before(grammarAccess.getEnumDeclarationAccess().getSemicolonKeyword_2_0_1_2_1()); }
+                ';'
+                { after(grammarAccess.getEnumDeclarationAccess().getSemicolonKeyword_2_0_1_2_1()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
 rule__ReferenceDeclaration__Alternatives_0
         @init {
                 int stackSize = keepStackSize();
@@ -828,6 +976,27 @@ finally {
         restoreStackSize(stackSize);
 }
 
+rule__QuotedOrUnquotedId__Alternatives
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getQuotedOrUnquotedIdAccess().getQUOTED_IDTerminalRuleCall_0()); }
+                RULE_QUOTED_ID
+                { after(grammarAccess.getQuotedOrUnquotedIdAccess().getQUOTED_IDTerminalRuleCall_0()); }
+        )
+        |
+        (
+                { before(grammarAccess.getQuotedOrUnquotedIdAccess().getIdentifierParserRuleCall_1()); }
+                ruleIdentifier
+                { after(grammarAccess.getQuotedOrUnquotedIdAccess().getIdentifierParserRuleCall_1()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
 rule__QualifiedName__Alternatives
         @init {
                 int stackSize = keepStackSize();
@@ -849,6 +1018,33 @@ finally {
         restoreStackSize(stackSize);
 }
 
+rule__Identifier__Alternatives
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getIdentifierAccess().getIDTerminalRuleCall_0()); }
+                RULE_ID
+                { after(grammarAccess.getIdentifierAccess().getIDTerminalRuleCall_0()); }
+        )
+        |
+        (
+                { before(grammarAccess.getIdentifierAccess().getTrueKeyword_1()); }
+                'true'
+                { after(grammarAccess.getIdentifierAccess().getTrueKeyword_1()); }
+        )
+        |
+        (
+                { before(grammarAccess.getIdentifierAccess().getFalseKeyword_2()); }
+                'false'
+                { after(grammarAccess.getIdentifierAccess().getFalseKeyword_2()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
 rule__LogicValue__Alternatives
         @init {
                 int stackSize = keepStackSize();
@@ -1437,6 +1633,303 @@ finally {
 }
 
 
+rule__EnumDeclaration__Group__0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__EnumDeclaration__Group__0__Impl
+        rule__EnumDeclaration__Group__1
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Group__0__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getEnumDeclarationAccess().getEnumKeyword_0()); }
+        'enum'
+        { after(grammarAccess.getEnumDeclarationAccess().getEnumKeyword_0()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Group__1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__EnumDeclaration__Group__1__Impl
+        rule__EnumDeclaration__Group__2
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Group__1__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getEnumDeclarationAccess().getNameAssignment_1()); }
+        (rule__EnumDeclaration__NameAssignment_1)
+        { after(grammarAccess.getEnumDeclarationAccess().getNameAssignment_1()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Group__2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__EnumDeclaration__Group__2__Impl
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Group__2__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getEnumDeclarationAccess().getAlternatives_2()); }
+        (rule__EnumDeclaration__Alternatives_2)
+        { after(grammarAccess.getEnumDeclarationAccess().getAlternatives_2()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+
+rule__EnumDeclaration__Group_2_0__0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__EnumDeclaration__Group_2_0__0__Impl
+        rule__EnumDeclaration__Group_2_0__1
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Group_2_0__0__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getEnumDeclarationAccess().getLeftCurlyBracketKeyword_2_0_0()); }
+        '{'
+        { after(grammarAccess.getEnumDeclarationAccess().getLeftCurlyBracketKeyword_2_0_0()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Group_2_0__1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__EnumDeclaration__Group_2_0__1__Impl
+        rule__EnumDeclaration__Group_2_0__2
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Group_2_0__1__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getEnumDeclarationAccess().getGroup_2_0_1()); }
+        (rule__EnumDeclaration__Group_2_0_1__0)?
+        { after(grammarAccess.getEnumDeclarationAccess().getGroup_2_0_1()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Group_2_0__2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__EnumDeclaration__Group_2_0__2__Impl
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Group_2_0__2__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getEnumDeclarationAccess().getRightCurlyBracketKeyword_2_0_2()); }
+        '}'
+        { after(grammarAccess.getEnumDeclarationAccess().getRightCurlyBracketKeyword_2_0_2()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+
+rule__EnumDeclaration__Group_2_0_1__0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__EnumDeclaration__Group_2_0_1__0__Impl
+        rule__EnumDeclaration__Group_2_0_1__1
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Group_2_0_1__0__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getEnumDeclarationAccess().getLiteralsAssignment_2_0_1_0()); }
+        (rule__EnumDeclaration__LiteralsAssignment_2_0_1_0)
+        { after(grammarAccess.getEnumDeclarationAccess().getLiteralsAssignment_2_0_1_0()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Group_2_0_1__1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__EnumDeclaration__Group_2_0_1__1__Impl
+        rule__EnumDeclaration__Group_2_0_1__2
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Group_2_0_1__1__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getEnumDeclarationAccess().getGroup_2_0_1_1()); }
+        (rule__EnumDeclaration__Group_2_0_1_1__0)*
+        { after(grammarAccess.getEnumDeclarationAccess().getGroup_2_0_1_1()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Group_2_0_1__2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__EnumDeclaration__Group_2_0_1__2__Impl
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Group_2_0_1__2__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getEnumDeclarationAccess().getAlternatives_2_0_1_2()); }
+        (rule__EnumDeclaration__Alternatives_2_0_1_2)?
+        { after(grammarAccess.getEnumDeclarationAccess().getAlternatives_2_0_1_2()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+
+rule__EnumDeclaration__Group_2_0_1_1__0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__EnumDeclaration__Group_2_0_1_1__0__Impl
+        rule__EnumDeclaration__Group_2_0_1_1__1
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Group_2_0_1_1__0__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getEnumDeclarationAccess().getCommaKeyword_2_0_1_1_0()); }
+        ','
+        { after(grammarAccess.getEnumDeclarationAccess().getCommaKeyword_2_0_1_1_0()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Group_2_0_1_1__1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__EnumDeclaration__Group_2_0_1_1__1__Impl
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__Group_2_0_1_1__1__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getEnumDeclarationAccess().getLiteralsAssignment_2_0_1_1_1()); }
+        (rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1)
+        { after(grammarAccess.getEnumDeclarationAccess().getLiteralsAssignment_2_0_1_1_1()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+
 rule__ReferenceDeclaration__Group__0
         @init {
                 int stackSize = keepStackSize();
@@ -1456,7 +1949,7 @@ rule__ReferenceDeclaration__Group__0__Impl
 :
 (
         { before(grammarAccess.getReferenceDeclarationAccess().getAlternatives_0()); }
-        (rule__ReferenceDeclaration__Alternatives_0)
+        (rule__ReferenceDeclaration__Alternatives_0)?
         { after(grammarAccess.getReferenceDeclarationAccess().getAlternatives_0()); }
 )
 ;
@@ -2212,7 +2705,7 @@ rule__Parameter__Group__0__Impl
 :
 (
         { before(grammarAccess.getParameterAccess().getParameterTypeAssignment_0()); }
-        (rule__Parameter__ParameterTypeAssignment_0)
+        (rule__Parameter__ParameterTypeAssignment_0)?
         { after(grammarAccess.getParameterAccess().getParameterTypeAssignment_0()); }
 )
 ;
@@ -3561,9 +4054,9 @@ rule__QualifiedName__Group_1__0__Impl
         }
 :
 (
-        { before(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_0()); }
-        RULE_ID
-        { after(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_0()); }
+        { before(grammarAccess.getQualifiedNameAccess().getIdentifierParserRuleCall_1_0()); }
+        ruleIdentifier
+        { after(grammarAccess.getQualifiedNameAccess().getIdentifierParserRuleCall_1_0()); }
 )
 ;
 finally {
@@ -3668,9 +4161,9 @@ rule__QualifiedName__Group_1_1__1__Impl
         }
 :
 (
-        { before(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1_1()); }
-        RULE_ID
-        { after(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1_1()); }
+        { before(grammarAccess.getQualifiedNameAccess().getIdentifierParserRuleCall_1_1_1()); }
+        ruleIdentifier
+        { after(grammarAccess.getQualifiedNameAccess().getIdentifierParserRuleCall_1_1_1()); }
 )
 ;
 finally {
@@ -3738,9 +4231,9 @@ rule__Problem__NameAssignment_0_1
         }
 :
         (
-                { before(grammarAccess.getProblemAccess().getNameIDTerminalRuleCall_0_1_0()); }
-                RULE_ID
-                { after(grammarAccess.getProblemAccess().getNameIDTerminalRuleCall_0_1_0()); }
+                { before(grammarAccess.getProblemAccess().getNameIdentifierParserRuleCall_0_1_0()); }
+                ruleIdentifier
+                { after(grammarAccess.getProblemAccess().getNameIdentifierParserRuleCall_0_1_0()); }
         )
 ;
 finally {
@@ -3787,9 +4280,9 @@ rule__ClassDeclaration__NameAssignment_2
         }
 :
         (
-                { before(grammarAccess.getClassDeclarationAccess().getNameIDTerminalRuleCall_2_0()); }
-                RULE_ID
-                { after(grammarAccess.getClassDeclarationAccess().getNameIDTerminalRuleCall_2_0()); }
+                { before(grammarAccess.getClassDeclarationAccess().getNameIdentifierParserRuleCall_2_0()); }
+                ruleIdentifier
+                { after(grammarAccess.getClassDeclarationAccess().getNameIdentifierParserRuleCall_2_0()); }
         )
 ;
 finally {
@@ -3802,13 +4295,13 @@ rule__ClassDeclaration__SuperTypesAssignment_3_1
         }
 :
         (
-                { before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_1_0()); }
+                { before(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationCrossReference_3_1_0()); }
                 (
-                        { before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_1_0_1()); }
+                        { before(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationQualifiedNameParserRuleCall_3_1_0_1()); }
                         ruleQualifiedName
-                        { after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_1_0_1()); }
+                        { after(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationQualifiedNameParserRuleCall_3_1_0_1()); }
                 )
-                { after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_1_0()); }
+                { after(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationCrossReference_3_1_0()); }
         )
 ;
 finally {
@@ -3821,13 +4314,13 @@ rule__ClassDeclaration__SuperTypesAssignment_3_2_1
         }
 :
         (
-                { before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_2_1_0()); }
+                { before(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationCrossReference_3_2_1_0()); }
                 (
-                        { before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_2_1_0_1()); }
+                        { before(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationQualifiedNameParserRuleCall_3_2_1_0_1()); }
                         ruleQualifiedName
-                        { after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_2_1_0_1()); }
+                        { after(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationQualifiedNameParserRuleCall_3_2_1_0_1()); }
                 )
-                { after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_2_1_0()); }
+                { after(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationCrossReference_3_2_1_0()); }
         )
 ;
 finally {
@@ -3849,6 +4342,66 @@ finally {
         restoreStackSize(stackSize);
 }
 
+rule__EnumDeclaration__NameAssignment_1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getEnumDeclarationAccess().getNameIdentifierParserRuleCall_1_0()); }
+                ruleIdentifier
+                { after(grammarAccess.getEnumDeclarationAccess().getNameIdentifierParserRuleCall_1_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__LiteralsAssignment_2_0_1_0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getEnumDeclarationAccess().getLiteralsEnumLiteralParserRuleCall_2_0_1_0_0()); }
+                ruleEnumLiteral
+                { after(grammarAccess.getEnumDeclarationAccess().getLiteralsEnumLiteralParserRuleCall_2_0_1_0_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getEnumDeclarationAccess().getLiteralsEnumLiteralParserRuleCall_2_0_1_1_1_0()); }
+                ruleEnumLiteral
+                { after(grammarAccess.getEnumDeclarationAccess().getLiteralsEnumLiteralParserRuleCall_2_0_1_1_1_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__EnumLiteral__NameAssignment
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getEnumLiteralAccess().getNameQuotedOrUnquotedIdParserRuleCall_0()); }
+                ruleQuotedOrUnquotedId
+                { after(grammarAccess.getEnumLiteralAccess().getNameQuotedOrUnquotedIdParserRuleCall_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
 rule__ReferenceDeclaration__ContainmentAssignment_0_0
         @init {
                 int stackSize = keepStackSize();
@@ -3874,13 +4427,13 @@ rule__ReferenceDeclaration__ReferenceTypeAssignment_1
         }
 :
         (
-                { before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationCrossReference_1_0()); }
+                { before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeRelationCrossReference_1_0()); }
                 (
-                        { before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationQualifiedNameParserRuleCall_1_0_1()); }
+                        { before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeRelationQualifiedNameParserRuleCall_1_0_1()); }
                         ruleQualifiedName
-                        { after(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationQualifiedNameParserRuleCall_1_0_1()); }
+                        { after(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeRelationQualifiedNameParserRuleCall_1_0_1()); }
                 )
-                { after(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationCrossReference_1_0()); }
+                { after(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeRelationCrossReference_1_0()); }
         )
 ;
 finally {
@@ -3908,9 +4461,9 @@ rule__ReferenceDeclaration__NameAssignment_3
         }
 :
         (
-                { before(grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_3_0()); }
-                RULE_ID
-                { after(grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_3_0()); }
+                { before(grammarAccess.getReferenceDeclarationAccess().getNameIdentifierParserRuleCall_3_0()); }
+                ruleIdentifier
+                { after(grammarAccess.getReferenceDeclarationAccess().getNameIdentifierParserRuleCall_3_0()); }
         )
 ;
 finally {
@@ -3961,9 +4514,9 @@ rule__PredicateDefinition__NameAssignment_1
         }
 :
         (
-                { before(grammarAccess.getPredicateDefinitionAccess().getNameIDTerminalRuleCall_1_0()); }
-                RULE_ID
-                { after(grammarAccess.getPredicateDefinitionAccess().getNameIDTerminalRuleCall_1_0()); }
+                { before(grammarAccess.getPredicateDefinitionAccess().getNameIdentifierParserRuleCall_1_0()); }
+                ruleIdentifier
+                { after(grammarAccess.getPredicateDefinitionAccess().getNameIdentifierParserRuleCall_1_0()); }
         )
 ;
 finally {
@@ -4036,13 +4589,13 @@ rule__Parameter__ParameterTypeAssignment_0
         }
 :
         (
-                { before(grammarAccess.getParameterAccess().getParameterTypeClassDeclarationCrossReference_0_0()); }
+                { before(grammarAccess.getParameterAccess().getParameterTypeRelationCrossReference_0_0()); }
                 (
-                        { before(grammarAccess.getParameterAccess().getParameterTypeClassDeclarationIDTerminalRuleCall_0_0_1()); }
-                        RULE_ID
-                        { after(grammarAccess.getParameterAccess().getParameterTypeClassDeclarationIDTerminalRuleCall_0_0_1()); }
+                        { before(grammarAccess.getParameterAccess().getParameterTypeRelationQualifiedNameParserRuleCall_0_0_1()); }
+                        ruleQualifiedName
+                        { after(grammarAccess.getParameterAccess().getParameterTypeRelationQualifiedNameParserRuleCall_0_0_1()); }
                 )
-                { after(grammarAccess.getParameterAccess().getParameterTypeClassDeclarationCrossReference_0_0()); }
+                { after(grammarAccess.getParameterAccess().getParameterTypeRelationCrossReference_0_0()); }
         )
 ;
 finally {
@@ -4055,9 +4608,9 @@ rule__Parameter__NameAssignment_1
         }
 :
         (
-                { before(grammarAccess.getParameterAccess().getNameIDTerminalRuleCall_1_0()); }
-                RULE_ID
-                { after(grammarAccess.getParameterAccess().getNameIDTerminalRuleCall_1_0()); }
+                { before(grammarAccess.getParameterAccess().getNameIdentifierParserRuleCall_1_0()); }
+                ruleIdentifier
+                { after(grammarAccess.getParameterAccess().getNameIdentifierParserRuleCall_1_0()); }
         )
 ;
 finally {
@@ -4177,19 +4730,19 @@ finally {
         restoreStackSize(stackSize);
 }
 
-rule__Argument__VariableAssignment
+rule__Argument__VariableOrNodeAssignment
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getArgumentAccess().getVariableVariableCrossReference_0()); }
+                { before(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0()); }
                 (
-                        { before(grammarAccess.getArgumentAccess().getVariableVariableIDTerminalRuleCall_0_1()); }
-                        RULE_ID
-                        { after(grammarAccess.getArgumentAccess().getVariableVariableIDTerminalRuleCall_0_1()); }
+                        { before(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1()); }
+                        ruleQualifiedName
+                        { after(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1()); }
                 )
-                { after(grammarAccess.getArgumentAccess().getVariableVariableCrossReference_0()); }
+                { after(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0()); }
         )
 ;
 finally {
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.tokens b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.tokens
index 96f12627..c0cdd3c6 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.tokens
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.tokens
@@ -1,34 +1,35 @@
-'!'=20
-'('=32
-')'=33
-'*'=16
-'+'=41
-'+='=42
-','=25
+'!'=22
+'('=33
+')'=34
+'*'=18
+'+'=42
+'+='=43
+','=13
 '.'=12
-'..'=37
-':'=35
-':-'=34
-';'=28
-'='=15
-'?'=21
-'['=29
-']'=30
-'abstract'=38
-'class'=23
-'contains'=39
-'error'=40
-'extends'=24
-'false'=18
-'opposite'=31
-'pred'=14
-'problem'=22
-'refers'=13
-'scope'=36
-'true'=17
-'unknown'=19
-'{'=26
-'}'=27
+'..'=38
+':'=36
+':-'=35
+';'=14
+'='=17
+'?'=23
+'['=30
+']'=31
+'abstract'=39
+'class'=25
+'contains'=40
+'enum'=29
+'error'=41
+'extends'=26
+'false'=20
+'opposite'=32
+'pred'=16
+'problem'=24
+'refers'=15
+'scope'=37
+'true'=19
+'unknown'=21
+'{'=27
+'}'=28
 RULE_ANY_OTHER=11
 RULE_ID=6
 RULE_INT=4
@@ -68,3 +69,4 @@ T__39=39
 T__40=40
 T__41=41
 T__42=42
+T__43=43
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java
index a180de53..e8f6f12d 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java
@@ -12,31 +12,16 @@ import java.util.ArrayList;
 
 @SuppressWarnings("all")
 public class InternalProblemLexer extends Lexer {
-    public static final int RULE_STRING=7;
-    public static final int RULE_SL_COMMENT=9;
     public static final int T__19=19;
     public static final int T__15=15;
-    public static final int T__37=37;
     public static final int T__16=16;
-    public static final int T__38=38;
     public static final int T__17=17;
-    public static final int T__39=39;
     public static final int T__18=18;
-    public static final int T__33=33;
     public static final int T__12=12;
-    public static final int T__34=34;
     public static final int T__13=13;
-    public static final int T__35=35;
     public static final int T__14=14;
-    public static final int T__36=36;
-    public static final int EOF=-1;
-    public static final int T__30=30;
-    public static final int T__31=31;
-    public static final int T__32=32;
     public static final int RULE_ID=6;
-    public static final int RULE_WS=10;
     public static final int RULE_QUOTED_ID=5;
-    public static final int RULE_ANY_OTHER=11;
     public static final int T__26=26;
     public static final int T__27=27;
     public static final int T__28=28;
@@ -47,11 +32,27 @@ public class InternalProblemLexer extends Lexer {
     public static final int T__23=23;
     public static final int T__24=24;
     public static final int T__25=25;
+    public static final int T__20=20;
+    public static final int T__21=21;
+    public static final int RULE_STRING=7;
+    public static final int RULE_SL_COMMENT=9;
+    public static final int T__37=37;
+    public static final int T__38=38;
+    public static final int T__39=39;
+    public static final int T__33=33;
+    public static final int T__34=34;
+    public static final int T__35=35;
+    public static final int T__36=36;
+    public static final int EOF=-1;
+    public static final int T__30=30;
+    public static final int T__31=31;
+    public static final int T__32=32;
+    public static final int RULE_WS=10;
+    public static final int RULE_ANY_OTHER=11;
     public static final int T__40=40;
     public static final int T__41=41;
-    public static final int T__20=20;
     public static final int T__42=42;
-    public static final int T__21=21;
+    public static final int T__43=43;
 
     // delegates
     // delegators
@@ -91,11 +92,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:12:7: ( 'refers' )
-            // InternalProblem.g:12:9: 'refers'
+            // InternalProblem.g:12:7: ( ',' )
+            // InternalProblem.g:12:9: ','
             {
-            match("refers"); 
-
+            match(','); 
 
             }
 
@@ -112,11 +112,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:13:7: ( 'pred' )
-            // InternalProblem.g:13:9: 'pred'
+            // InternalProblem.g:13:7: ( ';' )
+            // InternalProblem.g:13:9: ';'
             {
-            match("pred"); 
-
+            match(';'); 
 
             }
 
@@ -133,10 +132,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:14:7: ( '=' )
-            // InternalProblem.g:14:9: '='
+            // InternalProblem.g:14:7: ( 'refers' )
+            // InternalProblem.g:14:9: 'refers'
             {
-            match('='); 
+            match("refers"); 
+
 
             }
 
@@ -153,10 +153,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:15:7: ( '*' )
-            // InternalProblem.g:15:9: '*'
+            // InternalProblem.g:15:7: ( 'pred' )
+            // InternalProblem.g:15:9: 'pred'
             {
-            match('*'); 
+            match("pred"); 
+
 
             }
 
@@ -173,11 +174,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:16:7: ( 'true' )
-            // InternalProblem.g:16:9: 'true'
+            // InternalProblem.g:16:7: ( '=' )
+            // InternalProblem.g:16:9: '='
             {
-            match("true"); 
-
+            match('='); 
 
             }
 
@@ -194,11 +194,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:17:7: ( 'false' )
-            // InternalProblem.g:17:9: 'false'
+            // InternalProblem.g:17:7: ( '*' )
+            // InternalProblem.g:17:9: '*'
             {
-            match("false"); 
-
+            match('*'); 
 
             }
 
@@ -215,10 +214,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:18:7: ( 'unknown' )
-            // InternalProblem.g:18:9: 'unknown'
+            // InternalProblem.g:18:7: ( 'true' )
+            // InternalProblem.g:18:9: 'true'
             {
-            match("unknown"); 
+            match("true"); 
 
 
             }
@@ -236,10 +235,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:19:7: ( '!' )
-            // InternalProblem.g:19:9: '!'
+            // InternalProblem.g:19:7: ( 'false' )
+            // InternalProblem.g:19:9: 'false'
             {
-            match('!'); 
+            match("false"); 
+
 
             }
 
@@ -256,10 +256,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:20:7: ( '?' )
-            // InternalProblem.g:20:9: '?'
+            // InternalProblem.g:20:7: ( 'unknown' )
+            // InternalProblem.g:20:9: 'unknown'
             {
-            match('?'); 
+            match("unknown"); 
+
 
             }
 
@@ -276,11 +277,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:21:7: ( 'problem' )
-            // InternalProblem.g:21:9: 'problem'
+            // InternalProblem.g:21:7: ( '!' )
+            // InternalProblem.g:21:9: '!'
             {
-            match("problem"); 
-
+            match('!'); 
 
             }
 
@@ -297,11 +297,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:22:7: ( 'class' )
-            // InternalProblem.g:22:9: 'class'
+            // InternalProblem.g:22:7: ( '?' )
+            // InternalProblem.g:22:9: '?'
             {
-            match("class"); 
-
+            match('?'); 
 
             }
 
@@ -318,10 +317,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:23:7: ( 'extends' )
-            // InternalProblem.g:23:9: 'extends'
+            // InternalProblem.g:23:7: ( 'problem' )
+            // InternalProblem.g:23:9: 'problem'
             {
-            match("extends"); 
+            match("problem"); 
 
 
             }
@@ -339,10 +338,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:24:7: ( ',' )
-            // InternalProblem.g:24:9: ','
+            // InternalProblem.g:24:7: ( 'class' )
+            // InternalProblem.g:24:9: 'class'
             {
-            match(','); 
+            match("class"); 
+
 
             }
 
@@ -359,10 +359,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:25:7: ( '{' )
-            // InternalProblem.g:25:9: '{'
+            // InternalProblem.g:25:7: ( 'extends' )
+            // InternalProblem.g:25:9: 'extends'
             {
-            match('{'); 
+            match("extends"); 
+
 
             }
 
@@ -379,10 +380,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:26:7: ( '}' )
-            // InternalProblem.g:26:9: '}'
+            // InternalProblem.g:26:7: ( '{' )
+            // InternalProblem.g:26:9: '{'
             {
-            match('}'); 
+            match('{'); 
 
             }
 
@@ -399,10 +400,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:27:7: ( ';' )
-            // InternalProblem.g:27:9: ';'
+            // InternalProblem.g:27:7: ( '}' )
+            // InternalProblem.g:27:9: '}'
             {
-            match(';'); 
+            match('}'); 
 
             }
 
@@ -419,10 +420,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:28:7: ( '[' )
-            // InternalProblem.g:28:9: '['
+            // InternalProblem.g:28:7: ( 'enum' )
+            // InternalProblem.g:28:9: 'enum'
             {
-            match('['); 
+            match("enum"); 
+
 
             }
 
@@ -439,10 +441,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:29:7: ( ']' )
-            // InternalProblem.g:29:9: ']'
+            // InternalProblem.g:29:7: ( '[' )
+            // InternalProblem.g:29:9: '['
             {
-            match(']'); 
+            match('['); 
 
             }
 
@@ -459,11 +461,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:30:7: ( 'opposite' )
-            // InternalProblem.g:30:9: 'opposite'
+            // InternalProblem.g:30:7: ( ']' )
+            // InternalProblem.g:30:9: ']'
             {
-            match("opposite"); 
-
+            match(']'); 
 
             }
 
@@ -480,10 +481,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:31:7: ( '(' )
-            // InternalProblem.g:31:9: '('
+            // InternalProblem.g:31:7: ( 'opposite' )
+            // InternalProblem.g:31:9: 'opposite'
             {
-            match('('); 
+            match("opposite"); 
+
 
             }
 
@@ -500,10 +502,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:32:7: ( ')' )
-            // InternalProblem.g:32:9: ')'
+            // InternalProblem.g:32:7: ( '(' )
+            // InternalProblem.g:32:9: '('
             {
-            match(')'); 
+            match('('); 
 
             }
 
@@ -520,11 +522,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:33:7: ( ':-' )
-            // InternalProblem.g:33:9: ':-'
+            // InternalProblem.g:33:7: ( ')' )
+            // InternalProblem.g:33:9: ')'
             {
-            match(":-"); 
-
+            match(')'); 
 
             }
 
@@ -541,10 +542,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:34:7: ( ':' )
-            // InternalProblem.g:34:9: ':'
+            // InternalProblem.g:34:7: ( ':-' )
+            // InternalProblem.g:34:9: ':-'
             {
-            match(':'); 
+            match(":-"); 
+
 
             }
 
@@ -561,11 +563,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:35:7: ( 'scope' )
-            // InternalProblem.g:35:9: 'scope'
+            // InternalProblem.g:35:7: ( ':' )
+            // InternalProblem.g:35:9: ':'
             {
-            match("scope"); 
-
+            match(':'); 
 
             }
 
@@ -582,10 +583,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:36:7: ( '..' )
-            // InternalProblem.g:36:9: '..'
+            // InternalProblem.g:36:7: ( 'scope' )
+            // InternalProblem.g:36:9: 'scope'
             {
-            match(".."); 
+            match("scope"); 
 
 
             }
@@ -603,10 +604,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:37:7: ( 'abstract' )
-            // InternalProblem.g:37:9: 'abstract'
+            // InternalProblem.g:37:7: ( '..' )
+            // InternalProblem.g:37:9: '..'
             {
-            match("abstract"); 
+            match(".."); 
 
 
             }
@@ -624,10 +625,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:38:7: ( 'contains' )
-            // InternalProblem.g:38:9: 'contains'
+            // InternalProblem.g:38:7: ( 'abstract' )
+            // InternalProblem.g:38:9: 'abstract'
             {
-            match("contains"); 
+            match("abstract"); 
 
 
             }
@@ -645,10 +646,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:39:7: ( 'error' )
-            // InternalProblem.g:39:9: 'error'
+            // InternalProblem.g:39:7: ( 'contains' )
+            // InternalProblem.g:39:9: 'contains'
             {
-            match("error"); 
+            match("contains"); 
 
 
             }
@@ -666,10 +667,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:40:7: ( '+' )
-            // InternalProblem.g:40:9: '+'
+            // InternalProblem.g:40:7: ( 'error' )
+            // InternalProblem.g:40:9: 'error'
             {
-            match('+'); 
+            match("error"); 
+
 
             }
 
@@ -686,8 +688,28 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:41:7: ( '+=' )
-            // InternalProblem.g:41:9: '+='
+            // InternalProblem.g:41:7: ( '+' )
+            // InternalProblem.g:41:9: '+'
+            {
+            match('+'); 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__42"
+
+    // $ANTLR start "T__43"
+    public final void mT__43() throws RecognitionException {
+        try {
+            int _type = T__43;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:42:7: ( '+=' )
+            // InternalProblem.g:42:9: '+='
             {
             match("+="); 
 
@@ -700,18 +722,18 @@ public class InternalProblemLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end "T__42"
+    // $ANTLR end "T__43"
 
     // $ANTLR start "RULE_STRING"
     public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4471:13: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
-            // InternalProblem.g:4471:15: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+            // InternalProblem.g:5024:13: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
+            // InternalProblem.g:5024:15: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
             {
             match('\"'); 
-            // InternalProblem.g:4471:19: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+            // InternalProblem.g:5024:19: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
             loop1:
             do {
                 int alt1=3;
@@ -727,7 +749,7 @@ public class InternalProblemLexer extends Lexer {
 
                 switch (alt1) {
                 case 1 :
-                    // InternalProblem.g:4471:20: '\\\\' .
+                    // InternalProblem.g:5024:20: '\\\\' .
                     {
                     match('\\'); 
                     matchAny(); 
@@ -735,7 +757,7 @@ public class InternalProblemLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:4471:27: ~ ( ( '\\\\' | '\"' ) )
+                    // InternalProblem.g:5024:27: ~ ( ( '\\\\' | '\"' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -772,11 +794,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_QUOTED_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4473:16: ( '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
-            // InternalProblem.g:4473:18: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+            // InternalProblem.g:5026:16: ( '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalProblem.g:5026:18: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
             {
             match('\''); 
-            // InternalProblem.g:4473:23: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+            // InternalProblem.g:5026:23: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
             loop2:
             do {
                 int alt2=3;
@@ -792,7 +814,7 @@ public class InternalProblemLexer extends Lexer {
 
                 switch (alt2) {
                 case 1 :
-                    // InternalProblem.g:4473:24: '\\\\' .
+                    // InternalProblem.g:5026:24: '\\\\' .
                     {
                     match('\\'); 
                     matchAny(); 
@@ -800,7 +822,7 @@ public class InternalProblemLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:4473:31: ~ ( ( '\\\\' | '\\'' ) )
+                    // InternalProblem.g:5026:31: ~ ( ( '\\\\' | '\\'' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -837,10 +859,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4475:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // InternalProblem.g:4475:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalProblem.g:5028:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalProblem.g:5028:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // InternalProblem.g:4475:11: ( '^' )?
+            // InternalProblem.g:5028:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -849,7 +871,7 @@ public class InternalProblemLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // InternalProblem.g:4475:11: '^'
+                    // InternalProblem.g:5028:11: '^'
                     {
                     match('^'); 
 
@@ -867,7 +889,7 @@ public class InternalProblemLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // InternalProblem.g:4475:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalProblem.g:5028:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -916,10 +938,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4477:10: ( ( '0' .. '9' )+ )
-            // InternalProblem.g:4477:12: ( '0' .. '9' )+
+            // InternalProblem.g:5030:10: ( ( '0' .. '9' )+ )
+            // InternalProblem.g:5030:12: ( '0' .. '9' )+
             {
-            // InternalProblem.g:4477:12: ( '0' .. '9' )+
+            // InternalProblem.g:5030:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -933,7 +955,7 @@ public class InternalProblemLexer extends Lexer {
 
                 switch (alt5) {
                 case 1 :
-                    // InternalProblem.g:4477:13: '0' .. '9'
+                    // InternalProblem.g:5030:13: '0' .. '9'
                     {
                     matchRange('0','9'); 
 
@@ -965,12 +987,12 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4479:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // InternalProblem.g:4479:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalProblem.g:5032:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalProblem.g:5032:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // InternalProblem.g:4479:24: ( options {greedy=false; } : . )*
+            // InternalProblem.g:5032:24: ( options {greedy=false; } : . )*
             loop6:
             do {
                 int alt6=2;
@@ -995,7 +1017,7 @@ public class InternalProblemLexer extends Lexer {
 
                 switch (alt6) {
                 case 1 :
-                    // InternalProblem.g:4479:52: .
+                    // InternalProblem.g:5032:52: .
                     {
                     matchAny(); 
 
@@ -1025,12 +1047,12 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4481:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // InternalProblem.g:4481:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalProblem.g:5034:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalProblem.g:5034:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // InternalProblem.g:4481:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalProblem.g:5034:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop7:
             do {
                 int alt7=2;
@@ -1043,7 +1065,7 @@ public class InternalProblemLexer extends Lexer {
 
                 switch (alt7) {
                 case 1 :
-                    // InternalProblem.g:4481:24: ~ ( ( '\\n' | '\\r' ) )
+                    // InternalProblem.g:5034:24: ~ ( ( '\\n' | '\\r' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -1063,7 +1085,7 @@ public class InternalProblemLexer extends Lexer {
                 }
             } while (true);
 
-            // InternalProblem.g:4481:40: ( ( '\\r' )? '\\n' )?
+            // InternalProblem.g:5034:40: ( ( '\\r' )? '\\n' )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -1072,9 +1094,9 @@ public class InternalProblemLexer extends Lexer {
             }
             switch (alt9) {
                 case 1 :
-                    // InternalProblem.g:4481:41: ( '\\r' )? '\\n'
+                    // InternalProblem.g:5034:41: ( '\\r' )? '\\n'
                     {
-                    // InternalProblem.g:4481:41: ( '\\r' )?
+                    // InternalProblem.g:5034:41: ( '\\r' )?
                     int alt8=2;
                     int LA8_0 = input.LA(1);
 
@@ -1083,7 +1105,7 @@ public class InternalProblemLexer extends Lexer {
                     }
                     switch (alt8) {
                         case 1 :
-                            // InternalProblem.g:4481:41: '\\r'
+                            // InternalProblem.g:5034:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1115,10 +1137,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4483:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // InternalProblem.g:4483:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalProblem.g:5036:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalProblem.g:5036:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // InternalProblem.g:4483:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalProblem.g:5036:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt10=0;
             loop10:
             do {
@@ -1172,8 +1194,8 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4485:16: ( . )
-            // InternalProblem.g:4485:18: .
+            // InternalProblem.g:5038:16: ( . )
+            // InternalProblem.g:5038:18: .
             {
             matchAny(); 
 
@@ -1188,8 +1210,8 @@ public class InternalProblemLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // InternalProblem.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | RULE_STRING | RULE_QUOTED_ID | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt11=39;
+        // InternalProblem.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | RULE_STRING | RULE_QUOTED_ID | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt11=40;
         alt11 = dfa11.predict(input);
         switch (alt11) {
             case 1 :
@@ -1410,56 +1432,63 @@ public class InternalProblemLexer extends Lexer {
                 }
                 break;
             case 32 :
-                // InternalProblem.g:1:196: RULE_STRING
+                // InternalProblem.g:1:196: T__43
                 {
-                mRULE_STRING(); 
+                mT__43(); 
 
                 }
                 break;
             case 33 :
-                // InternalProblem.g:1:208: RULE_QUOTED_ID
+                // InternalProblem.g:1:202: RULE_STRING
                 {
-                mRULE_QUOTED_ID(); 
+                mRULE_STRING(); 
 
                 }
                 break;
             case 34 :
-                // InternalProblem.g:1:223: RULE_ID
+                // InternalProblem.g:1:214: RULE_QUOTED_ID
                 {
-                mRULE_ID(); 
+                mRULE_QUOTED_ID(); 
 
                 }
                 break;
             case 35 :
-                // InternalProblem.g:1:231: RULE_INT
+                // InternalProblem.g:1:229: RULE_ID
                 {
-                mRULE_INT(); 
+                mRULE_ID(); 
 
                 }
                 break;
             case 36 :
-                // InternalProblem.g:1:240: RULE_ML_COMMENT
+                // InternalProblem.g:1:237: RULE_INT
                 {
-                mRULE_ML_COMMENT(); 
+                mRULE_INT(); 
 
                 }
                 break;
             case 37 :
-                // InternalProblem.g:1:256: RULE_SL_COMMENT
+                // InternalProblem.g:1:246: RULE_ML_COMMENT
                 {
-                mRULE_SL_COMMENT(); 
+                mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 38 :
-                // InternalProblem.g:1:272: RULE_WS
+                // InternalProblem.g:1:262: RULE_SL_COMMENT
                 {
-                mRULE_WS(); 
+                mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 39 :
-                // InternalProblem.g:1:280: RULE_ANY_OTHER
+                // InternalProblem.g:1:278: RULE_WS
+                {
+                mRULE_WS(); 
+
+                }
+                break;
+            case 40 :
+                // InternalProblem.g:1:286: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1473,81 +1502,82 @@ public class InternalProblemLexer extends Lexer {
 
     protected DFA11 dfa11 = new DFA11(this);
     static final String DFA11_eotS =
-        "\1\uffff\1\43\2\45\2\uffff\3\45\2\uffff\2\45\6\uffff\1\45\2\uffff\1\74\2\45\1\100\3\41\2\uffff\1\41\4\uffff\1\45\1\uffff\1\45\2\uffff\3\45\2\uffff\4\45\6\uffff\1\45\4\uffff\2\45\10\uffff\16\45\1\142\1\45\1\144\12\45\1\uffff\1\45\1\uffff\1\160\1\45\1\162\2\45\1\165\1\45\1\167\1\45\1\171\1\45\1\uffff\1\45\1\uffff\2\45\1\uffff\1\45\1\uffff\1\45\1\uffff\1\u0080\1\u0081\1\45\1\u0083\2\45\2\uffff\1\u0086\1\uffff\1\u0087\1\u0088\3\uffff";
+        "\1\uffff\1\43\2\uffff\2\47\2\uffff\3\47\2\uffff\2\47\4\uffff\1\47\2\uffff\1\75\2\47\1\101\3\41\2\uffff\1\41\6\uffff\1\47\1\uffff\1\47\2\uffff\3\47\2\uffff\5\47\4\uffff\1\47\4\uffff\2\47\10\uffff\17\47\1\145\1\47\1\147\5\47\1\155\5\47\1\uffff\1\47\1\uffff\1\164\1\47\1\166\2\47\1\uffff\1\171\1\47\1\173\1\47\1\175\1\47\1\uffff\1\47\1\uffff\2\47\1\uffff\1\47\1\uffff\1\47\1\uffff\1\u0084\1\u0085\1\47\1\u0087\2\47\2\uffff\1\u008a\1\uffff\1\u008b\1\u008c\3\uffff";
     static final String DFA11_eofS =
-        "\u0089\uffff";
+        "\u008d\uffff";
     static final String DFA11_minS =
-        "\1\0\1\56\1\145\1\162\2\uffff\1\162\1\141\1\156\2\uffff\1\154\1\162\6\uffff\1\160\2\uffff\1\55\1\143\1\142\1\75\2\0\1\101\2\uffff\1\52\4\uffff\1\146\1\uffff\1\145\2\uffff\1\165\1\154\1\153\2\uffff\1\141\1\156\1\164\1\162\6\uffff\1\160\4\uffff\1\157\1\163\10\uffff\1\145\1\144\1\142\1\145\1\163\1\156\1\163\1\164\1\145\2\157\1\160\1\164\1\162\1\60\1\154\1\60\1\145\1\157\1\163\1\141\1\156\1\162\1\163\1\145\1\162\1\163\1\uffff\1\145\1\uffff\1\60\1\167\1\60\1\151\1\144\1\60\1\151\1\60\1\141\1\60\1\155\1\uffff\1\156\1\uffff\1\156\1\163\1\uffff\1\164\1\uffff\1\143\1\uffff\2\60\1\163\1\60\1\145\1\164\2\uffff\1\60\1\uffff\2\60\3\uffff";
+        "\1\0\1\56\2\uffff\1\145\1\162\2\uffff\1\162\1\141\1\156\2\uffff\1\154\1\156\4\uffff\1\160\2\uffff\1\55\1\143\1\142\1\75\2\0\1\101\2\uffff\1\52\6\uffff\1\146\1\uffff\1\145\2\uffff\1\165\1\154\1\153\2\uffff\1\141\1\156\1\164\1\165\1\162\4\uffff\1\160\4\uffff\1\157\1\163\10\uffff\1\145\1\144\1\142\1\145\1\163\1\156\1\163\1\164\1\145\1\155\2\157\1\160\1\164\1\162\1\60\1\154\1\60\1\145\1\157\1\163\1\141\1\156\1\60\1\162\1\163\1\145\1\162\1\163\1\uffff\1\145\1\uffff\1\60\1\167\1\60\1\151\1\144\1\uffff\1\60\1\151\1\60\1\141\1\60\1\155\1\uffff\1\156\1\uffff\1\156\1\163\1\uffff\1\164\1\uffff\1\143\1\uffff\2\60\1\163\1\60\1\145\1\164\2\uffff\1\60\1\uffff\2\60\3\uffff";
     static final String DFA11_maxS =
-        "\1\uffff\1\56\1\145\1\162\2\uffff\1\162\1\141\1\156\2\uffff\1\157\1\170\6\uffff\1\160\2\uffff\1\55\1\143\1\142\1\75\2\uffff\1\172\2\uffff\1\57\4\uffff\1\146\1\uffff\1\157\2\uffff\1\165\1\154\1\153\2\uffff\1\141\1\156\1\164\1\162\6\uffff\1\160\4\uffff\1\157\1\163\10\uffff\1\145\1\144\1\142\1\145\1\163\1\156\1\163\1\164\1\145\2\157\1\160\1\164\1\162\1\172\1\154\1\172\1\145\1\157\1\163\1\141\1\156\1\162\1\163\1\145\1\162\1\163\1\uffff\1\145\1\uffff\1\172\1\167\1\172\1\151\1\144\1\172\1\151\1\172\1\141\1\172\1\155\1\uffff\1\156\1\uffff\1\156\1\163\1\uffff\1\164\1\uffff\1\143\1\uffff\2\172\1\163\1\172\1\145\1\164\2\uffff\1\172\1\uffff\2\172\3\uffff";
+        "\1\uffff\1\56\2\uffff\1\145\1\162\2\uffff\1\162\1\141\1\156\2\uffff\1\157\1\170\4\uffff\1\160\2\uffff\1\55\1\143\1\142\1\75\2\uffff\1\172\2\uffff\1\57\6\uffff\1\146\1\uffff\1\157\2\uffff\1\165\1\154\1\153\2\uffff\1\141\1\156\1\164\1\165\1\162\4\uffff\1\160\4\uffff\1\157\1\163\10\uffff\1\145\1\144\1\142\1\145\1\163\1\156\1\163\1\164\1\145\1\155\2\157\1\160\1\164\1\162\1\172\1\154\1\172\1\145\1\157\1\163\1\141\1\156\1\172\1\162\1\163\1\145\1\162\1\163\1\uffff\1\145\1\uffff\1\172\1\167\1\172\1\151\1\144\1\uffff\1\172\1\151\1\172\1\141\1\172\1\155\1\uffff\1\156\1\uffff\1\156\1\163\1\uffff\1\164\1\uffff\1\143\1\uffff\2\172\1\163\1\172\1\145\1\164\2\uffff\1\172\1\uffff\2\172\3\uffff";
     static final String DFA11_acceptS =
-        "\4\uffff\1\4\1\5\3\uffff\1\11\1\12\2\uffff\1\16\1\17\1\20\1\21\1\22\1\23\1\uffff\1\25\1\26\7\uffff\1\42\1\43\1\uffff\1\46\1\47\1\32\1\1\1\uffff\1\42\1\uffff\1\4\1\5\3\uffff\1\11\1\12\4\uffff\1\16\1\17\1\20\1\21\1\22\1\23\1\uffff\1\25\1\26\1\27\1\30\2\uffff\1\37\1\36\1\40\1\41\1\43\1\44\1\45\1\46\33\uffff\1\3\1\uffff\1\6\13\uffff\1\7\1\uffff\1\14\2\uffff\1\35\1\uffff\1\31\1\uffff\1\2\6\uffff\1\13\1\10\1\uffff\1\15\2\uffff\1\34\1\24\1\33";
+        "\2\uffff\1\2\1\3\2\uffff\1\6\1\7\3\uffff\1\13\1\14\2\uffff\1\20\1\21\1\23\1\24\1\uffff\1\26\1\27\7\uffff\1\43\1\44\1\uffff\1\47\1\50\1\33\1\1\1\2\1\3\1\uffff\1\43\1\uffff\1\6\1\7\3\uffff\1\13\1\14\5\uffff\1\20\1\21\1\23\1\24\1\uffff\1\26\1\27\1\30\1\31\2\uffff\1\40\1\37\1\41\1\42\1\44\1\45\1\46\1\47\35\uffff\1\5\1\uffff\1\10\5\uffff\1\22\6\uffff\1\11\1\uffff\1\16\2\uffff\1\36\1\uffff\1\32\1\uffff\1\4\6\uffff\1\15\1\12\1\uffff\1\17\2\uffff\1\35\1\25\1\34";
     static final String DFA11_specialS =
-        "\1\0\31\uffff\1\2\1\1\155\uffff}>";
+        "\1\2\31\uffff\1\1\1\0\161\uffff}>";
     static final String[] DFA11_transitionS = {
-            "\11\41\2\40\2\41\1\40\22\41\1\40\1\11\1\32\4\41\1\33\1\24\1\25\1\5\1\31\1\15\1\41\1\1\1\37\12\36\1\26\1\20\1\41\1\4\1\41\1\12\1\41\32\35\1\21\1\41\1\22\1\34\1\35\1\41\1\30\1\35\1\13\1\35\1\14\1\7\10\35\1\23\1\3\1\35\1\2\1\27\1\6\1\10\5\35\1\16\1\41\1\17\uff82\41",
+            "\11\41\2\40\2\41\1\40\22\41\1\40\1\13\1\32\4\41\1\33\1\24\1\25\1\7\1\31\1\2\1\41\1\1\1\37\12\36\1\26\1\3\1\41\1\6\1\41\1\14\1\41\32\35\1\21\1\41\1\22\1\34\1\35\1\41\1\30\1\35\1\15\1\35\1\16\1\11\10\35\1\23\1\5\1\35\1\4\1\27\1\10\1\12\5\35\1\17\1\41\1\20\uff82\41",
             "\1\42",
-            "\1\44",
-            "\1\46",
             "",
             "",
-            "\1\51",
-            "\1\52",
-            "\1\53",
+            "\1\46",
+            "\1\50",
             "",
             "",
-            "\1\56\2\uffff\1\57",
-            "\1\61\5\uffff\1\60",
+            "\1\53",
+            "\1\54",
+            "\1\55",
             "",
             "",
+            "\1\60\2\uffff\1\61",
+            "\1\63\3\uffff\1\64\5\uffff\1\62",
             "",
             "",
             "",
             "",
-            "\1\70",
+            "\1\71",
             "",
             "",
-            "\1\73",
-            "\1\75",
+            "\1\74",
             "\1\76",
             "\1\77",
-            "\0\101",
+            "\1\100",
             "\0\102",
-            "\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\0\103",
+            "\32\47\4\uffff\1\47\1\uffff\32\47",
+            "",
+            "",
+            "\1\105\4\uffff\1\106",
             "",
             "",
-            "\1\104\4\uffff\1\105",
             "",
             "",
             "",
             "",
-            "\1\107",
+            "\1\110",
             "",
-            "\1\110\11\uffff\1\111",
+            "\1\111\11\uffff\1\112",
             "",
             "",
-            "\1\112",
             "\1\113",
             "\1\114",
+            "\1\115",
             "",
             "",
-            "\1\115",
             "\1\116",
             "\1\117",
             "\1\120",
+            "\1\121",
+            "\1\122",
             "",
             "",
             "",
             "",
-            "",
-            "",
-            "\1\121",
+            "\1\123",
             "",
             "",
             "",
             "",
-            "\1\122",
-            "\1\123",
+            "\1\124",
+            "\1\125",
             "",
             "",
             "",
@@ -1556,8 +1586,6 @@ public class InternalProblemLexer extends Lexer {
             "",
             "",
             "",
-            "\1\124",
-            "\1\125",
             "\1\126",
             "\1\127",
             "\1\130",
@@ -1570,55 +1598,60 @@ public class InternalProblemLexer extends Lexer {
             "\1\137",
             "\1\140",
             "\1\141",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\142",
             "\1\143",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\145",
+            "\1\144",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
             "\1\146",
-            "\1\147",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
             "\1\150",
             "\1\151",
             "\1\152",
             "\1\153",
             "\1\154",
-            "\1\155",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
             "\1\156",
-            "",
             "\1\157",
-            "",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\160",
             "\1\161",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\162",
+            "",
             "\1\163",
-            "\1\164",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\166",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\170",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\172",
             "",
-            "\1\173",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+            "\1\165",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+            "\1\167",
+            "\1\170",
             "",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+            "\1\172",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
             "\1\174",
-            "\1\175",
-            "",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
             "\1\176",
             "",
             "\1\177",
             "",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\u0080",
+            "\1\u0081",
+            "",
             "\1\u0082",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\1\u0084",
-            "\1\u0085",
             "",
+            "\1\u0083",
+            "",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+            "\1\u0086",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+            "\1\u0088",
+            "\1\u0089",
             "",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
             "",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
-            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+            "",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
+            "\12\47\7\uffff\32\47\4\uffff\1\47\1\uffff\32\47",
             "",
             "",
             ""
@@ -1654,47 +1687,67 @@ public class InternalProblemLexer extends Lexer {
             this.transition = DFA11_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | RULE_STRING | RULE_QUOTED_ID | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+            return "1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | RULE_STRING | RULE_QUOTED_ID | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             IntStream input = _input;
                 int _s = s;
             switch ( s ) {
                     case 0 : 
+                        int LA11_27 = input.LA(1);
+
+                        s = -1;
+                        if ( ((LA11_27>='\u0000' && LA11_27<='\uFFFF')) ) {s = 67;}
+
+                        else s = 33;
+
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA11_26 = input.LA(1);
+
+                        s = -1;
+                        if ( ((LA11_26>='\u0000' && LA11_26<='\uFFFF')) ) {s = 66;}
+
+                        else s = 33;
+
+                        if ( s>=0 ) return s;
+                        break;
+                    case 2 : 
                         int LA11_0 = input.LA(1);
 
                         s = -1;
                         if ( (LA11_0=='.') ) {s = 1;}
 
-                        else if ( (LA11_0=='r') ) {s = 2;}
+                        else if ( (LA11_0==',') ) {s = 2;}
 
-                        else if ( (LA11_0=='p') ) {s = 3;}
+                        else if ( (LA11_0==';') ) {s = 3;}
 
-                        else if ( (LA11_0=='=') ) {s = 4;}
+                        else if ( (LA11_0=='r') ) {s = 4;}
 
-                        else if ( (LA11_0=='*') ) {s = 5;}
+                        else if ( (LA11_0=='p') ) {s = 5;}
 
-                        else if ( (LA11_0=='t') ) {s = 6;}
+                        else if ( (LA11_0=='=') ) {s = 6;}
 
-                        else if ( (LA11_0=='f') ) {s = 7;}
+                        else if ( (LA11_0=='*') ) {s = 7;}
 
-                        else if ( (LA11_0=='u') ) {s = 8;}
+                        else if ( (LA11_0=='t') ) {s = 8;}
 
-                        else if ( (LA11_0=='!') ) {s = 9;}
+                        else if ( (LA11_0=='f') ) {s = 9;}
 
-                        else if ( (LA11_0=='?') ) {s = 10;}
+                        else if ( (LA11_0=='u') ) {s = 10;}
 
-                        else if ( (LA11_0=='c') ) {s = 11;}
+                        else if ( (LA11_0=='!') ) {s = 11;}
 
-                        else if ( (LA11_0=='e') ) {s = 12;}
+                        else if ( (LA11_0=='?') ) {s = 12;}
 
-                        else if ( (LA11_0==',') ) {s = 13;}
+                        else if ( (LA11_0=='c') ) {s = 13;}
 
-                        else if ( (LA11_0=='{') ) {s = 14;}
+                        else if ( (LA11_0=='e') ) {s = 14;}
 
-                        else if ( (LA11_0=='}') ) {s = 15;}
+                        else if ( (LA11_0=='{') ) {s = 15;}
 
-                        else if ( (LA11_0==';') ) {s = 16;}
+                        else if ( (LA11_0=='}') ) {s = 16;}
 
                         else if ( (LA11_0=='[') ) {s = 17;}
 
@@ -1732,26 +1785,6 @@ public class InternalProblemLexer extends Lexer {
 
                         if ( s>=0 ) return s;
                         break;
-                    case 1 : 
-                        int LA11_27 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA11_27>='\u0000' && LA11_27<='\uFFFF')) ) {s = 66;}
-
-                        else s = 33;
-
-                        if ( s>=0 ) return s;
-                        break;
-                    case 2 : 
-                        int LA11_26 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA11_26>='\u0000' && LA11_26<='\uFFFF')) ) {s = 65;}
-
-                        else s = 33;
-
-                        if ( s>=0 ) return s;
-                        break;
             }
             NoViableAltException nvae =
                 new NoViableAltException(getDescription(), 11, _s, input);
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemParser.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemParser.java
index 5eb272e7..0f70a158 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemParser.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemParser.java
@@ -22,33 +22,18 @@ import java.util.ArrayList;
 @SuppressWarnings("all")
 public class InternalProblemParser extends AbstractInternalContentAssistParser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_QUOTED_ID", "RULE_ID", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'.'", "'refers'", "'pred'", "'='", "'*'", "'true'", "'false'", "'unknown'", "'!'", "'?'", "'problem'", "'class'", "'extends'", "','", "'{'", "'}'", "';'", "'['", "']'", "'opposite'", "'('", "')'", "':-'", "':'", "'scope'", "'..'", "'abstract'", "'contains'", "'error'", "'+'", "'+='"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_QUOTED_ID", "RULE_ID", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'.'", "','", "';'", "'refers'", "'pred'", "'='", "'*'", "'true'", "'false'", "'unknown'", "'!'", "'?'", "'problem'", "'class'", "'extends'", "'{'", "'}'", "'enum'", "'['", "']'", "'opposite'", "'('", "')'", "':-'", "':'", "'scope'", "'..'", "'abstract'", "'contains'", "'error'", "'+'", "'+='"
     };
-    public static final int RULE_STRING=7;
-    public static final int RULE_SL_COMMENT=9;
     public static final int T__19=19;
     public static final int T__15=15;
-    public static final int T__37=37;
     public static final int T__16=16;
-    public static final int T__38=38;
     public static final int T__17=17;
-    public static final int T__39=39;
     public static final int T__18=18;
-    public static final int T__33=33;
     public static final int T__12=12;
-    public static final int T__34=34;
     public static final int T__13=13;
-    public static final int T__35=35;
     public static final int T__14=14;
-    public static final int T__36=36;
-    public static final int EOF=-1;
-    public static final int T__30=30;
-    public static final int T__31=31;
-    public static final int T__32=32;
     public static final int RULE_ID=6;
-    public static final int RULE_WS=10;
     public static final int RULE_QUOTED_ID=5;
-    public static final int RULE_ANY_OTHER=11;
     public static final int T__26=26;
     public static final int T__27=27;
     public static final int T__28=28;
@@ -59,11 +44,27 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     public static final int T__23=23;
     public static final int T__24=24;
     public static final int T__25=25;
+    public static final int T__20=20;
+    public static final int T__21=21;
+    public static final int RULE_STRING=7;
+    public static final int RULE_SL_COMMENT=9;
+    public static final int T__37=37;
+    public static final int T__38=38;
+    public static final int T__39=39;
+    public static final int T__33=33;
+    public static final int T__34=34;
+    public static final int T__35=35;
+    public static final int T__36=36;
+    public static final int EOF=-1;
+    public static final int T__30=30;
+    public static final int T__31=31;
+    public static final int T__32=32;
+    public static final int RULE_WS=10;
+    public static final int RULE_ANY_OTHER=11;
     public static final int T__40=40;
     public static final int T__41=41;
-    public static final int T__20=20;
     public static final int T__42=42;
-    public static final int T__21=21;
+    public static final int T__43=43;
 
     // delegates
     // delegators
@@ -331,12 +332,166 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "ruleClassDeclaration"
 
 
+    // $ANTLR start "entryRuleEnumDeclaration"
+    // InternalProblem.g:128:1: entryRuleEnumDeclaration : ruleEnumDeclaration EOF ;
+    public final void entryRuleEnumDeclaration() throws RecognitionException {
+        try {
+            // InternalProblem.g:129:1: ( ruleEnumDeclaration EOF )
+            // InternalProblem.g:130:1: ruleEnumDeclaration EOF
+            {
+             before(grammarAccess.getEnumDeclarationRule()); 
+            pushFollow(FOLLOW_1);
+            ruleEnumDeclaration();
+
+            state._fsp--;
+
+             after(grammarAccess.getEnumDeclarationRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleEnumDeclaration"
+
+
+    // $ANTLR start "ruleEnumDeclaration"
+    // InternalProblem.g:137:1: ruleEnumDeclaration : ( ( rule__EnumDeclaration__Group__0 ) ) ;
+    public final void ruleEnumDeclaration() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:141:2: ( ( ( rule__EnumDeclaration__Group__0 ) ) )
+            // InternalProblem.g:142:2: ( ( rule__EnumDeclaration__Group__0 ) )
+            {
+            // InternalProblem.g:142:2: ( ( rule__EnumDeclaration__Group__0 ) )
+            // InternalProblem.g:143:3: ( rule__EnumDeclaration__Group__0 )
+            {
+             before(grammarAccess.getEnumDeclarationAccess().getGroup()); 
+            // InternalProblem.g:144:3: ( rule__EnumDeclaration__Group__0 )
+            // InternalProblem.g:144:4: rule__EnumDeclaration__Group__0
+            {
+            pushFollow(FOLLOW_2);
+            rule__EnumDeclaration__Group__0();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getEnumDeclarationAccess().getGroup()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleEnumDeclaration"
+
+
+    // $ANTLR start "entryRuleEnumLiteral"
+    // InternalProblem.g:153:1: entryRuleEnumLiteral : ruleEnumLiteral EOF ;
+    public final void entryRuleEnumLiteral() throws RecognitionException {
+        try {
+            // InternalProblem.g:154:1: ( ruleEnumLiteral EOF )
+            // InternalProblem.g:155:1: ruleEnumLiteral EOF
+            {
+             before(grammarAccess.getEnumLiteralRule()); 
+            pushFollow(FOLLOW_1);
+            ruleEnumLiteral();
+
+            state._fsp--;
+
+             after(grammarAccess.getEnumLiteralRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleEnumLiteral"
+
+
+    // $ANTLR start "ruleEnumLiteral"
+    // InternalProblem.g:162:1: ruleEnumLiteral : ( ( rule__EnumLiteral__NameAssignment ) ) ;
+    public final void ruleEnumLiteral() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:166:2: ( ( ( rule__EnumLiteral__NameAssignment ) ) )
+            // InternalProblem.g:167:2: ( ( rule__EnumLiteral__NameAssignment ) )
+            {
+            // InternalProblem.g:167:2: ( ( rule__EnumLiteral__NameAssignment ) )
+            // InternalProblem.g:168:3: ( rule__EnumLiteral__NameAssignment )
+            {
+             before(grammarAccess.getEnumLiteralAccess().getNameAssignment()); 
+            // InternalProblem.g:169:3: ( rule__EnumLiteral__NameAssignment )
+            // InternalProblem.g:169:4: rule__EnumLiteral__NameAssignment
+            {
+            pushFollow(FOLLOW_2);
+            rule__EnumLiteral__NameAssignment();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getEnumLiteralAccess().getNameAssignment()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleEnumLiteral"
+
+
     // $ANTLR start "entryRuleReferenceDeclaration"
-    // InternalProblem.g:128:1: entryRuleReferenceDeclaration : ruleReferenceDeclaration EOF ;
+    // InternalProblem.g:178:1: entryRuleReferenceDeclaration : ruleReferenceDeclaration EOF ;
     public final void entryRuleReferenceDeclaration() throws RecognitionException {
         try {
-            // InternalProblem.g:129:1: ( ruleReferenceDeclaration EOF )
-            // InternalProblem.g:130:1: ruleReferenceDeclaration EOF
+            // InternalProblem.g:179:1: ( ruleReferenceDeclaration EOF )
+            // InternalProblem.g:180:1: ruleReferenceDeclaration EOF
             {
              before(grammarAccess.getReferenceDeclarationRule()); 
             pushFollow(FOLLOW_1);
@@ -362,21 +517,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleReferenceDeclaration"
-    // InternalProblem.g:137:1: ruleReferenceDeclaration : ( ( rule__ReferenceDeclaration__Group__0 ) ) ;
+    // InternalProblem.g:187:1: ruleReferenceDeclaration : ( ( rule__ReferenceDeclaration__Group__0 ) ) ;
     public final void ruleReferenceDeclaration() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:141:2: ( ( ( rule__ReferenceDeclaration__Group__0 ) ) )
-            // InternalProblem.g:142:2: ( ( rule__ReferenceDeclaration__Group__0 ) )
+            // InternalProblem.g:191:2: ( ( ( rule__ReferenceDeclaration__Group__0 ) ) )
+            // InternalProblem.g:192:2: ( ( rule__ReferenceDeclaration__Group__0 ) )
             {
-            // InternalProblem.g:142:2: ( ( rule__ReferenceDeclaration__Group__0 ) )
-            // InternalProblem.g:143:3: ( rule__ReferenceDeclaration__Group__0 )
+            // InternalProblem.g:192:2: ( ( rule__ReferenceDeclaration__Group__0 ) )
+            // InternalProblem.g:193:3: ( rule__ReferenceDeclaration__Group__0 )
             {
              before(grammarAccess.getReferenceDeclarationAccess().getGroup()); 
-            // InternalProblem.g:144:3: ( rule__ReferenceDeclaration__Group__0 )
-            // InternalProblem.g:144:4: rule__ReferenceDeclaration__Group__0
+            // InternalProblem.g:194:3: ( rule__ReferenceDeclaration__Group__0 )
+            // InternalProblem.g:194:4: rule__ReferenceDeclaration__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__ReferenceDeclaration__Group__0();
@@ -409,11 +564,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRulePredicateDefinition"
-    // InternalProblem.g:153:1: entryRulePredicateDefinition : rulePredicateDefinition EOF ;
+    // InternalProblem.g:203:1: entryRulePredicateDefinition : rulePredicateDefinition EOF ;
     public final void entryRulePredicateDefinition() throws RecognitionException {
         try {
-            // InternalProblem.g:154:1: ( rulePredicateDefinition EOF )
-            // InternalProblem.g:155:1: rulePredicateDefinition EOF
+            // InternalProblem.g:204:1: ( rulePredicateDefinition EOF )
+            // InternalProblem.g:205:1: rulePredicateDefinition EOF
             {
              before(grammarAccess.getPredicateDefinitionRule()); 
             pushFollow(FOLLOW_1);
@@ -439,21 +594,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rulePredicateDefinition"
-    // InternalProblem.g:162:1: rulePredicateDefinition : ( ( rule__PredicateDefinition__Group__0 ) ) ;
+    // InternalProblem.g:212:1: rulePredicateDefinition : ( ( rule__PredicateDefinition__Group__0 ) ) ;
     public final void rulePredicateDefinition() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:166:2: ( ( ( rule__PredicateDefinition__Group__0 ) ) )
-            // InternalProblem.g:167:2: ( ( rule__PredicateDefinition__Group__0 ) )
+            // InternalProblem.g:216:2: ( ( ( rule__PredicateDefinition__Group__0 ) ) )
+            // InternalProblem.g:217:2: ( ( rule__PredicateDefinition__Group__0 ) )
             {
-            // InternalProblem.g:167:2: ( ( rule__PredicateDefinition__Group__0 ) )
-            // InternalProblem.g:168:3: ( rule__PredicateDefinition__Group__0 )
+            // InternalProblem.g:217:2: ( ( rule__PredicateDefinition__Group__0 ) )
+            // InternalProblem.g:218:3: ( rule__PredicateDefinition__Group__0 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getGroup()); 
-            // InternalProblem.g:169:3: ( rule__PredicateDefinition__Group__0 )
-            // InternalProblem.g:169:4: rule__PredicateDefinition__Group__0
+            // InternalProblem.g:219:3: ( rule__PredicateDefinition__Group__0 )
+            // InternalProblem.g:219:4: rule__PredicateDefinition__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group__0();
@@ -486,11 +641,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleParameter"
-    // InternalProblem.g:178:1: entryRuleParameter : ruleParameter EOF ;
+    // InternalProblem.g:228:1: entryRuleParameter : ruleParameter EOF ;
     public final void entryRuleParameter() throws RecognitionException {
         try {
-            // InternalProblem.g:179:1: ( ruleParameter EOF )
-            // InternalProblem.g:180:1: ruleParameter EOF
+            // InternalProblem.g:229:1: ( ruleParameter EOF )
+            // InternalProblem.g:230:1: ruleParameter EOF
             {
              before(grammarAccess.getParameterRule()); 
             pushFollow(FOLLOW_1);
@@ -516,21 +671,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleParameter"
-    // InternalProblem.g:187:1: ruleParameter : ( ( rule__Parameter__Group__0 ) ) ;
+    // InternalProblem.g:237:1: ruleParameter : ( ( rule__Parameter__Group__0 ) ) ;
     public final void ruleParameter() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:191:2: ( ( ( rule__Parameter__Group__0 ) ) )
-            // InternalProblem.g:192:2: ( ( rule__Parameter__Group__0 ) )
+            // InternalProblem.g:241:2: ( ( ( rule__Parameter__Group__0 ) ) )
+            // InternalProblem.g:242:2: ( ( rule__Parameter__Group__0 ) )
             {
-            // InternalProblem.g:192:2: ( ( rule__Parameter__Group__0 ) )
-            // InternalProblem.g:193:3: ( rule__Parameter__Group__0 )
+            // InternalProblem.g:242:2: ( ( rule__Parameter__Group__0 ) )
+            // InternalProblem.g:243:3: ( rule__Parameter__Group__0 )
             {
              before(grammarAccess.getParameterAccess().getGroup()); 
-            // InternalProblem.g:194:3: ( rule__Parameter__Group__0 )
-            // InternalProblem.g:194:4: rule__Parameter__Group__0
+            // InternalProblem.g:244:3: ( rule__Parameter__Group__0 )
+            // InternalProblem.g:244:4: rule__Parameter__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__Parameter__Group__0();
@@ -563,11 +718,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleConjunction"
-    // InternalProblem.g:203:1: entryRuleConjunction : ruleConjunction EOF ;
+    // InternalProblem.g:253:1: entryRuleConjunction : ruleConjunction EOF ;
     public final void entryRuleConjunction() throws RecognitionException {
         try {
-            // InternalProblem.g:204:1: ( ruleConjunction EOF )
-            // InternalProblem.g:205:1: ruleConjunction EOF
+            // InternalProblem.g:254:1: ( ruleConjunction EOF )
+            // InternalProblem.g:255:1: ruleConjunction EOF
             {
              before(grammarAccess.getConjunctionRule()); 
             pushFollow(FOLLOW_1);
@@ -593,21 +748,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleConjunction"
-    // InternalProblem.g:212:1: ruleConjunction : ( ( rule__Conjunction__Group__0 ) ) ;
+    // InternalProblem.g:262:1: ruleConjunction : ( ( rule__Conjunction__Group__0 ) ) ;
     public final void ruleConjunction() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:216:2: ( ( ( rule__Conjunction__Group__0 ) ) )
-            // InternalProblem.g:217:2: ( ( rule__Conjunction__Group__0 ) )
+            // InternalProblem.g:266:2: ( ( ( rule__Conjunction__Group__0 ) ) )
+            // InternalProblem.g:267:2: ( ( rule__Conjunction__Group__0 ) )
             {
-            // InternalProblem.g:217:2: ( ( rule__Conjunction__Group__0 ) )
-            // InternalProblem.g:218:3: ( rule__Conjunction__Group__0 )
+            // InternalProblem.g:267:2: ( ( rule__Conjunction__Group__0 ) )
+            // InternalProblem.g:268:3: ( rule__Conjunction__Group__0 )
             {
              before(grammarAccess.getConjunctionAccess().getGroup()); 
-            // InternalProblem.g:219:3: ( rule__Conjunction__Group__0 )
-            // InternalProblem.g:219:4: rule__Conjunction__Group__0
+            // InternalProblem.g:269:3: ( rule__Conjunction__Group__0 )
+            // InternalProblem.g:269:4: rule__Conjunction__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__Conjunction__Group__0();
@@ -640,11 +795,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // InternalProblem.g:228:1: entryRuleLiteral : ruleLiteral EOF ;
+    // InternalProblem.g:278:1: entryRuleLiteral : ruleLiteral EOF ;
     public final void entryRuleLiteral() throws RecognitionException {
         try {
-            // InternalProblem.g:229:1: ( ruleLiteral EOF )
-            // InternalProblem.g:230:1: ruleLiteral EOF
+            // InternalProblem.g:279:1: ( ruleLiteral EOF )
+            // InternalProblem.g:280:1: ruleLiteral EOF
             {
              before(grammarAccess.getLiteralRule()); 
             pushFollow(FOLLOW_1);
@@ -670,21 +825,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleLiteral"
-    // InternalProblem.g:237:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
+    // InternalProblem.g:287:1: ruleLiteral : ( ( rule__Literal__Alternatives ) ) ;
     public final void ruleLiteral() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:241:2: ( ( ( rule__Literal__Alternatives ) ) )
-            // InternalProblem.g:242:2: ( ( rule__Literal__Alternatives ) )
+            // InternalProblem.g:291:2: ( ( ( rule__Literal__Alternatives ) ) )
+            // InternalProblem.g:292:2: ( ( rule__Literal__Alternatives ) )
             {
-            // InternalProblem.g:242:2: ( ( rule__Literal__Alternatives ) )
-            // InternalProblem.g:243:3: ( rule__Literal__Alternatives )
+            // InternalProblem.g:292:2: ( ( rule__Literal__Alternatives ) )
+            // InternalProblem.g:293:3: ( rule__Literal__Alternatives )
             {
              before(grammarAccess.getLiteralAccess().getAlternatives()); 
-            // InternalProblem.g:244:3: ( rule__Literal__Alternatives )
-            // InternalProblem.g:244:4: rule__Literal__Alternatives
+            // InternalProblem.g:294:3: ( rule__Literal__Alternatives )
+            // InternalProblem.g:294:4: rule__Literal__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__Literal__Alternatives();
@@ -717,11 +872,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleNegativeLiteral"
-    // InternalProblem.g:253:1: entryRuleNegativeLiteral : ruleNegativeLiteral EOF ;
+    // InternalProblem.g:303:1: entryRuleNegativeLiteral : ruleNegativeLiteral EOF ;
     public final void entryRuleNegativeLiteral() throws RecognitionException {
         try {
-            // InternalProblem.g:254:1: ( ruleNegativeLiteral EOF )
-            // InternalProblem.g:255:1: ruleNegativeLiteral EOF
+            // InternalProblem.g:304:1: ( ruleNegativeLiteral EOF )
+            // InternalProblem.g:305:1: ruleNegativeLiteral EOF
             {
              before(grammarAccess.getNegativeLiteralRule()); 
             pushFollow(FOLLOW_1);
@@ -747,21 +902,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleNegativeLiteral"
-    // InternalProblem.g:262:1: ruleNegativeLiteral : ( ( rule__NegativeLiteral__Group__0 ) ) ;
+    // InternalProblem.g:312:1: ruleNegativeLiteral : ( ( rule__NegativeLiteral__Group__0 ) ) ;
     public final void ruleNegativeLiteral() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:266:2: ( ( ( rule__NegativeLiteral__Group__0 ) ) )
-            // InternalProblem.g:267:2: ( ( rule__NegativeLiteral__Group__0 ) )
+            // InternalProblem.g:316:2: ( ( ( rule__NegativeLiteral__Group__0 ) ) )
+            // InternalProblem.g:317:2: ( ( rule__NegativeLiteral__Group__0 ) )
             {
-            // InternalProblem.g:267:2: ( ( rule__NegativeLiteral__Group__0 ) )
-            // InternalProblem.g:268:3: ( rule__NegativeLiteral__Group__0 )
+            // InternalProblem.g:317:2: ( ( rule__NegativeLiteral__Group__0 ) )
+            // InternalProblem.g:318:3: ( rule__NegativeLiteral__Group__0 )
             {
              before(grammarAccess.getNegativeLiteralAccess().getGroup()); 
-            // InternalProblem.g:269:3: ( rule__NegativeLiteral__Group__0 )
-            // InternalProblem.g:269:4: rule__NegativeLiteral__Group__0
+            // InternalProblem.g:319:3: ( rule__NegativeLiteral__Group__0 )
+            // InternalProblem.g:319:4: rule__NegativeLiteral__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__NegativeLiteral__Group__0();
@@ -794,11 +949,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAtom"
-    // InternalProblem.g:278:1: entryRuleAtom : ruleAtom EOF ;
+    // InternalProblem.g:328:1: entryRuleAtom : ruleAtom EOF ;
     public final void entryRuleAtom() throws RecognitionException {
         try {
-            // InternalProblem.g:279:1: ( ruleAtom EOF )
-            // InternalProblem.g:280:1: ruleAtom EOF
+            // InternalProblem.g:329:1: ( ruleAtom EOF )
+            // InternalProblem.g:330:1: ruleAtom EOF
             {
              before(grammarAccess.getAtomRule()); 
             pushFollow(FOLLOW_1);
@@ -824,21 +979,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAtom"
-    // InternalProblem.g:287:1: ruleAtom : ( ( rule__Atom__Group__0 ) ) ;
+    // InternalProblem.g:337:1: ruleAtom : ( ( rule__Atom__Group__0 ) ) ;
     public final void ruleAtom() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:291:2: ( ( ( rule__Atom__Group__0 ) ) )
-            // InternalProblem.g:292:2: ( ( rule__Atom__Group__0 ) )
+            // InternalProblem.g:341:2: ( ( ( rule__Atom__Group__0 ) ) )
+            // InternalProblem.g:342:2: ( ( rule__Atom__Group__0 ) )
             {
-            // InternalProblem.g:292:2: ( ( rule__Atom__Group__0 ) )
-            // InternalProblem.g:293:3: ( rule__Atom__Group__0 )
+            // InternalProblem.g:342:2: ( ( rule__Atom__Group__0 ) )
+            // InternalProblem.g:343:3: ( rule__Atom__Group__0 )
             {
              before(grammarAccess.getAtomAccess().getGroup()); 
-            // InternalProblem.g:294:3: ( rule__Atom__Group__0 )
-            // InternalProblem.g:294:4: rule__Atom__Group__0
+            // InternalProblem.g:344:3: ( rule__Atom__Group__0 )
+            // InternalProblem.g:344:4: rule__Atom__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__Atom__Group__0();
@@ -871,11 +1026,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleArgument"
-    // InternalProblem.g:303:1: entryRuleArgument : ruleArgument EOF ;
+    // InternalProblem.g:353:1: entryRuleArgument : ruleArgument EOF ;
     public final void entryRuleArgument() throws RecognitionException {
         try {
-            // InternalProblem.g:304:1: ( ruleArgument EOF )
-            // InternalProblem.g:305:1: ruleArgument EOF
+            // InternalProblem.g:354:1: ( ruleArgument EOF )
+            // InternalProblem.g:355:1: ruleArgument EOF
             {
              before(grammarAccess.getArgumentRule()); 
             pushFollow(FOLLOW_1);
@@ -901,31 +1056,31 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleArgument"
-    // InternalProblem.g:312:1: ruleArgument : ( ( rule__Argument__VariableAssignment ) ) ;
+    // InternalProblem.g:362:1: ruleArgument : ( ( rule__Argument__VariableOrNodeAssignment ) ) ;
     public final void ruleArgument() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:316:2: ( ( ( rule__Argument__VariableAssignment ) ) )
-            // InternalProblem.g:317:2: ( ( rule__Argument__VariableAssignment ) )
+            // InternalProblem.g:366:2: ( ( ( rule__Argument__VariableOrNodeAssignment ) ) )
+            // InternalProblem.g:367:2: ( ( rule__Argument__VariableOrNodeAssignment ) )
             {
-            // InternalProblem.g:317:2: ( ( rule__Argument__VariableAssignment ) )
-            // InternalProblem.g:318:3: ( rule__Argument__VariableAssignment )
+            // InternalProblem.g:367:2: ( ( rule__Argument__VariableOrNodeAssignment ) )
+            // InternalProblem.g:368:3: ( rule__Argument__VariableOrNodeAssignment )
             {
-             before(grammarAccess.getArgumentAccess().getVariableAssignment()); 
-            // InternalProblem.g:319:3: ( rule__Argument__VariableAssignment )
-            // InternalProblem.g:319:4: rule__Argument__VariableAssignment
+             before(grammarAccess.getArgumentAccess().getVariableOrNodeAssignment()); 
+            // InternalProblem.g:369:3: ( rule__Argument__VariableOrNodeAssignment )
+            // InternalProblem.g:369:4: rule__Argument__VariableOrNodeAssignment
             {
             pushFollow(FOLLOW_2);
-            rule__Argument__VariableAssignment();
+            rule__Argument__VariableOrNodeAssignment();
 
             state._fsp--;
 
 
             }
 
-             after(grammarAccess.getArgumentAccess().getVariableAssignment()); 
+             after(grammarAccess.getArgumentAccess().getVariableOrNodeAssignment()); 
 
             }
 
@@ -948,11 +1103,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleAssertion"
-    // InternalProblem.g:328:1: entryRuleAssertion : ruleAssertion EOF ;
+    // InternalProblem.g:378:1: entryRuleAssertion : ruleAssertion EOF ;
     public final void entryRuleAssertion() throws RecognitionException {
         try {
-            // InternalProblem.g:329:1: ( ruleAssertion EOF )
-            // InternalProblem.g:330:1: ruleAssertion EOF
+            // InternalProblem.g:379:1: ( ruleAssertion EOF )
+            // InternalProblem.g:380:1: ruleAssertion EOF
             {
              before(grammarAccess.getAssertionRule()); 
             pushFollow(FOLLOW_1);
@@ -978,21 +1133,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAssertion"
-    // InternalProblem.g:337:1: ruleAssertion : ( ( rule__Assertion__Group__0 ) ) ;
+    // InternalProblem.g:387:1: ruleAssertion : ( ( rule__Assertion__Group__0 ) ) ;
     public final void ruleAssertion() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:341:2: ( ( ( rule__Assertion__Group__0 ) ) )
-            // InternalProblem.g:342:2: ( ( rule__Assertion__Group__0 ) )
+            // InternalProblem.g:391:2: ( ( ( rule__Assertion__Group__0 ) ) )
+            // InternalProblem.g:392:2: ( ( rule__Assertion__Group__0 ) )
             {
-            // InternalProblem.g:342:2: ( ( rule__Assertion__Group__0 ) )
-            // InternalProblem.g:343:3: ( rule__Assertion__Group__0 )
+            // InternalProblem.g:392:2: ( ( rule__Assertion__Group__0 ) )
+            // InternalProblem.g:393:3: ( rule__Assertion__Group__0 )
             {
              before(grammarAccess.getAssertionAccess().getGroup()); 
-            // InternalProblem.g:344:3: ( rule__Assertion__Group__0 )
-            // InternalProblem.g:344:4: rule__Assertion__Group__0
+            // InternalProblem.g:394:3: ( rule__Assertion__Group__0 )
+            // InternalProblem.g:394:4: rule__Assertion__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group__0();
@@ -1025,11 +1180,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleScopeDeclaration"
-    // InternalProblem.g:353:1: entryRuleScopeDeclaration : ruleScopeDeclaration EOF ;
+    // InternalProblem.g:403:1: entryRuleScopeDeclaration : ruleScopeDeclaration EOF ;
     public final void entryRuleScopeDeclaration() throws RecognitionException {
         try {
-            // InternalProblem.g:354:1: ( ruleScopeDeclaration EOF )
-            // InternalProblem.g:355:1: ruleScopeDeclaration EOF
+            // InternalProblem.g:404:1: ( ruleScopeDeclaration EOF )
+            // InternalProblem.g:405:1: ruleScopeDeclaration EOF
             {
              before(grammarAccess.getScopeDeclarationRule()); 
             pushFollow(FOLLOW_1);
@@ -1055,21 +1210,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleScopeDeclaration"
-    // InternalProblem.g:362:1: ruleScopeDeclaration : ( ( rule__ScopeDeclaration__Group__0 ) ) ;
+    // InternalProblem.g:412:1: ruleScopeDeclaration : ( ( rule__ScopeDeclaration__Group__0 ) ) ;
     public final void ruleScopeDeclaration() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:366:2: ( ( ( rule__ScopeDeclaration__Group__0 ) ) )
-            // InternalProblem.g:367:2: ( ( rule__ScopeDeclaration__Group__0 ) )
+            // InternalProblem.g:416:2: ( ( ( rule__ScopeDeclaration__Group__0 ) ) )
+            // InternalProblem.g:417:2: ( ( rule__ScopeDeclaration__Group__0 ) )
             {
-            // InternalProblem.g:367:2: ( ( rule__ScopeDeclaration__Group__0 ) )
-            // InternalProblem.g:368:3: ( rule__ScopeDeclaration__Group__0 )
+            // InternalProblem.g:417:2: ( ( rule__ScopeDeclaration__Group__0 ) )
+            // InternalProblem.g:418:3: ( rule__ScopeDeclaration__Group__0 )
             {
              before(grammarAccess.getScopeDeclarationAccess().getGroup()); 
-            // InternalProblem.g:369:3: ( rule__ScopeDeclaration__Group__0 )
-            // InternalProblem.g:369:4: rule__ScopeDeclaration__Group__0
+            // InternalProblem.g:419:3: ( rule__ScopeDeclaration__Group__0 )
+            // InternalProblem.g:419:4: rule__ScopeDeclaration__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__ScopeDeclaration__Group__0();
@@ -1102,11 +1257,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTypeScope"
-    // InternalProblem.g:378:1: entryRuleTypeScope : ruleTypeScope EOF ;
+    // InternalProblem.g:428:1: entryRuleTypeScope : ruleTypeScope EOF ;
     public final void entryRuleTypeScope() throws RecognitionException {
         try {
-            // InternalProblem.g:379:1: ( ruleTypeScope EOF )
-            // InternalProblem.g:380:1: ruleTypeScope EOF
+            // InternalProblem.g:429:1: ( ruleTypeScope EOF )
+            // InternalProblem.g:430:1: ruleTypeScope EOF
             {
              before(grammarAccess.getTypeScopeRule()); 
             pushFollow(FOLLOW_1);
@@ -1132,21 +1287,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTypeScope"
-    // InternalProblem.g:387:1: ruleTypeScope : ( ( rule__TypeScope__Group__0 ) ) ;
+    // InternalProblem.g:437:1: ruleTypeScope : ( ( rule__TypeScope__Group__0 ) ) ;
     public final void ruleTypeScope() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:391:2: ( ( ( rule__TypeScope__Group__0 ) ) )
-            // InternalProblem.g:392:2: ( ( rule__TypeScope__Group__0 ) )
+            // InternalProblem.g:441:2: ( ( ( rule__TypeScope__Group__0 ) ) )
+            // InternalProblem.g:442:2: ( ( rule__TypeScope__Group__0 ) )
             {
-            // InternalProblem.g:392:2: ( ( rule__TypeScope__Group__0 ) )
-            // InternalProblem.g:393:3: ( rule__TypeScope__Group__0 )
+            // InternalProblem.g:442:2: ( ( rule__TypeScope__Group__0 ) )
+            // InternalProblem.g:443:3: ( rule__TypeScope__Group__0 )
             {
              before(grammarAccess.getTypeScopeAccess().getGroup()); 
-            // InternalProblem.g:394:3: ( rule__TypeScope__Group__0 )
-            // InternalProblem.g:394:4: rule__TypeScope__Group__0
+            // InternalProblem.g:444:3: ( rule__TypeScope__Group__0 )
+            // InternalProblem.g:444:4: rule__TypeScope__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TypeScope__Group__0();
@@ -1179,11 +1334,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleMultiplicity"
-    // InternalProblem.g:403:1: entryRuleMultiplicity : ruleMultiplicity EOF ;
+    // InternalProblem.g:453:1: entryRuleMultiplicity : ruleMultiplicity EOF ;
     public final void entryRuleMultiplicity() throws RecognitionException {
         try {
-            // InternalProblem.g:404:1: ( ruleMultiplicity EOF )
-            // InternalProblem.g:405:1: ruleMultiplicity EOF
+            // InternalProblem.g:454:1: ( ruleMultiplicity EOF )
+            // InternalProblem.g:455:1: ruleMultiplicity EOF
             {
              before(grammarAccess.getMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -1209,21 +1364,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleMultiplicity"
-    // InternalProblem.g:412:1: ruleMultiplicity : ( ( rule__Multiplicity__Alternatives ) ) ;
+    // InternalProblem.g:462:1: ruleMultiplicity : ( ( rule__Multiplicity__Alternatives ) ) ;
     public final void ruleMultiplicity() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:416:2: ( ( ( rule__Multiplicity__Alternatives ) ) )
-            // InternalProblem.g:417:2: ( ( rule__Multiplicity__Alternatives ) )
+            // InternalProblem.g:466:2: ( ( ( rule__Multiplicity__Alternatives ) ) )
+            // InternalProblem.g:467:2: ( ( rule__Multiplicity__Alternatives ) )
             {
-            // InternalProblem.g:417:2: ( ( rule__Multiplicity__Alternatives ) )
-            // InternalProblem.g:418:3: ( rule__Multiplicity__Alternatives )
+            // InternalProblem.g:467:2: ( ( rule__Multiplicity__Alternatives ) )
+            // InternalProblem.g:468:3: ( rule__Multiplicity__Alternatives )
             {
              before(grammarAccess.getMultiplicityAccess().getAlternatives()); 
-            // InternalProblem.g:419:3: ( rule__Multiplicity__Alternatives )
-            // InternalProblem.g:419:4: rule__Multiplicity__Alternatives
+            // InternalProblem.g:469:3: ( rule__Multiplicity__Alternatives )
+            // InternalProblem.g:469:4: rule__Multiplicity__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__Multiplicity__Alternatives();
@@ -1256,11 +1411,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDefiniteMultiplicity"
-    // InternalProblem.g:428:1: entryRuleDefiniteMultiplicity : ruleDefiniteMultiplicity EOF ;
+    // InternalProblem.g:478:1: entryRuleDefiniteMultiplicity : ruleDefiniteMultiplicity EOF ;
     public final void entryRuleDefiniteMultiplicity() throws RecognitionException {
         try {
-            // InternalProblem.g:429:1: ( ruleDefiniteMultiplicity EOF )
-            // InternalProblem.g:430:1: ruleDefiniteMultiplicity EOF
+            // InternalProblem.g:479:1: ( ruleDefiniteMultiplicity EOF )
+            // InternalProblem.g:480:1: ruleDefiniteMultiplicity EOF
             {
              before(grammarAccess.getDefiniteMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -1286,21 +1441,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDefiniteMultiplicity"
-    // InternalProblem.g:437:1: ruleDefiniteMultiplicity : ( ( rule__DefiniteMultiplicity__Alternatives ) ) ;
+    // InternalProblem.g:487:1: ruleDefiniteMultiplicity : ( ( rule__DefiniteMultiplicity__Alternatives ) ) ;
     public final void ruleDefiniteMultiplicity() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:441:2: ( ( ( rule__DefiniteMultiplicity__Alternatives ) ) )
-            // InternalProblem.g:442:2: ( ( rule__DefiniteMultiplicity__Alternatives ) )
+            // InternalProblem.g:491:2: ( ( ( rule__DefiniteMultiplicity__Alternatives ) ) )
+            // InternalProblem.g:492:2: ( ( rule__DefiniteMultiplicity__Alternatives ) )
             {
-            // InternalProblem.g:442:2: ( ( rule__DefiniteMultiplicity__Alternatives ) )
-            // InternalProblem.g:443:3: ( rule__DefiniteMultiplicity__Alternatives )
+            // InternalProblem.g:492:2: ( ( rule__DefiniteMultiplicity__Alternatives ) )
+            // InternalProblem.g:493:3: ( rule__DefiniteMultiplicity__Alternatives )
             {
              before(grammarAccess.getDefiniteMultiplicityAccess().getAlternatives()); 
-            // InternalProblem.g:444:3: ( rule__DefiniteMultiplicity__Alternatives )
-            // InternalProblem.g:444:4: rule__DefiniteMultiplicity__Alternatives
+            // InternalProblem.g:494:3: ( rule__DefiniteMultiplicity__Alternatives )
+            // InternalProblem.g:494:4: rule__DefiniteMultiplicity__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__DefiniteMultiplicity__Alternatives();
@@ -1333,11 +1488,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleUnboundedMultiplicity"
-    // InternalProblem.g:453:1: entryRuleUnboundedMultiplicity : ruleUnboundedMultiplicity EOF ;
+    // InternalProblem.g:503:1: entryRuleUnboundedMultiplicity : ruleUnboundedMultiplicity EOF ;
     public final void entryRuleUnboundedMultiplicity() throws RecognitionException {
         try {
-            // InternalProblem.g:454:1: ( ruleUnboundedMultiplicity EOF )
-            // InternalProblem.g:455:1: ruleUnboundedMultiplicity EOF
+            // InternalProblem.g:504:1: ( ruleUnboundedMultiplicity EOF )
+            // InternalProblem.g:505:1: ruleUnboundedMultiplicity EOF
             {
              before(grammarAccess.getUnboundedMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -1363,21 +1518,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleUnboundedMultiplicity"
-    // InternalProblem.g:462:1: ruleUnboundedMultiplicity : ( () ) ;
+    // InternalProblem.g:512:1: ruleUnboundedMultiplicity : ( () ) ;
     public final void ruleUnboundedMultiplicity() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:466:2: ( ( () ) )
-            // InternalProblem.g:467:2: ( () )
+            // InternalProblem.g:516:2: ( ( () ) )
+            // InternalProblem.g:517:2: ( () )
             {
-            // InternalProblem.g:467:2: ( () )
-            // InternalProblem.g:468:3: ()
+            // InternalProblem.g:517:2: ( () )
+            // InternalProblem.g:518:3: ()
             {
              before(grammarAccess.getUnboundedMultiplicityAccess().getUnboundedMultiplicityAction()); 
-            // InternalProblem.g:469:3: ()
-            // InternalProblem.g:469:4: 
+            // InternalProblem.g:519:3: ()
+            // InternalProblem.g:519:4: 
             {
             }
 
@@ -1400,11 +1555,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRangeMultiplicity"
-    // InternalProblem.g:478:1: entryRuleRangeMultiplicity : ruleRangeMultiplicity EOF ;
+    // InternalProblem.g:528:1: entryRuleRangeMultiplicity : ruleRangeMultiplicity EOF ;
     public final void entryRuleRangeMultiplicity() throws RecognitionException {
         try {
-            // InternalProblem.g:479:1: ( ruleRangeMultiplicity EOF )
-            // InternalProblem.g:480:1: ruleRangeMultiplicity EOF
+            // InternalProblem.g:529:1: ( ruleRangeMultiplicity EOF )
+            // InternalProblem.g:530:1: ruleRangeMultiplicity EOF
             {
              before(grammarAccess.getRangeMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -1430,21 +1585,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRangeMultiplicity"
-    // InternalProblem.g:487:1: ruleRangeMultiplicity : ( ( rule__RangeMultiplicity__Group__0 ) ) ;
+    // InternalProblem.g:537:1: ruleRangeMultiplicity : ( ( rule__RangeMultiplicity__Group__0 ) ) ;
     public final void ruleRangeMultiplicity() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:491:2: ( ( ( rule__RangeMultiplicity__Group__0 ) ) )
-            // InternalProblem.g:492:2: ( ( rule__RangeMultiplicity__Group__0 ) )
+            // InternalProblem.g:541:2: ( ( ( rule__RangeMultiplicity__Group__0 ) ) )
+            // InternalProblem.g:542:2: ( ( rule__RangeMultiplicity__Group__0 ) )
             {
-            // InternalProblem.g:492:2: ( ( rule__RangeMultiplicity__Group__0 ) )
-            // InternalProblem.g:493:3: ( rule__RangeMultiplicity__Group__0 )
+            // InternalProblem.g:542:2: ( ( rule__RangeMultiplicity__Group__0 ) )
+            // InternalProblem.g:543:3: ( rule__RangeMultiplicity__Group__0 )
             {
              before(grammarAccess.getRangeMultiplicityAccess().getGroup()); 
-            // InternalProblem.g:494:3: ( rule__RangeMultiplicity__Group__0 )
-            // InternalProblem.g:494:4: rule__RangeMultiplicity__Group__0
+            // InternalProblem.g:544:3: ( rule__RangeMultiplicity__Group__0 )
+            // InternalProblem.g:544:4: rule__RangeMultiplicity__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__RangeMultiplicity__Group__0();
@@ -1477,11 +1632,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleExactMultiplicity"
-    // InternalProblem.g:503:1: entryRuleExactMultiplicity : ruleExactMultiplicity EOF ;
+    // InternalProblem.g:553:1: entryRuleExactMultiplicity : ruleExactMultiplicity EOF ;
     public final void entryRuleExactMultiplicity() throws RecognitionException {
         try {
-            // InternalProblem.g:504:1: ( ruleExactMultiplicity EOF )
-            // InternalProblem.g:505:1: ruleExactMultiplicity EOF
+            // InternalProblem.g:554:1: ( ruleExactMultiplicity EOF )
+            // InternalProblem.g:555:1: ruleExactMultiplicity EOF
             {
              before(grammarAccess.getExactMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -1507,21 +1662,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleExactMultiplicity"
-    // InternalProblem.g:512:1: ruleExactMultiplicity : ( ( rule__ExactMultiplicity__ExactValueAssignment ) ) ;
+    // InternalProblem.g:562:1: ruleExactMultiplicity : ( ( rule__ExactMultiplicity__ExactValueAssignment ) ) ;
     public final void ruleExactMultiplicity() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:516:2: ( ( ( rule__ExactMultiplicity__ExactValueAssignment ) ) )
-            // InternalProblem.g:517:2: ( ( rule__ExactMultiplicity__ExactValueAssignment ) )
+            // InternalProblem.g:566:2: ( ( ( rule__ExactMultiplicity__ExactValueAssignment ) ) )
+            // InternalProblem.g:567:2: ( ( rule__ExactMultiplicity__ExactValueAssignment ) )
             {
-            // InternalProblem.g:517:2: ( ( rule__ExactMultiplicity__ExactValueAssignment ) )
-            // InternalProblem.g:518:3: ( rule__ExactMultiplicity__ExactValueAssignment )
+            // InternalProblem.g:567:2: ( ( rule__ExactMultiplicity__ExactValueAssignment ) )
+            // InternalProblem.g:568:3: ( rule__ExactMultiplicity__ExactValueAssignment )
             {
              before(grammarAccess.getExactMultiplicityAccess().getExactValueAssignment()); 
-            // InternalProblem.g:519:3: ( rule__ExactMultiplicity__ExactValueAssignment )
-            // InternalProblem.g:519:4: rule__ExactMultiplicity__ExactValueAssignment
+            // InternalProblem.g:569:3: ( rule__ExactMultiplicity__ExactValueAssignment )
+            // InternalProblem.g:569:4: rule__ExactMultiplicity__ExactValueAssignment
             {
             pushFollow(FOLLOW_2);
             rule__ExactMultiplicity__ExactValueAssignment();
@@ -1554,11 +1709,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleUpperBound"
-    // InternalProblem.g:528:1: entryRuleUpperBound : ruleUpperBound EOF ;
+    // InternalProblem.g:578:1: entryRuleUpperBound : ruleUpperBound EOF ;
     public final void entryRuleUpperBound() throws RecognitionException {
         try {
-            // InternalProblem.g:529:1: ( ruleUpperBound EOF )
-            // InternalProblem.g:530:1: ruleUpperBound EOF
+            // InternalProblem.g:579:1: ( ruleUpperBound EOF )
+            // InternalProblem.g:580:1: ruleUpperBound EOF
             {
              before(grammarAccess.getUpperBoundRule()); 
             pushFollow(FOLLOW_1);
@@ -1584,21 +1739,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleUpperBound"
-    // InternalProblem.g:537:1: ruleUpperBound : ( ( rule__UpperBound__Alternatives ) ) ;
+    // InternalProblem.g:587:1: ruleUpperBound : ( ( rule__UpperBound__Alternatives ) ) ;
     public final void ruleUpperBound() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:541:2: ( ( ( rule__UpperBound__Alternatives ) ) )
-            // InternalProblem.g:542:2: ( ( rule__UpperBound__Alternatives ) )
+            // InternalProblem.g:591:2: ( ( ( rule__UpperBound__Alternatives ) ) )
+            // InternalProblem.g:592:2: ( ( rule__UpperBound__Alternatives ) )
             {
-            // InternalProblem.g:542:2: ( ( rule__UpperBound__Alternatives ) )
-            // InternalProblem.g:543:3: ( rule__UpperBound__Alternatives )
+            // InternalProblem.g:592:2: ( ( rule__UpperBound__Alternatives ) )
+            // InternalProblem.g:593:3: ( rule__UpperBound__Alternatives )
             {
              before(grammarAccess.getUpperBoundAccess().getAlternatives()); 
-            // InternalProblem.g:544:3: ( rule__UpperBound__Alternatives )
-            // InternalProblem.g:544:4: rule__UpperBound__Alternatives
+            // InternalProblem.g:594:3: ( rule__UpperBound__Alternatives )
+            // InternalProblem.g:594:4: rule__UpperBound__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__UpperBound__Alternatives();
@@ -1630,12 +1785,89 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "ruleUpperBound"
 
 
+    // $ANTLR start "entryRuleQuotedOrUnquotedId"
+    // InternalProblem.g:603:1: entryRuleQuotedOrUnquotedId : ruleQuotedOrUnquotedId EOF ;
+    public final void entryRuleQuotedOrUnquotedId() throws RecognitionException {
+        try {
+            // InternalProblem.g:604:1: ( ruleQuotedOrUnquotedId EOF )
+            // InternalProblem.g:605:1: ruleQuotedOrUnquotedId EOF
+            {
+             before(grammarAccess.getQuotedOrUnquotedIdRule()); 
+            pushFollow(FOLLOW_1);
+            ruleQuotedOrUnquotedId();
+
+            state._fsp--;
+
+             after(grammarAccess.getQuotedOrUnquotedIdRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleQuotedOrUnquotedId"
+
+
+    // $ANTLR start "ruleQuotedOrUnquotedId"
+    // InternalProblem.g:612:1: ruleQuotedOrUnquotedId : ( ( rule__QuotedOrUnquotedId__Alternatives ) ) ;
+    public final void ruleQuotedOrUnquotedId() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:616:2: ( ( ( rule__QuotedOrUnquotedId__Alternatives ) ) )
+            // InternalProblem.g:617:2: ( ( rule__QuotedOrUnquotedId__Alternatives ) )
+            {
+            // InternalProblem.g:617:2: ( ( rule__QuotedOrUnquotedId__Alternatives ) )
+            // InternalProblem.g:618:3: ( rule__QuotedOrUnquotedId__Alternatives )
+            {
+             before(grammarAccess.getQuotedOrUnquotedIdAccess().getAlternatives()); 
+            // InternalProblem.g:619:3: ( rule__QuotedOrUnquotedId__Alternatives )
+            // InternalProblem.g:619:4: rule__QuotedOrUnquotedId__Alternatives
+            {
+            pushFollow(FOLLOW_2);
+            rule__QuotedOrUnquotedId__Alternatives();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getQuotedOrUnquotedIdAccess().getAlternatives()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleQuotedOrUnquotedId"
+
+
     // $ANTLR start "entryRuleQualifiedName"
-    // InternalProblem.g:553:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
+    // InternalProblem.g:628:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
     public final void entryRuleQualifiedName() throws RecognitionException {
         try {
-            // InternalProblem.g:554:1: ( ruleQualifiedName EOF )
-            // InternalProblem.g:555:1: ruleQualifiedName EOF
+            // InternalProblem.g:629:1: ( ruleQualifiedName EOF )
+            // InternalProblem.g:630:1: ruleQualifiedName EOF
             {
              before(grammarAccess.getQualifiedNameRule()); 
             pushFollow(FOLLOW_1);
@@ -1661,21 +1893,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // InternalProblem.g:562:1: ruleQualifiedName : ( ( rule__QualifiedName__Alternatives ) ) ;
+    // InternalProblem.g:637:1: ruleQualifiedName : ( ( rule__QualifiedName__Alternatives ) ) ;
     public final void ruleQualifiedName() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:566:2: ( ( ( rule__QualifiedName__Alternatives ) ) )
-            // InternalProblem.g:567:2: ( ( rule__QualifiedName__Alternatives ) )
+            // InternalProblem.g:641:2: ( ( ( rule__QualifiedName__Alternatives ) ) )
+            // InternalProblem.g:642:2: ( ( rule__QualifiedName__Alternatives ) )
             {
-            // InternalProblem.g:567:2: ( ( rule__QualifiedName__Alternatives ) )
-            // InternalProblem.g:568:3: ( rule__QualifiedName__Alternatives )
+            // InternalProblem.g:642:2: ( ( rule__QualifiedName__Alternatives ) )
+            // InternalProblem.g:643:3: ( rule__QualifiedName__Alternatives )
             {
              before(grammarAccess.getQualifiedNameAccess().getAlternatives()); 
-            // InternalProblem.g:569:3: ( rule__QualifiedName__Alternatives )
-            // InternalProblem.g:569:4: rule__QualifiedName__Alternatives
+            // InternalProblem.g:644:3: ( rule__QualifiedName__Alternatives )
+            // InternalProblem.g:644:4: rule__QualifiedName__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedName__Alternatives();
@@ -1707,22 +1939,99 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "ruleQualifiedName"
 
 
+    // $ANTLR start "entryRuleIdentifier"
+    // InternalProblem.g:653:1: entryRuleIdentifier : ruleIdentifier EOF ;
+    public final void entryRuleIdentifier() throws RecognitionException {
+        try {
+            // InternalProblem.g:654:1: ( ruleIdentifier EOF )
+            // InternalProblem.g:655:1: ruleIdentifier EOF
+            {
+             before(grammarAccess.getIdentifierRule()); 
+            pushFollow(FOLLOW_1);
+            ruleIdentifier();
+
+            state._fsp--;
+
+             after(grammarAccess.getIdentifierRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleIdentifier"
+
+
+    // $ANTLR start "ruleIdentifier"
+    // InternalProblem.g:662:1: ruleIdentifier : ( ( rule__Identifier__Alternatives ) ) ;
+    public final void ruleIdentifier() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:666:2: ( ( ( rule__Identifier__Alternatives ) ) )
+            // InternalProblem.g:667:2: ( ( rule__Identifier__Alternatives ) )
+            {
+            // InternalProblem.g:667:2: ( ( rule__Identifier__Alternatives ) )
+            // InternalProblem.g:668:3: ( rule__Identifier__Alternatives )
+            {
+             before(grammarAccess.getIdentifierAccess().getAlternatives()); 
+            // InternalProblem.g:669:3: ( rule__Identifier__Alternatives )
+            // InternalProblem.g:669:4: rule__Identifier__Alternatives
+            {
+            pushFollow(FOLLOW_2);
+            rule__Identifier__Alternatives();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getIdentifierAccess().getAlternatives()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleIdentifier"
+
+
     // $ANTLR start "ruleLogicValue"
-    // InternalProblem.g:578:1: ruleLogicValue : ( ( rule__LogicValue__Alternatives ) ) ;
+    // InternalProblem.g:678:1: ruleLogicValue : ( ( rule__LogicValue__Alternatives ) ) ;
     public final void ruleLogicValue() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:582:1: ( ( ( rule__LogicValue__Alternatives ) ) )
-            // InternalProblem.g:583:2: ( ( rule__LogicValue__Alternatives ) )
+            // InternalProblem.g:682:1: ( ( ( rule__LogicValue__Alternatives ) ) )
+            // InternalProblem.g:683:2: ( ( rule__LogicValue__Alternatives ) )
             {
-            // InternalProblem.g:583:2: ( ( rule__LogicValue__Alternatives ) )
-            // InternalProblem.g:584:3: ( rule__LogicValue__Alternatives )
+            // InternalProblem.g:683:2: ( ( rule__LogicValue__Alternatives ) )
+            // InternalProblem.g:684:3: ( rule__LogicValue__Alternatives )
             {
              before(grammarAccess.getLogicValueAccess().getAlternatives()); 
-            // InternalProblem.g:585:3: ( rule__LogicValue__Alternatives )
-            // InternalProblem.g:585:4: rule__LogicValue__Alternatives
+            // InternalProblem.g:685:3: ( rule__LogicValue__Alternatives )
+            // InternalProblem.g:685:4: rule__LogicValue__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__LogicValue__Alternatives();
@@ -1755,21 +2064,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleShortLogicValue"
-    // InternalProblem.g:594:1: ruleShortLogicValue : ( ( rule__ShortLogicValue__Alternatives ) ) ;
+    // InternalProblem.g:694:1: ruleShortLogicValue : ( ( rule__ShortLogicValue__Alternatives ) ) ;
     public final void ruleShortLogicValue() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:598:1: ( ( ( rule__ShortLogicValue__Alternatives ) ) )
-            // InternalProblem.g:599:2: ( ( rule__ShortLogicValue__Alternatives ) )
+            // InternalProblem.g:698:1: ( ( ( rule__ShortLogicValue__Alternatives ) ) )
+            // InternalProblem.g:699:2: ( ( rule__ShortLogicValue__Alternatives ) )
             {
-            // InternalProblem.g:599:2: ( ( rule__ShortLogicValue__Alternatives ) )
-            // InternalProblem.g:600:3: ( rule__ShortLogicValue__Alternatives )
+            // InternalProblem.g:699:2: ( ( rule__ShortLogicValue__Alternatives ) )
+            // InternalProblem.g:700:3: ( rule__ShortLogicValue__Alternatives )
             {
              before(grammarAccess.getShortLogicValueAccess().getAlternatives()); 
-            // InternalProblem.g:601:3: ( rule__ShortLogicValue__Alternatives )
-            // InternalProblem.g:601:4: rule__ShortLogicValue__Alternatives
+            // InternalProblem.g:701:3: ( rule__ShortLogicValue__Alternatives )
+            // InternalProblem.g:701:4: rule__ShortLogicValue__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__ShortLogicValue__Alternatives();
@@ -1802,38 +2111,45 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Statement__Alternatives"
-    // InternalProblem.g:609:1: rule__Statement__Alternatives : ( ( ruleClassDeclaration ) | ( rulePredicateDefinition ) | ( ruleAssertion ) | ( ruleScopeDeclaration ) );
+    // InternalProblem.g:709:1: rule__Statement__Alternatives : ( ( ruleClassDeclaration ) | ( ruleEnumDeclaration ) | ( rulePredicateDefinition ) | ( ruleAssertion ) | ( ruleScopeDeclaration ) );
     public final void rule__Statement__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:613:1: ( ( ruleClassDeclaration ) | ( rulePredicateDefinition ) | ( ruleAssertion ) | ( ruleScopeDeclaration ) )
-            int alt1=4;
+            // InternalProblem.g:713:1: ( ( ruleClassDeclaration ) | ( ruleEnumDeclaration ) | ( rulePredicateDefinition ) | ( ruleAssertion ) | ( ruleScopeDeclaration ) )
+            int alt1=5;
             switch ( input.LA(1) ) {
-            case 23:
-            case 38:
+            case 25:
+            case 39:
                 {
                 alt1=1;
                 }
                 break;
-            case 14:
-            case 40:
+            case 29:
                 {
                 alt1=2;
                 }
                 break;
+            case 16:
+            case 41:
+                {
+                alt1=3;
+                }
+                break;
             case RULE_QUOTED_ID:
             case RULE_ID:
+            case 19:
             case 20:
-            case 21:
+            case 22:
+            case 23:
                 {
-                alt1=3;
+                alt1=4;
                 }
                 break;
-            case 36:
+            case 37:
                 {
-                alt1=4;
+                alt1=5;
                 }
                 break;
             default:
@@ -1845,10 +2161,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
             switch (alt1) {
                 case 1 :
-                    // InternalProblem.g:614:2: ( ruleClassDeclaration )
+                    // InternalProblem.g:714:2: ( ruleClassDeclaration )
                     {
-                    // InternalProblem.g:614:2: ( ruleClassDeclaration )
-                    // InternalProblem.g:615:3: ruleClassDeclaration
+                    // InternalProblem.g:714:2: ( ruleClassDeclaration )
+                    // InternalProblem.g:715:3: ruleClassDeclaration
                     {
                      before(grammarAccess.getStatementAccess().getClassDeclarationParserRuleCall_0()); 
                     pushFollow(FOLLOW_2);
@@ -1864,18 +2180,18 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:620:2: ( rulePredicateDefinition )
+                    // InternalProblem.g:720:2: ( ruleEnumDeclaration )
                     {
-                    // InternalProblem.g:620:2: ( rulePredicateDefinition )
-                    // InternalProblem.g:621:3: rulePredicateDefinition
+                    // InternalProblem.g:720:2: ( ruleEnumDeclaration )
+                    // InternalProblem.g:721:3: ruleEnumDeclaration
                     {
-                     before(grammarAccess.getStatementAccess().getPredicateDefinitionParserRuleCall_1()); 
+                     before(grammarAccess.getStatementAccess().getEnumDeclarationParserRuleCall_1()); 
                     pushFollow(FOLLOW_2);
-                    rulePredicateDefinition();
+                    ruleEnumDeclaration();
 
                     state._fsp--;
 
-                     after(grammarAccess.getStatementAccess().getPredicateDefinitionParserRuleCall_1()); 
+                     after(grammarAccess.getStatementAccess().getEnumDeclarationParserRuleCall_1()); 
 
                     }
 
@@ -1883,18 +2199,18 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalProblem.g:626:2: ( ruleAssertion )
+                    // InternalProblem.g:726:2: ( rulePredicateDefinition )
                     {
-                    // InternalProblem.g:626:2: ( ruleAssertion )
-                    // InternalProblem.g:627:3: ruleAssertion
+                    // InternalProblem.g:726:2: ( rulePredicateDefinition )
+                    // InternalProblem.g:727:3: rulePredicateDefinition
                     {
-                     before(grammarAccess.getStatementAccess().getAssertionParserRuleCall_2()); 
+                     before(grammarAccess.getStatementAccess().getPredicateDefinitionParserRuleCall_2()); 
                     pushFollow(FOLLOW_2);
-                    ruleAssertion();
+                    rulePredicateDefinition();
 
                     state._fsp--;
 
-                     after(grammarAccess.getStatementAccess().getAssertionParserRuleCall_2()); 
+                     after(grammarAccess.getStatementAccess().getPredicateDefinitionParserRuleCall_2()); 
 
                     }
 
@@ -1902,18 +2218,37 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // InternalProblem.g:632:2: ( ruleScopeDeclaration )
+                    // InternalProblem.g:732:2: ( ruleAssertion )
+                    {
+                    // InternalProblem.g:732:2: ( ruleAssertion )
+                    // InternalProblem.g:733:3: ruleAssertion
+                    {
+                     before(grammarAccess.getStatementAccess().getAssertionParserRuleCall_3()); 
+                    pushFollow(FOLLOW_2);
+                    ruleAssertion();
+
+                    state._fsp--;
+
+                     after(grammarAccess.getStatementAccess().getAssertionParserRuleCall_3()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 5 :
+                    // InternalProblem.g:738:2: ( ruleScopeDeclaration )
                     {
-                    // InternalProblem.g:632:2: ( ruleScopeDeclaration )
-                    // InternalProblem.g:633:3: ruleScopeDeclaration
+                    // InternalProblem.g:738:2: ( ruleScopeDeclaration )
+                    // InternalProblem.g:739:3: ruleScopeDeclaration
                     {
-                     before(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_3()); 
+                     before(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_4()); 
                     pushFollow(FOLLOW_2);
                     ruleScopeDeclaration();
 
                     state._fsp--;
 
-                     after(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_3()); 
+                     after(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_4()); 
 
                     }
 
@@ -1938,17 +2273,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Alternatives_4"
-    // InternalProblem.g:642:1: rule__ClassDeclaration__Alternatives_4 : ( ( ( rule__ClassDeclaration__Group_4_0__0 ) ) | ( '.' ) );
+    // InternalProblem.g:748:1: rule__ClassDeclaration__Alternatives_4 : ( ( ( rule__ClassDeclaration__Group_4_0__0 ) ) | ( '.' ) );
     public final void rule__ClassDeclaration__Alternatives_4() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:646:1: ( ( ( rule__ClassDeclaration__Group_4_0__0 ) ) | ( '.' ) )
+            // InternalProblem.g:752:1: ( ( ( rule__ClassDeclaration__Group_4_0__0 ) ) | ( '.' ) )
             int alt2=2;
             int LA2_0 = input.LA(1);
 
-            if ( (LA2_0==26) ) {
+            if ( (LA2_0==27) ) {
                 alt2=1;
             }
             else if ( (LA2_0==12) ) {
@@ -1962,14 +2297,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
             }
             switch (alt2) {
                 case 1 :
-                    // InternalProblem.g:647:2: ( ( rule__ClassDeclaration__Group_4_0__0 ) )
+                    // InternalProblem.g:753:2: ( ( rule__ClassDeclaration__Group_4_0__0 ) )
                     {
-                    // InternalProblem.g:647:2: ( ( rule__ClassDeclaration__Group_4_0__0 ) )
-                    // InternalProblem.g:648:3: ( rule__ClassDeclaration__Group_4_0__0 )
+                    // InternalProblem.g:753:2: ( ( rule__ClassDeclaration__Group_4_0__0 ) )
+                    // InternalProblem.g:754:3: ( rule__ClassDeclaration__Group_4_0__0 )
                     {
                      before(grammarAccess.getClassDeclarationAccess().getGroup_4_0()); 
-                    // InternalProblem.g:649:3: ( rule__ClassDeclaration__Group_4_0__0 )
-                    // InternalProblem.g:649:4: rule__ClassDeclaration__Group_4_0__0
+                    // InternalProblem.g:755:3: ( rule__ClassDeclaration__Group_4_0__0 )
+                    // InternalProblem.g:755:4: rule__ClassDeclaration__Group_4_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__ClassDeclaration__Group_4_0__0();
@@ -1987,10 +2322,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:653:2: ( '.' )
+                    // InternalProblem.g:759:2: ( '.' )
                     {
-                    // InternalProblem.g:653:2: ( '.' )
-                    // InternalProblem.g:654:3: '.'
+                    // InternalProblem.g:759:2: ( '.' )
+                    // InternalProblem.g:760:3: '.'
                     {
                      before(grammarAccess.getClassDeclarationAccess().getFullStopKeyword_4_1()); 
                     match(input,12,FOLLOW_2); 
@@ -2018,21 +2353,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__ClassDeclaration__Alternatives_4"
 
 
-    // $ANTLR start "rule__ReferenceDeclaration__Alternatives_0"
-    // InternalProblem.g:663:1: rule__ReferenceDeclaration__Alternatives_0 : ( ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) ) | ( 'refers' ) );
-    public final void rule__ReferenceDeclaration__Alternatives_0() throws RecognitionException {
+    // $ANTLR start "rule__EnumDeclaration__Alternatives_2"
+    // InternalProblem.g:769:1: rule__EnumDeclaration__Alternatives_2 : ( ( ( rule__EnumDeclaration__Group_2_0__0 ) ) | ( '.' ) );
+    public final void rule__EnumDeclaration__Alternatives_2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:667:1: ( ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) ) | ( 'refers' ) )
+            // InternalProblem.g:773:1: ( ( ( rule__EnumDeclaration__Group_2_0__0 ) ) | ( '.' ) )
             int alt3=2;
             int LA3_0 = input.LA(1);
 
-            if ( (LA3_0==39) ) {
+            if ( (LA3_0==27) ) {
                 alt3=1;
             }
-            else if ( (LA3_0==13) ) {
+            else if ( (LA3_0==12) ) {
                 alt3=2;
             }
             else {
@@ -2043,14 +2378,166 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
             }
             switch (alt3) {
                 case 1 :
-                    // InternalProblem.g:668:2: ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) )
+                    // InternalProblem.g:774:2: ( ( rule__EnumDeclaration__Group_2_0__0 ) )
+                    {
+                    // InternalProblem.g:774:2: ( ( rule__EnumDeclaration__Group_2_0__0 ) )
+                    // InternalProblem.g:775:3: ( rule__EnumDeclaration__Group_2_0__0 )
+                    {
+                     before(grammarAccess.getEnumDeclarationAccess().getGroup_2_0()); 
+                    // InternalProblem.g:776:3: ( rule__EnumDeclaration__Group_2_0__0 )
+                    // InternalProblem.g:776:4: rule__EnumDeclaration__Group_2_0__0
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__EnumDeclaration__Group_2_0__0();
+
+                    state._fsp--;
+
+
+                    }
+
+                     after(grammarAccess.getEnumDeclarationAccess().getGroup_2_0()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:780:2: ( '.' )
+                    {
+                    // InternalProblem.g:780:2: ( '.' )
+                    // InternalProblem.g:781:3: '.'
+                    {
+                     before(grammarAccess.getEnumDeclarationAccess().getFullStopKeyword_2_1()); 
+                    match(input,12,FOLLOW_2); 
+                     after(grammarAccess.getEnumDeclarationAccess().getFullStopKeyword_2_1()); 
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Alternatives_2"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Alternatives_2_0_1_2"
+    // InternalProblem.g:790:1: rule__EnumDeclaration__Alternatives_2_0_1_2 : ( ( ',' ) | ( ';' ) );
+    public final void rule__EnumDeclaration__Alternatives_2_0_1_2() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:794:1: ( ( ',' ) | ( ';' ) )
+            int alt4=2;
+            int LA4_0 = input.LA(1);
+
+            if ( (LA4_0==13) ) {
+                alt4=1;
+            }
+            else if ( (LA4_0==14) ) {
+                alt4=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 4, 0, input);
+
+                throw nvae;
+            }
+            switch (alt4) {
+                case 1 :
+                    // InternalProblem.g:795:2: ( ',' )
+                    {
+                    // InternalProblem.g:795:2: ( ',' )
+                    // InternalProblem.g:796:3: ','
+                    {
+                     before(grammarAccess.getEnumDeclarationAccess().getCommaKeyword_2_0_1_2_0()); 
+                    match(input,13,FOLLOW_2); 
+                     after(grammarAccess.getEnumDeclarationAccess().getCommaKeyword_2_0_1_2_0()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:801:2: ( ';' )
+                    {
+                    // InternalProblem.g:801:2: ( ';' )
+                    // InternalProblem.g:802:3: ';'
+                    {
+                     before(grammarAccess.getEnumDeclarationAccess().getSemicolonKeyword_2_0_1_2_1()); 
+                    match(input,14,FOLLOW_2); 
+                     after(grammarAccess.getEnumDeclarationAccess().getSemicolonKeyword_2_0_1_2_1()); 
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Alternatives_2_0_1_2"
+
+
+    // $ANTLR start "rule__ReferenceDeclaration__Alternatives_0"
+    // InternalProblem.g:811:1: rule__ReferenceDeclaration__Alternatives_0 : ( ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) ) | ( 'refers' ) );
+    public final void rule__ReferenceDeclaration__Alternatives_0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:815:1: ( ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) ) | ( 'refers' ) )
+            int alt5=2;
+            int LA5_0 = input.LA(1);
+
+            if ( (LA5_0==40) ) {
+                alt5=1;
+            }
+            else if ( (LA5_0==15) ) {
+                alt5=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 5, 0, input);
+
+                throw nvae;
+            }
+            switch (alt5) {
+                case 1 :
+                    // InternalProblem.g:816:2: ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) )
                     {
-                    // InternalProblem.g:668:2: ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) )
-                    // InternalProblem.g:669:3: ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 )
+                    // InternalProblem.g:816:2: ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) )
+                    // InternalProblem.g:817:3: ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 )
                     {
                      before(grammarAccess.getReferenceDeclarationAccess().getContainmentAssignment_0_0()); 
-                    // InternalProblem.g:670:3: ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 )
-                    // InternalProblem.g:670:4: rule__ReferenceDeclaration__ContainmentAssignment_0_0
+                    // InternalProblem.g:818:3: ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 )
+                    // InternalProblem.g:818:4: rule__ReferenceDeclaration__ContainmentAssignment_0_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__ReferenceDeclaration__ContainmentAssignment_0_0();
@@ -2068,13 +2555,13 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:674:2: ( 'refers' )
+                    // InternalProblem.g:822:2: ( 'refers' )
                     {
-                    // InternalProblem.g:674:2: ( 'refers' )
-                    // InternalProblem.g:675:3: 'refers'
+                    // InternalProblem.g:822:2: ( 'refers' )
+                    // InternalProblem.g:823:3: 'refers'
                     {
                      before(grammarAccess.getReferenceDeclarationAccess().getRefersKeyword_0_1()); 
-                    match(input,13,FOLLOW_2); 
+                    match(input,15,FOLLOW_2); 
                      after(grammarAccess.getReferenceDeclarationAccess().getRefersKeyword_0_1()); 
 
                     }
@@ -2100,38 +2587,38 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Alternatives_0"
-    // InternalProblem.g:684:1: rule__PredicateDefinition__Alternatives_0 : ( ( ( rule__PredicateDefinition__Group_0_0__0 ) ) | ( 'pred' ) );
+    // InternalProblem.g:832:1: rule__PredicateDefinition__Alternatives_0 : ( ( ( rule__PredicateDefinition__Group_0_0__0 ) ) | ( 'pred' ) );
     public final void rule__PredicateDefinition__Alternatives_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:688:1: ( ( ( rule__PredicateDefinition__Group_0_0__0 ) ) | ( 'pred' ) )
-            int alt4=2;
-            int LA4_0 = input.LA(1);
+            // InternalProblem.g:836:1: ( ( ( rule__PredicateDefinition__Group_0_0__0 ) ) | ( 'pred' ) )
+            int alt6=2;
+            int LA6_0 = input.LA(1);
 
-            if ( (LA4_0==40) ) {
-                alt4=1;
+            if ( (LA6_0==41) ) {
+                alt6=1;
             }
-            else if ( (LA4_0==14) ) {
-                alt4=2;
+            else if ( (LA6_0==16) ) {
+                alt6=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 4, 0, input);
+                    new NoViableAltException("", 6, 0, input);
 
                 throw nvae;
             }
-            switch (alt4) {
+            switch (alt6) {
                 case 1 :
-                    // InternalProblem.g:689:2: ( ( rule__PredicateDefinition__Group_0_0__0 ) )
+                    // InternalProblem.g:837:2: ( ( rule__PredicateDefinition__Group_0_0__0 ) )
                     {
-                    // InternalProblem.g:689:2: ( ( rule__PredicateDefinition__Group_0_0__0 ) )
-                    // InternalProblem.g:690:3: ( rule__PredicateDefinition__Group_0_0__0 )
+                    // InternalProblem.g:837:2: ( ( rule__PredicateDefinition__Group_0_0__0 ) )
+                    // InternalProblem.g:838:3: ( rule__PredicateDefinition__Group_0_0__0 )
                     {
                      before(grammarAccess.getPredicateDefinitionAccess().getGroup_0_0()); 
-                    // InternalProblem.g:691:3: ( rule__PredicateDefinition__Group_0_0__0 )
-                    // InternalProblem.g:691:4: rule__PredicateDefinition__Group_0_0__0
+                    // InternalProblem.g:839:3: ( rule__PredicateDefinition__Group_0_0__0 )
+                    // InternalProblem.g:839:4: rule__PredicateDefinition__Group_0_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__PredicateDefinition__Group_0_0__0();
@@ -2149,13 +2636,13 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:695:2: ( 'pred' )
+                    // InternalProblem.g:843:2: ( 'pred' )
                     {
-                    // InternalProblem.g:695:2: ( 'pred' )
-                    // InternalProblem.g:696:3: 'pred'
+                    // InternalProblem.g:843:2: ( 'pred' )
+                    // InternalProblem.g:844:3: 'pred'
                     {
                      before(grammarAccess.getPredicateDefinitionAccess().getPredKeyword_0_1()); 
-                    match(input,14,FOLLOW_2); 
+                    match(input,16,FOLLOW_2); 
                      after(grammarAccess.getPredicateDefinitionAccess().getPredKeyword_0_1()); 
 
                     }
@@ -2181,34 +2668,34 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Literal__Alternatives"
-    // InternalProblem.g:705:1: rule__Literal__Alternatives : ( ( ruleAtom ) | ( ruleNegativeLiteral ) );
+    // InternalProblem.g:853:1: rule__Literal__Alternatives : ( ( ruleAtom ) | ( ruleNegativeLiteral ) );
     public final void rule__Literal__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:709:1: ( ( ruleAtom ) | ( ruleNegativeLiteral ) )
-            int alt5=2;
-            int LA5_0 = input.LA(1);
+            // InternalProblem.g:857:1: ( ( ruleAtom ) | ( ruleNegativeLiteral ) )
+            int alt7=2;
+            int LA7_0 = input.LA(1);
 
-            if ( ((LA5_0>=RULE_QUOTED_ID && LA5_0<=RULE_ID)) ) {
-                alt5=1;
+            if ( ((LA7_0>=RULE_QUOTED_ID && LA7_0<=RULE_ID)||(LA7_0>=19 && LA7_0<=20)) ) {
+                alt7=1;
             }
-            else if ( (LA5_0==20) ) {
-                alt5=2;
+            else if ( (LA7_0==22) ) {
+                alt7=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 5, 0, input);
+                    new NoViableAltException("", 7, 0, input);
 
                 throw nvae;
             }
-            switch (alt5) {
+            switch (alt7) {
                 case 1 :
-                    // InternalProblem.g:710:2: ( ruleAtom )
+                    // InternalProblem.g:858:2: ( ruleAtom )
                     {
-                    // InternalProblem.g:710:2: ( ruleAtom )
-                    // InternalProblem.g:711:3: ruleAtom
+                    // InternalProblem.g:858:2: ( ruleAtom )
+                    // InternalProblem.g:859:3: ruleAtom
                     {
                      before(grammarAccess.getLiteralAccess().getAtomParserRuleCall_0()); 
                     pushFollow(FOLLOW_2);
@@ -2224,10 +2711,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:716:2: ( ruleNegativeLiteral )
+                    // InternalProblem.g:864:2: ( ruleNegativeLiteral )
                     {
-                    // InternalProblem.g:716:2: ( ruleNegativeLiteral )
-                    // InternalProblem.g:717:3: ruleNegativeLiteral
+                    // InternalProblem.g:864:2: ( ruleNegativeLiteral )
+                    // InternalProblem.g:865:3: ruleNegativeLiteral
                     {
                      before(grammarAccess.getLiteralAccess().getNegativeLiteralParserRuleCall_1()); 
                     pushFollow(FOLLOW_2);
@@ -2260,25 +2747,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Alternatives_0"
-    // InternalProblem.g:726:1: rule__Assertion__Alternatives_0 : ( ( ( rule__Assertion__Group_0_0__0 ) ) | ( ( rule__Assertion__Group_0_1__0 ) ) );
+    // InternalProblem.g:874:1: rule__Assertion__Alternatives_0 : ( ( ( rule__Assertion__Group_0_0__0 ) ) | ( ( rule__Assertion__Group_0_1__0 ) ) );
     public final void rule__Assertion__Alternatives_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:730:1: ( ( ( rule__Assertion__Group_0_0__0 ) ) | ( ( rule__Assertion__Group_0_1__0 ) ) )
-            int alt6=2;
-            alt6 = dfa6.predict(input);
-            switch (alt6) {
+            // InternalProblem.g:878:1: ( ( ( rule__Assertion__Group_0_0__0 ) ) | ( ( rule__Assertion__Group_0_1__0 ) ) )
+            int alt8=2;
+            alt8 = dfa8.predict(input);
+            switch (alt8) {
                 case 1 :
-                    // InternalProblem.g:731:2: ( ( rule__Assertion__Group_0_0__0 ) )
+                    // InternalProblem.g:879:2: ( ( rule__Assertion__Group_0_0__0 ) )
                     {
-                    // InternalProblem.g:731:2: ( ( rule__Assertion__Group_0_0__0 ) )
-                    // InternalProblem.g:732:3: ( rule__Assertion__Group_0_0__0 )
+                    // InternalProblem.g:879:2: ( ( rule__Assertion__Group_0_0__0 ) )
+                    // InternalProblem.g:880:3: ( rule__Assertion__Group_0_0__0 )
                     {
                      before(grammarAccess.getAssertionAccess().getGroup_0_0()); 
-                    // InternalProblem.g:733:3: ( rule__Assertion__Group_0_0__0 )
-                    // InternalProblem.g:733:4: rule__Assertion__Group_0_0__0
+                    // InternalProblem.g:881:3: ( rule__Assertion__Group_0_0__0 )
+                    // InternalProblem.g:881:4: rule__Assertion__Group_0_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Assertion__Group_0_0__0();
@@ -2296,14 +2783,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:737:2: ( ( rule__Assertion__Group_0_1__0 ) )
+                    // InternalProblem.g:885:2: ( ( rule__Assertion__Group_0_1__0 ) )
                     {
-                    // InternalProblem.g:737:2: ( ( rule__Assertion__Group_0_1__0 ) )
-                    // InternalProblem.g:738:3: ( rule__Assertion__Group_0_1__0 )
+                    // InternalProblem.g:885:2: ( ( rule__Assertion__Group_0_1__0 ) )
+                    // InternalProblem.g:886:3: ( rule__Assertion__Group_0_1__0 )
                     {
                      before(grammarAccess.getAssertionAccess().getGroup_0_1()); 
-                    // InternalProblem.g:739:3: ( rule__Assertion__Group_0_1__0 )
-                    // InternalProblem.g:739:4: rule__Assertion__Group_0_1__0
+                    // InternalProblem.g:887:3: ( rule__Assertion__Group_0_1__0 )
+                    // InternalProblem.g:887:4: rule__Assertion__Group_0_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Assertion__Group_0_1__0();
@@ -2338,38 +2825,38 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Alternatives_1"
-    // InternalProblem.g:747:1: rule__TypeScope__Alternatives_1 : ( ( ( rule__TypeScope__IncrementAssignment_1_0 ) ) | ( '=' ) );
+    // InternalProblem.g:895:1: rule__TypeScope__Alternatives_1 : ( ( ( rule__TypeScope__IncrementAssignment_1_0 ) ) | ( '=' ) );
     public final void rule__TypeScope__Alternatives_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:751:1: ( ( ( rule__TypeScope__IncrementAssignment_1_0 ) ) | ( '=' ) )
-            int alt7=2;
-            int LA7_0 = input.LA(1);
+            // InternalProblem.g:899:1: ( ( ( rule__TypeScope__IncrementAssignment_1_0 ) ) | ( '=' ) )
+            int alt9=2;
+            int LA9_0 = input.LA(1);
 
-            if ( (LA7_0==42) ) {
-                alt7=1;
+            if ( (LA9_0==43) ) {
+                alt9=1;
             }
-            else if ( (LA7_0==15) ) {
-                alt7=2;
+            else if ( (LA9_0==17) ) {
+                alt9=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 7, 0, input);
+                    new NoViableAltException("", 9, 0, input);
 
                 throw nvae;
             }
-            switch (alt7) {
+            switch (alt9) {
                 case 1 :
-                    // InternalProblem.g:752:2: ( ( rule__TypeScope__IncrementAssignment_1_0 ) )
+                    // InternalProblem.g:900:2: ( ( rule__TypeScope__IncrementAssignment_1_0 ) )
                     {
-                    // InternalProblem.g:752:2: ( ( rule__TypeScope__IncrementAssignment_1_0 ) )
-                    // InternalProblem.g:753:3: ( rule__TypeScope__IncrementAssignment_1_0 )
+                    // InternalProblem.g:900:2: ( ( rule__TypeScope__IncrementAssignment_1_0 ) )
+                    // InternalProblem.g:901:3: ( rule__TypeScope__IncrementAssignment_1_0 )
                     {
                      before(grammarAccess.getTypeScopeAccess().getIncrementAssignment_1_0()); 
-                    // InternalProblem.g:754:3: ( rule__TypeScope__IncrementAssignment_1_0 )
-                    // InternalProblem.g:754:4: rule__TypeScope__IncrementAssignment_1_0
+                    // InternalProblem.g:902:3: ( rule__TypeScope__IncrementAssignment_1_0 )
+                    // InternalProblem.g:902:4: rule__TypeScope__IncrementAssignment_1_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TypeScope__IncrementAssignment_1_0();
@@ -2387,13 +2874,13 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:758:2: ( '=' )
+                    // InternalProblem.g:906:2: ( '=' )
                     {
-                    // InternalProblem.g:758:2: ( '=' )
-                    // InternalProblem.g:759:3: '='
+                    // InternalProblem.g:906:2: ( '=' )
+                    // InternalProblem.g:907:3: '='
                     {
                      before(grammarAccess.getTypeScopeAccess().getEqualsSignKeyword_1_1()); 
-                    match(input,15,FOLLOW_2); 
+                    match(input,17,FOLLOW_2); 
                      after(grammarAccess.getTypeScopeAccess().getEqualsSignKeyword_1_1()); 
 
                     }
@@ -2419,34 +2906,34 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Multiplicity__Alternatives"
-    // InternalProblem.g:768:1: rule__Multiplicity__Alternatives : ( ( ruleUnboundedMultiplicity ) | ( ruleDefiniteMultiplicity ) );
+    // InternalProblem.g:916:1: rule__Multiplicity__Alternatives : ( ( ruleUnboundedMultiplicity ) | ( ruleDefiniteMultiplicity ) );
     public final void rule__Multiplicity__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:772:1: ( ( ruleUnboundedMultiplicity ) | ( ruleDefiniteMultiplicity ) )
-            int alt8=2;
-            int LA8_0 = input.LA(1);
+            // InternalProblem.g:920:1: ( ( ruleUnboundedMultiplicity ) | ( ruleDefiniteMultiplicity ) )
+            int alt10=2;
+            int LA10_0 = input.LA(1);
 
-            if ( (LA8_0==EOF||LA8_0==30) ) {
-                alt8=1;
+            if ( (LA10_0==EOF||LA10_0==31) ) {
+                alt10=1;
             }
-            else if ( (LA8_0==RULE_INT) ) {
-                alt8=2;
+            else if ( (LA10_0==RULE_INT) ) {
+                alt10=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 8, 0, input);
+                    new NoViableAltException("", 10, 0, input);
 
                 throw nvae;
             }
-            switch (alt8) {
+            switch (alt10) {
                 case 1 :
-                    // InternalProblem.g:773:2: ( ruleUnboundedMultiplicity )
+                    // InternalProblem.g:921:2: ( ruleUnboundedMultiplicity )
                     {
-                    // InternalProblem.g:773:2: ( ruleUnboundedMultiplicity )
-                    // InternalProblem.g:774:3: ruleUnboundedMultiplicity
+                    // InternalProblem.g:921:2: ( ruleUnboundedMultiplicity )
+                    // InternalProblem.g:922:3: ruleUnboundedMultiplicity
                     {
                      before(grammarAccess.getMultiplicityAccess().getUnboundedMultiplicityParserRuleCall_0()); 
                     pushFollow(FOLLOW_2);
@@ -2462,10 +2949,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:779:2: ( ruleDefiniteMultiplicity )
+                    // InternalProblem.g:927:2: ( ruleDefiniteMultiplicity )
                     {
-                    // InternalProblem.g:779:2: ( ruleDefiniteMultiplicity )
-                    // InternalProblem.g:780:3: ruleDefiniteMultiplicity
+                    // InternalProblem.g:927:2: ( ruleDefiniteMultiplicity )
+                    // InternalProblem.g:928:3: ruleDefiniteMultiplicity
                     {
                      before(grammarAccess.getMultiplicityAccess().getDefiniteMultiplicityParserRuleCall_1()); 
                     pushFollow(FOLLOW_2);
@@ -2498,44 +2985,44 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DefiniteMultiplicity__Alternatives"
-    // InternalProblem.g:789:1: rule__DefiniteMultiplicity__Alternatives : ( ( ruleRangeMultiplicity ) | ( ruleExactMultiplicity ) );
+    // InternalProblem.g:937:1: rule__DefiniteMultiplicity__Alternatives : ( ( ruleRangeMultiplicity ) | ( ruleExactMultiplicity ) );
     public final void rule__DefiniteMultiplicity__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:793:1: ( ( ruleRangeMultiplicity ) | ( ruleExactMultiplicity ) )
-            int alt9=2;
-            int LA9_0 = input.LA(1);
+            // InternalProblem.g:941:1: ( ( ruleRangeMultiplicity ) | ( ruleExactMultiplicity ) )
+            int alt11=2;
+            int LA11_0 = input.LA(1);
 
-            if ( (LA9_0==RULE_INT) ) {
-                int LA9_1 = input.LA(2);
+            if ( (LA11_0==RULE_INT) ) {
+                int LA11_1 = input.LA(2);
 
-                if ( (LA9_1==37) ) {
-                    alt9=1;
+                if ( (LA11_1==38) ) {
+                    alt11=1;
                 }
-                else if ( (LA9_1==EOF||LA9_1==12||LA9_1==25||LA9_1==30) ) {
-                    alt9=2;
+                else if ( (LA11_1==EOF||(LA11_1>=12 && LA11_1<=13)||LA11_1==31) ) {
+                    alt11=2;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("", 9, 1, input);
+                        new NoViableAltException("", 11, 1, input);
 
                     throw nvae;
                 }
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 9, 0, input);
+                    new NoViableAltException("", 11, 0, input);
 
                 throw nvae;
             }
-            switch (alt9) {
+            switch (alt11) {
                 case 1 :
-                    // InternalProblem.g:794:2: ( ruleRangeMultiplicity )
+                    // InternalProblem.g:942:2: ( ruleRangeMultiplicity )
                     {
-                    // InternalProblem.g:794:2: ( ruleRangeMultiplicity )
-                    // InternalProblem.g:795:3: ruleRangeMultiplicity
+                    // InternalProblem.g:942:2: ( ruleRangeMultiplicity )
+                    // InternalProblem.g:943:3: ruleRangeMultiplicity
                     {
                      before(grammarAccess.getDefiniteMultiplicityAccess().getRangeMultiplicityParserRuleCall_0()); 
                     pushFollow(FOLLOW_2);
@@ -2551,10 +3038,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:800:2: ( ruleExactMultiplicity )
+                    // InternalProblem.g:948:2: ( ruleExactMultiplicity )
                     {
-                    // InternalProblem.g:800:2: ( ruleExactMultiplicity )
-                    // InternalProblem.g:801:3: ruleExactMultiplicity
+                    // InternalProblem.g:948:2: ( ruleExactMultiplicity )
+                    // InternalProblem.g:949:3: ruleExactMultiplicity
                     {
                      before(grammarAccess.getDefiniteMultiplicityAccess().getExactMultiplicityParserRuleCall_1()); 
                     pushFollow(FOLLOW_2);
@@ -2587,34 +3074,34 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__UpperBound__Alternatives"
-    // InternalProblem.g:810:1: rule__UpperBound__Alternatives : ( ( RULE_INT ) | ( '*' ) );
+    // InternalProblem.g:958:1: rule__UpperBound__Alternatives : ( ( RULE_INT ) | ( '*' ) );
     public final void rule__UpperBound__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:814:1: ( ( RULE_INT ) | ( '*' ) )
-            int alt10=2;
-            int LA10_0 = input.LA(1);
+            // InternalProblem.g:962:1: ( ( RULE_INT ) | ( '*' ) )
+            int alt12=2;
+            int LA12_0 = input.LA(1);
 
-            if ( (LA10_0==RULE_INT) ) {
-                alt10=1;
+            if ( (LA12_0==RULE_INT) ) {
+                alt12=1;
             }
-            else if ( (LA10_0==16) ) {
-                alt10=2;
+            else if ( (LA12_0==18) ) {
+                alt12=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 10, 0, input);
+                    new NoViableAltException("", 12, 0, input);
 
                 throw nvae;
             }
-            switch (alt10) {
+            switch (alt12) {
                 case 1 :
-                    // InternalProblem.g:815:2: ( RULE_INT )
+                    // InternalProblem.g:963:2: ( RULE_INT )
                     {
-                    // InternalProblem.g:815:2: ( RULE_INT )
-                    // InternalProblem.g:816:3: RULE_INT
+                    // InternalProblem.g:963:2: ( RULE_INT )
+                    // InternalProblem.g:964:3: RULE_INT
                     {
                      before(grammarAccess.getUpperBoundAccess().getINTTerminalRuleCall_0()); 
                     match(input,RULE_INT,FOLLOW_2); 
@@ -2626,13 +3113,13 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:821:2: ( '*' )
+                    // InternalProblem.g:969:2: ( '*' )
                     {
-                    // InternalProblem.g:821:2: ( '*' )
-                    // InternalProblem.g:822:3: '*'
+                    // InternalProblem.g:969:2: ( '*' )
+                    // InternalProblem.g:970:3: '*'
                     {
                      before(grammarAccess.getUpperBoundAccess().getAsteriskKeyword_1()); 
-                    match(input,16,FOLLOW_2); 
+                    match(input,18,FOLLOW_2); 
                      after(grammarAccess.getUpperBoundAccess().getAsteriskKeyword_1()); 
 
                     }
@@ -2657,35 +3144,110 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__UpperBound__Alternatives"
 
 
+    // $ANTLR start "rule__QuotedOrUnquotedId__Alternatives"
+    // InternalProblem.g:979:1: rule__QuotedOrUnquotedId__Alternatives : ( ( RULE_QUOTED_ID ) | ( ruleIdentifier ) );
+    public final void rule__QuotedOrUnquotedId__Alternatives() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:983:1: ( ( RULE_QUOTED_ID ) | ( ruleIdentifier ) )
+            int alt13=2;
+            int LA13_0 = input.LA(1);
+
+            if ( (LA13_0==RULE_QUOTED_ID) ) {
+                alt13=1;
+            }
+            else if ( (LA13_0==RULE_ID||(LA13_0>=19 && LA13_0<=20)) ) {
+                alt13=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 13, 0, input);
+
+                throw nvae;
+            }
+            switch (alt13) {
+                case 1 :
+                    // InternalProblem.g:984:2: ( RULE_QUOTED_ID )
+                    {
+                    // InternalProblem.g:984:2: ( RULE_QUOTED_ID )
+                    // InternalProblem.g:985:3: RULE_QUOTED_ID
+                    {
+                     before(grammarAccess.getQuotedOrUnquotedIdAccess().getQUOTED_IDTerminalRuleCall_0()); 
+                    match(input,RULE_QUOTED_ID,FOLLOW_2); 
+                     after(grammarAccess.getQuotedOrUnquotedIdAccess().getQUOTED_IDTerminalRuleCall_0()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:990:2: ( ruleIdentifier )
+                    {
+                    // InternalProblem.g:990:2: ( ruleIdentifier )
+                    // InternalProblem.g:991:3: ruleIdentifier
+                    {
+                     before(grammarAccess.getQuotedOrUnquotedIdAccess().getIdentifierParserRuleCall_1()); 
+                    pushFollow(FOLLOW_2);
+                    ruleIdentifier();
+
+                    state._fsp--;
+
+                     after(grammarAccess.getQuotedOrUnquotedIdAccess().getIdentifierParserRuleCall_1()); 
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__QuotedOrUnquotedId__Alternatives"
+
+
     // $ANTLR start "rule__QualifiedName__Alternatives"
-    // InternalProblem.g:831:1: rule__QualifiedName__Alternatives : ( ( RULE_QUOTED_ID ) | ( ( rule__QualifiedName__Group_1__0 ) ) );
+    // InternalProblem.g:1000:1: rule__QualifiedName__Alternatives : ( ( RULE_QUOTED_ID ) | ( ( rule__QualifiedName__Group_1__0 ) ) );
     public final void rule__QualifiedName__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:835:1: ( ( RULE_QUOTED_ID ) | ( ( rule__QualifiedName__Group_1__0 ) ) )
-            int alt11=2;
-            int LA11_0 = input.LA(1);
+            // InternalProblem.g:1004:1: ( ( RULE_QUOTED_ID ) | ( ( rule__QualifiedName__Group_1__0 ) ) )
+            int alt14=2;
+            int LA14_0 = input.LA(1);
 
-            if ( (LA11_0==RULE_QUOTED_ID) ) {
-                alt11=1;
+            if ( (LA14_0==RULE_QUOTED_ID) ) {
+                alt14=1;
             }
-            else if ( (LA11_0==RULE_ID) ) {
-                alt11=2;
+            else if ( (LA14_0==RULE_ID||(LA14_0>=19 && LA14_0<=20)) ) {
+                alt14=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 11, 0, input);
+                    new NoViableAltException("", 14, 0, input);
 
                 throw nvae;
             }
-            switch (alt11) {
+            switch (alt14) {
                 case 1 :
-                    // InternalProblem.g:836:2: ( RULE_QUOTED_ID )
+                    // InternalProblem.g:1005:2: ( RULE_QUOTED_ID )
                     {
-                    // InternalProblem.g:836:2: ( RULE_QUOTED_ID )
-                    // InternalProblem.g:837:3: RULE_QUOTED_ID
+                    // InternalProblem.g:1005:2: ( RULE_QUOTED_ID )
+                    // InternalProblem.g:1006:3: RULE_QUOTED_ID
                     {
                      before(grammarAccess.getQualifiedNameAccess().getQUOTED_IDTerminalRuleCall_0()); 
                     match(input,RULE_QUOTED_ID,FOLLOW_2); 
@@ -2697,14 +3259,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:842:2: ( ( rule__QualifiedName__Group_1__0 ) )
+                    // InternalProblem.g:1011:2: ( ( rule__QualifiedName__Group_1__0 ) )
                     {
-                    // InternalProblem.g:842:2: ( ( rule__QualifiedName__Group_1__0 ) )
-                    // InternalProblem.g:843:3: ( rule__QualifiedName__Group_1__0 )
+                    // InternalProblem.g:1011:2: ( ( rule__QualifiedName__Group_1__0 ) )
+                    // InternalProblem.g:1012:3: ( rule__QualifiedName__Group_1__0 )
                     {
                      before(grammarAccess.getQualifiedNameAccess().getGroup_1()); 
-                    // InternalProblem.g:844:3: ( rule__QualifiedName__Group_1__0 )
-                    // InternalProblem.g:844:4: rule__QualifiedName__Group_1__0
+                    // InternalProblem.g:1013:3: ( rule__QualifiedName__Group_1__0 )
+                    // InternalProblem.g:1013:4: rule__QualifiedName__Group_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__QualifiedName__Group_1__0();
@@ -2738,50 +3300,145 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__QualifiedName__Alternatives"
 
 
+    // $ANTLR start "rule__Identifier__Alternatives"
+    // InternalProblem.g:1021:1: rule__Identifier__Alternatives : ( ( RULE_ID ) | ( 'true' ) | ( 'false' ) );
+    public final void rule__Identifier__Alternatives() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1025:1: ( ( RULE_ID ) | ( 'true' ) | ( 'false' ) )
+            int alt15=3;
+            switch ( input.LA(1) ) {
+            case RULE_ID:
+                {
+                alt15=1;
+                }
+                break;
+            case 19:
+                {
+                alt15=2;
+                }
+                break;
+            case 20:
+                {
+                alt15=3;
+                }
+                break;
+            default:
+                NoViableAltException nvae =
+                    new NoViableAltException("", 15, 0, input);
+
+                throw nvae;
+            }
+
+            switch (alt15) {
+                case 1 :
+                    // InternalProblem.g:1026:2: ( RULE_ID )
+                    {
+                    // InternalProblem.g:1026:2: ( RULE_ID )
+                    // InternalProblem.g:1027:3: RULE_ID
+                    {
+                     before(grammarAccess.getIdentifierAccess().getIDTerminalRuleCall_0()); 
+                    match(input,RULE_ID,FOLLOW_2); 
+                     after(grammarAccess.getIdentifierAccess().getIDTerminalRuleCall_0()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:1032:2: ( 'true' )
+                    {
+                    // InternalProblem.g:1032:2: ( 'true' )
+                    // InternalProblem.g:1033:3: 'true'
+                    {
+                     before(grammarAccess.getIdentifierAccess().getTrueKeyword_1()); 
+                    match(input,19,FOLLOW_2); 
+                     after(grammarAccess.getIdentifierAccess().getTrueKeyword_1()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 3 :
+                    // InternalProblem.g:1038:2: ( 'false' )
+                    {
+                    // InternalProblem.g:1038:2: ( 'false' )
+                    // InternalProblem.g:1039:3: 'false'
+                    {
+                     before(grammarAccess.getIdentifierAccess().getFalseKeyword_2()); 
+                    match(input,20,FOLLOW_2); 
+                     after(grammarAccess.getIdentifierAccess().getFalseKeyword_2()); 
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Identifier__Alternatives"
+
+
     // $ANTLR start "rule__LogicValue__Alternatives"
-    // InternalProblem.g:852:1: rule__LogicValue__Alternatives : ( ( ( 'true' ) ) | ( ( 'false' ) ) | ( ( 'unknown' ) ) );
+    // InternalProblem.g:1048:1: rule__LogicValue__Alternatives : ( ( ( 'true' ) ) | ( ( 'false' ) ) | ( ( 'unknown' ) ) );
     public final void rule__LogicValue__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:856:1: ( ( ( 'true' ) ) | ( ( 'false' ) ) | ( ( 'unknown' ) ) )
-            int alt12=3;
+            // InternalProblem.g:1052:1: ( ( ( 'true' ) ) | ( ( 'false' ) ) | ( ( 'unknown' ) ) )
+            int alt16=3;
             switch ( input.LA(1) ) {
-            case 17:
+            case 19:
                 {
-                alt12=1;
+                alt16=1;
                 }
                 break;
-            case 18:
+            case 20:
                 {
-                alt12=2;
+                alt16=2;
                 }
                 break;
-            case 19:
+            case 21:
                 {
-                alt12=3;
+                alt16=3;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("", 12, 0, input);
+                    new NoViableAltException("", 16, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt12) {
+            switch (alt16) {
                 case 1 :
-                    // InternalProblem.g:857:2: ( ( 'true' ) )
+                    // InternalProblem.g:1053:2: ( ( 'true' ) )
                     {
-                    // InternalProblem.g:857:2: ( ( 'true' ) )
-                    // InternalProblem.g:858:3: ( 'true' )
+                    // InternalProblem.g:1053:2: ( ( 'true' ) )
+                    // InternalProblem.g:1054:3: ( 'true' )
                     {
                      before(grammarAccess.getLogicValueAccess().getTRUEEnumLiteralDeclaration_0()); 
-                    // InternalProblem.g:859:3: ( 'true' )
-                    // InternalProblem.g:859:4: 'true'
+                    // InternalProblem.g:1055:3: ( 'true' )
+                    // InternalProblem.g:1055:4: 'true'
                     {
-                    match(input,17,FOLLOW_2); 
+                    match(input,19,FOLLOW_2); 
 
                     }
 
@@ -2793,16 +3450,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:863:2: ( ( 'false' ) )
+                    // InternalProblem.g:1059:2: ( ( 'false' ) )
                     {
-                    // InternalProblem.g:863:2: ( ( 'false' ) )
-                    // InternalProblem.g:864:3: ( 'false' )
+                    // InternalProblem.g:1059:2: ( ( 'false' ) )
+                    // InternalProblem.g:1060:3: ( 'false' )
                     {
                      before(grammarAccess.getLogicValueAccess().getFALSEEnumLiteralDeclaration_1()); 
-                    // InternalProblem.g:865:3: ( 'false' )
-                    // InternalProblem.g:865:4: 'false'
+                    // InternalProblem.g:1061:3: ( 'false' )
+                    // InternalProblem.g:1061:4: 'false'
                     {
-                    match(input,18,FOLLOW_2); 
+                    match(input,20,FOLLOW_2); 
 
                     }
 
@@ -2814,16 +3471,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalProblem.g:869:2: ( ( 'unknown' ) )
+                    // InternalProblem.g:1065:2: ( ( 'unknown' ) )
                     {
-                    // InternalProblem.g:869:2: ( ( 'unknown' ) )
-                    // InternalProblem.g:870:3: ( 'unknown' )
+                    // InternalProblem.g:1065:2: ( ( 'unknown' ) )
+                    // InternalProblem.g:1066:3: ( 'unknown' )
                     {
                      before(grammarAccess.getLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_2()); 
-                    // InternalProblem.g:871:3: ( 'unknown' )
-                    // InternalProblem.g:871:4: 'unknown'
+                    // InternalProblem.g:1067:3: ( 'unknown' )
+                    // InternalProblem.g:1067:4: 'unknown'
                     {
-                    match(input,19,FOLLOW_2); 
+                    match(input,21,FOLLOW_2); 
 
                     }
 
@@ -2852,40 +3509,40 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ShortLogicValue__Alternatives"
-    // InternalProblem.g:879:1: rule__ShortLogicValue__Alternatives : ( ( ( '!' ) ) | ( ( '?' ) ) );
+    // InternalProblem.g:1075:1: rule__ShortLogicValue__Alternatives : ( ( ( '!' ) ) | ( ( '?' ) ) );
     public final void rule__ShortLogicValue__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:883:1: ( ( ( '!' ) ) | ( ( '?' ) ) )
-            int alt13=2;
-            int LA13_0 = input.LA(1);
+            // InternalProblem.g:1079:1: ( ( ( '!' ) ) | ( ( '?' ) ) )
+            int alt17=2;
+            int LA17_0 = input.LA(1);
 
-            if ( (LA13_0==20) ) {
-                alt13=1;
+            if ( (LA17_0==22) ) {
+                alt17=1;
             }
-            else if ( (LA13_0==21) ) {
-                alt13=2;
+            else if ( (LA17_0==23) ) {
+                alt17=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 13, 0, input);
+                    new NoViableAltException("", 17, 0, input);
 
                 throw nvae;
             }
-            switch (alt13) {
+            switch (alt17) {
                 case 1 :
-                    // InternalProblem.g:884:2: ( ( '!' ) )
+                    // InternalProblem.g:1080:2: ( ( '!' ) )
                     {
-                    // InternalProblem.g:884:2: ( ( '!' ) )
-                    // InternalProblem.g:885:3: ( '!' )
+                    // InternalProblem.g:1080:2: ( ( '!' ) )
+                    // InternalProblem.g:1081:3: ( '!' )
                     {
                      before(grammarAccess.getShortLogicValueAccess().getFALSEEnumLiteralDeclaration_0()); 
-                    // InternalProblem.g:886:3: ( '!' )
-                    // InternalProblem.g:886:4: '!'
+                    // InternalProblem.g:1082:3: ( '!' )
+                    // InternalProblem.g:1082:4: '!'
                     {
-                    match(input,20,FOLLOW_2); 
+                    match(input,22,FOLLOW_2); 
 
                     }
 
@@ -2897,16 +3554,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:890:2: ( ( '?' ) )
+                    // InternalProblem.g:1086:2: ( ( '?' ) )
                     {
-                    // InternalProblem.g:890:2: ( ( '?' ) )
-                    // InternalProblem.g:891:3: ( '?' )
+                    // InternalProblem.g:1086:2: ( ( '?' ) )
+                    // InternalProblem.g:1087:3: ( '?' )
                     {
                      before(grammarAccess.getShortLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_1()); 
-                    // InternalProblem.g:892:3: ( '?' )
-                    // InternalProblem.g:892:4: '?'
+                    // InternalProblem.g:1088:3: ( '?' )
+                    // InternalProblem.g:1088:4: '?'
                     {
-                    match(input,21,FOLLOW_2); 
+                    match(input,23,FOLLOW_2); 
 
                     }
 
@@ -2935,14 +3592,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group__0"
-    // InternalProblem.g:900:1: rule__Problem__Group__0 : rule__Problem__Group__0__Impl rule__Problem__Group__1 ;
+    // InternalProblem.g:1096:1: rule__Problem__Group__0 : rule__Problem__Group__0__Impl rule__Problem__Group__1 ;
     public final void rule__Problem__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:904:1: ( rule__Problem__Group__0__Impl rule__Problem__Group__1 )
-            // InternalProblem.g:905:2: rule__Problem__Group__0__Impl rule__Problem__Group__1
+            // InternalProblem.g:1100:1: ( rule__Problem__Group__0__Impl rule__Problem__Group__1 )
+            // InternalProblem.g:1101:2: rule__Problem__Group__0__Impl rule__Problem__Group__1
             {
             pushFollow(FOLLOW_3);
             rule__Problem__Group__0__Impl();
@@ -2973,29 +3630,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group__0__Impl"
-    // InternalProblem.g:912:1: rule__Problem__Group__0__Impl : ( ( rule__Problem__Group_0__0 )? ) ;
+    // InternalProblem.g:1108:1: rule__Problem__Group__0__Impl : ( ( rule__Problem__Group_0__0 )? ) ;
     public final void rule__Problem__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:916:1: ( ( ( rule__Problem__Group_0__0 )? ) )
-            // InternalProblem.g:917:1: ( ( rule__Problem__Group_0__0 )? )
+            // InternalProblem.g:1112:1: ( ( ( rule__Problem__Group_0__0 )? ) )
+            // InternalProblem.g:1113:1: ( ( rule__Problem__Group_0__0 )? )
             {
-            // InternalProblem.g:917:1: ( ( rule__Problem__Group_0__0 )? )
-            // InternalProblem.g:918:2: ( rule__Problem__Group_0__0 )?
+            // InternalProblem.g:1113:1: ( ( rule__Problem__Group_0__0 )? )
+            // InternalProblem.g:1114:2: ( rule__Problem__Group_0__0 )?
             {
              before(grammarAccess.getProblemAccess().getGroup_0()); 
-            // InternalProblem.g:919:2: ( rule__Problem__Group_0__0 )?
-            int alt14=2;
-            int LA14_0 = input.LA(1);
+            // InternalProblem.g:1115:2: ( rule__Problem__Group_0__0 )?
+            int alt18=2;
+            int LA18_0 = input.LA(1);
 
-            if ( (LA14_0==22) ) {
-                alt14=1;
+            if ( (LA18_0==24) ) {
+                alt18=1;
             }
-            switch (alt14) {
+            switch (alt18) {
                 case 1 :
-                    // InternalProblem.g:919:3: rule__Problem__Group_0__0
+                    // InternalProblem.g:1115:3: rule__Problem__Group_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Problem__Group_0__0();
@@ -3031,14 +3688,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group__1"
-    // InternalProblem.g:927:1: rule__Problem__Group__1 : rule__Problem__Group__1__Impl ;
+    // InternalProblem.g:1123:1: rule__Problem__Group__1 : rule__Problem__Group__1__Impl ;
     public final void rule__Problem__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:931:1: ( rule__Problem__Group__1__Impl )
-            // InternalProblem.g:932:2: rule__Problem__Group__1__Impl
+            // InternalProblem.g:1127:1: ( rule__Problem__Group__1__Impl )
+            // InternalProblem.g:1128:2: rule__Problem__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Problem__Group__1__Impl();
@@ -3064,33 +3721,33 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group__1__Impl"
-    // InternalProblem.g:938:1: rule__Problem__Group__1__Impl : ( ( rule__Problem__StatementsAssignment_1 )* ) ;
+    // InternalProblem.g:1134:1: rule__Problem__Group__1__Impl : ( ( rule__Problem__StatementsAssignment_1 )* ) ;
     public final void rule__Problem__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:942:1: ( ( ( rule__Problem__StatementsAssignment_1 )* ) )
-            // InternalProblem.g:943:1: ( ( rule__Problem__StatementsAssignment_1 )* )
+            // InternalProblem.g:1138:1: ( ( ( rule__Problem__StatementsAssignment_1 )* ) )
+            // InternalProblem.g:1139:1: ( ( rule__Problem__StatementsAssignment_1 )* )
             {
-            // InternalProblem.g:943:1: ( ( rule__Problem__StatementsAssignment_1 )* )
-            // InternalProblem.g:944:2: ( rule__Problem__StatementsAssignment_1 )*
+            // InternalProblem.g:1139:1: ( ( rule__Problem__StatementsAssignment_1 )* )
+            // InternalProblem.g:1140:2: ( rule__Problem__StatementsAssignment_1 )*
             {
              before(grammarAccess.getProblemAccess().getStatementsAssignment_1()); 
-            // InternalProblem.g:945:2: ( rule__Problem__StatementsAssignment_1 )*
-            loop15:
+            // InternalProblem.g:1141:2: ( rule__Problem__StatementsAssignment_1 )*
+            loop19:
             do {
-                int alt15=2;
-                int LA15_0 = input.LA(1);
+                int alt19=2;
+                int LA19_0 = input.LA(1);
 
-                if ( ((LA15_0>=RULE_QUOTED_ID && LA15_0<=RULE_ID)||LA15_0==14||(LA15_0>=20 && LA15_0<=21)||LA15_0==23||LA15_0==36||LA15_0==38||LA15_0==40) ) {
-                    alt15=1;
+                if ( ((LA19_0>=RULE_QUOTED_ID && LA19_0<=RULE_ID)||LA19_0==16||(LA19_0>=19 && LA19_0<=20)||(LA19_0>=22 && LA19_0<=23)||LA19_0==25||LA19_0==29||LA19_0==37||LA19_0==39||LA19_0==41) ) {
+                    alt19=1;
                 }
 
 
-                switch (alt15) {
+                switch (alt19) {
                 case 1 :
-                    // InternalProblem.g:945:3: rule__Problem__StatementsAssignment_1
+                    // InternalProblem.g:1141:3: rule__Problem__StatementsAssignment_1
                     {
                     pushFollow(FOLLOW_4);
                     rule__Problem__StatementsAssignment_1();
@@ -3102,7 +3759,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop15;
+                    break loop19;
                 }
             } while (true);
 
@@ -3129,14 +3786,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group_0__0"
-    // InternalProblem.g:954:1: rule__Problem__Group_0__0 : rule__Problem__Group_0__0__Impl rule__Problem__Group_0__1 ;
+    // InternalProblem.g:1150:1: rule__Problem__Group_0__0 : rule__Problem__Group_0__0__Impl rule__Problem__Group_0__1 ;
     public final void rule__Problem__Group_0__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:958:1: ( rule__Problem__Group_0__0__Impl rule__Problem__Group_0__1 )
-            // InternalProblem.g:959:2: rule__Problem__Group_0__0__Impl rule__Problem__Group_0__1
+            // InternalProblem.g:1154:1: ( rule__Problem__Group_0__0__Impl rule__Problem__Group_0__1 )
+            // InternalProblem.g:1155:2: rule__Problem__Group_0__0__Impl rule__Problem__Group_0__1
             {
             pushFollow(FOLLOW_5);
             rule__Problem__Group_0__0__Impl();
@@ -3167,20 +3824,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group_0__0__Impl"
-    // InternalProblem.g:966:1: rule__Problem__Group_0__0__Impl : ( 'problem' ) ;
+    // InternalProblem.g:1162:1: rule__Problem__Group_0__0__Impl : ( 'problem' ) ;
     public final void rule__Problem__Group_0__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:970:1: ( ( 'problem' ) )
-            // InternalProblem.g:971:1: ( 'problem' )
+            // InternalProblem.g:1166:1: ( ( 'problem' ) )
+            // InternalProblem.g:1167:1: ( 'problem' )
             {
-            // InternalProblem.g:971:1: ( 'problem' )
-            // InternalProblem.g:972:2: 'problem'
+            // InternalProblem.g:1167:1: ( 'problem' )
+            // InternalProblem.g:1168:2: 'problem'
             {
              before(grammarAccess.getProblemAccess().getProblemKeyword_0_0()); 
-            match(input,22,FOLLOW_2); 
+            match(input,24,FOLLOW_2); 
              after(grammarAccess.getProblemAccess().getProblemKeyword_0_0()); 
 
             }
@@ -3204,14 +3861,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group_0__1"
-    // InternalProblem.g:981:1: rule__Problem__Group_0__1 : rule__Problem__Group_0__1__Impl rule__Problem__Group_0__2 ;
+    // InternalProblem.g:1177:1: rule__Problem__Group_0__1 : rule__Problem__Group_0__1__Impl rule__Problem__Group_0__2 ;
     public final void rule__Problem__Group_0__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:985:1: ( rule__Problem__Group_0__1__Impl rule__Problem__Group_0__2 )
-            // InternalProblem.g:986:2: rule__Problem__Group_0__1__Impl rule__Problem__Group_0__2
+            // InternalProblem.g:1181:1: ( rule__Problem__Group_0__1__Impl rule__Problem__Group_0__2 )
+            // InternalProblem.g:1182:2: rule__Problem__Group_0__1__Impl rule__Problem__Group_0__2
             {
             pushFollow(FOLLOW_6);
             rule__Problem__Group_0__1__Impl();
@@ -3242,21 +3899,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group_0__1__Impl"
-    // InternalProblem.g:993:1: rule__Problem__Group_0__1__Impl : ( ( rule__Problem__NameAssignment_0_1 ) ) ;
+    // InternalProblem.g:1189:1: rule__Problem__Group_0__1__Impl : ( ( rule__Problem__NameAssignment_0_1 ) ) ;
     public final void rule__Problem__Group_0__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:997:1: ( ( ( rule__Problem__NameAssignment_0_1 ) ) )
-            // InternalProblem.g:998:1: ( ( rule__Problem__NameAssignment_0_1 ) )
+            // InternalProblem.g:1193:1: ( ( ( rule__Problem__NameAssignment_0_1 ) ) )
+            // InternalProblem.g:1194:1: ( ( rule__Problem__NameAssignment_0_1 ) )
             {
-            // InternalProblem.g:998:1: ( ( rule__Problem__NameAssignment_0_1 ) )
-            // InternalProblem.g:999:2: ( rule__Problem__NameAssignment_0_1 )
+            // InternalProblem.g:1194:1: ( ( rule__Problem__NameAssignment_0_1 ) )
+            // InternalProblem.g:1195:2: ( rule__Problem__NameAssignment_0_1 )
             {
              before(grammarAccess.getProblemAccess().getNameAssignment_0_1()); 
-            // InternalProblem.g:1000:2: ( rule__Problem__NameAssignment_0_1 )
-            // InternalProblem.g:1000:3: rule__Problem__NameAssignment_0_1
+            // InternalProblem.g:1196:2: ( rule__Problem__NameAssignment_0_1 )
+            // InternalProblem.g:1196:3: rule__Problem__NameAssignment_0_1
             {
             pushFollow(FOLLOW_2);
             rule__Problem__NameAssignment_0_1();
@@ -3289,14 +3946,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group_0__2"
-    // InternalProblem.g:1008:1: rule__Problem__Group_0__2 : rule__Problem__Group_0__2__Impl ;
+    // InternalProblem.g:1204:1: rule__Problem__Group_0__2 : rule__Problem__Group_0__2__Impl ;
     public final void rule__Problem__Group_0__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1012:1: ( rule__Problem__Group_0__2__Impl )
-            // InternalProblem.g:1013:2: rule__Problem__Group_0__2__Impl
+            // InternalProblem.g:1208:1: ( rule__Problem__Group_0__2__Impl )
+            // InternalProblem.g:1209:2: rule__Problem__Group_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Problem__Group_0__2__Impl();
@@ -3322,17 +3979,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group_0__2__Impl"
-    // InternalProblem.g:1019:1: rule__Problem__Group_0__2__Impl : ( '.' ) ;
+    // InternalProblem.g:1215:1: rule__Problem__Group_0__2__Impl : ( '.' ) ;
     public final void rule__Problem__Group_0__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1023:1: ( ( '.' ) )
-            // InternalProblem.g:1024:1: ( '.' )
+            // InternalProblem.g:1219:1: ( ( '.' ) )
+            // InternalProblem.g:1220:1: ( '.' )
             {
-            // InternalProblem.g:1024:1: ( '.' )
-            // InternalProblem.g:1025:2: '.'
+            // InternalProblem.g:1220:1: ( '.' )
+            // InternalProblem.g:1221:2: '.'
             {
              before(grammarAccess.getProblemAccess().getFullStopKeyword_0_2()); 
             match(input,12,FOLLOW_2); 
@@ -3359,14 +4016,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__0"
-    // InternalProblem.g:1035:1: rule__ClassDeclaration__Group__0 : rule__ClassDeclaration__Group__0__Impl rule__ClassDeclaration__Group__1 ;
+    // InternalProblem.g:1231:1: rule__ClassDeclaration__Group__0 : rule__ClassDeclaration__Group__0__Impl rule__ClassDeclaration__Group__1 ;
     public final void rule__ClassDeclaration__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1039:1: ( rule__ClassDeclaration__Group__0__Impl rule__ClassDeclaration__Group__1 )
-            // InternalProblem.g:1040:2: rule__ClassDeclaration__Group__0__Impl rule__ClassDeclaration__Group__1
+            // InternalProblem.g:1235:1: ( rule__ClassDeclaration__Group__0__Impl rule__ClassDeclaration__Group__1 )
+            // InternalProblem.g:1236:2: rule__ClassDeclaration__Group__0__Impl rule__ClassDeclaration__Group__1
             {
             pushFollow(FOLLOW_7);
             rule__ClassDeclaration__Group__0__Impl();
@@ -3397,29 +4054,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__0__Impl"
-    // InternalProblem.g:1047:1: rule__ClassDeclaration__Group__0__Impl : ( ( rule__ClassDeclaration__AbstractAssignment_0 )? ) ;
+    // InternalProblem.g:1243:1: rule__ClassDeclaration__Group__0__Impl : ( ( rule__ClassDeclaration__AbstractAssignment_0 )? ) ;
     public final void rule__ClassDeclaration__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1051:1: ( ( ( rule__ClassDeclaration__AbstractAssignment_0 )? ) )
-            // InternalProblem.g:1052:1: ( ( rule__ClassDeclaration__AbstractAssignment_0 )? )
+            // InternalProblem.g:1247:1: ( ( ( rule__ClassDeclaration__AbstractAssignment_0 )? ) )
+            // InternalProblem.g:1248:1: ( ( rule__ClassDeclaration__AbstractAssignment_0 )? )
             {
-            // InternalProblem.g:1052:1: ( ( rule__ClassDeclaration__AbstractAssignment_0 )? )
-            // InternalProblem.g:1053:2: ( rule__ClassDeclaration__AbstractAssignment_0 )?
+            // InternalProblem.g:1248:1: ( ( rule__ClassDeclaration__AbstractAssignment_0 )? )
+            // InternalProblem.g:1249:2: ( rule__ClassDeclaration__AbstractAssignment_0 )?
             {
              before(grammarAccess.getClassDeclarationAccess().getAbstractAssignment_0()); 
-            // InternalProblem.g:1054:2: ( rule__ClassDeclaration__AbstractAssignment_0 )?
-            int alt16=2;
-            int LA16_0 = input.LA(1);
+            // InternalProblem.g:1250:2: ( rule__ClassDeclaration__AbstractAssignment_0 )?
+            int alt20=2;
+            int LA20_0 = input.LA(1);
 
-            if ( (LA16_0==38) ) {
-                alt16=1;
+            if ( (LA20_0==39) ) {
+                alt20=1;
             }
-            switch (alt16) {
+            switch (alt20) {
                 case 1 :
-                    // InternalProblem.g:1054:3: rule__ClassDeclaration__AbstractAssignment_0
+                    // InternalProblem.g:1250:3: rule__ClassDeclaration__AbstractAssignment_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__ClassDeclaration__AbstractAssignment_0();
@@ -3455,14 +4112,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__1"
-    // InternalProblem.g:1062:1: rule__ClassDeclaration__Group__1 : rule__ClassDeclaration__Group__1__Impl rule__ClassDeclaration__Group__2 ;
+    // InternalProblem.g:1258:1: rule__ClassDeclaration__Group__1 : rule__ClassDeclaration__Group__1__Impl rule__ClassDeclaration__Group__2 ;
     public final void rule__ClassDeclaration__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1066:1: ( rule__ClassDeclaration__Group__1__Impl rule__ClassDeclaration__Group__2 )
-            // InternalProblem.g:1067:2: rule__ClassDeclaration__Group__1__Impl rule__ClassDeclaration__Group__2
+            // InternalProblem.g:1262:1: ( rule__ClassDeclaration__Group__1__Impl rule__ClassDeclaration__Group__2 )
+            // InternalProblem.g:1263:2: rule__ClassDeclaration__Group__1__Impl rule__ClassDeclaration__Group__2
             {
             pushFollow(FOLLOW_5);
             rule__ClassDeclaration__Group__1__Impl();
@@ -3493,20 +4150,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__1__Impl"
-    // InternalProblem.g:1074:1: rule__ClassDeclaration__Group__1__Impl : ( 'class' ) ;
+    // InternalProblem.g:1270:1: rule__ClassDeclaration__Group__1__Impl : ( 'class' ) ;
     public final void rule__ClassDeclaration__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1078:1: ( ( 'class' ) )
-            // InternalProblem.g:1079:1: ( 'class' )
+            // InternalProblem.g:1274:1: ( ( 'class' ) )
+            // InternalProblem.g:1275:1: ( 'class' )
             {
-            // InternalProblem.g:1079:1: ( 'class' )
-            // InternalProblem.g:1080:2: 'class'
+            // InternalProblem.g:1275:1: ( 'class' )
+            // InternalProblem.g:1276:2: 'class'
             {
              before(grammarAccess.getClassDeclarationAccess().getClassKeyword_1()); 
-            match(input,23,FOLLOW_2); 
+            match(input,25,FOLLOW_2); 
              after(grammarAccess.getClassDeclarationAccess().getClassKeyword_1()); 
 
             }
@@ -3530,14 +4187,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__2"
-    // InternalProblem.g:1089:1: rule__ClassDeclaration__Group__2 : rule__ClassDeclaration__Group__2__Impl rule__ClassDeclaration__Group__3 ;
+    // InternalProblem.g:1285:1: rule__ClassDeclaration__Group__2 : rule__ClassDeclaration__Group__2__Impl rule__ClassDeclaration__Group__3 ;
     public final void rule__ClassDeclaration__Group__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1093:1: ( rule__ClassDeclaration__Group__2__Impl rule__ClassDeclaration__Group__3 )
-            // InternalProblem.g:1094:2: rule__ClassDeclaration__Group__2__Impl rule__ClassDeclaration__Group__3
+            // InternalProblem.g:1289:1: ( rule__ClassDeclaration__Group__2__Impl rule__ClassDeclaration__Group__3 )
+            // InternalProblem.g:1290:2: rule__ClassDeclaration__Group__2__Impl rule__ClassDeclaration__Group__3
             {
             pushFollow(FOLLOW_8);
             rule__ClassDeclaration__Group__2__Impl();
@@ -3568,21 +4225,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__2__Impl"
-    // InternalProblem.g:1101:1: rule__ClassDeclaration__Group__2__Impl : ( ( rule__ClassDeclaration__NameAssignment_2 ) ) ;
+    // InternalProblem.g:1297:1: rule__ClassDeclaration__Group__2__Impl : ( ( rule__ClassDeclaration__NameAssignment_2 ) ) ;
     public final void rule__ClassDeclaration__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1105:1: ( ( ( rule__ClassDeclaration__NameAssignment_2 ) ) )
-            // InternalProblem.g:1106:1: ( ( rule__ClassDeclaration__NameAssignment_2 ) )
+            // InternalProblem.g:1301:1: ( ( ( rule__ClassDeclaration__NameAssignment_2 ) ) )
+            // InternalProblem.g:1302:1: ( ( rule__ClassDeclaration__NameAssignment_2 ) )
             {
-            // InternalProblem.g:1106:1: ( ( rule__ClassDeclaration__NameAssignment_2 ) )
-            // InternalProblem.g:1107:2: ( rule__ClassDeclaration__NameAssignment_2 )
+            // InternalProblem.g:1302:1: ( ( rule__ClassDeclaration__NameAssignment_2 ) )
+            // InternalProblem.g:1303:2: ( rule__ClassDeclaration__NameAssignment_2 )
             {
              before(grammarAccess.getClassDeclarationAccess().getNameAssignment_2()); 
-            // InternalProblem.g:1108:2: ( rule__ClassDeclaration__NameAssignment_2 )
-            // InternalProblem.g:1108:3: rule__ClassDeclaration__NameAssignment_2
+            // InternalProblem.g:1304:2: ( rule__ClassDeclaration__NameAssignment_2 )
+            // InternalProblem.g:1304:3: rule__ClassDeclaration__NameAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__NameAssignment_2();
@@ -3615,14 +4272,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__3"
-    // InternalProblem.g:1116:1: rule__ClassDeclaration__Group__3 : rule__ClassDeclaration__Group__3__Impl rule__ClassDeclaration__Group__4 ;
+    // InternalProblem.g:1312:1: rule__ClassDeclaration__Group__3 : rule__ClassDeclaration__Group__3__Impl rule__ClassDeclaration__Group__4 ;
     public final void rule__ClassDeclaration__Group__3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1120:1: ( rule__ClassDeclaration__Group__3__Impl rule__ClassDeclaration__Group__4 )
-            // InternalProblem.g:1121:2: rule__ClassDeclaration__Group__3__Impl rule__ClassDeclaration__Group__4
+            // InternalProblem.g:1316:1: ( rule__ClassDeclaration__Group__3__Impl rule__ClassDeclaration__Group__4 )
+            // InternalProblem.g:1317:2: rule__ClassDeclaration__Group__3__Impl rule__ClassDeclaration__Group__4
             {
             pushFollow(FOLLOW_8);
             rule__ClassDeclaration__Group__3__Impl();
@@ -3653,29 +4310,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__3__Impl"
-    // InternalProblem.g:1128:1: rule__ClassDeclaration__Group__3__Impl : ( ( rule__ClassDeclaration__Group_3__0 )? ) ;
+    // InternalProblem.g:1324:1: rule__ClassDeclaration__Group__3__Impl : ( ( rule__ClassDeclaration__Group_3__0 )? ) ;
     public final void rule__ClassDeclaration__Group__3__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1132:1: ( ( ( rule__ClassDeclaration__Group_3__0 )? ) )
-            // InternalProblem.g:1133:1: ( ( rule__ClassDeclaration__Group_3__0 )? )
+            // InternalProblem.g:1328:1: ( ( ( rule__ClassDeclaration__Group_3__0 )? ) )
+            // InternalProblem.g:1329:1: ( ( rule__ClassDeclaration__Group_3__0 )? )
             {
-            // InternalProblem.g:1133:1: ( ( rule__ClassDeclaration__Group_3__0 )? )
-            // InternalProblem.g:1134:2: ( rule__ClassDeclaration__Group_3__0 )?
+            // InternalProblem.g:1329:1: ( ( rule__ClassDeclaration__Group_3__0 )? )
+            // InternalProblem.g:1330:2: ( rule__ClassDeclaration__Group_3__0 )?
             {
              before(grammarAccess.getClassDeclarationAccess().getGroup_3()); 
-            // InternalProblem.g:1135:2: ( rule__ClassDeclaration__Group_3__0 )?
-            int alt17=2;
-            int LA17_0 = input.LA(1);
+            // InternalProblem.g:1331:2: ( rule__ClassDeclaration__Group_3__0 )?
+            int alt21=2;
+            int LA21_0 = input.LA(1);
 
-            if ( (LA17_0==24) ) {
-                alt17=1;
+            if ( (LA21_0==26) ) {
+                alt21=1;
             }
-            switch (alt17) {
+            switch (alt21) {
                 case 1 :
-                    // InternalProblem.g:1135:3: rule__ClassDeclaration__Group_3__0
+                    // InternalProblem.g:1331:3: rule__ClassDeclaration__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__ClassDeclaration__Group_3__0();
@@ -3711,14 +4368,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__4"
-    // InternalProblem.g:1143:1: rule__ClassDeclaration__Group__4 : rule__ClassDeclaration__Group__4__Impl ;
+    // InternalProblem.g:1339:1: rule__ClassDeclaration__Group__4 : rule__ClassDeclaration__Group__4__Impl ;
     public final void rule__ClassDeclaration__Group__4() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1147:1: ( rule__ClassDeclaration__Group__4__Impl )
-            // InternalProblem.g:1148:2: rule__ClassDeclaration__Group__4__Impl
+            // InternalProblem.g:1343:1: ( rule__ClassDeclaration__Group__4__Impl )
+            // InternalProblem.g:1344:2: rule__ClassDeclaration__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__Group__4__Impl();
@@ -3744,21 +4401,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__4__Impl"
-    // InternalProblem.g:1154:1: rule__ClassDeclaration__Group__4__Impl : ( ( rule__ClassDeclaration__Alternatives_4 ) ) ;
+    // InternalProblem.g:1350:1: rule__ClassDeclaration__Group__4__Impl : ( ( rule__ClassDeclaration__Alternatives_4 ) ) ;
     public final void rule__ClassDeclaration__Group__4__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1158:1: ( ( ( rule__ClassDeclaration__Alternatives_4 ) ) )
-            // InternalProblem.g:1159:1: ( ( rule__ClassDeclaration__Alternatives_4 ) )
+            // InternalProblem.g:1354:1: ( ( ( rule__ClassDeclaration__Alternatives_4 ) ) )
+            // InternalProblem.g:1355:1: ( ( rule__ClassDeclaration__Alternatives_4 ) )
             {
-            // InternalProblem.g:1159:1: ( ( rule__ClassDeclaration__Alternatives_4 ) )
-            // InternalProblem.g:1160:2: ( rule__ClassDeclaration__Alternatives_4 )
+            // InternalProblem.g:1355:1: ( ( rule__ClassDeclaration__Alternatives_4 ) )
+            // InternalProblem.g:1356:2: ( rule__ClassDeclaration__Alternatives_4 )
             {
              before(grammarAccess.getClassDeclarationAccess().getAlternatives_4()); 
-            // InternalProblem.g:1161:2: ( rule__ClassDeclaration__Alternatives_4 )
-            // InternalProblem.g:1161:3: rule__ClassDeclaration__Alternatives_4
+            // InternalProblem.g:1357:2: ( rule__ClassDeclaration__Alternatives_4 )
+            // InternalProblem.g:1357:3: rule__ClassDeclaration__Alternatives_4
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__Alternatives_4();
@@ -3791,16 +4448,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3__0"
-    // InternalProblem.g:1170:1: rule__ClassDeclaration__Group_3__0 : rule__ClassDeclaration__Group_3__0__Impl rule__ClassDeclaration__Group_3__1 ;
+    // InternalProblem.g:1366:1: rule__ClassDeclaration__Group_3__0 : rule__ClassDeclaration__Group_3__0__Impl rule__ClassDeclaration__Group_3__1 ;
     public final void rule__ClassDeclaration__Group_3__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1174:1: ( rule__ClassDeclaration__Group_3__0__Impl rule__ClassDeclaration__Group_3__1 )
-            // InternalProblem.g:1175:2: rule__ClassDeclaration__Group_3__0__Impl rule__ClassDeclaration__Group_3__1
+            // InternalProblem.g:1370:1: ( rule__ClassDeclaration__Group_3__0__Impl rule__ClassDeclaration__Group_3__1 )
+            // InternalProblem.g:1371:2: rule__ClassDeclaration__Group_3__0__Impl rule__ClassDeclaration__Group_3__1
             {
-            pushFollow(FOLLOW_9);
+            pushFollow(FOLLOW_5);
             rule__ClassDeclaration__Group_3__0__Impl();
 
             state._fsp--;
@@ -3829,20 +4486,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3__0__Impl"
-    // InternalProblem.g:1182:1: rule__ClassDeclaration__Group_3__0__Impl : ( 'extends' ) ;
+    // InternalProblem.g:1378:1: rule__ClassDeclaration__Group_3__0__Impl : ( 'extends' ) ;
     public final void rule__ClassDeclaration__Group_3__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1186:1: ( ( 'extends' ) )
-            // InternalProblem.g:1187:1: ( 'extends' )
+            // InternalProblem.g:1382:1: ( ( 'extends' ) )
+            // InternalProblem.g:1383:1: ( 'extends' )
             {
-            // InternalProblem.g:1187:1: ( 'extends' )
-            // InternalProblem.g:1188:2: 'extends'
+            // InternalProblem.g:1383:1: ( 'extends' )
+            // InternalProblem.g:1384:2: 'extends'
             {
              before(grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0()); 
-            match(input,24,FOLLOW_2); 
+            match(input,26,FOLLOW_2); 
              after(grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0()); 
 
             }
@@ -3866,16 +4523,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3__1"
-    // InternalProblem.g:1197:1: rule__ClassDeclaration__Group_3__1 : rule__ClassDeclaration__Group_3__1__Impl rule__ClassDeclaration__Group_3__2 ;
+    // InternalProblem.g:1393:1: rule__ClassDeclaration__Group_3__1 : rule__ClassDeclaration__Group_3__1__Impl rule__ClassDeclaration__Group_3__2 ;
     public final void rule__ClassDeclaration__Group_3__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1201:1: ( rule__ClassDeclaration__Group_3__1__Impl rule__ClassDeclaration__Group_3__2 )
-            // InternalProblem.g:1202:2: rule__ClassDeclaration__Group_3__1__Impl rule__ClassDeclaration__Group_3__2
+            // InternalProblem.g:1397:1: ( rule__ClassDeclaration__Group_3__1__Impl rule__ClassDeclaration__Group_3__2 )
+            // InternalProblem.g:1398:2: rule__ClassDeclaration__Group_3__1__Impl rule__ClassDeclaration__Group_3__2
             {
-            pushFollow(FOLLOW_10);
+            pushFollow(FOLLOW_9);
             rule__ClassDeclaration__Group_3__1__Impl();
 
             state._fsp--;
@@ -3904,21 +4561,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3__1__Impl"
-    // InternalProblem.g:1209:1: rule__ClassDeclaration__Group_3__1__Impl : ( ( rule__ClassDeclaration__SuperTypesAssignment_3_1 ) ) ;
+    // InternalProblem.g:1405:1: rule__ClassDeclaration__Group_3__1__Impl : ( ( rule__ClassDeclaration__SuperTypesAssignment_3_1 ) ) ;
     public final void rule__ClassDeclaration__Group_3__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1213:1: ( ( ( rule__ClassDeclaration__SuperTypesAssignment_3_1 ) ) )
-            // InternalProblem.g:1214:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_1 ) )
+            // InternalProblem.g:1409:1: ( ( ( rule__ClassDeclaration__SuperTypesAssignment_3_1 ) ) )
+            // InternalProblem.g:1410:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_1 ) )
             {
-            // InternalProblem.g:1214:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_1 ) )
-            // InternalProblem.g:1215:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_1 )
+            // InternalProblem.g:1410:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_1 ) )
+            // InternalProblem.g:1411:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_1 )
             {
              before(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_1()); 
-            // InternalProblem.g:1216:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_1 )
-            // InternalProblem.g:1216:3: rule__ClassDeclaration__SuperTypesAssignment_3_1
+            // InternalProblem.g:1412:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_1 )
+            // InternalProblem.g:1412:3: rule__ClassDeclaration__SuperTypesAssignment_3_1
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__SuperTypesAssignment_3_1();
@@ -3951,14 +4608,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3__2"
-    // InternalProblem.g:1224:1: rule__ClassDeclaration__Group_3__2 : rule__ClassDeclaration__Group_3__2__Impl ;
+    // InternalProblem.g:1420:1: rule__ClassDeclaration__Group_3__2 : rule__ClassDeclaration__Group_3__2__Impl ;
     public final void rule__ClassDeclaration__Group_3__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1228:1: ( rule__ClassDeclaration__Group_3__2__Impl )
-            // InternalProblem.g:1229:2: rule__ClassDeclaration__Group_3__2__Impl
+            // InternalProblem.g:1424:1: ( rule__ClassDeclaration__Group_3__2__Impl )
+            // InternalProblem.g:1425:2: rule__ClassDeclaration__Group_3__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__Group_3__2__Impl();
@@ -3984,35 +4641,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3__2__Impl"
-    // InternalProblem.g:1235:1: rule__ClassDeclaration__Group_3__2__Impl : ( ( rule__ClassDeclaration__Group_3_2__0 )* ) ;
+    // InternalProblem.g:1431:1: rule__ClassDeclaration__Group_3__2__Impl : ( ( rule__ClassDeclaration__Group_3_2__0 )* ) ;
     public final void rule__ClassDeclaration__Group_3__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1239:1: ( ( ( rule__ClassDeclaration__Group_3_2__0 )* ) )
-            // InternalProblem.g:1240:1: ( ( rule__ClassDeclaration__Group_3_2__0 )* )
+            // InternalProblem.g:1435:1: ( ( ( rule__ClassDeclaration__Group_3_2__0 )* ) )
+            // InternalProblem.g:1436:1: ( ( rule__ClassDeclaration__Group_3_2__0 )* )
             {
-            // InternalProblem.g:1240:1: ( ( rule__ClassDeclaration__Group_3_2__0 )* )
-            // InternalProblem.g:1241:2: ( rule__ClassDeclaration__Group_3_2__0 )*
+            // InternalProblem.g:1436:1: ( ( rule__ClassDeclaration__Group_3_2__0 )* )
+            // InternalProblem.g:1437:2: ( rule__ClassDeclaration__Group_3_2__0 )*
             {
              before(grammarAccess.getClassDeclarationAccess().getGroup_3_2()); 
-            // InternalProblem.g:1242:2: ( rule__ClassDeclaration__Group_3_2__0 )*
-            loop18:
+            // InternalProblem.g:1438:2: ( rule__ClassDeclaration__Group_3_2__0 )*
+            loop22:
             do {
-                int alt18=2;
-                int LA18_0 = input.LA(1);
+                int alt22=2;
+                int LA22_0 = input.LA(1);
 
-                if ( (LA18_0==25) ) {
-                    alt18=1;
+                if ( (LA22_0==13) ) {
+                    alt22=1;
                 }
 
 
-                switch (alt18) {
+                switch (alt22) {
                 case 1 :
-                    // InternalProblem.g:1242:3: rule__ClassDeclaration__Group_3_2__0
+                    // InternalProblem.g:1438:3: rule__ClassDeclaration__Group_3_2__0
                     {
-                    pushFollow(FOLLOW_11);
+                    pushFollow(FOLLOW_10);
                     rule__ClassDeclaration__Group_3_2__0();
 
                     state._fsp--;
@@ -4022,7 +4679,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop18;
+                    break loop22;
                 }
             } while (true);
 
@@ -4049,16 +4706,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3_2__0"
-    // InternalProblem.g:1251:1: rule__ClassDeclaration__Group_3_2__0 : rule__ClassDeclaration__Group_3_2__0__Impl rule__ClassDeclaration__Group_3_2__1 ;
+    // InternalProblem.g:1447:1: rule__ClassDeclaration__Group_3_2__0 : rule__ClassDeclaration__Group_3_2__0__Impl rule__ClassDeclaration__Group_3_2__1 ;
     public final void rule__ClassDeclaration__Group_3_2__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1255:1: ( rule__ClassDeclaration__Group_3_2__0__Impl rule__ClassDeclaration__Group_3_2__1 )
-            // InternalProblem.g:1256:2: rule__ClassDeclaration__Group_3_2__0__Impl rule__ClassDeclaration__Group_3_2__1
+            // InternalProblem.g:1451:1: ( rule__ClassDeclaration__Group_3_2__0__Impl rule__ClassDeclaration__Group_3_2__1 )
+            // InternalProblem.g:1452:2: rule__ClassDeclaration__Group_3_2__0__Impl rule__ClassDeclaration__Group_3_2__1
             {
-            pushFollow(FOLLOW_9);
+            pushFollow(FOLLOW_5);
             rule__ClassDeclaration__Group_3_2__0__Impl();
 
             state._fsp--;
@@ -4087,20 +4744,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3_2__0__Impl"
-    // InternalProblem.g:1263:1: rule__ClassDeclaration__Group_3_2__0__Impl : ( ',' ) ;
+    // InternalProblem.g:1459:1: rule__ClassDeclaration__Group_3_2__0__Impl : ( ',' ) ;
     public final void rule__ClassDeclaration__Group_3_2__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1267:1: ( ( ',' ) )
-            // InternalProblem.g:1268:1: ( ',' )
+            // InternalProblem.g:1463:1: ( ( ',' ) )
+            // InternalProblem.g:1464:1: ( ',' )
             {
-            // InternalProblem.g:1268:1: ( ',' )
-            // InternalProblem.g:1269:2: ','
+            // InternalProblem.g:1464:1: ( ',' )
+            // InternalProblem.g:1465:2: ','
             {
              before(grammarAccess.getClassDeclarationAccess().getCommaKeyword_3_2_0()); 
-            match(input,25,FOLLOW_2); 
+            match(input,13,FOLLOW_2); 
              after(grammarAccess.getClassDeclarationAccess().getCommaKeyword_3_2_0()); 
 
             }
@@ -4124,14 +4781,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3_2__1"
-    // InternalProblem.g:1278:1: rule__ClassDeclaration__Group_3_2__1 : rule__ClassDeclaration__Group_3_2__1__Impl ;
+    // InternalProblem.g:1474:1: rule__ClassDeclaration__Group_3_2__1 : rule__ClassDeclaration__Group_3_2__1__Impl ;
     public final void rule__ClassDeclaration__Group_3_2__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1282:1: ( rule__ClassDeclaration__Group_3_2__1__Impl )
-            // InternalProblem.g:1283:2: rule__ClassDeclaration__Group_3_2__1__Impl
+            // InternalProblem.g:1478:1: ( rule__ClassDeclaration__Group_3_2__1__Impl )
+            // InternalProblem.g:1479:2: rule__ClassDeclaration__Group_3_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__Group_3_2__1__Impl();
@@ -4157,21 +4814,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3_2__1__Impl"
-    // InternalProblem.g:1289:1: rule__ClassDeclaration__Group_3_2__1__Impl : ( ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 ) ) ;
+    // InternalProblem.g:1485:1: rule__ClassDeclaration__Group_3_2__1__Impl : ( ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 ) ) ;
     public final void rule__ClassDeclaration__Group_3_2__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1293:1: ( ( ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 ) ) )
-            // InternalProblem.g:1294:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 ) )
+            // InternalProblem.g:1489:1: ( ( ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 ) ) )
+            // InternalProblem.g:1490:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 ) )
             {
-            // InternalProblem.g:1294:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 ) )
-            // InternalProblem.g:1295:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 )
+            // InternalProblem.g:1490:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 ) )
+            // InternalProblem.g:1491:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 )
             {
              before(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_2_1()); 
-            // InternalProblem.g:1296:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 )
-            // InternalProblem.g:1296:3: rule__ClassDeclaration__SuperTypesAssignment_3_2_1
+            // InternalProblem.g:1492:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 )
+            // InternalProblem.g:1492:3: rule__ClassDeclaration__SuperTypesAssignment_3_2_1
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__SuperTypesAssignment_3_2_1();
@@ -4204,16 +4861,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0__0"
-    // InternalProblem.g:1305:1: rule__ClassDeclaration__Group_4_0__0 : rule__ClassDeclaration__Group_4_0__0__Impl rule__ClassDeclaration__Group_4_0__1 ;
+    // InternalProblem.g:1501:1: rule__ClassDeclaration__Group_4_0__0 : rule__ClassDeclaration__Group_4_0__0__Impl rule__ClassDeclaration__Group_4_0__1 ;
     public final void rule__ClassDeclaration__Group_4_0__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1309:1: ( rule__ClassDeclaration__Group_4_0__0__Impl rule__ClassDeclaration__Group_4_0__1 )
-            // InternalProblem.g:1310:2: rule__ClassDeclaration__Group_4_0__0__Impl rule__ClassDeclaration__Group_4_0__1
+            // InternalProblem.g:1505:1: ( rule__ClassDeclaration__Group_4_0__0__Impl rule__ClassDeclaration__Group_4_0__1 )
+            // InternalProblem.g:1506:2: rule__ClassDeclaration__Group_4_0__0__Impl rule__ClassDeclaration__Group_4_0__1
             {
-            pushFollow(FOLLOW_12);
+            pushFollow(FOLLOW_11);
             rule__ClassDeclaration__Group_4_0__0__Impl();
 
             state._fsp--;
@@ -4242,20 +4899,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0__0__Impl"
-    // InternalProblem.g:1317:1: rule__ClassDeclaration__Group_4_0__0__Impl : ( '{' ) ;
+    // InternalProblem.g:1513:1: rule__ClassDeclaration__Group_4_0__0__Impl : ( '{' ) ;
     public final void rule__ClassDeclaration__Group_4_0__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1321:1: ( ( '{' ) )
-            // InternalProblem.g:1322:1: ( '{' )
+            // InternalProblem.g:1517:1: ( ( '{' ) )
+            // InternalProblem.g:1518:1: ( '{' )
             {
-            // InternalProblem.g:1322:1: ( '{' )
-            // InternalProblem.g:1323:2: '{'
+            // InternalProblem.g:1518:1: ( '{' )
+            // InternalProblem.g:1519:2: '{'
             {
              before(grammarAccess.getClassDeclarationAccess().getLeftCurlyBracketKeyword_4_0_0()); 
-            match(input,26,FOLLOW_2); 
+            match(input,27,FOLLOW_2); 
              after(grammarAccess.getClassDeclarationAccess().getLeftCurlyBracketKeyword_4_0_0()); 
 
             }
@@ -4279,16 +4936,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0__1"
-    // InternalProblem.g:1332:1: rule__ClassDeclaration__Group_4_0__1 : rule__ClassDeclaration__Group_4_0__1__Impl rule__ClassDeclaration__Group_4_0__2 ;
+    // InternalProblem.g:1528:1: rule__ClassDeclaration__Group_4_0__1 : rule__ClassDeclaration__Group_4_0__1__Impl rule__ClassDeclaration__Group_4_0__2 ;
     public final void rule__ClassDeclaration__Group_4_0__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1336:1: ( rule__ClassDeclaration__Group_4_0__1__Impl rule__ClassDeclaration__Group_4_0__2 )
-            // InternalProblem.g:1337:2: rule__ClassDeclaration__Group_4_0__1__Impl rule__ClassDeclaration__Group_4_0__2
+            // InternalProblem.g:1532:1: ( rule__ClassDeclaration__Group_4_0__1__Impl rule__ClassDeclaration__Group_4_0__2 )
+            // InternalProblem.g:1533:2: rule__ClassDeclaration__Group_4_0__1__Impl rule__ClassDeclaration__Group_4_0__2
             {
-            pushFollow(FOLLOW_12);
+            pushFollow(FOLLOW_11);
             rule__ClassDeclaration__Group_4_0__1__Impl();
 
             state._fsp--;
@@ -4317,35 +4974,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0__1__Impl"
-    // InternalProblem.g:1344:1: rule__ClassDeclaration__Group_4_0__1__Impl : ( ( rule__ClassDeclaration__Group_4_0_1__0 )* ) ;
+    // InternalProblem.g:1540:1: rule__ClassDeclaration__Group_4_0__1__Impl : ( ( rule__ClassDeclaration__Group_4_0_1__0 )* ) ;
     public final void rule__ClassDeclaration__Group_4_0__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1348:1: ( ( ( rule__ClassDeclaration__Group_4_0_1__0 )* ) )
-            // InternalProblem.g:1349:1: ( ( rule__ClassDeclaration__Group_4_0_1__0 )* )
+            // InternalProblem.g:1544:1: ( ( ( rule__ClassDeclaration__Group_4_0_1__0 )* ) )
+            // InternalProblem.g:1545:1: ( ( rule__ClassDeclaration__Group_4_0_1__0 )* )
             {
-            // InternalProblem.g:1349:1: ( ( rule__ClassDeclaration__Group_4_0_1__0 )* )
-            // InternalProblem.g:1350:2: ( rule__ClassDeclaration__Group_4_0_1__0 )*
+            // InternalProblem.g:1545:1: ( ( rule__ClassDeclaration__Group_4_0_1__0 )* )
+            // InternalProblem.g:1546:2: ( rule__ClassDeclaration__Group_4_0_1__0 )*
             {
              before(grammarAccess.getClassDeclarationAccess().getGroup_4_0_1()); 
-            // InternalProblem.g:1351:2: ( rule__ClassDeclaration__Group_4_0_1__0 )*
-            loop19:
+            // InternalProblem.g:1547:2: ( rule__ClassDeclaration__Group_4_0_1__0 )*
+            loop23:
             do {
-                int alt19=2;
-                int LA19_0 = input.LA(1);
+                int alt23=2;
+                int LA23_0 = input.LA(1);
 
-                if ( (LA19_0==13||LA19_0==39) ) {
-                    alt19=1;
+                if ( ((LA23_0>=RULE_QUOTED_ID && LA23_0<=RULE_ID)||LA23_0==15||(LA23_0>=19 && LA23_0<=20)||LA23_0==40) ) {
+                    alt23=1;
                 }
 
 
-                switch (alt19) {
+                switch (alt23) {
                 case 1 :
-                    // InternalProblem.g:1351:3: rule__ClassDeclaration__Group_4_0_1__0
+                    // InternalProblem.g:1547:3: rule__ClassDeclaration__Group_4_0_1__0
                     {
-                    pushFollow(FOLLOW_13);
+                    pushFollow(FOLLOW_12);
                     rule__ClassDeclaration__Group_4_0_1__0();
 
                     state._fsp--;
@@ -4355,7 +5012,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop19;
+                    break loop23;
                 }
             } while (true);
 
@@ -4382,14 +5039,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0__2"
-    // InternalProblem.g:1359:1: rule__ClassDeclaration__Group_4_0__2 : rule__ClassDeclaration__Group_4_0__2__Impl ;
+    // InternalProblem.g:1555:1: rule__ClassDeclaration__Group_4_0__2 : rule__ClassDeclaration__Group_4_0__2__Impl ;
     public final void rule__ClassDeclaration__Group_4_0__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1363:1: ( rule__ClassDeclaration__Group_4_0__2__Impl )
-            // InternalProblem.g:1364:2: rule__ClassDeclaration__Group_4_0__2__Impl
+            // InternalProblem.g:1559:1: ( rule__ClassDeclaration__Group_4_0__2__Impl )
+            // InternalProblem.g:1560:2: rule__ClassDeclaration__Group_4_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__Group_4_0__2__Impl();
@@ -4415,20 +5072,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0__2__Impl"
-    // InternalProblem.g:1370:1: rule__ClassDeclaration__Group_4_0__2__Impl : ( '}' ) ;
+    // InternalProblem.g:1566:1: rule__ClassDeclaration__Group_4_0__2__Impl : ( '}' ) ;
     public final void rule__ClassDeclaration__Group_4_0__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1374:1: ( ( '}' ) )
-            // InternalProblem.g:1375:1: ( '}' )
+            // InternalProblem.g:1570:1: ( ( '}' ) )
+            // InternalProblem.g:1571:1: ( '}' )
             {
-            // InternalProblem.g:1375:1: ( '}' )
-            // InternalProblem.g:1376:2: '}'
+            // InternalProblem.g:1571:1: ( '}' )
+            // InternalProblem.g:1572:2: '}'
             {
              before(grammarAccess.getClassDeclarationAccess().getRightCurlyBracketKeyword_4_0_2()); 
-            match(input,27,FOLLOW_2); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getClassDeclarationAccess().getRightCurlyBracketKeyword_4_0_2()); 
 
             }
@@ -4452,16 +5109,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0_1__0"
-    // InternalProblem.g:1386:1: rule__ClassDeclaration__Group_4_0_1__0 : rule__ClassDeclaration__Group_4_0_1__0__Impl rule__ClassDeclaration__Group_4_0_1__1 ;
+    // InternalProblem.g:1582:1: rule__ClassDeclaration__Group_4_0_1__0 : rule__ClassDeclaration__Group_4_0_1__0__Impl rule__ClassDeclaration__Group_4_0_1__1 ;
     public final void rule__ClassDeclaration__Group_4_0_1__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1390:1: ( rule__ClassDeclaration__Group_4_0_1__0__Impl rule__ClassDeclaration__Group_4_0_1__1 )
-            // InternalProblem.g:1391:2: rule__ClassDeclaration__Group_4_0_1__0__Impl rule__ClassDeclaration__Group_4_0_1__1
+            // InternalProblem.g:1586:1: ( rule__ClassDeclaration__Group_4_0_1__0__Impl rule__ClassDeclaration__Group_4_0_1__1 )
+            // InternalProblem.g:1587:2: rule__ClassDeclaration__Group_4_0_1__0__Impl rule__ClassDeclaration__Group_4_0_1__1
             {
-            pushFollow(FOLLOW_14);
+            pushFollow(FOLLOW_13);
             rule__ClassDeclaration__Group_4_0_1__0__Impl();
 
             state._fsp--;
@@ -4490,21 +5147,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0_1__0__Impl"
-    // InternalProblem.g:1398:1: rule__ClassDeclaration__Group_4_0_1__0__Impl : ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 ) ) ;
+    // InternalProblem.g:1594:1: rule__ClassDeclaration__Group_4_0_1__0__Impl : ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 ) ) ;
     public final void rule__ClassDeclaration__Group_4_0_1__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1402:1: ( ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 ) ) )
-            // InternalProblem.g:1403:1: ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 ) )
+            // InternalProblem.g:1598:1: ( ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 ) ) )
+            // InternalProblem.g:1599:1: ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 ) )
             {
-            // InternalProblem.g:1403:1: ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 ) )
-            // InternalProblem.g:1404:2: ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 )
+            // InternalProblem.g:1599:1: ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 ) )
+            // InternalProblem.g:1600:2: ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 )
             {
              before(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsAssignment_4_0_1_0()); 
-            // InternalProblem.g:1405:2: ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 )
-            // InternalProblem.g:1405:3: rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0
+            // InternalProblem.g:1601:2: ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 )
+            // InternalProblem.g:1601:3: rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0();
@@ -4537,14 +5194,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0_1__1"
-    // InternalProblem.g:1413:1: rule__ClassDeclaration__Group_4_0_1__1 : rule__ClassDeclaration__Group_4_0_1__1__Impl ;
+    // InternalProblem.g:1609:1: rule__ClassDeclaration__Group_4_0_1__1 : rule__ClassDeclaration__Group_4_0_1__1__Impl ;
     public final void rule__ClassDeclaration__Group_4_0_1__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1417:1: ( rule__ClassDeclaration__Group_4_0_1__1__Impl )
-            // InternalProblem.g:1418:2: rule__ClassDeclaration__Group_4_0_1__1__Impl
+            // InternalProblem.g:1613:1: ( rule__ClassDeclaration__Group_4_0_1__1__Impl )
+            // InternalProblem.g:1614:2: rule__ClassDeclaration__Group_4_0_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__Group_4_0_1__1__Impl();
@@ -4570,31 +5227,31 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0_1__1__Impl"
-    // InternalProblem.g:1424:1: rule__ClassDeclaration__Group_4_0_1__1__Impl : ( ( ';' )? ) ;
+    // InternalProblem.g:1620:1: rule__ClassDeclaration__Group_4_0_1__1__Impl : ( ( ';' )? ) ;
     public final void rule__ClassDeclaration__Group_4_0_1__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1428:1: ( ( ( ';' )? ) )
-            // InternalProblem.g:1429:1: ( ( ';' )? )
+            // InternalProblem.g:1624:1: ( ( ( ';' )? ) )
+            // InternalProblem.g:1625:1: ( ( ';' )? )
             {
-            // InternalProblem.g:1429:1: ( ( ';' )? )
-            // InternalProblem.g:1430:2: ( ';' )?
+            // InternalProblem.g:1625:1: ( ( ';' )? )
+            // InternalProblem.g:1626:2: ( ';' )?
             {
              before(grammarAccess.getClassDeclarationAccess().getSemicolonKeyword_4_0_1_1()); 
-            // InternalProblem.g:1431:2: ( ';' )?
-            int alt20=2;
-            int LA20_0 = input.LA(1);
+            // InternalProblem.g:1627:2: ( ';' )?
+            int alt24=2;
+            int LA24_0 = input.LA(1);
 
-            if ( (LA20_0==28) ) {
-                alt20=1;
+            if ( (LA24_0==14) ) {
+                alt24=1;
             }
-            switch (alt20) {
+            switch (alt24) {
                 case 1 :
-                    // InternalProblem.g:1431:3: ';'
+                    // InternalProblem.g:1627:3: ';'
                     {
-                    match(input,28,FOLLOW_2); 
+                    match(input,14,FOLLOW_2); 
 
                     }
                     break;
@@ -4623,17 +5280,938 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__ClassDeclaration__Group_4_0_1__1__Impl"
 
 
+    // $ANTLR start "rule__EnumDeclaration__Group__0"
+    // InternalProblem.g:1636:1: rule__EnumDeclaration__Group__0 : rule__EnumDeclaration__Group__0__Impl rule__EnumDeclaration__Group__1 ;
+    public final void rule__EnumDeclaration__Group__0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1640:1: ( rule__EnumDeclaration__Group__0__Impl rule__EnumDeclaration__Group__1 )
+            // InternalProblem.g:1641:2: rule__EnumDeclaration__Group__0__Impl rule__EnumDeclaration__Group__1
+            {
+            pushFollow(FOLLOW_5);
+            rule__EnumDeclaration__Group__0__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__EnumDeclaration__Group__1();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group__0"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group__0__Impl"
+    // InternalProblem.g:1648:1: rule__EnumDeclaration__Group__0__Impl : ( 'enum' ) ;
+    public final void rule__EnumDeclaration__Group__0__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1652:1: ( ( 'enum' ) )
+            // InternalProblem.g:1653:1: ( 'enum' )
+            {
+            // InternalProblem.g:1653:1: ( 'enum' )
+            // InternalProblem.g:1654:2: 'enum'
+            {
+             before(grammarAccess.getEnumDeclarationAccess().getEnumKeyword_0()); 
+            match(input,29,FOLLOW_2); 
+             after(grammarAccess.getEnumDeclarationAccess().getEnumKeyword_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group__0__Impl"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group__1"
+    // InternalProblem.g:1663:1: rule__EnumDeclaration__Group__1 : rule__EnumDeclaration__Group__1__Impl rule__EnumDeclaration__Group__2 ;
+    public final void rule__EnumDeclaration__Group__1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1667:1: ( rule__EnumDeclaration__Group__1__Impl rule__EnumDeclaration__Group__2 )
+            // InternalProblem.g:1668:2: rule__EnumDeclaration__Group__1__Impl rule__EnumDeclaration__Group__2
+            {
+            pushFollow(FOLLOW_14);
+            rule__EnumDeclaration__Group__1__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__EnumDeclaration__Group__2();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group__1"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group__1__Impl"
+    // InternalProblem.g:1675:1: rule__EnumDeclaration__Group__1__Impl : ( ( rule__EnumDeclaration__NameAssignment_1 ) ) ;
+    public final void rule__EnumDeclaration__Group__1__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1679:1: ( ( ( rule__EnumDeclaration__NameAssignment_1 ) ) )
+            // InternalProblem.g:1680:1: ( ( rule__EnumDeclaration__NameAssignment_1 ) )
+            {
+            // InternalProblem.g:1680:1: ( ( rule__EnumDeclaration__NameAssignment_1 ) )
+            // InternalProblem.g:1681:2: ( rule__EnumDeclaration__NameAssignment_1 )
+            {
+             before(grammarAccess.getEnumDeclarationAccess().getNameAssignment_1()); 
+            // InternalProblem.g:1682:2: ( rule__EnumDeclaration__NameAssignment_1 )
+            // InternalProblem.g:1682:3: rule__EnumDeclaration__NameAssignment_1
+            {
+            pushFollow(FOLLOW_2);
+            rule__EnumDeclaration__NameAssignment_1();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getEnumDeclarationAccess().getNameAssignment_1()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group__1__Impl"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group__2"
+    // InternalProblem.g:1690:1: rule__EnumDeclaration__Group__2 : rule__EnumDeclaration__Group__2__Impl ;
+    public final void rule__EnumDeclaration__Group__2() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1694:1: ( rule__EnumDeclaration__Group__2__Impl )
+            // InternalProblem.g:1695:2: rule__EnumDeclaration__Group__2__Impl
+            {
+            pushFollow(FOLLOW_2);
+            rule__EnumDeclaration__Group__2__Impl();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group__2"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group__2__Impl"
+    // InternalProblem.g:1701:1: rule__EnumDeclaration__Group__2__Impl : ( ( rule__EnumDeclaration__Alternatives_2 ) ) ;
+    public final void rule__EnumDeclaration__Group__2__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1705:1: ( ( ( rule__EnumDeclaration__Alternatives_2 ) ) )
+            // InternalProblem.g:1706:1: ( ( rule__EnumDeclaration__Alternatives_2 ) )
+            {
+            // InternalProblem.g:1706:1: ( ( rule__EnumDeclaration__Alternatives_2 ) )
+            // InternalProblem.g:1707:2: ( rule__EnumDeclaration__Alternatives_2 )
+            {
+             before(grammarAccess.getEnumDeclarationAccess().getAlternatives_2()); 
+            // InternalProblem.g:1708:2: ( rule__EnumDeclaration__Alternatives_2 )
+            // InternalProblem.g:1708:3: rule__EnumDeclaration__Alternatives_2
+            {
+            pushFollow(FOLLOW_2);
+            rule__EnumDeclaration__Alternatives_2();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getEnumDeclarationAccess().getAlternatives_2()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group__2__Impl"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group_2_0__0"
+    // InternalProblem.g:1717:1: rule__EnumDeclaration__Group_2_0__0 : rule__EnumDeclaration__Group_2_0__0__Impl rule__EnumDeclaration__Group_2_0__1 ;
+    public final void rule__EnumDeclaration__Group_2_0__0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1721:1: ( rule__EnumDeclaration__Group_2_0__0__Impl rule__EnumDeclaration__Group_2_0__1 )
+            // InternalProblem.g:1722:2: rule__EnumDeclaration__Group_2_0__0__Impl rule__EnumDeclaration__Group_2_0__1
+            {
+            pushFollow(FOLLOW_15);
+            rule__EnumDeclaration__Group_2_0__0__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__EnumDeclaration__Group_2_0__1();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group_2_0__0"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group_2_0__0__Impl"
+    // InternalProblem.g:1729:1: rule__EnumDeclaration__Group_2_0__0__Impl : ( '{' ) ;
+    public final void rule__EnumDeclaration__Group_2_0__0__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1733:1: ( ( '{' ) )
+            // InternalProblem.g:1734:1: ( '{' )
+            {
+            // InternalProblem.g:1734:1: ( '{' )
+            // InternalProblem.g:1735:2: '{'
+            {
+             before(grammarAccess.getEnumDeclarationAccess().getLeftCurlyBracketKeyword_2_0_0()); 
+            match(input,27,FOLLOW_2); 
+             after(grammarAccess.getEnumDeclarationAccess().getLeftCurlyBracketKeyword_2_0_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group_2_0__0__Impl"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group_2_0__1"
+    // InternalProblem.g:1744:1: rule__EnumDeclaration__Group_2_0__1 : rule__EnumDeclaration__Group_2_0__1__Impl rule__EnumDeclaration__Group_2_0__2 ;
+    public final void rule__EnumDeclaration__Group_2_0__1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1748:1: ( rule__EnumDeclaration__Group_2_0__1__Impl rule__EnumDeclaration__Group_2_0__2 )
+            // InternalProblem.g:1749:2: rule__EnumDeclaration__Group_2_0__1__Impl rule__EnumDeclaration__Group_2_0__2
+            {
+            pushFollow(FOLLOW_15);
+            rule__EnumDeclaration__Group_2_0__1__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__EnumDeclaration__Group_2_0__2();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group_2_0__1"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group_2_0__1__Impl"
+    // InternalProblem.g:1756:1: rule__EnumDeclaration__Group_2_0__1__Impl : ( ( rule__EnumDeclaration__Group_2_0_1__0 )? ) ;
+    public final void rule__EnumDeclaration__Group_2_0__1__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1760:1: ( ( ( rule__EnumDeclaration__Group_2_0_1__0 )? ) )
+            // InternalProblem.g:1761:1: ( ( rule__EnumDeclaration__Group_2_0_1__0 )? )
+            {
+            // InternalProblem.g:1761:1: ( ( rule__EnumDeclaration__Group_2_0_1__0 )? )
+            // InternalProblem.g:1762:2: ( rule__EnumDeclaration__Group_2_0_1__0 )?
+            {
+             before(grammarAccess.getEnumDeclarationAccess().getGroup_2_0_1()); 
+            // InternalProblem.g:1763:2: ( rule__EnumDeclaration__Group_2_0_1__0 )?
+            int alt25=2;
+            int LA25_0 = input.LA(1);
+
+            if ( ((LA25_0>=RULE_QUOTED_ID && LA25_0<=RULE_ID)||(LA25_0>=19 && LA25_0<=20)) ) {
+                alt25=1;
+            }
+            switch (alt25) {
+                case 1 :
+                    // InternalProblem.g:1763:3: rule__EnumDeclaration__Group_2_0_1__0
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__EnumDeclaration__Group_2_0_1__0();
+
+                    state._fsp--;
+
+
+                    }
+                    break;
+
+            }
+
+             after(grammarAccess.getEnumDeclarationAccess().getGroup_2_0_1()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group_2_0__1__Impl"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group_2_0__2"
+    // InternalProblem.g:1771:1: rule__EnumDeclaration__Group_2_0__2 : rule__EnumDeclaration__Group_2_0__2__Impl ;
+    public final void rule__EnumDeclaration__Group_2_0__2() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1775:1: ( rule__EnumDeclaration__Group_2_0__2__Impl )
+            // InternalProblem.g:1776:2: rule__EnumDeclaration__Group_2_0__2__Impl
+            {
+            pushFollow(FOLLOW_2);
+            rule__EnumDeclaration__Group_2_0__2__Impl();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group_2_0__2"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group_2_0__2__Impl"
+    // InternalProblem.g:1782:1: rule__EnumDeclaration__Group_2_0__2__Impl : ( '}' ) ;
+    public final void rule__EnumDeclaration__Group_2_0__2__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1786:1: ( ( '}' ) )
+            // InternalProblem.g:1787:1: ( '}' )
+            {
+            // InternalProblem.g:1787:1: ( '}' )
+            // InternalProblem.g:1788:2: '}'
+            {
+             before(grammarAccess.getEnumDeclarationAccess().getRightCurlyBracketKeyword_2_0_2()); 
+            match(input,28,FOLLOW_2); 
+             after(grammarAccess.getEnumDeclarationAccess().getRightCurlyBracketKeyword_2_0_2()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group_2_0__2__Impl"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group_2_0_1__0"
+    // InternalProblem.g:1798:1: rule__EnumDeclaration__Group_2_0_1__0 : rule__EnumDeclaration__Group_2_0_1__0__Impl rule__EnumDeclaration__Group_2_0_1__1 ;
+    public final void rule__EnumDeclaration__Group_2_0_1__0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1802:1: ( rule__EnumDeclaration__Group_2_0_1__0__Impl rule__EnumDeclaration__Group_2_0_1__1 )
+            // InternalProblem.g:1803:2: rule__EnumDeclaration__Group_2_0_1__0__Impl rule__EnumDeclaration__Group_2_0_1__1
+            {
+            pushFollow(FOLLOW_16);
+            rule__EnumDeclaration__Group_2_0_1__0__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__EnumDeclaration__Group_2_0_1__1();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group_2_0_1__0"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group_2_0_1__0__Impl"
+    // InternalProblem.g:1810:1: rule__EnumDeclaration__Group_2_0_1__0__Impl : ( ( rule__EnumDeclaration__LiteralsAssignment_2_0_1_0 ) ) ;
+    public final void rule__EnumDeclaration__Group_2_0_1__0__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1814:1: ( ( ( rule__EnumDeclaration__LiteralsAssignment_2_0_1_0 ) ) )
+            // InternalProblem.g:1815:1: ( ( rule__EnumDeclaration__LiteralsAssignment_2_0_1_0 ) )
+            {
+            // InternalProblem.g:1815:1: ( ( rule__EnumDeclaration__LiteralsAssignment_2_0_1_0 ) )
+            // InternalProblem.g:1816:2: ( rule__EnumDeclaration__LiteralsAssignment_2_0_1_0 )
+            {
+             before(grammarAccess.getEnumDeclarationAccess().getLiteralsAssignment_2_0_1_0()); 
+            // InternalProblem.g:1817:2: ( rule__EnumDeclaration__LiteralsAssignment_2_0_1_0 )
+            // InternalProblem.g:1817:3: rule__EnumDeclaration__LiteralsAssignment_2_0_1_0
+            {
+            pushFollow(FOLLOW_2);
+            rule__EnumDeclaration__LiteralsAssignment_2_0_1_0();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getEnumDeclarationAccess().getLiteralsAssignment_2_0_1_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group_2_0_1__0__Impl"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group_2_0_1__1"
+    // InternalProblem.g:1825:1: rule__EnumDeclaration__Group_2_0_1__1 : rule__EnumDeclaration__Group_2_0_1__1__Impl rule__EnumDeclaration__Group_2_0_1__2 ;
+    public final void rule__EnumDeclaration__Group_2_0_1__1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1829:1: ( rule__EnumDeclaration__Group_2_0_1__1__Impl rule__EnumDeclaration__Group_2_0_1__2 )
+            // InternalProblem.g:1830:2: rule__EnumDeclaration__Group_2_0_1__1__Impl rule__EnumDeclaration__Group_2_0_1__2
+            {
+            pushFollow(FOLLOW_16);
+            rule__EnumDeclaration__Group_2_0_1__1__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__EnumDeclaration__Group_2_0_1__2();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group_2_0_1__1"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group_2_0_1__1__Impl"
+    // InternalProblem.g:1837:1: rule__EnumDeclaration__Group_2_0_1__1__Impl : ( ( rule__EnumDeclaration__Group_2_0_1_1__0 )* ) ;
+    public final void rule__EnumDeclaration__Group_2_0_1__1__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1841:1: ( ( ( rule__EnumDeclaration__Group_2_0_1_1__0 )* ) )
+            // InternalProblem.g:1842:1: ( ( rule__EnumDeclaration__Group_2_0_1_1__0 )* )
+            {
+            // InternalProblem.g:1842:1: ( ( rule__EnumDeclaration__Group_2_0_1_1__0 )* )
+            // InternalProblem.g:1843:2: ( rule__EnumDeclaration__Group_2_0_1_1__0 )*
+            {
+             before(grammarAccess.getEnumDeclarationAccess().getGroup_2_0_1_1()); 
+            // InternalProblem.g:1844:2: ( rule__EnumDeclaration__Group_2_0_1_1__0 )*
+            loop26:
+            do {
+                int alt26=2;
+                int LA26_0 = input.LA(1);
+
+                if ( (LA26_0==13) ) {
+                    int LA26_1 = input.LA(2);
+
+                    if ( ((LA26_1>=RULE_QUOTED_ID && LA26_1<=RULE_ID)||(LA26_1>=19 && LA26_1<=20)) ) {
+                        alt26=1;
+                    }
+
+
+                }
+
+
+                switch (alt26) {
+                case 1 :
+                    // InternalProblem.g:1844:3: rule__EnumDeclaration__Group_2_0_1_1__0
+                    {
+                    pushFollow(FOLLOW_10);
+                    rule__EnumDeclaration__Group_2_0_1_1__0();
+
+                    state._fsp--;
+
+
+                    }
+                    break;
+
+                default :
+                    break loop26;
+                }
+            } while (true);
+
+             after(grammarAccess.getEnumDeclarationAccess().getGroup_2_0_1_1()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group_2_0_1__1__Impl"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group_2_0_1__2"
+    // InternalProblem.g:1852:1: rule__EnumDeclaration__Group_2_0_1__2 : rule__EnumDeclaration__Group_2_0_1__2__Impl ;
+    public final void rule__EnumDeclaration__Group_2_0_1__2() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1856:1: ( rule__EnumDeclaration__Group_2_0_1__2__Impl )
+            // InternalProblem.g:1857:2: rule__EnumDeclaration__Group_2_0_1__2__Impl
+            {
+            pushFollow(FOLLOW_2);
+            rule__EnumDeclaration__Group_2_0_1__2__Impl();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group_2_0_1__2"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group_2_0_1__2__Impl"
+    // InternalProblem.g:1863:1: rule__EnumDeclaration__Group_2_0_1__2__Impl : ( ( rule__EnumDeclaration__Alternatives_2_0_1_2 )? ) ;
+    public final void rule__EnumDeclaration__Group_2_0_1__2__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1867:1: ( ( ( rule__EnumDeclaration__Alternatives_2_0_1_2 )? ) )
+            // InternalProblem.g:1868:1: ( ( rule__EnumDeclaration__Alternatives_2_0_1_2 )? )
+            {
+            // InternalProblem.g:1868:1: ( ( rule__EnumDeclaration__Alternatives_2_0_1_2 )? )
+            // InternalProblem.g:1869:2: ( rule__EnumDeclaration__Alternatives_2_0_1_2 )?
+            {
+             before(grammarAccess.getEnumDeclarationAccess().getAlternatives_2_0_1_2()); 
+            // InternalProblem.g:1870:2: ( rule__EnumDeclaration__Alternatives_2_0_1_2 )?
+            int alt27=2;
+            int LA27_0 = input.LA(1);
+
+            if ( ((LA27_0>=13 && LA27_0<=14)) ) {
+                alt27=1;
+            }
+            switch (alt27) {
+                case 1 :
+                    // InternalProblem.g:1870:3: rule__EnumDeclaration__Alternatives_2_0_1_2
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__EnumDeclaration__Alternatives_2_0_1_2();
+
+                    state._fsp--;
+
+
+                    }
+                    break;
+
+            }
+
+             after(grammarAccess.getEnumDeclarationAccess().getAlternatives_2_0_1_2()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group_2_0_1__2__Impl"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group_2_0_1_1__0"
+    // InternalProblem.g:1879:1: rule__EnumDeclaration__Group_2_0_1_1__0 : rule__EnumDeclaration__Group_2_0_1_1__0__Impl rule__EnumDeclaration__Group_2_0_1_1__1 ;
+    public final void rule__EnumDeclaration__Group_2_0_1_1__0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1883:1: ( rule__EnumDeclaration__Group_2_0_1_1__0__Impl rule__EnumDeclaration__Group_2_0_1_1__1 )
+            // InternalProblem.g:1884:2: rule__EnumDeclaration__Group_2_0_1_1__0__Impl rule__EnumDeclaration__Group_2_0_1_1__1
+            {
+            pushFollow(FOLLOW_5);
+            rule__EnumDeclaration__Group_2_0_1_1__0__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__EnumDeclaration__Group_2_0_1_1__1();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group_2_0_1_1__0"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group_2_0_1_1__0__Impl"
+    // InternalProblem.g:1891:1: rule__EnumDeclaration__Group_2_0_1_1__0__Impl : ( ',' ) ;
+    public final void rule__EnumDeclaration__Group_2_0_1_1__0__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1895:1: ( ( ',' ) )
+            // InternalProblem.g:1896:1: ( ',' )
+            {
+            // InternalProblem.g:1896:1: ( ',' )
+            // InternalProblem.g:1897:2: ','
+            {
+             before(grammarAccess.getEnumDeclarationAccess().getCommaKeyword_2_0_1_1_0()); 
+            match(input,13,FOLLOW_2); 
+             after(grammarAccess.getEnumDeclarationAccess().getCommaKeyword_2_0_1_1_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group_2_0_1_1__0__Impl"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group_2_0_1_1__1"
+    // InternalProblem.g:1906:1: rule__EnumDeclaration__Group_2_0_1_1__1 : rule__EnumDeclaration__Group_2_0_1_1__1__Impl ;
+    public final void rule__EnumDeclaration__Group_2_0_1_1__1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1910:1: ( rule__EnumDeclaration__Group_2_0_1_1__1__Impl )
+            // InternalProblem.g:1911:2: rule__EnumDeclaration__Group_2_0_1_1__1__Impl
+            {
+            pushFollow(FOLLOW_2);
+            rule__EnumDeclaration__Group_2_0_1_1__1__Impl();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group_2_0_1_1__1"
+
+
+    // $ANTLR start "rule__EnumDeclaration__Group_2_0_1_1__1__Impl"
+    // InternalProblem.g:1917:1: rule__EnumDeclaration__Group_2_0_1_1__1__Impl : ( ( rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1 ) ) ;
+    public final void rule__EnumDeclaration__Group_2_0_1_1__1__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1921:1: ( ( ( rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1 ) ) )
+            // InternalProblem.g:1922:1: ( ( rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1 ) )
+            {
+            // InternalProblem.g:1922:1: ( ( rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1 ) )
+            // InternalProblem.g:1923:2: ( rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1 )
+            {
+             before(grammarAccess.getEnumDeclarationAccess().getLiteralsAssignment_2_0_1_1_1()); 
+            // InternalProblem.g:1924:2: ( rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1 )
+            // InternalProblem.g:1924:3: rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1
+            {
+            pushFollow(FOLLOW_2);
+            rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getEnumDeclarationAccess().getLiteralsAssignment_2_0_1_1_1()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__Group_2_0_1_1__1__Impl"
+
+
     // $ANTLR start "rule__ReferenceDeclaration__Group__0"
-    // InternalProblem.g:1440:1: rule__ReferenceDeclaration__Group__0 : rule__ReferenceDeclaration__Group__0__Impl rule__ReferenceDeclaration__Group__1 ;
+    // InternalProblem.g:1933:1: rule__ReferenceDeclaration__Group__0 : rule__ReferenceDeclaration__Group__0__Impl rule__ReferenceDeclaration__Group__1 ;
     public final void rule__ReferenceDeclaration__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1444:1: ( rule__ReferenceDeclaration__Group__0__Impl rule__ReferenceDeclaration__Group__1 )
-            // InternalProblem.g:1445:2: rule__ReferenceDeclaration__Group__0__Impl rule__ReferenceDeclaration__Group__1
+            // InternalProblem.g:1937:1: ( rule__ReferenceDeclaration__Group__0__Impl rule__ReferenceDeclaration__Group__1 )
+            // InternalProblem.g:1938:2: rule__ReferenceDeclaration__Group__0__Impl rule__ReferenceDeclaration__Group__1
             {
-            pushFollow(FOLLOW_9);
+            pushFollow(FOLLOW_17);
             rule__ReferenceDeclaration__Group__0__Impl();
 
             state._fsp--;
@@ -4662,27 +6240,38 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__0__Impl"
-    // InternalProblem.g:1452:1: rule__ReferenceDeclaration__Group__0__Impl : ( ( rule__ReferenceDeclaration__Alternatives_0 ) ) ;
+    // InternalProblem.g:1945:1: rule__ReferenceDeclaration__Group__0__Impl : ( ( rule__ReferenceDeclaration__Alternatives_0 )? ) ;
     public final void rule__ReferenceDeclaration__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1456:1: ( ( ( rule__ReferenceDeclaration__Alternatives_0 ) ) )
-            // InternalProblem.g:1457:1: ( ( rule__ReferenceDeclaration__Alternatives_0 ) )
+            // InternalProblem.g:1949:1: ( ( ( rule__ReferenceDeclaration__Alternatives_0 )? ) )
+            // InternalProblem.g:1950:1: ( ( rule__ReferenceDeclaration__Alternatives_0 )? )
             {
-            // InternalProblem.g:1457:1: ( ( rule__ReferenceDeclaration__Alternatives_0 ) )
-            // InternalProblem.g:1458:2: ( rule__ReferenceDeclaration__Alternatives_0 )
+            // InternalProblem.g:1950:1: ( ( rule__ReferenceDeclaration__Alternatives_0 )? )
+            // InternalProblem.g:1951:2: ( rule__ReferenceDeclaration__Alternatives_0 )?
             {
              before(grammarAccess.getReferenceDeclarationAccess().getAlternatives_0()); 
-            // InternalProblem.g:1459:2: ( rule__ReferenceDeclaration__Alternatives_0 )
-            // InternalProblem.g:1459:3: rule__ReferenceDeclaration__Alternatives_0
-            {
-            pushFollow(FOLLOW_2);
-            rule__ReferenceDeclaration__Alternatives_0();
+            // InternalProblem.g:1952:2: ( rule__ReferenceDeclaration__Alternatives_0 )?
+            int alt28=2;
+            int LA28_0 = input.LA(1);
+
+            if ( (LA28_0==15||LA28_0==40) ) {
+                alt28=1;
+            }
+            switch (alt28) {
+                case 1 :
+                    // InternalProblem.g:1952:3: rule__ReferenceDeclaration__Alternatives_0
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__ReferenceDeclaration__Alternatives_0();
+
+                    state._fsp--;
 
-            state._fsp--;
 
+                    }
+                    break;
 
             }
 
@@ -4709,16 +6298,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__1"
-    // InternalProblem.g:1467:1: rule__ReferenceDeclaration__Group__1 : rule__ReferenceDeclaration__Group__1__Impl rule__ReferenceDeclaration__Group__2 ;
+    // InternalProblem.g:1960:1: rule__ReferenceDeclaration__Group__1 : rule__ReferenceDeclaration__Group__1__Impl rule__ReferenceDeclaration__Group__2 ;
     public final void rule__ReferenceDeclaration__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1471:1: ( rule__ReferenceDeclaration__Group__1__Impl rule__ReferenceDeclaration__Group__2 )
-            // InternalProblem.g:1472:2: rule__ReferenceDeclaration__Group__1__Impl rule__ReferenceDeclaration__Group__2
+            // InternalProblem.g:1964:1: ( rule__ReferenceDeclaration__Group__1__Impl rule__ReferenceDeclaration__Group__2 )
+            // InternalProblem.g:1965:2: rule__ReferenceDeclaration__Group__1__Impl rule__ReferenceDeclaration__Group__2
             {
-            pushFollow(FOLLOW_15);
+            pushFollow(FOLLOW_18);
             rule__ReferenceDeclaration__Group__1__Impl();
 
             state._fsp--;
@@ -4747,21 +6336,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__1__Impl"
-    // InternalProblem.g:1479:1: rule__ReferenceDeclaration__Group__1__Impl : ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) ) ;
+    // InternalProblem.g:1972:1: rule__ReferenceDeclaration__Group__1__Impl : ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) ) ;
     public final void rule__ReferenceDeclaration__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1483:1: ( ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) ) )
-            // InternalProblem.g:1484:1: ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) )
+            // InternalProblem.g:1976:1: ( ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) ) )
+            // InternalProblem.g:1977:1: ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) )
             {
-            // InternalProblem.g:1484:1: ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) )
-            // InternalProblem.g:1485:2: ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 )
+            // InternalProblem.g:1977:1: ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) )
+            // InternalProblem.g:1978:2: ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 )
             {
              before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeAssignment_1()); 
-            // InternalProblem.g:1486:2: ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 )
-            // InternalProblem.g:1486:3: rule__ReferenceDeclaration__ReferenceTypeAssignment_1
+            // InternalProblem.g:1979:2: ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 )
+            // InternalProblem.g:1979:3: rule__ReferenceDeclaration__ReferenceTypeAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__ReferenceDeclaration__ReferenceTypeAssignment_1();
@@ -4794,16 +6383,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__2"
-    // InternalProblem.g:1494:1: rule__ReferenceDeclaration__Group__2 : rule__ReferenceDeclaration__Group__2__Impl rule__ReferenceDeclaration__Group__3 ;
+    // InternalProblem.g:1987:1: rule__ReferenceDeclaration__Group__2 : rule__ReferenceDeclaration__Group__2__Impl rule__ReferenceDeclaration__Group__3 ;
     public final void rule__ReferenceDeclaration__Group__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1498:1: ( rule__ReferenceDeclaration__Group__2__Impl rule__ReferenceDeclaration__Group__3 )
-            // InternalProblem.g:1499:2: rule__ReferenceDeclaration__Group__2__Impl rule__ReferenceDeclaration__Group__3
+            // InternalProblem.g:1991:1: ( rule__ReferenceDeclaration__Group__2__Impl rule__ReferenceDeclaration__Group__3 )
+            // InternalProblem.g:1992:2: rule__ReferenceDeclaration__Group__2__Impl rule__ReferenceDeclaration__Group__3
             {
-            pushFollow(FOLLOW_15);
+            pushFollow(FOLLOW_18);
             rule__ReferenceDeclaration__Group__2__Impl();
 
             state._fsp--;
@@ -4832,29 +6421,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__2__Impl"
-    // InternalProblem.g:1506:1: rule__ReferenceDeclaration__Group__2__Impl : ( ( rule__ReferenceDeclaration__Group_2__0 )? ) ;
+    // InternalProblem.g:1999:1: rule__ReferenceDeclaration__Group__2__Impl : ( ( rule__ReferenceDeclaration__Group_2__0 )? ) ;
     public final void rule__ReferenceDeclaration__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1510:1: ( ( ( rule__ReferenceDeclaration__Group_2__0 )? ) )
-            // InternalProblem.g:1511:1: ( ( rule__ReferenceDeclaration__Group_2__0 )? )
+            // InternalProblem.g:2003:1: ( ( ( rule__ReferenceDeclaration__Group_2__0 )? ) )
+            // InternalProblem.g:2004:1: ( ( rule__ReferenceDeclaration__Group_2__0 )? )
             {
-            // InternalProblem.g:1511:1: ( ( rule__ReferenceDeclaration__Group_2__0 )? )
-            // InternalProblem.g:1512:2: ( rule__ReferenceDeclaration__Group_2__0 )?
+            // InternalProblem.g:2004:1: ( ( rule__ReferenceDeclaration__Group_2__0 )? )
+            // InternalProblem.g:2005:2: ( rule__ReferenceDeclaration__Group_2__0 )?
             {
              before(grammarAccess.getReferenceDeclarationAccess().getGroup_2()); 
-            // InternalProblem.g:1513:2: ( rule__ReferenceDeclaration__Group_2__0 )?
-            int alt21=2;
-            int LA21_0 = input.LA(1);
+            // InternalProblem.g:2006:2: ( rule__ReferenceDeclaration__Group_2__0 )?
+            int alt29=2;
+            int LA29_0 = input.LA(1);
 
-            if ( (LA21_0==29) ) {
-                alt21=1;
+            if ( (LA29_0==30) ) {
+                alt29=1;
             }
-            switch (alt21) {
+            switch (alt29) {
                 case 1 :
-                    // InternalProblem.g:1513:3: rule__ReferenceDeclaration__Group_2__0
+                    // InternalProblem.g:2006:3: rule__ReferenceDeclaration__Group_2__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__ReferenceDeclaration__Group_2__0();
@@ -4890,16 +6479,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__3"
-    // InternalProblem.g:1521:1: rule__ReferenceDeclaration__Group__3 : rule__ReferenceDeclaration__Group__3__Impl rule__ReferenceDeclaration__Group__4 ;
+    // InternalProblem.g:2014:1: rule__ReferenceDeclaration__Group__3 : rule__ReferenceDeclaration__Group__3__Impl rule__ReferenceDeclaration__Group__4 ;
     public final void rule__ReferenceDeclaration__Group__3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1525:1: ( rule__ReferenceDeclaration__Group__3__Impl rule__ReferenceDeclaration__Group__4 )
-            // InternalProblem.g:1526:2: rule__ReferenceDeclaration__Group__3__Impl rule__ReferenceDeclaration__Group__4
+            // InternalProblem.g:2018:1: ( rule__ReferenceDeclaration__Group__3__Impl rule__ReferenceDeclaration__Group__4 )
+            // InternalProblem.g:2019:2: rule__ReferenceDeclaration__Group__3__Impl rule__ReferenceDeclaration__Group__4
             {
-            pushFollow(FOLLOW_16);
+            pushFollow(FOLLOW_19);
             rule__ReferenceDeclaration__Group__3__Impl();
 
             state._fsp--;
@@ -4928,21 +6517,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__3__Impl"
-    // InternalProblem.g:1533:1: rule__ReferenceDeclaration__Group__3__Impl : ( ( rule__ReferenceDeclaration__NameAssignment_3 ) ) ;
+    // InternalProblem.g:2026:1: rule__ReferenceDeclaration__Group__3__Impl : ( ( rule__ReferenceDeclaration__NameAssignment_3 ) ) ;
     public final void rule__ReferenceDeclaration__Group__3__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1537:1: ( ( ( rule__ReferenceDeclaration__NameAssignment_3 ) ) )
-            // InternalProblem.g:1538:1: ( ( rule__ReferenceDeclaration__NameAssignment_3 ) )
+            // InternalProblem.g:2030:1: ( ( ( rule__ReferenceDeclaration__NameAssignment_3 ) ) )
+            // InternalProblem.g:2031:1: ( ( rule__ReferenceDeclaration__NameAssignment_3 ) )
             {
-            // InternalProblem.g:1538:1: ( ( rule__ReferenceDeclaration__NameAssignment_3 ) )
-            // InternalProblem.g:1539:2: ( rule__ReferenceDeclaration__NameAssignment_3 )
+            // InternalProblem.g:2031:1: ( ( rule__ReferenceDeclaration__NameAssignment_3 ) )
+            // InternalProblem.g:2032:2: ( rule__ReferenceDeclaration__NameAssignment_3 )
             {
              before(grammarAccess.getReferenceDeclarationAccess().getNameAssignment_3()); 
-            // InternalProblem.g:1540:2: ( rule__ReferenceDeclaration__NameAssignment_3 )
-            // InternalProblem.g:1540:3: rule__ReferenceDeclaration__NameAssignment_3
+            // InternalProblem.g:2033:2: ( rule__ReferenceDeclaration__NameAssignment_3 )
+            // InternalProblem.g:2033:3: rule__ReferenceDeclaration__NameAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__ReferenceDeclaration__NameAssignment_3();
@@ -4975,14 +6564,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__4"
-    // InternalProblem.g:1548:1: rule__ReferenceDeclaration__Group__4 : rule__ReferenceDeclaration__Group__4__Impl ;
+    // InternalProblem.g:2041:1: rule__ReferenceDeclaration__Group__4 : rule__ReferenceDeclaration__Group__4__Impl ;
     public final void rule__ReferenceDeclaration__Group__4() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1552:1: ( rule__ReferenceDeclaration__Group__4__Impl )
-            // InternalProblem.g:1553:2: rule__ReferenceDeclaration__Group__4__Impl
+            // InternalProblem.g:2045:1: ( rule__ReferenceDeclaration__Group__4__Impl )
+            // InternalProblem.g:2046:2: rule__ReferenceDeclaration__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ReferenceDeclaration__Group__4__Impl();
@@ -5008,29 +6597,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__4__Impl"
-    // InternalProblem.g:1559:1: rule__ReferenceDeclaration__Group__4__Impl : ( ( rule__ReferenceDeclaration__Group_4__0 )? ) ;
+    // InternalProblem.g:2052:1: rule__ReferenceDeclaration__Group__4__Impl : ( ( rule__ReferenceDeclaration__Group_4__0 )? ) ;
     public final void rule__ReferenceDeclaration__Group__4__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1563:1: ( ( ( rule__ReferenceDeclaration__Group_4__0 )? ) )
-            // InternalProblem.g:1564:1: ( ( rule__ReferenceDeclaration__Group_4__0 )? )
+            // InternalProblem.g:2056:1: ( ( ( rule__ReferenceDeclaration__Group_4__0 )? ) )
+            // InternalProblem.g:2057:1: ( ( rule__ReferenceDeclaration__Group_4__0 )? )
             {
-            // InternalProblem.g:1564:1: ( ( rule__ReferenceDeclaration__Group_4__0 )? )
-            // InternalProblem.g:1565:2: ( rule__ReferenceDeclaration__Group_4__0 )?
+            // InternalProblem.g:2057:1: ( ( rule__ReferenceDeclaration__Group_4__0 )? )
+            // InternalProblem.g:2058:2: ( rule__ReferenceDeclaration__Group_4__0 )?
             {
              before(grammarAccess.getReferenceDeclarationAccess().getGroup_4()); 
-            // InternalProblem.g:1566:2: ( rule__ReferenceDeclaration__Group_4__0 )?
-            int alt22=2;
-            int LA22_0 = input.LA(1);
+            // InternalProblem.g:2059:2: ( rule__ReferenceDeclaration__Group_4__0 )?
+            int alt30=2;
+            int LA30_0 = input.LA(1);
 
-            if ( (LA22_0==31) ) {
-                alt22=1;
+            if ( (LA30_0==32) ) {
+                alt30=1;
             }
-            switch (alt22) {
+            switch (alt30) {
                 case 1 :
-                    // InternalProblem.g:1566:3: rule__ReferenceDeclaration__Group_4__0
+                    // InternalProblem.g:2059:3: rule__ReferenceDeclaration__Group_4__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__ReferenceDeclaration__Group_4__0();
@@ -5066,16 +6655,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_2__0"
-    // InternalProblem.g:1575:1: rule__ReferenceDeclaration__Group_2__0 : rule__ReferenceDeclaration__Group_2__0__Impl rule__ReferenceDeclaration__Group_2__1 ;
+    // InternalProblem.g:2068:1: rule__ReferenceDeclaration__Group_2__0 : rule__ReferenceDeclaration__Group_2__0__Impl rule__ReferenceDeclaration__Group_2__1 ;
     public final void rule__ReferenceDeclaration__Group_2__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1579:1: ( rule__ReferenceDeclaration__Group_2__0__Impl rule__ReferenceDeclaration__Group_2__1 )
-            // InternalProblem.g:1580:2: rule__ReferenceDeclaration__Group_2__0__Impl rule__ReferenceDeclaration__Group_2__1
+            // InternalProblem.g:2072:1: ( rule__ReferenceDeclaration__Group_2__0__Impl rule__ReferenceDeclaration__Group_2__1 )
+            // InternalProblem.g:2073:2: rule__ReferenceDeclaration__Group_2__0__Impl rule__ReferenceDeclaration__Group_2__1
             {
-            pushFollow(FOLLOW_17);
+            pushFollow(FOLLOW_20);
             rule__ReferenceDeclaration__Group_2__0__Impl();
 
             state._fsp--;
@@ -5104,20 +6693,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_2__0__Impl"
-    // InternalProblem.g:1587:1: rule__ReferenceDeclaration__Group_2__0__Impl : ( '[' ) ;
+    // InternalProblem.g:2080:1: rule__ReferenceDeclaration__Group_2__0__Impl : ( '[' ) ;
     public final void rule__ReferenceDeclaration__Group_2__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1591:1: ( ( '[' ) )
-            // InternalProblem.g:1592:1: ( '[' )
+            // InternalProblem.g:2084:1: ( ( '[' ) )
+            // InternalProblem.g:2085:1: ( '[' )
             {
-            // InternalProblem.g:1592:1: ( '[' )
-            // InternalProblem.g:1593:2: '['
+            // InternalProblem.g:2085:1: ( '[' )
+            // InternalProblem.g:2086:2: '['
             {
              before(grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2_0()); 
-            match(input,29,FOLLOW_2); 
+            match(input,30,FOLLOW_2); 
              after(grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2_0()); 
 
             }
@@ -5141,16 +6730,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_2__1"
-    // InternalProblem.g:1602:1: rule__ReferenceDeclaration__Group_2__1 : rule__ReferenceDeclaration__Group_2__1__Impl rule__ReferenceDeclaration__Group_2__2 ;
+    // InternalProblem.g:2095:1: rule__ReferenceDeclaration__Group_2__1 : rule__ReferenceDeclaration__Group_2__1__Impl rule__ReferenceDeclaration__Group_2__2 ;
     public final void rule__ReferenceDeclaration__Group_2__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1606:1: ( rule__ReferenceDeclaration__Group_2__1__Impl rule__ReferenceDeclaration__Group_2__2 )
-            // InternalProblem.g:1607:2: rule__ReferenceDeclaration__Group_2__1__Impl rule__ReferenceDeclaration__Group_2__2
+            // InternalProblem.g:2099:1: ( rule__ReferenceDeclaration__Group_2__1__Impl rule__ReferenceDeclaration__Group_2__2 )
+            // InternalProblem.g:2100:2: rule__ReferenceDeclaration__Group_2__1__Impl rule__ReferenceDeclaration__Group_2__2
             {
-            pushFollow(FOLLOW_18);
+            pushFollow(FOLLOW_21);
             rule__ReferenceDeclaration__Group_2__1__Impl();
 
             state._fsp--;
@@ -5179,21 +6768,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_2__1__Impl"
-    // InternalProblem.g:1614:1: rule__ReferenceDeclaration__Group_2__1__Impl : ( ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 ) ) ;
+    // InternalProblem.g:2107:1: rule__ReferenceDeclaration__Group_2__1__Impl : ( ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 ) ) ;
     public final void rule__ReferenceDeclaration__Group_2__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1618:1: ( ( ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 ) ) )
-            // InternalProblem.g:1619:1: ( ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 ) )
+            // InternalProblem.g:2111:1: ( ( ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 ) ) )
+            // InternalProblem.g:2112:1: ( ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 ) )
             {
-            // InternalProblem.g:1619:1: ( ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 ) )
-            // InternalProblem.g:1620:2: ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 )
+            // InternalProblem.g:2112:1: ( ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 ) )
+            // InternalProblem.g:2113:2: ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 )
             {
              before(grammarAccess.getReferenceDeclarationAccess().getMultiplicityAssignment_2_1()); 
-            // InternalProblem.g:1621:2: ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 )
-            // InternalProblem.g:1621:3: rule__ReferenceDeclaration__MultiplicityAssignment_2_1
+            // InternalProblem.g:2114:2: ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 )
+            // InternalProblem.g:2114:3: rule__ReferenceDeclaration__MultiplicityAssignment_2_1
             {
             pushFollow(FOLLOW_2);
             rule__ReferenceDeclaration__MultiplicityAssignment_2_1();
@@ -5226,14 +6815,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_2__2"
-    // InternalProblem.g:1629:1: rule__ReferenceDeclaration__Group_2__2 : rule__ReferenceDeclaration__Group_2__2__Impl ;
+    // InternalProblem.g:2122:1: rule__ReferenceDeclaration__Group_2__2 : rule__ReferenceDeclaration__Group_2__2__Impl ;
     public final void rule__ReferenceDeclaration__Group_2__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1633:1: ( rule__ReferenceDeclaration__Group_2__2__Impl )
-            // InternalProblem.g:1634:2: rule__ReferenceDeclaration__Group_2__2__Impl
+            // InternalProblem.g:2126:1: ( rule__ReferenceDeclaration__Group_2__2__Impl )
+            // InternalProblem.g:2127:2: rule__ReferenceDeclaration__Group_2__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ReferenceDeclaration__Group_2__2__Impl();
@@ -5259,20 +6848,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_2__2__Impl"
-    // InternalProblem.g:1640:1: rule__ReferenceDeclaration__Group_2__2__Impl : ( ']' ) ;
+    // InternalProblem.g:2133:1: rule__ReferenceDeclaration__Group_2__2__Impl : ( ']' ) ;
     public final void rule__ReferenceDeclaration__Group_2__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1644:1: ( ( ']' ) )
-            // InternalProblem.g:1645:1: ( ']' )
+            // InternalProblem.g:2137:1: ( ( ']' ) )
+            // InternalProblem.g:2138:1: ( ']' )
             {
-            // InternalProblem.g:1645:1: ( ']' )
-            // InternalProblem.g:1646:2: ']'
+            // InternalProblem.g:2138:1: ( ']' )
+            // InternalProblem.g:2139:2: ']'
             {
              before(grammarAccess.getReferenceDeclarationAccess().getRightSquareBracketKeyword_2_2()); 
-            match(input,30,FOLLOW_2); 
+            match(input,31,FOLLOW_2); 
              after(grammarAccess.getReferenceDeclarationAccess().getRightSquareBracketKeyword_2_2()); 
 
             }
@@ -5296,16 +6885,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_4__0"
-    // InternalProblem.g:1656:1: rule__ReferenceDeclaration__Group_4__0 : rule__ReferenceDeclaration__Group_4__0__Impl rule__ReferenceDeclaration__Group_4__1 ;
+    // InternalProblem.g:2149:1: rule__ReferenceDeclaration__Group_4__0 : rule__ReferenceDeclaration__Group_4__0__Impl rule__ReferenceDeclaration__Group_4__1 ;
     public final void rule__ReferenceDeclaration__Group_4__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1660:1: ( rule__ReferenceDeclaration__Group_4__0__Impl rule__ReferenceDeclaration__Group_4__1 )
-            // InternalProblem.g:1661:2: rule__ReferenceDeclaration__Group_4__0__Impl rule__ReferenceDeclaration__Group_4__1
+            // InternalProblem.g:2153:1: ( rule__ReferenceDeclaration__Group_4__0__Impl rule__ReferenceDeclaration__Group_4__1 )
+            // InternalProblem.g:2154:2: rule__ReferenceDeclaration__Group_4__0__Impl rule__ReferenceDeclaration__Group_4__1
             {
-            pushFollow(FOLLOW_9);
+            pushFollow(FOLLOW_5);
             rule__ReferenceDeclaration__Group_4__0__Impl();
 
             state._fsp--;
@@ -5334,20 +6923,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_4__0__Impl"
-    // InternalProblem.g:1668:1: rule__ReferenceDeclaration__Group_4__0__Impl : ( 'opposite' ) ;
+    // InternalProblem.g:2161:1: rule__ReferenceDeclaration__Group_4__0__Impl : ( 'opposite' ) ;
     public final void rule__ReferenceDeclaration__Group_4__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1672:1: ( ( 'opposite' ) )
-            // InternalProblem.g:1673:1: ( 'opposite' )
+            // InternalProblem.g:2165:1: ( ( 'opposite' ) )
+            // InternalProblem.g:2166:1: ( 'opposite' )
             {
-            // InternalProblem.g:1673:1: ( 'opposite' )
-            // InternalProblem.g:1674:2: 'opposite'
+            // InternalProblem.g:2166:1: ( 'opposite' )
+            // InternalProblem.g:2167:2: 'opposite'
             {
              before(grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_4_0()); 
-            match(input,31,FOLLOW_2); 
+            match(input,32,FOLLOW_2); 
              after(grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_4_0()); 
 
             }
@@ -5371,14 +6960,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_4__1"
-    // InternalProblem.g:1683:1: rule__ReferenceDeclaration__Group_4__1 : rule__ReferenceDeclaration__Group_4__1__Impl ;
+    // InternalProblem.g:2176:1: rule__ReferenceDeclaration__Group_4__1 : rule__ReferenceDeclaration__Group_4__1__Impl ;
     public final void rule__ReferenceDeclaration__Group_4__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1687:1: ( rule__ReferenceDeclaration__Group_4__1__Impl )
-            // InternalProblem.g:1688:2: rule__ReferenceDeclaration__Group_4__1__Impl
+            // InternalProblem.g:2180:1: ( rule__ReferenceDeclaration__Group_4__1__Impl )
+            // InternalProblem.g:2181:2: rule__ReferenceDeclaration__Group_4__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ReferenceDeclaration__Group_4__1__Impl();
@@ -5404,21 +6993,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_4__1__Impl"
-    // InternalProblem.g:1694:1: rule__ReferenceDeclaration__Group_4__1__Impl : ( ( rule__ReferenceDeclaration__OppositeAssignment_4_1 ) ) ;
+    // InternalProblem.g:2187:1: rule__ReferenceDeclaration__Group_4__1__Impl : ( ( rule__ReferenceDeclaration__OppositeAssignment_4_1 ) ) ;
     public final void rule__ReferenceDeclaration__Group_4__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1698:1: ( ( ( rule__ReferenceDeclaration__OppositeAssignment_4_1 ) ) )
-            // InternalProblem.g:1699:1: ( ( rule__ReferenceDeclaration__OppositeAssignment_4_1 ) )
+            // InternalProblem.g:2191:1: ( ( ( rule__ReferenceDeclaration__OppositeAssignment_4_1 ) ) )
+            // InternalProblem.g:2192:1: ( ( rule__ReferenceDeclaration__OppositeAssignment_4_1 ) )
             {
-            // InternalProblem.g:1699:1: ( ( rule__ReferenceDeclaration__OppositeAssignment_4_1 ) )
-            // InternalProblem.g:1700:2: ( rule__ReferenceDeclaration__OppositeAssignment_4_1 )
+            // InternalProblem.g:2192:1: ( ( rule__ReferenceDeclaration__OppositeAssignment_4_1 ) )
+            // InternalProblem.g:2193:2: ( rule__ReferenceDeclaration__OppositeAssignment_4_1 )
             {
              before(grammarAccess.getReferenceDeclarationAccess().getOppositeAssignment_4_1()); 
-            // InternalProblem.g:1701:2: ( rule__ReferenceDeclaration__OppositeAssignment_4_1 )
-            // InternalProblem.g:1701:3: rule__ReferenceDeclaration__OppositeAssignment_4_1
+            // InternalProblem.g:2194:2: ( rule__ReferenceDeclaration__OppositeAssignment_4_1 )
+            // InternalProblem.g:2194:3: rule__ReferenceDeclaration__OppositeAssignment_4_1
             {
             pushFollow(FOLLOW_2);
             rule__ReferenceDeclaration__OppositeAssignment_4_1();
@@ -5451,14 +7040,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__0"
-    // InternalProblem.g:1710:1: rule__PredicateDefinition__Group__0 : rule__PredicateDefinition__Group__0__Impl rule__PredicateDefinition__Group__1 ;
+    // InternalProblem.g:2203:1: rule__PredicateDefinition__Group__0 : rule__PredicateDefinition__Group__0__Impl rule__PredicateDefinition__Group__1 ;
     public final void rule__PredicateDefinition__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1714:1: ( rule__PredicateDefinition__Group__0__Impl rule__PredicateDefinition__Group__1 )
-            // InternalProblem.g:1715:2: rule__PredicateDefinition__Group__0__Impl rule__PredicateDefinition__Group__1
+            // InternalProblem.g:2207:1: ( rule__PredicateDefinition__Group__0__Impl rule__PredicateDefinition__Group__1 )
+            // InternalProblem.g:2208:2: rule__PredicateDefinition__Group__0__Impl rule__PredicateDefinition__Group__1
             {
             pushFollow(FOLLOW_5);
             rule__PredicateDefinition__Group__0__Impl();
@@ -5489,21 +7078,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__0__Impl"
-    // InternalProblem.g:1722:1: rule__PredicateDefinition__Group__0__Impl : ( ( rule__PredicateDefinition__Alternatives_0 ) ) ;
+    // InternalProblem.g:2215:1: rule__PredicateDefinition__Group__0__Impl : ( ( rule__PredicateDefinition__Alternatives_0 ) ) ;
     public final void rule__PredicateDefinition__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1726:1: ( ( ( rule__PredicateDefinition__Alternatives_0 ) ) )
-            // InternalProblem.g:1727:1: ( ( rule__PredicateDefinition__Alternatives_0 ) )
+            // InternalProblem.g:2219:1: ( ( ( rule__PredicateDefinition__Alternatives_0 ) ) )
+            // InternalProblem.g:2220:1: ( ( rule__PredicateDefinition__Alternatives_0 ) )
             {
-            // InternalProblem.g:1727:1: ( ( rule__PredicateDefinition__Alternatives_0 ) )
-            // InternalProblem.g:1728:2: ( rule__PredicateDefinition__Alternatives_0 )
+            // InternalProblem.g:2220:1: ( ( rule__PredicateDefinition__Alternatives_0 ) )
+            // InternalProblem.g:2221:2: ( rule__PredicateDefinition__Alternatives_0 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getAlternatives_0()); 
-            // InternalProblem.g:1729:2: ( rule__PredicateDefinition__Alternatives_0 )
-            // InternalProblem.g:1729:3: rule__PredicateDefinition__Alternatives_0
+            // InternalProblem.g:2222:2: ( rule__PredicateDefinition__Alternatives_0 )
+            // InternalProblem.g:2222:3: rule__PredicateDefinition__Alternatives_0
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Alternatives_0();
@@ -5536,16 +7125,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__1"
-    // InternalProblem.g:1737:1: rule__PredicateDefinition__Group__1 : rule__PredicateDefinition__Group__1__Impl rule__PredicateDefinition__Group__2 ;
+    // InternalProblem.g:2230:1: rule__PredicateDefinition__Group__1 : rule__PredicateDefinition__Group__1__Impl rule__PredicateDefinition__Group__2 ;
     public final void rule__PredicateDefinition__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1741:1: ( rule__PredicateDefinition__Group__1__Impl rule__PredicateDefinition__Group__2 )
-            // InternalProblem.g:1742:2: rule__PredicateDefinition__Group__1__Impl rule__PredicateDefinition__Group__2
+            // InternalProblem.g:2234:1: ( rule__PredicateDefinition__Group__1__Impl rule__PredicateDefinition__Group__2 )
+            // InternalProblem.g:2235:2: rule__PredicateDefinition__Group__1__Impl rule__PredicateDefinition__Group__2
             {
-            pushFollow(FOLLOW_19);
+            pushFollow(FOLLOW_22);
             rule__PredicateDefinition__Group__1__Impl();
 
             state._fsp--;
@@ -5574,21 +7163,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__1__Impl"
-    // InternalProblem.g:1749:1: rule__PredicateDefinition__Group__1__Impl : ( ( rule__PredicateDefinition__NameAssignment_1 ) ) ;
+    // InternalProblem.g:2242:1: rule__PredicateDefinition__Group__1__Impl : ( ( rule__PredicateDefinition__NameAssignment_1 ) ) ;
     public final void rule__PredicateDefinition__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1753:1: ( ( ( rule__PredicateDefinition__NameAssignment_1 ) ) )
-            // InternalProblem.g:1754:1: ( ( rule__PredicateDefinition__NameAssignment_1 ) )
+            // InternalProblem.g:2246:1: ( ( ( rule__PredicateDefinition__NameAssignment_1 ) ) )
+            // InternalProblem.g:2247:1: ( ( rule__PredicateDefinition__NameAssignment_1 ) )
             {
-            // InternalProblem.g:1754:1: ( ( rule__PredicateDefinition__NameAssignment_1 ) )
-            // InternalProblem.g:1755:2: ( rule__PredicateDefinition__NameAssignment_1 )
+            // InternalProblem.g:2247:1: ( ( rule__PredicateDefinition__NameAssignment_1 ) )
+            // InternalProblem.g:2248:2: ( rule__PredicateDefinition__NameAssignment_1 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getNameAssignment_1()); 
-            // InternalProblem.g:1756:2: ( rule__PredicateDefinition__NameAssignment_1 )
-            // InternalProblem.g:1756:3: rule__PredicateDefinition__NameAssignment_1
+            // InternalProblem.g:2249:2: ( rule__PredicateDefinition__NameAssignment_1 )
+            // InternalProblem.g:2249:3: rule__PredicateDefinition__NameAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__NameAssignment_1();
@@ -5621,16 +7210,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__2"
-    // InternalProblem.g:1764:1: rule__PredicateDefinition__Group__2 : rule__PredicateDefinition__Group__2__Impl rule__PredicateDefinition__Group__3 ;
+    // InternalProblem.g:2257:1: rule__PredicateDefinition__Group__2 : rule__PredicateDefinition__Group__2__Impl rule__PredicateDefinition__Group__3 ;
     public final void rule__PredicateDefinition__Group__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1768:1: ( rule__PredicateDefinition__Group__2__Impl rule__PredicateDefinition__Group__3 )
-            // InternalProblem.g:1769:2: rule__PredicateDefinition__Group__2__Impl rule__PredicateDefinition__Group__3
+            // InternalProblem.g:2261:1: ( rule__PredicateDefinition__Group__2__Impl rule__PredicateDefinition__Group__3 )
+            // InternalProblem.g:2262:2: rule__PredicateDefinition__Group__2__Impl rule__PredicateDefinition__Group__3
             {
-            pushFollow(FOLLOW_20);
+            pushFollow(FOLLOW_23);
             rule__PredicateDefinition__Group__2__Impl();
 
             state._fsp--;
@@ -5659,20 +7248,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__2__Impl"
-    // InternalProblem.g:1776:1: rule__PredicateDefinition__Group__2__Impl : ( '(' ) ;
+    // InternalProblem.g:2269:1: rule__PredicateDefinition__Group__2__Impl : ( '(' ) ;
     public final void rule__PredicateDefinition__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1780:1: ( ( '(' ) )
-            // InternalProblem.g:1781:1: ( '(' )
+            // InternalProblem.g:2273:1: ( ( '(' ) )
+            // InternalProblem.g:2274:1: ( '(' )
             {
-            // InternalProblem.g:1781:1: ( '(' )
-            // InternalProblem.g:1782:2: '('
+            // InternalProblem.g:2274:1: ( '(' )
+            // InternalProblem.g:2275:2: '('
             {
              before(grammarAccess.getPredicateDefinitionAccess().getLeftParenthesisKeyword_2()); 
-            match(input,32,FOLLOW_2); 
+            match(input,33,FOLLOW_2); 
              after(grammarAccess.getPredicateDefinitionAccess().getLeftParenthesisKeyword_2()); 
 
             }
@@ -5696,16 +7285,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__3"
-    // InternalProblem.g:1791:1: rule__PredicateDefinition__Group__3 : rule__PredicateDefinition__Group__3__Impl rule__PredicateDefinition__Group__4 ;
+    // InternalProblem.g:2284:1: rule__PredicateDefinition__Group__3 : rule__PredicateDefinition__Group__3__Impl rule__PredicateDefinition__Group__4 ;
     public final void rule__PredicateDefinition__Group__3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1795:1: ( rule__PredicateDefinition__Group__3__Impl rule__PredicateDefinition__Group__4 )
-            // InternalProblem.g:1796:2: rule__PredicateDefinition__Group__3__Impl rule__PredicateDefinition__Group__4
+            // InternalProblem.g:2288:1: ( rule__PredicateDefinition__Group__3__Impl rule__PredicateDefinition__Group__4 )
+            // InternalProblem.g:2289:2: rule__PredicateDefinition__Group__3__Impl rule__PredicateDefinition__Group__4
             {
-            pushFollow(FOLLOW_20);
+            pushFollow(FOLLOW_23);
             rule__PredicateDefinition__Group__3__Impl();
 
             state._fsp--;
@@ -5734,29 +7323,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__3__Impl"
-    // InternalProblem.g:1803:1: rule__PredicateDefinition__Group__3__Impl : ( ( rule__PredicateDefinition__Group_3__0 )? ) ;
+    // InternalProblem.g:2296:1: rule__PredicateDefinition__Group__3__Impl : ( ( rule__PredicateDefinition__Group_3__0 )? ) ;
     public final void rule__PredicateDefinition__Group__3__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1807:1: ( ( ( rule__PredicateDefinition__Group_3__0 )? ) )
-            // InternalProblem.g:1808:1: ( ( rule__PredicateDefinition__Group_3__0 )? )
+            // InternalProblem.g:2300:1: ( ( ( rule__PredicateDefinition__Group_3__0 )? ) )
+            // InternalProblem.g:2301:1: ( ( rule__PredicateDefinition__Group_3__0 )? )
             {
-            // InternalProblem.g:1808:1: ( ( rule__PredicateDefinition__Group_3__0 )? )
-            // InternalProblem.g:1809:2: ( rule__PredicateDefinition__Group_3__0 )?
+            // InternalProblem.g:2301:1: ( ( rule__PredicateDefinition__Group_3__0 )? )
+            // InternalProblem.g:2302:2: ( rule__PredicateDefinition__Group_3__0 )?
             {
              before(grammarAccess.getPredicateDefinitionAccess().getGroup_3()); 
-            // InternalProblem.g:1810:2: ( rule__PredicateDefinition__Group_3__0 )?
-            int alt23=2;
-            int LA23_0 = input.LA(1);
+            // InternalProblem.g:2303:2: ( rule__PredicateDefinition__Group_3__0 )?
+            int alt31=2;
+            int LA31_0 = input.LA(1);
 
-            if ( (LA23_0==RULE_ID) ) {
-                alt23=1;
+            if ( ((LA31_0>=RULE_QUOTED_ID && LA31_0<=RULE_ID)||(LA31_0>=19 && LA31_0<=20)) ) {
+                alt31=1;
             }
-            switch (alt23) {
+            switch (alt31) {
                 case 1 :
-                    // InternalProblem.g:1810:3: rule__PredicateDefinition__Group_3__0
+                    // InternalProblem.g:2303:3: rule__PredicateDefinition__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__PredicateDefinition__Group_3__0();
@@ -5792,16 +7381,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__4"
-    // InternalProblem.g:1818:1: rule__PredicateDefinition__Group__4 : rule__PredicateDefinition__Group__4__Impl rule__PredicateDefinition__Group__5 ;
+    // InternalProblem.g:2311:1: rule__PredicateDefinition__Group__4 : rule__PredicateDefinition__Group__4__Impl rule__PredicateDefinition__Group__5 ;
     public final void rule__PredicateDefinition__Group__4() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1822:1: ( rule__PredicateDefinition__Group__4__Impl rule__PredicateDefinition__Group__5 )
-            // InternalProblem.g:1823:2: rule__PredicateDefinition__Group__4__Impl rule__PredicateDefinition__Group__5
+            // InternalProblem.g:2315:1: ( rule__PredicateDefinition__Group__4__Impl rule__PredicateDefinition__Group__5 )
+            // InternalProblem.g:2316:2: rule__PredicateDefinition__Group__4__Impl rule__PredicateDefinition__Group__5
             {
-            pushFollow(FOLLOW_21);
+            pushFollow(FOLLOW_24);
             rule__PredicateDefinition__Group__4__Impl();
 
             state._fsp--;
@@ -5830,20 +7419,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__4__Impl"
-    // InternalProblem.g:1830:1: rule__PredicateDefinition__Group__4__Impl : ( ')' ) ;
+    // InternalProblem.g:2323:1: rule__PredicateDefinition__Group__4__Impl : ( ')' ) ;
     public final void rule__PredicateDefinition__Group__4__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1834:1: ( ( ')' ) )
-            // InternalProblem.g:1835:1: ( ')' )
+            // InternalProblem.g:2327:1: ( ( ')' ) )
+            // InternalProblem.g:2328:1: ( ')' )
             {
-            // InternalProblem.g:1835:1: ( ')' )
-            // InternalProblem.g:1836:2: ')'
+            // InternalProblem.g:2328:1: ( ')' )
+            // InternalProblem.g:2329:2: ')'
             {
              before(grammarAccess.getPredicateDefinitionAccess().getRightParenthesisKeyword_4()); 
-            match(input,33,FOLLOW_2); 
+            match(input,34,FOLLOW_2); 
              after(grammarAccess.getPredicateDefinitionAccess().getRightParenthesisKeyword_4()); 
 
             }
@@ -5867,16 +7456,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__5"
-    // InternalProblem.g:1845:1: rule__PredicateDefinition__Group__5 : rule__PredicateDefinition__Group__5__Impl rule__PredicateDefinition__Group__6 ;
+    // InternalProblem.g:2338:1: rule__PredicateDefinition__Group__5 : rule__PredicateDefinition__Group__5__Impl rule__PredicateDefinition__Group__6 ;
     public final void rule__PredicateDefinition__Group__5() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1849:1: ( rule__PredicateDefinition__Group__5__Impl rule__PredicateDefinition__Group__6 )
-            // InternalProblem.g:1850:2: rule__PredicateDefinition__Group__5__Impl rule__PredicateDefinition__Group__6
+            // InternalProblem.g:2342:1: ( rule__PredicateDefinition__Group__5__Impl rule__PredicateDefinition__Group__6 )
+            // InternalProblem.g:2343:2: rule__PredicateDefinition__Group__5__Impl rule__PredicateDefinition__Group__6
             {
-            pushFollow(FOLLOW_21);
+            pushFollow(FOLLOW_24);
             rule__PredicateDefinition__Group__5__Impl();
 
             state._fsp--;
@@ -5905,29 +7494,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__5__Impl"
-    // InternalProblem.g:1857:1: rule__PredicateDefinition__Group__5__Impl : ( ( rule__PredicateDefinition__Group_5__0 )? ) ;
+    // InternalProblem.g:2350:1: rule__PredicateDefinition__Group__5__Impl : ( ( rule__PredicateDefinition__Group_5__0 )? ) ;
     public final void rule__PredicateDefinition__Group__5__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1861:1: ( ( ( rule__PredicateDefinition__Group_5__0 )? ) )
-            // InternalProblem.g:1862:1: ( ( rule__PredicateDefinition__Group_5__0 )? )
+            // InternalProblem.g:2354:1: ( ( ( rule__PredicateDefinition__Group_5__0 )? ) )
+            // InternalProblem.g:2355:1: ( ( rule__PredicateDefinition__Group_5__0 )? )
             {
-            // InternalProblem.g:1862:1: ( ( rule__PredicateDefinition__Group_5__0 )? )
-            // InternalProblem.g:1863:2: ( rule__PredicateDefinition__Group_5__0 )?
+            // InternalProblem.g:2355:1: ( ( rule__PredicateDefinition__Group_5__0 )? )
+            // InternalProblem.g:2356:2: ( rule__PredicateDefinition__Group_5__0 )?
             {
              before(grammarAccess.getPredicateDefinitionAccess().getGroup_5()); 
-            // InternalProblem.g:1864:2: ( rule__PredicateDefinition__Group_5__0 )?
-            int alt24=2;
-            int LA24_0 = input.LA(1);
+            // InternalProblem.g:2357:2: ( rule__PredicateDefinition__Group_5__0 )?
+            int alt32=2;
+            int LA32_0 = input.LA(1);
 
-            if ( (LA24_0==34) ) {
-                alt24=1;
+            if ( (LA32_0==35) ) {
+                alt32=1;
             }
-            switch (alt24) {
+            switch (alt32) {
                 case 1 :
-                    // InternalProblem.g:1864:3: rule__PredicateDefinition__Group_5__0
+                    // InternalProblem.g:2357:3: rule__PredicateDefinition__Group_5__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__PredicateDefinition__Group_5__0();
@@ -5963,14 +7552,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__6"
-    // InternalProblem.g:1872:1: rule__PredicateDefinition__Group__6 : rule__PredicateDefinition__Group__6__Impl ;
+    // InternalProblem.g:2365:1: rule__PredicateDefinition__Group__6 : rule__PredicateDefinition__Group__6__Impl ;
     public final void rule__PredicateDefinition__Group__6() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1876:1: ( rule__PredicateDefinition__Group__6__Impl )
-            // InternalProblem.g:1877:2: rule__PredicateDefinition__Group__6__Impl
+            // InternalProblem.g:2369:1: ( rule__PredicateDefinition__Group__6__Impl )
+            // InternalProblem.g:2370:2: rule__PredicateDefinition__Group__6__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group__6__Impl();
@@ -5996,17 +7585,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__6__Impl"
-    // InternalProblem.g:1883:1: rule__PredicateDefinition__Group__6__Impl : ( '.' ) ;
+    // InternalProblem.g:2376:1: rule__PredicateDefinition__Group__6__Impl : ( '.' ) ;
     public final void rule__PredicateDefinition__Group__6__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1887:1: ( ( '.' ) )
-            // InternalProblem.g:1888:1: ( '.' )
+            // InternalProblem.g:2380:1: ( ( '.' ) )
+            // InternalProblem.g:2381:1: ( '.' )
             {
-            // InternalProblem.g:1888:1: ( '.' )
-            // InternalProblem.g:1889:2: '.'
+            // InternalProblem.g:2381:1: ( '.' )
+            // InternalProblem.g:2382:2: '.'
             {
              before(grammarAccess.getPredicateDefinitionAccess().getFullStopKeyword_6()); 
             match(input,12,FOLLOW_2); 
@@ -6033,16 +7622,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_0_0__0"
-    // InternalProblem.g:1899:1: rule__PredicateDefinition__Group_0_0__0 : rule__PredicateDefinition__Group_0_0__0__Impl rule__PredicateDefinition__Group_0_0__1 ;
+    // InternalProblem.g:2392:1: rule__PredicateDefinition__Group_0_0__0 : rule__PredicateDefinition__Group_0_0__0__Impl rule__PredicateDefinition__Group_0_0__1 ;
     public final void rule__PredicateDefinition__Group_0_0__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1903:1: ( rule__PredicateDefinition__Group_0_0__0__Impl rule__PredicateDefinition__Group_0_0__1 )
-            // InternalProblem.g:1904:2: rule__PredicateDefinition__Group_0_0__0__Impl rule__PredicateDefinition__Group_0_0__1
+            // InternalProblem.g:2396:1: ( rule__PredicateDefinition__Group_0_0__0__Impl rule__PredicateDefinition__Group_0_0__1 )
+            // InternalProblem.g:2397:2: rule__PredicateDefinition__Group_0_0__0__Impl rule__PredicateDefinition__Group_0_0__1
             {
-            pushFollow(FOLLOW_22);
+            pushFollow(FOLLOW_25);
             rule__PredicateDefinition__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -6071,21 +7660,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_0_0__0__Impl"
-    // InternalProblem.g:1911:1: rule__PredicateDefinition__Group_0_0__0__Impl : ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) ) ;
+    // InternalProblem.g:2404:1: rule__PredicateDefinition__Group_0_0__0__Impl : ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) ) ;
     public final void rule__PredicateDefinition__Group_0_0__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1915:1: ( ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) ) )
-            // InternalProblem.g:1916:1: ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) )
+            // InternalProblem.g:2408:1: ( ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) ) )
+            // InternalProblem.g:2409:1: ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) )
             {
-            // InternalProblem.g:1916:1: ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) )
-            // InternalProblem.g:1917:2: ( rule__PredicateDefinition__ErrorAssignment_0_0_0 )
+            // InternalProblem.g:2409:1: ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) )
+            // InternalProblem.g:2410:2: ( rule__PredicateDefinition__ErrorAssignment_0_0_0 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getErrorAssignment_0_0_0()); 
-            // InternalProblem.g:1918:2: ( rule__PredicateDefinition__ErrorAssignment_0_0_0 )
-            // InternalProblem.g:1918:3: rule__PredicateDefinition__ErrorAssignment_0_0_0
+            // InternalProblem.g:2411:2: ( rule__PredicateDefinition__ErrorAssignment_0_0_0 )
+            // InternalProblem.g:2411:3: rule__PredicateDefinition__ErrorAssignment_0_0_0
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__ErrorAssignment_0_0_0();
@@ -6118,14 +7707,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_0_0__1"
-    // InternalProblem.g:1926:1: rule__PredicateDefinition__Group_0_0__1 : rule__PredicateDefinition__Group_0_0__1__Impl ;
+    // InternalProblem.g:2419:1: rule__PredicateDefinition__Group_0_0__1 : rule__PredicateDefinition__Group_0_0__1__Impl ;
     public final void rule__PredicateDefinition__Group_0_0__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1930:1: ( rule__PredicateDefinition__Group_0_0__1__Impl )
-            // InternalProblem.g:1931:2: rule__PredicateDefinition__Group_0_0__1__Impl
+            // InternalProblem.g:2423:1: ( rule__PredicateDefinition__Group_0_0__1__Impl )
+            // InternalProblem.g:2424:2: rule__PredicateDefinition__Group_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group_0_0__1__Impl();
@@ -6151,31 +7740,31 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_0_0__1__Impl"
-    // InternalProblem.g:1937:1: rule__PredicateDefinition__Group_0_0__1__Impl : ( ( 'pred' )? ) ;
+    // InternalProblem.g:2430:1: rule__PredicateDefinition__Group_0_0__1__Impl : ( ( 'pred' )? ) ;
     public final void rule__PredicateDefinition__Group_0_0__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1941:1: ( ( ( 'pred' )? ) )
-            // InternalProblem.g:1942:1: ( ( 'pred' )? )
+            // InternalProblem.g:2434:1: ( ( ( 'pred' )? ) )
+            // InternalProblem.g:2435:1: ( ( 'pred' )? )
             {
-            // InternalProblem.g:1942:1: ( ( 'pred' )? )
-            // InternalProblem.g:1943:2: ( 'pred' )?
+            // InternalProblem.g:2435:1: ( ( 'pred' )? )
+            // InternalProblem.g:2436:2: ( 'pred' )?
             {
              before(grammarAccess.getPredicateDefinitionAccess().getPredKeyword_0_0_1()); 
-            // InternalProblem.g:1944:2: ( 'pred' )?
-            int alt25=2;
-            int LA25_0 = input.LA(1);
+            // InternalProblem.g:2437:2: ( 'pred' )?
+            int alt33=2;
+            int LA33_0 = input.LA(1);
 
-            if ( (LA25_0==14) ) {
-                alt25=1;
+            if ( (LA33_0==16) ) {
+                alt33=1;
             }
-            switch (alt25) {
+            switch (alt33) {
                 case 1 :
-                    // InternalProblem.g:1944:3: 'pred'
+                    // InternalProblem.g:2437:3: 'pred'
                     {
-                    match(input,14,FOLLOW_2); 
+                    match(input,16,FOLLOW_2); 
 
                     }
                     break;
@@ -6205,16 +7794,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3__0"
-    // InternalProblem.g:1953:1: rule__PredicateDefinition__Group_3__0 : rule__PredicateDefinition__Group_3__0__Impl rule__PredicateDefinition__Group_3__1 ;
+    // InternalProblem.g:2446:1: rule__PredicateDefinition__Group_3__0 : rule__PredicateDefinition__Group_3__0__Impl rule__PredicateDefinition__Group_3__1 ;
     public final void rule__PredicateDefinition__Group_3__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1957:1: ( rule__PredicateDefinition__Group_3__0__Impl rule__PredicateDefinition__Group_3__1 )
-            // InternalProblem.g:1958:2: rule__PredicateDefinition__Group_3__0__Impl rule__PredicateDefinition__Group_3__1
+            // InternalProblem.g:2450:1: ( rule__PredicateDefinition__Group_3__0__Impl rule__PredicateDefinition__Group_3__1 )
+            // InternalProblem.g:2451:2: rule__PredicateDefinition__Group_3__0__Impl rule__PredicateDefinition__Group_3__1
             {
-            pushFollow(FOLLOW_10);
+            pushFollow(FOLLOW_9);
             rule__PredicateDefinition__Group_3__0__Impl();
 
             state._fsp--;
@@ -6243,21 +7832,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3__0__Impl"
-    // InternalProblem.g:1965:1: rule__PredicateDefinition__Group_3__0__Impl : ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) ) ;
+    // InternalProblem.g:2458:1: rule__PredicateDefinition__Group_3__0__Impl : ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) ) ;
     public final void rule__PredicateDefinition__Group_3__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1969:1: ( ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) ) )
-            // InternalProblem.g:1970:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) )
+            // InternalProblem.g:2462:1: ( ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) ) )
+            // InternalProblem.g:2463:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) )
             {
-            // InternalProblem.g:1970:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) )
-            // InternalProblem.g:1971:2: ( rule__PredicateDefinition__ParametersAssignment_3_0 )
+            // InternalProblem.g:2463:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) )
+            // InternalProblem.g:2464:2: ( rule__PredicateDefinition__ParametersAssignment_3_0 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getParametersAssignment_3_0()); 
-            // InternalProblem.g:1972:2: ( rule__PredicateDefinition__ParametersAssignment_3_0 )
-            // InternalProblem.g:1972:3: rule__PredicateDefinition__ParametersAssignment_3_0
+            // InternalProblem.g:2465:2: ( rule__PredicateDefinition__ParametersAssignment_3_0 )
+            // InternalProblem.g:2465:3: rule__PredicateDefinition__ParametersAssignment_3_0
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__ParametersAssignment_3_0();
@@ -6290,14 +7879,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3__1"
-    // InternalProblem.g:1980:1: rule__PredicateDefinition__Group_3__1 : rule__PredicateDefinition__Group_3__1__Impl ;
+    // InternalProblem.g:2473:1: rule__PredicateDefinition__Group_3__1 : rule__PredicateDefinition__Group_3__1__Impl ;
     public final void rule__PredicateDefinition__Group_3__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1984:1: ( rule__PredicateDefinition__Group_3__1__Impl )
-            // InternalProblem.g:1985:2: rule__PredicateDefinition__Group_3__1__Impl
+            // InternalProblem.g:2477:1: ( rule__PredicateDefinition__Group_3__1__Impl )
+            // InternalProblem.g:2478:2: rule__PredicateDefinition__Group_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group_3__1__Impl();
@@ -6323,35 +7912,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3__1__Impl"
-    // InternalProblem.g:1991:1: rule__PredicateDefinition__Group_3__1__Impl : ( ( rule__PredicateDefinition__Group_3_1__0 )* ) ;
+    // InternalProblem.g:2484:1: rule__PredicateDefinition__Group_3__1__Impl : ( ( rule__PredicateDefinition__Group_3_1__0 )* ) ;
     public final void rule__PredicateDefinition__Group_3__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1995:1: ( ( ( rule__PredicateDefinition__Group_3_1__0 )* ) )
-            // InternalProblem.g:1996:1: ( ( rule__PredicateDefinition__Group_3_1__0 )* )
+            // InternalProblem.g:2488:1: ( ( ( rule__PredicateDefinition__Group_3_1__0 )* ) )
+            // InternalProblem.g:2489:1: ( ( rule__PredicateDefinition__Group_3_1__0 )* )
             {
-            // InternalProblem.g:1996:1: ( ( rule__PredicateDefinition__Group_3_1__0 )* )
-            // InternalProblem.g:1997:2: ( rule__PredicateDefinition__Group_3_1__0 )*
+            // InternalProblem.g:2489:1: ( ( rule__PredicateDefinition__Group_3_1__0 )* )
+            // InternalProblem.g:2490:2: ( rule__PredicateDefinition__Group_3_1__0 )*
             {
              before(grammarAccess.getPredicateDefinitionAccess().getGroup_3_1()); 
-            // InternalProblem.g:1998:2: ( rule__PredicateDefinition__Group_3_1__0 )*
-            loop26:
+            // InternalProblem.g:2491:2: ( rule__PredicateDefinition__Group_3_1__0 )*
+            loop34:
             do {
-                int alt26=2;
-                int LA26_0 = input.LA(1);
+                int alt34=2;
+                int LA34_0 = input.LA(1);
 
-                if ( (LA26_0==25) ) {
-                    alt26=1;
+                if ( (LA34_0==13) ) {
+                    alt34=1;
                 }
 
 
-                switch (alt26) {
+                switch (alt34) {
                 case 1 :
-                    // InternalProblem.g:1998:3: rule__PredicateDefinition__Group_3_1__0
+                    // InternalProblem.g:2491:3: rule__PredicateDefinition__Group_3_1__0
                     {
-                    pushFollow(FOLLOW_11);
+                    pushFollow(FOLLOW_10);
                     rule__PredicateDefinition__Group_3_1__0();
 
                     state._fsp--;
@@ -6361,7 +7950,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop26;
+                    break loop34;
                 }
             } while (true);
 
@@ -6388,14 +7977,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3_1__0"
-    // InternalProblem.g:2007:1: rule__PredicateDefinition__Group_3_1__0 : rule__PredicateDefinition__Group_3_1__0__Impl rule__PredicateDefinition__Group_3_1__1 ;
+    // InternalProblem.g:2500:1: rule__PredicateDefinition__Group_3_1__0 : rule__PredicateDefinition__Group_3_1__0__Impl rule__PredicateDefinition__Group_3_1__1 ;
     public final void rule__PredicateDefinition__Group_3_1__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2011:1: ( rule__PredicateDefinition__Group_3_1__0__Impl rule__PredicateDefinition__Group_3_1__1 )
-            // InternalProblem.g:2012:2: rule__PredicateDefinition__Group_3_1__0__Impl rule__PredicateDefinition__Group_3_1__1
+            // InternalProblem.g:2504:1: ( rule__PredicateDefinition__Group_3_1__0__Impl rule__PredicateDefinition__Group_3_1__1 )
+            // InternalProblem.g:2505:2: rule__PredicateDefinition__Group_3_1__0__Impl rule__PredicateDefinition__Group_3_1__1
             {
             pushFollow(FOLLOW_5);
             rule__PredicateDefinition__Group_3_1__0__Impl();
@@ -6426,20 +8015,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3_1__0__Impl"
-    // InternalProblem.g:2019:1: rule__PredicateDefinition__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalProblem.g:2512:1: rule__PredicateDefinition__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__PredicateDefinition__Group_3_1__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2023:1: ( ( ',' ) )
-            // InternalProblem.g:2024:1: ( ',' )
+            // InternalProblem.g:2516:1: ( ( ',' ) )
+            // InternalProblem.g:2517:1: ( ',' )
             {
-            // InternalProblem.g:2024:1: ( ',' )
-            // InternalProblem.g:2025:2: ','
+            // InternalProblem.g:2517:1: ( ',' )
+            // InternalProblem.g:2518:2: ','
             {
              before(grammarAccess.getPredicateDefinitionAccess().getCommaKeyword_3_1_0()); 
-            match(input,25,FOLLOW_2); 
+            match(input,13,FOLLOW_2); 
              after(grammarAccess.getPredicateDefinitionAccess().getCommaKeyword_3_1_0()); 
 
             }
@@ -6463,14 +8052,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3_1__1"
-    // InternalProblem.g:2034:1: rule__PredicateDefinition__Group_3_1__1 : rule__PredicateDefinition__Group_3_1__1__Impl ;
+    // InternalProblem.g:2527:1: rule__PredicateDefinition__Group_3_1__1 : rule__PredicateDefinition__Group_3_1__1__Impl ;
     public final void rule__PredicateDefinition__Group_3_1__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2038:1: ( rule__PredicateDefinition__Group_3_1__1__Impl )
-            // InternalProblem.g:2039:2: rule__PredicateDefinition__Group_3_1__1__Impl
+            // InternalProblem.g:2531:1: ( rule__PredicateDefinition__Group_3_1__1__Impl )
+            // InternalProblem.g:2532:2: rule__PredicateDefinition__Group_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group_3_1__1__Impl();
@@ -6496,21 +8085,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3_1__1__Impl"
-    // InternalProblem.g:2045:1: rule__PredicateDefinition__Group_3_1__1__Impl : ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) ) ;
+    // InternalProblem.g:2538:1: rule__PredicateDefinition__Group_3_1__1__Impl : ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) ) ;
     public final void rule__PredicateDefinition__Group_3_1__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2049:1: ( ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) ) )
-            // InternalProblem.g:2050:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) )
+            // InternalProblem.g:2542:1: ( ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) ) )
+            // InternalProblem.g:2543:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) )
             {
-            // InternalProblem.g:2050:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) )
-            // InternalProblem.g:2051:2: ( rule__PredicateDefinition__ParametersAssignment_3_1_1 )
+            // InternalProblem.g:2543:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) )
+            // InternalProblem.g:2544:2: ( rule__PredicateDefinition__ParametersAssignment_3_1_1 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getParametersAssignment_3_1_1()); 
-            // InternalProblem.g:2052:2: ( rule__PredicateDefinition__ParametersAssignment_3_1_1 )
-            // InternalProblem.g:2052:3: rule__PredicateDefinition__ParametersAssignment_3_1_1
+            // InternalProblem.g:2545:2: ( rule__PredicateDefinition__ParametersAssignment_3_1_1 )
+            // InternalProblem.g:2545:3: rule__PredicateDefinition__ParametersAssignment_3_1_1
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__ParametersAssignment_3_1_1();
@@ -6543,16 +8132,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5__0"
-    // InternalProblem.g:2061:1: rule__PredicateDefinition__Group_5__0 : rule__PredicateDefinition__Group_5__0__Impl rule__PredicateDefinition__Group_5__1 ;
+    // InternalProblem.g:2554:1: rule__PredicateDefinition__Group_5__0 : rule__PredicateDefinition__Group_5__0__Impl rule__PredicateDefinition__Group_5__1 ;
     public final void rule__PredicateDefinition__Group_5__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2065:1: ( rule__PredicateDefinition__Group_5__0__Impl rule__PredicateDefinition__Group_5__1 )
-            // InternalProblem.g:2066:2: rule__PredicateDefinition__Group_5__0__Impl rule__PredicateDefinition__Group_5__1
+            // InternalProblem.g:2558:1: ( rule__PredicateDefinition__Group_5__0__Impl rule__PredicateDefinition__Group_5__1 )
+            // InternalProblem.g:2559:2: rule__PredicateDefinition__Group_5__0__Impl rule__PredicateDefinition__Group_5__1
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_26);
             rule__PredicateDefinition__Group_5__0__Impl();
 
             state._fsp--;
@@ -6581,20 +8170,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5__0__Impl"
-    // InternalProblem.g:2073:1: rule__PredicateDefinition__Group_5__0__Impl : ( ':-' ) ;
+    // InternalProblem.g:2566:1: rule__PredicateDefinition__Group_5__0__Impl : ( ':-' ) ;
     public final void rule__PredicateDefinition__Group_5__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2077:1: ( ( ':-' ) )
-            // InternalProblem.g:2078:1: ( ':-' )
+            // InternalProblem.g:2570:1: ( ( ':-' ) )
+            // InternalProblem.g:2571:1: ( ':-' )
             {
-            // InternalProblem.g:2078:1: ( ':-' )
-            // InternalProblem.g:2079:2: ':-'
+            // InternalProblem.g:2571:1: ( ':-' )
+            // InternalProblem.g:2572:2: ':-'
             {
              before(grammarAccess.getPredicateDefinitionAccess().getColonHyphenMinusKeyword_5_0()); 
-            match(input,34,FOLLOW_2); 
+            match(input,35,FOLLOW_2); 
              after(grammarAccess.getPredicateDefinitionAccess().getColonHyphenMinusKeyword_5_0()); 
 
             }
@@ -6618,16 +8207,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5__1"
-    // InternalProblem.g:2088:1: rule__PredicateDefinition__Group_5__1 : rule__PredicateDefinition__Group_5__1__Impl rule__PredicateDefinition__Group_5__2 ;
+    // InternalProblem.g:2581:1: rule__PredicateDefinition__Group_5__1 : rule__PredicateDefinition__Group_5__1__Impl rule__PredicateDefinition__Group_5__2 ;
     public final void rule__PredicateDefinition__Group_5__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2092:1: ( rule__PredicateDefinition__Group_5__1__Impl rule__PredicateDefinition__Group_5__2 )
-            // InternalProblem.g:2093:2: rule__PredicateDefinition__Group_5__1__Impl rule__PredicateDefinition__Group_5__2
+            // InternalProblem.g:2585:1: ( rule__PredicateDefinition__Group_5__1__Impl rule__PredicateDefinition__Group_5__2 )
+            // InternalProblem.g:2586:2: rule__PredicateDefinition__Group_5__1__Impl rule__PredicateDefinition__Group_5__2
             {
-            pushFollow(FOLLOW_14);
+            pushFollow(FOLLOW_13);
             rule__PredicateDefinition__Group_5__1__Impl();
 
             state._fsp--;
@@ -6656,21 +8245,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5__1__Impl"
-    // InternalProblem.g:2100:1: rule__PredicateDefinition__Group_5__1__Impl : ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) ) ;
+    // InternalProblem.g:2593:1: rule__PredicateDefinition__Group_5__1__Impl : ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) ) ;
     public final void rule__PredicateDefinition__Group_5__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2104:1: ( ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) ) )
-            // InternalProblem.g:2105:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) )
+            // InternalProblem.g:2597:1: ( ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) ) )
+            // InternalProblem.g:2598:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) )
             {
-            // InternalProblem.g:2105:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) )
-            // InternalProblem.g:2106:2: ( rule__PredicateDefinition__BodiesAssignment_5_1 )
+            // InternalProblem.g:2598:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) )
+            // InternalProblem.g:2599:2: ( rule__PredicateDefinition__BodiesAssignment_5_1 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getBodiesAssignment_5_1()); 
-            // InternalProblem.g:2107:2: ( rule__PredicateDefinition__BodiesAssignment_5_1 )
-            // InternalProblem.g:2107:3: rule__PredicateDefinition__BodiesAssignment_5_1
+            // InternalProblem.g:2600:2: ( rule__PredicateDefinition__BodiesAssignment_5_1 )
+            // InternalProblem.g:2600:3: rule__PredicateDefinition__BodiesAssignment_5_1
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__BodiesAssignment_5_1();
@@ -6703,14 +8292,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5__2"
-    // InternalProblem.g:2115:1: rule__PredicateDefinition__Group_5__2 : rule__PredicateDefinition__Group_5__2__Impl ;
+    // InternalProblem.g:2608:1: rule__PredicateDefinition__Group_5__2 : rule__PredicateDefinition__Group_5__2__Impl ;
     public final void rule__PredicateDefinition__Group_5__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2119:1: ( rule__PredicateDefinition__Group_5__2__Impl )
-            // InternalProblem.g:2120:2: rule__PredicateDefinition__Group_5__2__Impl
+            // InternalProblem.g:2612:1: ( rule__PredicateDefinition__Group_5__2__Impl )
+            // InternalProblem.g:2613:2: rule__PredicateDefinition__Group_5__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group_5__2__Impl();
@@ -6736,35 +8325,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5__2__Impl"
-    // InternalProblem.g:2126:1: rule__PredicateDefinition__Group_5__2__Impl : ( ( rule__PredicateDefinition__Group_5_2__0 )* ) ;
+    // InternalProblem.g:2619:1: rule__PredicateDefinition__Group_5__2__Impl : ( ( rule__PredicateDefinition__Group_5_2__0 )* ) ;
     public final void rule__PredicateDefinition__Group_5__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2130:1: ( ( ( rule__PredicateDefinition__Group_5_2__0 )* ) )
-            // InternalProblem.g:2131:1: ( ( rule__PredicateDefinition__Group_5_2__0 )* )
+            // InternalProblem.g:2623:1: ( ( ( rule__PredicateDefinition__Group_5_2__0 )* ) )
+            // InternalProblem.g:2624:1: ( ( rule__PredicateDefinition__Group_5_2__0 )* )
             {
-            // InternalProblem.g:2131:1: ( ( rule__PredicateDefinition__Group_5_2__0 )* )
-            // InternalProblem.g:2132:2: ( rule__PredicateDefinition__Group_5_2__0 )*
+            // InternalProblem.g:2624:1: ( ( rule__PredicateDefinition__Group_5_2__0 )* )
+            // InternalProblem.g:2625:2: ( rule__PredicateDefinition__Group_5_2__0 )*
             {
              before(grammarAccess.getPredicateDefinitionAccess().getGroup_5_2()); 
-            // InternalProblem.g:2133:2: ( rule__PredicateDefinition__Group_5_2__0 )*
-            loop27:
+            // InternalProblem.g:2626:2: ( rule__PredicateDefinition__Group_5_2__0 )*
+            loop35:
             do {
-                int alt27=2;
-                int LA27_0 = input.LA(1);
+                int alt35=2;
+                int LA35_0 = input.LA(1);
 
-                if ( (LA27_0==28) ) {
-                    alt27=1;
+                if ( (LA35_0==14) ) {
+                    alt35=1;
                 }
 
 
-                switch (alt27) {
+                switch (alt35) {
                 case 1 :
-                    // InternalProblem.g:2133:3: rule__PredicateDefinition__Group_5_2__0
+                    // InternalProblem.g:2626:3: rule__PredicateDefinition__Group_5_2__0
                     {
-                    pushFollow(FOLLOW_24);
+                    pushFollow(FOLLOW_27);
                     rule__PredicateDefinition__Group_5_2__0();
 
                     state._fsp--;
@@ -6774,7 +8363,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop27;
+                    break loop35;
                 }
             } while (true);
 
@@ -6801,16 +8390,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5_2__0"
-    // InternalProblem.g:2142:1: rule__PredicateDefinition__Group_5_2__0 : rule__PredicateDefinition__Group_5_2__0__Impl rule__PredicateDefinition__Group_5_2__1 ;
+    // InternalProblem.g:2635:1: rule__PredicateDefinition__Group_5_2__0 : rule__PredicateDefinition__Group_5_2__0__Impl rule__PredicateDefinition__Group_5_2__1 ;
     public final void rule__PredicateDefinition__Group_5_2__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2146:1: ( rule__PredicateDefinition__Group_5_2__0__Impl rule__PredicateDefinition__Group_5_2__1 )
-            // InternalProblem.g:2147:2: rule__PredicateDefinition__Group_5_2__0__Impl rule__PredicateDefinition__Group_5_2__1
+            // InternalProblem.g:2639:1: ( rule__PredicateDefinition__Group_5_2__0__Impl rule__PredicateDefinition__Group_5_2__1 )
+            // InternalProblem.g:2640:2: rule__PredicateDefinition__Group_5_2__0__Impl rule__PredicateDefinition__Group_5_2__1
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_26);
             rule__PredicateDefinition__Group_5_2__0__Impl();
 
             state._fsp--;
@@ -6839,20 +8428,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5_2__0__Impl"
-    // InternalProblem.g:2154:1: rule__PredicateDefinition__Group_5_2__0__Impl : ( ';' ) ;
+    // InternalProblem.g:2647:1: rule__PredicateDefinition__Group_5_2__0__Impl : ( ';' ) ;
     public final void rule__PredicateDefinition__Group_5_2__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2158:1: ( ( ';' ) )
-            // InternalProblem.g:2159:1: ( ';' )
+            // InternalProblem.g:2651:1: ( ( ';' ) )
+            // InternalProblem.g:2652:1: ( ';' )
             {
-            // InternalProblem.g:2159:1: ( ';' )
-            // InternalProblem.g:2160:2: ';'
+            // InternalProblem.g:2652:1: ( ';' )
+            // InternalProblem.g:2653:2: ';'
             {
              before(grammarAccess.getPredicateDefinitionAccess().getSemicolonKeyword_5_2_0()); 
-            match(input,28,FOLLOW_2); 
+            match(input,14,FOLLOW_2); 
              after(grammarAccess.getPredicateDefinitionAccess().getSemicolonKeyword_5_2_0()); 
 
             }
@@ -6876,14 +8465,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5_2__1"
-    // InternalProblem.g:2169:1: rule__PredicateDefinition__Group_5_2__1 : rule__PredicateDefinition__Group_5_2__1__Impl ;
+    // InternalProblem.g:2662:1: rule__PredicateDefinition__Group_5_2__1 : rule__PredicateDefinition__Group_5_2__1__Impl ;
     public final void rule__PredicateDefinition__Group_5_2__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2173:1: ( rule__PredicateDefinition__Group_5_2__1__Impl )
-            // InternalProblem.g:2174:2: rule__PredicateDefinition__Group_5_2__1__Impl
+            // InternalProblem.g:2666:1: ( rule__PredicateDefinition__Group_5_2__1__Impl )
+            // InternalProblem.g:2667:2: rule__PredicateDefinition__Group_5_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group_5_2__1__Impl();
@@ -6909,21 +8498,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5_2__1__Impl"
-    // InternalProblem.g:2180:1: rule__PredicateDefinition__Group_5_2__1__Impl : ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) ) ;
+    // InternalProblem.g:2673:1: rule__PredicateDefinition__Group_5_2__1__Impl : ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) ) ;
     public final void rule__PredicateDefinition__Group_5_2__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2184:1: ( ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) ) )
-            // InternalProblem.g:2185:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) )
+            // InternalProblem.g:2677:1: ( ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) ) )
+            // InternalProblem.g:2678:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) )
             {
-            // InternalProblem.g:2185:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) )
-            // InternalProblem.g:2186:2: ( rule__PredicateDefinition__BodiesAssignment_5_2_1 )
+            // InternalProblem.g:2678:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) )
+            // InternalProblem.g:2679:2: ( rule__PredicateDefinition__BodiesAssignment_5_2_1 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getBodiesAssignment_5_2_1()); 
-            // InternalProblem.g:2187:2: ( rule__PredicateDefinition__BodiesAssignment_5_2_1 )
-            // InternalProblem.g:2187:3: rule__PredicateDefinition__BodiesAssignment_5_2_1
+            // InternalProblem.g:2680:2: ( rule__PredicateDefinition__BodiesAssignment_5_2_1 )
+            // InternalProblem.g:2680:3: rule__PredicateDefinition__BodiesAssignment_5_2_1
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__BodiesAssignment_5_2_1();
@@ -6956,14 +8545,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Parameter__Group__0"
-    // InternalProblem.g:2196:1: rule__Parameter__Group__0 : rule__Parameter__Group__0__Impl rule__Parameter__Group__1 ;
+    // InternalProblem.g:2689:1: rule__Parameter__Group__0 : rule__Parameter__Group__0__Impl rule__Parameter__Group__1 ;
     public final void rule__Parameter__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2200:1: ( rule__Parameter__Group__0__Impl rule__Parameter__Group__1 )
-            // InternalProblem.g:2201:2: rule__Parameter__Group__0__Impl rule__Parameter__Group__1
+            // InternalProblem.g:2693:1: ( rule__Parameter__Group__0__Impl rule__Parameter__Group__1 )
+            // InternalProblem.g:2694:2: rule__Parameter__Group__0__Impl rule__Parameter__Group__1
             {
             pushFollow(FOLLOW_5);
             rule__Parameter__Group__0__Impl();
@@ -6994,27 +8583,68 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Parameter__Group__0__Impl"
-    // InternalProblem.g:2208:1: rule__Parameter__Group__0__Impl : ( ( rule__Parameter__ParameterTypeAssignment_0 ) ) ;
+    // InternalProblem.g:2701:1: rule__Parameter__Group__0__Impl : ( ( rule__Parameter__ParameterTypeAssignment_0 )? ) ;
     public final void rule__Parameter__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2212:1: ( ( ( rule__Parameter__ParameterTypeAssignment_0 ) ) )
-            // InternalProblem.g:2213:1: ( ( rule__Parameter__ParameterTypeAssignment_0 ) )
+            // InternalProblem.g:2705:1: ( ( ( rule__Parameter__ParameterTypeAssignment_0 )? ) )
+            // InternalProblem.g:2706:1: ( ( rule__Parameter__ParameterTypeAssignment_0 )? )
             {
-            // InternalProblem.g:2213:1: ( ( rule__Parameter__ParameterTypeAssignment_0 ) )
-            // InternalProblem.g:2214:2: ( rule__Parameter__ParameterTypeAssignment_0 )
+            // InternalProblem.g:2706:1: ( ( rule__Parameter__ParameterTypeAssignment_0 )? )
+            // InternalProblem.g:2707:2: ( rule__Parameter__ParameterTypeAssignment_0 )?
             {
              before(grammarAccess.getParameterAccess().getParameterTypeAssignment_0()); 
-            // InternalProblem.g:2215:2: ( rule__Parameter__ParameterTypeAssignment_0 )
-            // InternalProblem.g:2215:3: rule__Parameter__ParameterTypeAssignment_0
-            {
-            pushFollow(FOLLOW_2);
-            rule__Parameter__ParameterTypeAssignment_0();
+            // InternalProblem.g:2708:2: ( rule__Parameter__ParameterTypeAssignment_0 )?
+            int alt36=2;
+            switch ( input.LA(1) ) {
+                case RULE_QUOTED_ID:
+                    {
+                    alt36=1;
+                    }
+                    break;
+                case RULE_ID:
+                    {
+                    int LA36_2 = input.LA(2);
+
+                    if ( (LA36_2==RULE_ID||(LA36_2>=19 && LA36_2<=20)||LA36_2==36) ) {
+                        alt36=1;
+                    }
+                    }
+                    break;
+                case 19:
+                    {
+                    int LA36_3 = input.LA(2);
+
+                    if ( (LA36_3==RULE_ID||(LA36_3>=19 && LA36_3<=20)||LA36_3==36) ) {
+                        alt36=1;
+                    }
+                    }
+                    break;
+                case 20:
+                    {
+                    int LA36_4 = input.LA(2);
+
+                    if ( (LA36_4==RULE_ID||(LA36_4>=19 && LA36_4<=20)||LA36_4==36) ) {
+                        alt36=1;
+                    }
+                    }
+                    break;
+            }
+
+            switch (alt36) {
+                case 1 :
+                    // InternalProblem.g:2708:3: rule__Parameter__ParameterTypeAssignment_0
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__Parameter__ParameterTypeAssignment_0();
+
+                    state._fsp--;
 
-            state._fsp--;
 
+                    }
+                    break;
 
             }
 
@@ -7041,14 +8671,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Parameter__Group__1"
-    // InternalProblem.g:2223:1: rule__Parameter__Group__1 : rule__Parameter__Group__1__Impl ;
+    // InternalProblem.g:2716:1: rule__Parameter__Group__1 : rule__Parameter__Group__1__Impl ;
     public final void rule__Parameter__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2227:1: ( rule__Parameter__Group__1__Impl )
-            // InternalProblem.g:2228:2: rule__Parameter__Group__1__Impl
+            // InternalProblem.g:2720:1: ( rule__Parameter__Group__1__Impl )
+            // InternalProblem.g:2721:2: rule__Parameter__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Parameter__Group__1__Impl();
@@ -7074,21 +8704,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Parameter__Group__1__Impl"
-    // InternalProblem.g:2234:1: rule__Parameter__Group__1__Impl : ( ( rule__Parameter__NameAssignment_1 ) ) ;
+    // InternalProblem.g:2727:1: rule__Parameter__Group__1__Impl : ( ( rule__Parameter__NameAssignment_1 ) ) ;
     public final void rule__Parameter__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2238:1: ( ( ( rule__Parameter__NameAssignment_1 ) ) )
-            // InternalProblem.g:2239:1: ( ( rule__Parameter__NameAssignment_1 ) )
+            // InternalProblem.g:2731:1: ( ( ( rule__Parameter__NameAssignment_1 ) ) )
+            // InternalProblem.g:2732:1: ( ( rule__Parameter__NameAssignment_1 ) )
             {
-            // InternalProblem.g:2239:1: ( ( rule__Parameter__NameAssignment_1 ) )
-            // InternalProblem.g:2240:2: ( rule__Parameter__NameAssignment_1 )
+            // InternalProblem.g:2732:1: ( ( rule__Parameter__NameAssignment_1 ) )
+            // InternalProblem.g:2733:2: ( rule__Parameter__NameAssignment_1 )
             {
              before(grammarAccess.getParameterAccess().getNameAssignment_1()); 
-            // InternalProblem.g:2241:2: ( rule__Parameter__NameAssignment_1 )
-            // InternalProblem.g:2241:3: rule__Parameter__NameAssignment_1
+            // InternalProblem.g:2734:2: ( rule__Parameter__NameAssignment_1 )
+            // InternalProblem.g:2734:3: rule__Parameter__NameAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__Parameter__NameAssignment_1();
@@ -7121,16 +8751,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group__0"
-    // InternalProblem.g:2250:1: rule__Conjunction__Group__0 : rule__Conjunction__Group__0__Impl rule__Conjunction__Group__1 ;
+    // InternalProblem.g:2743:1: rule__Conjunction__Group__0 : rule__Conjunction__Group__0__Impl rule__Conjunction__Group__1 ;
     public final void rule__Conjunction__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2254:1: ( rule__Conjunction__Group__0__Impl rule__Conjunction__Group__1 )
-            // InternalProblem.g:2255:2: rule__Conjunction__Group__0__Impl rule__Conjunction__Group__1
+            // InternalProblem.g:2747:1: ( rule__Conjunction__Group__0__Impl rule__Conjunction__Group__1 )
+            // InternalProblem.g:2748:2: rule__Conjunction__Group__0__Impl rule__Conjunction__Group__1
             {
-            pushFollow(FOLLOW_10);
+            pushFollow(FOLLOW_9);
             rule__Conjunction__Group__0__Impl();
 
             state._fsp--;
@@ -7159,21 +8789,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group__0__Impl"
-    // InternalProblem.g:2262:1: rule__Conjunction__Group__0__Impl : ( ( rule__Conjunction__LiteralsAssignment_0 ) ) ;
+    // InternalProblem.g:2755:1: rule__Conjunction__Group__0__Impl : ( ( rule__Conjunction__LiteralsAssignment_0 ) ) ;
     public final void rule__Conjunction__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2266:1: ( ( ( rule__Conjunction__LiteralsAssignment_0 ) ) )
-            // InternalProblem.g:2267:1: ( ( rule__Conjunction__LiteralsAssignment_0 ) )
+            // InternalProblem.g:2759:1: ( ( ( rule__Conjunction__LiteralsAssignment_0 ) ) )
+            // InternalProblem.g:2760:1: ( ( rule__Conjunction__LiteralsAssignment_0 ) )
             {
-            // InternalProblem.g:2267:1: ( ( rule__Conjunction__LiteralsAssignment_0 ) )
-            // InternalProblem.g:2268:2: ( rule__Conjunction__LiteralsAssignment_0 )
+            // InternalProblem.g:2760:1: ( ( rule__Conjunction__LiteralsAssignment_0 ) )
+            // InternalProblem.g:2761:2: ( rule__Conjunction__LiteralsAssignment_0 )
             {
              before(grammarAccess.getConjunctionAccess().getLiteralsAssignment_0()); 
-            // InternalProblem.g:2269:2: ( rule__Conjunction__LiteralsAssignment_0 )
-            // InternalProblem.g:2269:3: rule__Conjunction__LiteralsAssignment_0
+            // InternalProblem.g:2762:2: ( rule__Conjunction__LiteralsAssignment_0 )
+            // InternalProblem.g:2762:3: rule__Conjunction__LiteralsAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__Conjunction__LiteralsAssignment_0();
@@ -7206,14 +8836,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group__1"
-    // InternalProblem.g:2277:1: rule__Conjunction__Group__1 : rule__Conjunction__Group__1__Impl ;
+    // InternalProblem.g:2770:1: rule__Conjunction__Group__1 : rule__Conjunction__Group__1__Impl ;
     public final void rule__Conjunction__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2281:1: ( rule__Conjunction__Group__1__Impl )
-            // InternalProblem.g:2282:2: rule__Conjunction__Group__1__Impl
+            // InternalProblem.g:2774:1: ( rule__Conjunction__Group__1__Impl )
+            // InternalProblem.g:2775:2: rule__Conjunction__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Conjunction__Group__1__Impl();
@@ -7239,35 +8869,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group__1__Impl"
-    // InternalProblem.g:2288:1: rule__Conjunction__Group__1__Impl : ( ( rule__Conjunction__Group_1__0 )* ) ;
+    // InternalProblem.g:2781:1: rule__Conjunction__Group__1__Impl : ( ( rule__Conjunction__Group_1__0 )* ) ;
     public final void rule__Conjunction__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2292:1: ( ( ( rule__Conjunction__Group_1__0 )* ) )
-            // InternalProblem.g:2293:1: ( ( rule__Conjunction__Group_1__0 )* )
+            // InternalProblem.g:2785:1: ( ( ( rule__Conjunction__Group_1__0 )* ) )
+            // InternalProblem.g:2786:1: ( ( rule__Conjunction__Group_1__0 )* )
             {
-            // InternalProblem.g:2293:1: ( ( rule__Conjunction__Group_1__0 )* )
-            // InternalProblem.g:2294:2: ( rule__Conjunction__Group_1__0 )*
+            // InternalProblem.g:2786:1: ( ( rule__Conjunction__Group_1__0 )* )
+            // InternalProblem.g:2787:2: ( rule__Conjunction__Group_1__0 )*
             {
              before(grammarAccess.getConjunctionAccess().getGroup_1()); 
-            // InternalProblem.g:2295:2: ( rule__Conjunction__Group_1__0 )*
-            loop28:
+            // InternalProblem.g:2788:2: ( rule__Conjunction__Group_1__0 )*
+            loop37:
             do {
-                int alt28=2;
-                int LA28_0 = input.LA(1);
+                int alt37=2;
+                int LA37_0 = input.LA(1);
 
-                if ( (LA28_0==25) ) {
-                    alt28=1;
+                if ( (LA37_0==13) ) {
+                    alt37=1;
                 }
 
 
-                switch (alt28) {
+                switch (alt37) {
                 case 1 :
-                    // InternalProblem.g:2295:3: rule__Conjunction__Group_1__0
+                    // InternalProblem.g:2788:3: rule__Conjunction__Group_1__0
                     {
-                    pushFollow(FOLLOW_11);
+                    pushFollow(FOLLOW_10);
                     rule__Conjunction__Group_1__0();
 
                     state._fsp--;
@@ -7277,7 +8907,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop28;
+                    break loop37;
                 }
             } while (true);
 
@@ -7304,16 +8934,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group_1__0"
-    // InternalProblem.g:2304:1: rule__Conjunction__Group_1__0 : rule__Conjunction__Group_1__0__Impl rule__Conjunction__Group_1__1 ;
+    // InternalProblem.g:2797:1: rule__Conjunction__Group_1__0 : rule__Conjunction__Group_1__0__Impl rule__Conjunction__Group_1__1 ;
     public final void rule__Conjunction__Group_1__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2308:1: ( rule__Conjunction__Group_1__0__Impl rule__Conjunction__Group_1__1 )
-            // InternalProblem.g:2309:2: rule__Conjunction__Group_1__0__Impl rule__Conjunction__Group_1__1
+            // InternalProblem.g:2801:1: ( rule__Conjunction__Group_1__0__Impl rule__Conjunction__Group_1__1 )
+            // InternalProblem.g:2802:2: rule__Conjunction__Group_1__0__Impl rule__Conjunction__Group_1__1
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_26);
             rule__Conjunction__Group_1__0__Impl();
 
             state._fsp--;
@@ -7342,20 +8972,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group_1__0__Impl"
-    // InternalProblem.g:2316:1: rule__Conjunction__Group_1__0__Impl : ( ',' ) ;
+    // InternalProblem.g:2809:1: rule__Conjunction__Group_1__0__Impl : ( ',' ) ;
     public final void rule__Conjunction__Group_1__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2320:1: ( ( ',' ) )
-            // InternalProblem.g:2321:1: ( ',' )
+            // InternalProblem.g:2813:1: ( ( ',' ) )
+            // InternalProblem.g:2814:1: ( ',' )
             {
-            // InternalProblem.g:2321:1: ( ',' )
-            // InternalProblem.g:2322:2: ','
+            // InternalProblem.g:2814:1: ( ',' )
+            // InternalProblem.g:2815:2: ','
             {
              before(grammarAccess.getConjunctionAccess().getCommaKeyword_1_0()); 
-            match(input,25,FOLLOW_2); 
+            match(input,13,FOLLOW_2); 
              after(grammarAccess.getConjunctionAccess().getCommaKeyword_1_0()); 
 
             }
@@ -7379,14 +9009,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group_1__1"
-    // InternalProblem.g:2331:1: rule__Conjunction__Group_1__1 : rule__Conjunction__Group_1__1__Impl ;
+    // InternalProblem.g:2824:1: rule__Conjunction__Group_1__1 : rule__Conjunction__Group_1__1__Impl ;
     public final void rule__Conjunction__Group_1__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2335:1: ( rule__Conjunction__Group_1__1__Impl )
-            // InternalProblem.g:2336:2: rule__Conjunction__Group_1__1__Impl
+            // InternalProblem.g:2828:1: ( rule__Conjunction__Group_1__1__Impl )
+            // InternalProblem.g:2829:2: rule__Conjunction__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Conjunction__Group_1__1__Impl();
@@ -7412,21 +9042,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group_1__1__Impl"
-    // InternalProblem.g:2342:1: rule__Conjunction__Group_1__1__Impl : ( ( rule__Conjunction__LiteralsAssignment_1_1 ) ) ;
+    // InternalProblem.g:2835:1: rule__Conjunction__Group_1__1__Impl : ( ( rule__Conjunction__LiteralsAssignment_1_1 ) ) ;
     public final void rule__Conjunction__Group_1__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2346:1: ( ( ( rule__Conjunction__LiteralsAssignment_1_1 ) ) )
-            // InternalProblem.g:2347:1: ( ( rule__Conjunction__LiteralsAssignment_1_1 ) )
+            // InternalProblem.g:2839:1: ( ( ( rule__Conjunction__LiteralsAssignment_1_1 ) ) )
+            // InternalProblem.g:2840:1: ( ( rule__Conjunction__LiteralsAssignment_1_1 ) )
             {
-            // InternalProblem.g:2347:1: ( ( rule__Conjunction__LiteralsAssignment_1_1 ) )
-            // InternalProblem.g:2348:2: ( rule__Conjunction__LiteralsAssignment_1_1 )
+            // InternalProblem.g:2840:1: ( ( rule__Conjunction__LiteralsAssignment_1_1 ) )
+            // InternalProblem.g:2841:2: ( rule__Conjunction__LiteralsAssignment_1_1 )
             {
              before(grammarAccess.getConjunctionAccess().getLiteralsAssignment_1_1()); 
-            // InternalProblem.g:2349:2: ( rule__Conjunction__LiteralsAssignment_1_1 )
-            // InternalProblem.g:2349:3: rule__Conjunction__LiteralsAssignment_1_1
+            // InternalProblem.g:2842:2: ( rule__Conjunction__LiteralsAssignment_1_1 )
+            // InternalProblem.g:2842:3: rule__Conjunction__LiteralsAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__Conjunction__LiteralsAssignment_1_1();
@@ -7459,16 +9089,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NegativeLiteral__Group__0"
-    // InternalProblem.g:2358:1: rule__NegativeLiteral__Group__0 : rule__NegativeLiteral__Group__0__Impl rule__NegativeLiteral__Group__1 ;
+    // InternalProblem.g:2851:1: rule__NegativeLiteral__Group__0 : rule__NegativeLiteral__Group__0__Impl rule__NegativeLiteral__Group__1 ;
     public final void rule__NegativeLiteral__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2362:1: ( rule__NegativeLiteral__Group__0__Impl rule__NegativeLiteral__Group__1 )
-            // InternalProblem.g:2363:2: rule__NegativeLiteral__Group__0__Impl rule__NegativeLiteral__Group__1
+            // InternalProblem.g:2855:1: ( rule__NegativeLiteral__Group__0__Impl rule__NegativeLiteral__Group__1 )
+            // InternalProblem.g:2856:2: rule__NegativeLiteral__Group__0__Impl rule__NegativeLiteral__Group__1
             {
-            pushFollow(FOLLOW_9);
+            pushFollow(FOLLOW_5);
             rule__NegativeLiteral__Group__0__Impl();
 
             state._fsp--;
@@ -7497,20 +9127,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NegativeLiteral__Group__0__Impl"
-    // InternalProblem.g:2370:1: rule__NegativeLiteral__Group__0__Impl : ( '!' ) ;
+    // InternalProblem.g:2863:1: rule__NegativeLiteral__Group__0__Impl : ( '!' ) ;
     public final void rule__NegativeLiteral__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2374:1: ( ( '!' ) )
-            // InternalProblem.g:2375:1: ( '!' )
+            // InternalProblem.g:2867:1: ( ( '!' ) )
+            // InternalProblem.g:2868:1: ( '!' )
             {
-            // InternalProblem.g:2375:1: ( '!' )
-            // InternalProblem.g:2376:2: '!'
+            // InternalProblem.g:2868:1: ( '!' )
+            // InternalProblem.g:2869:2: '!'
             {
              before(grammarAccess.getNegativeLiteralAccess().getExclamationMarkKeyword_0()); 
-            match(input,20,FOLLOW_2); 
+            match(input,22,FOLLOW_2); 
              after(grammarAccess.getNegativeLiteralAccess().getExclamationMarkKeyword_0()); 
 
             }
@@ -7534,14 +9164,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NegativeLiteral__Group__1"
-    // InternalProblem.g:2385:1: rule__NegativeLiteral__Group__1 : rule__NegativeLiteral__Group__1__Impl ;
+    // InternalProblem.g:2878:1: rule__NegativeLiteral__Group__1 : rule__NegativeLiteral__Group__1__Impl ;
     public final void rule__NegativeLiteral__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2389:1: ( rule__NegativeLiteral__Group__1__Impl )
-            // InternalProblem.g:2390:2: rule__NegativeLiteral__Group__1__Impl
+            // InternalProblem.g:2882:1: ( rule__NegativeLiteral__Group__1__Impl )
+            // InternalProblem.g:2883:2: rule__NegativeLiteral__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__NegativeLiteral__Group__1__Impl();
@@ -7567,21 +9197,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NegativeLiteral__Group__1__Impl"
-    // InternalProblem.g:2396:1: rule__NegativeLiteral__Group__1__Impl : ( ( rule__NegativeLiteral__AtomAssignment_1 ) ) ;
+    // InternalProblem.g:2889:1: rule__NegativeLiteral__Group__1__Impl : ( ( rule__NegativeLiteral__AtomAssignment_1 ) ) ;
     public final void rule__NegativeLiteral__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2400:1: ( ( ( rule__NegativeLiteral__AtomAssignment_1 ) ) )
-            // InternalProblem.g:2401:1: ( ( rule__NegativeLiteral__AtomAssignment_1 ) )
+            // InternalProblem.g:2893:1: ( ( ( rule__NegativeLiteral__AtomAssignment_1 ) ) )
+            // InternalProblem.g:2894:1: ( ( rule__NegativeLiteral__AtomAssignment_1 ) )
             {
-            // InternalProblem.g:2401:1: ( ( rule__NegativeLiteral__AtomAssignment_1 ) )
-            // InternalProblem.g:2402:2: ( rule__NegativeLiteral__AtomAssignment_1 )
+            // InternalProblem.g:2894:1: ( ( rule__NegativeLiteral__AtomAssignment_1 ) )
+            // InternalProblem.g:2895:2: ( rule__NegativeLiteral__AtomAssignment_1 )
             {
              before(grammarAccess.getNegativeLiteralAccess().getAtomAssignment_1()); 
-            // InternalProblem.g:2403:2: ( rule__NegativeLiteral__AtomAssignment_1 )
-            // InternalProblem.g:2403:3: rule__NegativeLiteral__AtomAssignment_1
+            // InternalProblem.g:2896:2: ( rule__NegativeLiteral__AtomAssignment_1 )
+            // InternalProblem.g:2896:3: rule__NegativeLiteral__AtomAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__NegativeLiteral__AtomAssignment_1();
@@ -7614,16 +9244,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__0"
-    // InternalProblem.g:2412:1: rule__Atom__Group__0 : rule__Atom__Group__0__Impl rule__Atom__Group__1 ;
+    // InternalProblem.g:2905:1: rule__Atom__Group__0 : rule__Atom__Group__0__Impl rule__Atom__Group__1 ;
     public final void rule__Atom__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2416:1: ( rule__Atom__Group__0__Impl rule__Atom__Group__1 )
-            // InternalProblem.g:2417:2: rule__Atom__Group__0__Impl rule__Atom__Group__1
+            // InternalProblem.g:2909:1: ( rule__Atom__Group__0__Impl rule__Atom__Group__1 )
+            // InternalProblem.g:2910:2: rule__Atom__Group__0__Impl rule__Atom__Group__1
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_28);
             rule__Atom__Group__0__Impl();
 
             state._fsp--;
@@ -7652,21 +9282,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__0__Impl"
-    // InternalProblem.g:2424:1: rule__Atom__Group__0__Impl : ( ( rule__Atom__RelationAssignment_0 ) ) ;
+    // InternalProblem.g:2917:1: rule__Atom__Group__0__Impl : ( ( rule__Atom__RelationAssignment_0 ) ) ;
     public final void rule__Atom__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2428:1: ( ( ( rule__Atom__RelationAssignment_0 ) ) )
-            // InternalProblem.g:2429:1: ( ( rule__Atom__RelationAssignment_0 ) )
+            // InternalProblem.g:2921:1: ( ( ( rule__Atom__RelationAssignment_0 ) ) )
+            // InternalProblem.g:2922:1: ( ( rule__Atom__RelationAssignment_0 ) )
             {
-            // InternalProblem.g:2429:1: ( ( rule__Atom__RelationAssignment_0 ) )
-            // InternalProblem.g:2430:2: ( rule__Atom__RelationAssignment_0 )
+            // InternalProblem.g:2922:1: ( ( rule__Atom__RelationAssignment_0 ) )
+            // InternalProblem.g:2923:2: ( rule__Atom__RelationAssignment_0 )
             {
              before(grammarAccess.getAtomAccess().getRelationAssignment_0()); 
-            // InternalProblem.g:2431:2: ( rule__Atom__RelationAssignment_0 )
-            // InternalProblem.g:2431:3: rule__Atom__RelationAssignment_0
+            // InternalProblem.g:2924:2: ( rule__Atom__RelationAssignment_0 )
+            // InternalProblem.g:2924:3: rule__Atom__RelationAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__Atom__RelationAssignment_0();
@@ -7699,16 +9329,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__1"
-    // InternalProblem.g:2439:1: rule__Atom__Group__1 : rule__Atom__Group__1__Impl rule__Atom__Group__2 ;
+    // InternalProblem.g:2932:1: rule__Atom__Group__1 : rule__Atom__Group__1__Impl rule__Atom__Group__2 ;
     public final void rule__Atom__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2443:1: ( rule__Atom__Group__1__Impl rule__Atom__Group__2 )
-            // InternalProblem.g:2444:2: rule__Atom__Group__1__Impl rule__Atom__Group__2
+            // InternalProblem.g:2936:1: ( rule__Atom__Group__1__Impl rule__Atom__Group__2 )
+            // InternalProblem.g:2937:2: rule__Atom__Group__1__Impl rule__Atom__Group__2
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_28);
             rule__Atom__Group__1__Impl();
 
             state._fsp--;
@@ -7737,29 +9367,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__1__Impl"
-    // InternalProblem.g:2451:1: rule__Atom__Group__1__Impl : ( ( rule__Atom__TransitiveClosureAssignment_1 )? ) ;
+    // InternalProblem.g:2944:1: rule__Atom__Group__1__Impl : ( ( rule__Atom__TransitiveClosureAssignment_1 )? ) ;
     public final void rule__Atom__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2455:1: ( ( ( rule__Atom__TransitiveClosureAssignment_1 )? ) )
-            // InternalProblem.g:2456:1: ( ( rule__Atom__TransitiveClosureAssignment_1 )? )
+            // InternalProblem.g:2948:1: ( ( ( rule__Atom__TransitiveClosureAssignment_1 )? ) )
+            // InternalProblem.g:2949:1: ( ( rule__Atom__TransitiveClosureAssignment_1 )? )
             {
-            // InternalProblem.g:2456:1: ( ( rule__Atom__TransitiveClosureAssignment_1 )? )
-            // InternalProblem.g:2457:2: ( rule__Atom__TransitiveClosureAssignment_1 )?
+            // InternalProblem.g:2949:1: ( ( rule__Atom__TransitiveClosureAssignment_1 )? )
+            // InternalProblem.g:2950:2: ( rule__Atom__TransitiveClosureAssignment_1 )?
             {
              before(grammarAccess.getAtomAccess().getTransitiveClosureAssignment_1()); 
-            // InternalProblem.g:2458:2: ( rule__Atom__TransitiveClosureAssignment_1 )?
-            int alt29=2;
-            int LA29_0 = input.LA(1);
+            // InternalProblem.g:2951:2: ( rule__Atom__TransitiveClosureAssignment_1 )?
+            int alt38=2;
+            int LA38_0 = input.LA(1);
 
-            if ( (LA29_0==41) ) {
-                alt29=1;
+            if ( (LA38_0==42) ) {
+                alt38=1;
             }
-            switch (alt29) {
+            switch (alt38) {
                 case 1 :
-                    // InternalProblem.g:2458:3: rule__Atom__TransitiveClosureAssignment_1
+                    // InternalProblem.g:2951:3: rule__Atom__TransitiveClosureAssignment_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__Atom__TransitiveClosureAssignment_1();
@@ -7795,16 +9425,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__2"
-    // InternalProblem.g:2466:1: rule__Atom__Group__2 : rule__Atom__Group__2__Impl rule__Atom__Group__3 ;
+    // InternalProblem.g:2959:1: rule__Atom__Group__2 : rule__Atom__Group__2__Impl rule__Atom__Group__3 ;
     public final void rule__Atom__Group__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2470:1: ( rule__Atom__Group__2__Impl rule__Atom__Group__3 )
-            // InternalProblem.g:2471:2: rule__Atom__Group__2__Impl rule__Atom__Group__3
+            // InternalProblem.g:2963:1: ( rule__Atom__Group__2__Impl rule__Atom__Group__3 )
+            // InternalProblem.g:2964:2: rule__Atom__Group__2__Impl rule__Atom__Group__3
             {
-            pushFollow(FOLLOW_20);
+            pushFollow(FOLLOW_23);
             rule__Atom__Group__2__Impl();
 
             state._fsp--;
@@ -7833,20 +9463,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__2__Impl"
-    // InternalProblem.g:2478:1: rule__Atom__Group__2__Impl : ( '(' ) ;
+    // InternalProblem.g:2971:1: rule__Atom__Group__2__Impl : ( '(' ) ;
     public final void rule__Atom__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2482:1: ( ( '(' ) )
-            // InternalProblem.g:2483:1: ( '(' )
+            // InternalProblem.g:2975:1: ( ( '(' ) )
+            // InternalProblem.g:2976:1: ( '(' )
             {
-            // InternalProblem.g:2483:1: ( '(' )
-            // InternalProblem.g:2484:2: '('
+            // InternalProblem.g:2976:1: ( '(' )
+            // InternalProblem.g:2977:2: '('
             {
              before(grammarAccess.getAtomAccess().getLeftParenthesisKeyword_2()); 
-            match(input,32,FOLLOW_2); 
+            match(input,33,FOLLOW_2); 
              after(grammarAccess.getAtomAccess().getLeftParenthesisKeyword_2()); 
 
             }
@@ -7870,16 +9500,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__3"
-    // InternalProblem.g:2493:1: rule__Atom__Group__3 : rule__Atom__Group__3__Impl rule__Atom__Group__4 ;
+    // InternalProblem.g:2986:1: rule__Atom__Group__3 : rule__Atom__Group__3__Impl rule__Atom__Group__4 ;
     public final void rule__Atom__Group__3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2497:1: ( rule__Atom__Group__3__Impl rule__Atom__Group__4 )
-            // InternalProblem.g:2498:2: rule__Atom__Group__3__Impl rule__Atom__Group__4
+            // InternalProblem.g:2990:1: ( rule__Atom__Group__3__Impl rule__Atom__Group__4 )
+            // InternalProblem.g:2991:2: rule__Atom__Group__3__Impl rule__Atom__Group__4
             {
-            pushFollow(FOLLOW_20);
+            pushFollow(FOLLOW_23);
             rule__Atom__Group__3__Impl();
 
             state._fsp--;
@@ -7908,29 +9538,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__3__Impl"
-    // InternalProblem.g:2505:1: rule__Atom__Group__3__Impl : ( ( rule__Atom__Group_3__0 )? ) ;
+    // InternalProblem.g:2998:1: rule__Atom__Group__3__Impl : ( ( rule__Atom__Group_3__0 )? ) ;
     public final void rule__Atom__Group__3__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2509:1: ( ( ( rule__Atom__Group_3__0 )? ) )
-            // InternalProblem.g:2510:1: ( ( rule__Atom__Group_3__0 )? )
+            // InternalProblem.g:3002:1: ( ( ( rule__Atom__Group_3__0 )? ) )
+            // InternalProblem.g:3003:1: ( ( rule__Atom__Group_3__0 )? )
             {
-            // InternalProblem.g:2510:1: ( ( rule__Atom__Group_3__0 )? )
-            // InternalProblem.g:2511:2: ( rule__Atom__Group_3__0 )?
+            // InternalProblem.g:3003:1: ( ( rule__Atom__Group_3__0 )? )
+            // InternalProblem.g:3004:2: ( rule__Atom__Group_3__0 )?
             {
              before(grammarAccess.getAtomAccess().getGroup_3()); 
-            // InternalProblem.g:2512:2: ( rule__Atom__Group_3__0 )?
-            int alt30=2;
-            int LA30_0 = input.LA(1);
+            // InternalProblem.g:3005:2: ( rule__Atom__Group_3__0 )?
+            int alt39=2;
+            int LA39_0 = input.LA(1);
 
-            if ( (LA30_0==RULE_ID) ) {
-                alt30=1;
+            if ( ((LA39_0>=RULE_QUOTED_ID && LA39_0<=RULE_ID)||(LA39_0>=19 && LA39_0<=20)) ) {
+                alt39=1;
             }
-            switch (alt30) {
+            switch (alt39) {
                 case 1 :
-                    // InternalProblem.g:2512:3: rule__Atom__Group_3__0
+                    // InternalProblem.g:3005:3: rule__Atom__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Atom__Group_3__0();
@@ -7966,14 +9596,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__4"
-    // InternalProblem.g:2520:1: rule__Atom__Group__4 : rule__Atom__Group__4__Impl ;
+    // InternalProblem.g:3013:1: rule__Atom__Group__4 : rule__Atom__Group__4__Impl ;
     public final void rule__Atom__Group__4() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2524:1: ( rule__Atom__Group__4__Impl )
-            // InternalProblem.g:2525:2: rule__Atom__Group__4__Impl
+            // InternalProblem.g:3017:1: ( rule__Atom__Group__4__Impl )
+            // InternalProblem.g:3018:2: rule__Atom__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Atom__Group__4__Impl();
@@ -7999,20 +9629,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__4__Impl"
-    // InternalProblem.g:2531:1: rule__Atom__Group__4__Impl : ( ')' ) ;
+    // InternalProblem.g:3024:1: rule__Atom__Group__4__Impl : ( ')' ) ;
     public final void rule__Atom__Group__4__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2535:1: ( ( ')' ) )
-            // InternalProblem.g:2536:1: ( ')' )
+            // InternalProblem.g:3028:1: ( ( ')' ) )
+            // InternalProblem.g:3029:1: ( ')' )
             {
-            // InternalProblem.g:2536:1: ( ')' )
-            // InternalProblem.g:2537:2: ')'
+            // InternalProblem.g:3029:1: ( ')' )
+            // InternalProblem.g:3030:2: ')'
             {
              before(grammarAccess.getAtomAccess().getRightParenthesisKeyword_4()); 
-            match(input,33,FOLLOW_2); 
+            match(input,34,FOLLOW_2); 
              after(grammarAccess.getAtomAccess().getRightParenthesisKeyword_4()); 
 
             }
@@ -8036,16 +9666,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3__0"
-    // InternalProblem.g:2547:1: rule__Atom__Group_3__0 : rule__Atom__Group_3__0__Impl rule__Atom__Group_3__1 ;
+    // InternalProblem.g:3040:1: rule__Atom__Group_3__0 : rule__Atom__Group_3__0__Impl rule__Atom__Group_3__1 ;
     public final void rule__Atom__Group_3__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2551:1: ( rule__Atom__Group_3__0__Impl rule__Atom__Group_3__1 )
-            // InternalProblem.g:2552:2: rule__Atom__Group_3__0__Impl rule__Atom__Group_3__1
+            // InternalProblem.g:3044:1: ( rule__Atom__Group_3__0__Impl rule__Atom__Group_3__1 )
+            // InternalProblem.g:3045:2: rule__Atom__Group_3__0__Impl rule__Atom__Group_3__1
             {
-            pushFollow(FOLLOW_10);
+            pushFollow(FOLLOW_9);
             rule__Atom__Group_3__0__Impl();
 
             state._fsp--;
@@ -8074,21 +9704,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3__0__Impl"
-    // InternalProblem.g:2559:1: rule__Atom__Group_3__0__Impl : ( ( rule__Atom__ArgumentsAssignment_3_0 ) ) ;
+    // InternalProblem.g:3052:1: rule__Atom__Group_3__0__Impl : ( ( rule__Atom__ArgumentsAssignment_3_0 ) ) ;
     public final void rule__Atom__Group_3__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2563:1: ( ( ( rule__Atom__ArgumentsAssignment_3_0 ) ) )
-            // InternalProblem.g:2564:1: ( ( rule__Atom__ArgumentsAssignment_3_0 ) )
+            // InternalProblem.g:3056:1: ( ( ( rule__Atom__ArgumentsAssignment_3_0 ) ) )
+            // InternalProblem.g:3057:1: ( ( rule__Atom__ArgumentsAssignment_3_0 ) )
             {
-            // InternalProblem.g:2564:1: ( ( rule__Atom__ArgumentsAssignment_3_0 ) )
-            // InternalProblem.g:2565:2: ( rule__Atom__ArgumentsAssignment_3_0 )
+            // InternalProblem.g:3057:1: ( ( rule__Atom__ArgumentsAssignment_3_0 ) )
+            // InternalProblem.g:3058:2: ( rule__Atom__ArgumentsAssignment_3_0 )
             {
              before(grammarAccess.getAtomAccess().getArgumentsAssignment_3_0()); 
-            // InternalProblem.g:2566:2: ( rule__Atom__ArgumentsAssignment_3_0 )
-            // InternalProblem.g:2566:3: rule__Atom__ArgumentsAssignment_3_0
+            // InternalProblem.g:3059:2: ( rule__Atom__ArgumentsAssignment_3_0 )
+            // InternalProblem.g:3059:3: rule__Atom__ArgumentsAssignment_3_0
             {
             pushFollow(FOLLOW_2);
             rule__Atom__ArgumentsAssignment_3_0();
@@ -8121,14 +9751,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3__1"
-    // InternalProblem.g:2574:1: rule__Atom__Group_3__1 : rule__Atom__Group_3__1__Impl ;
+    // InternalProblem.g:3067:1: rule__Atom__Group_3__1 : rule__Atom__Group_3__1__Impl ;
     public final void rule__Atom__Group_3__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2578:1: ( rule__Atom__Group_3__1__Impl )
-            // InternalProblem.g:2579:2: rule__Atom__Group_3__1__Impl
+            // InternalProblem.g:3071:1: ( rule__Atom__Group_3__1__Impl )
+            // InternalProblem.g:3072:2: rule__Atom__Group_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Atom__Group_3__1__Impl();
@@ -8154,35 +9784,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3__1__Impl"
-    // InternalProblem.g:2585:1: rule__Atom__Group_3__1__Impl : ( ( rule__Atom__Group_3_1__0 )* ) ;
+    // InternalProblem.g:3078:1: rule__Atom__Group_3__1__Impl : ( ( rule__Atom__Group_3_1__0 )* ) ;
     public final void rule__Atom__Group_3__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2589:1: ( ( ( rule__Atom__Group_3_1__0 )* ) )
-            // InternalProblem.g:2590:1: ( ( rule__Atom__Group_3_1__0 )* )
+            // InternalProblem.g:3082:1: ( ( ( rule__Atom__Group_3_1__0 )* ) )
+            // InternalProblem.g:3083:1: ( ( rule__Atom__Group_3_1__0 )* )
             {
-            // InternalProblem.g:2590:1: ( ( rule__Atom__Group_3_1__0 )* )
-            // InternalProblem.g:2591:2: ( rule__Atom__Group_3_1__0 )*
+            // InternalProblem.g:3083:1: ( ( rule__Atom__Group_3_1__0 )* )
+            // InternalProblem.g:3084:2: ( rule__Atom__Group_3_1__0 )*
             {
              before(grammarAccess.getAtomAccess().getGroup_3_1()); 
-            // InternalProblem.g:2592:2: ( rule__Atom__Group_3_1__0 )*
-            loop31:
+            // InternalProblem.g:3085:2: ( rule__Atom__Group_3_1__0 )*
+            loop40:
             do {
-                int alt31=2;
-                int LA31_0 = input.LA(1);
+                int alt40=2;
+                int LA40_0 = input.LA(1);
 
-                if ( (LA31_0==25) ) {
-                    alt31=1;
+                if ( (LA40_0==13) ) {
+                    alt40=1;
                 }
 
 
-                switch (alt31) {
+                switch (alt40) {
                 case 1 :
-                    // InternalProblem.g:2592:3: rule__Atom__Group_3_1__0
+                    // InternalProblem.g:3085:3: rule__Atom__Group_3_1__0
                     {
-                    pushFollow(FOLLOW_11);
+                    pushFollow(FOLLOW_10);
                     rule__Atom__Group_3_1__0();
 
                     state._fsp--;
@@ -8192,7 +9822,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop31;
+                    break loop40;
                 }
             } while (true);
 
@@ -8219,14 +9849,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3_1__0"
-    // InternalProblem.g:2601:1: rule__Atom__Group_3_1__0 : rule__Atom__Group_3_1__0__Impl rule__Atom__Group_3_1__1 ;
+    // InternalProblem.g:3094:1: rule__Atom__Group_3_1__0 : rule__Atom__Group_3_1__0__Impl rule__Atom__Group_3_1__1 ;
     public final void rule__Atom__Group_3_1__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2605:1: ( rule__Atom__Group_3_1__0__Impl rule__Atom__Group_3_1__1 )
-            // InternalProblem.g:2606:2: rule__Atom__Group_3_1__0__Impl rule__Atom__Group_3_1__1
+            // InternalProblem.g:3098:1: ( rule__Atom__Group_3_1__0__Impl rule__Atom__Group_3_1__1 )
+            // InternalProblem.g:3099:2: rule__Atom__Group_3_1__0__Impl rule__Atom__Group_3_1__1
             {
             pushFollow(FOLLOW_5);
             rule__Atom__Group_3_1__0__Impl();
@@ -8257,20 +9887,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3_1__0__Impl"
-    // InternalProblem.g:2613:1: rule__Atom__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalProblem.g:3106:1: rule__Atom__Group_3_1__0__Impl : ( ',' ) ;
     public final void rule__Atom__Group_3_1__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2617:1: ( ( ',' ) )
-            // InternalProblem.g:2618:1: ( ',' )
+            // InternalProblem.g:3110:1: ( ( ',' ) )
+            // InternalProblem.g:3111:1: ( ',' )
             {
-            // InternalProblem.g:2618:1: ( ',' )
-            // InternalProblem.g:2619:2: ','
+            // InternalProblem.g:3111:1: ( ',' )
+            // InternalProblem.g:3112:2: ','
             {
              before(grammarAccess.getAtomAccess().getCommaKeyword_3_1_0()); 
-            match(input,25,FOLLOW_2); 
+            match(input,13,FOLLOW_2); 
              after(grammarAccess.getAtomAccess().getCommaKeyword_3_1_0()); 
 
             }
@@ -8294,14 +9924,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3_1__1"
-    // InternalProblem.g:2628:1: rule__Atom__Group_3_1__1 : rule__Atom__Group_3_1__1__Impl ;
+    // InternalProblem.g:3121:1: rule__Atom__Group_3_1__1 : rule__Atom__Group_3_1__1__Impl ;
     public final void rule__Atom__Group_3_1__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2632:1: ( rule__Atom__Group_3_1__1__Impl )
-            // InternalProblem.g:2633:2: rule__Atom__Group_3_1__1__Impl
+            // InternalProblem.g:3125:1: ( rule__Atom__Group_3_1__1__Impl )
+            // InternalProblem.g:3126:2: rule__Atom__Group_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Atom__Group_3_1__1__Impl();
@@ -8327,21 +9957,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3_1__1__Impl"
-    // InternalProblem.g:2639:1: rule__Atom__Group_3_1__1__Impl : ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) ) ;
+    // InternalProblem.g:3132:1: rule__Atom__Group_3_1__1__Impl : ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) ) ;
     public final void rule__Atom__Group_3_1__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2643:1: ( ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) ) )
-            // InternalProblem.g:2644:1: ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) )
+            // InternalProblem.g:3136:1: ( ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) ) )
+            // InternalProblem.g:3137:1: ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) )
             {
-            // InternalProblem.g:2644:1: ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) )
-            // InternalProblem.g:2645:2: ( rule__Atom__ArgumentsAssignment_3_1_1 )
+            // InternalProblem.g:3137:1: ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) )
+            // InternalProblem.g:3138:2: ( rule__Atom__ArgumentsAssignment_3_1_1 )
             {
              before(grammarAccess.getAtomAccess().getArgumentsAssignment_3_1_1()); 
-            // InternalProblem.g:2646:2: ( rule__Atom__ArgumentsAssignment_3_1_1 )
-            // InternalProblem.g:2646:3: rule__Atom__ArgumentsAssignment_3_1_1
+            // InternalProblem.g:3139:2: ( rule__Atom__ArgumentsAssignment_3_1_1 )
+            // InternalProblem.g:3139:3: rule__Atom__ArgumentsAssignment_3_1_1
             {
             pushFollow(FOLLOW_2);
             rule__Atom__ArgumentsAssignment_3_1_1();
@@ -8374,14 +10004,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group__0"
-    // InternalProblem.g:2655:1: rule__Assertion__Group__0 : rule__Assertion__Group__0__Impl rule__Assertion__Group__1 ;
+    // InternalProblem.g:3148:1: rule__Assertion__Group__0 : rule__Assertion__Group__0__Impl rule__Assertion__Group__1 ;
     public final void rule__Assertion__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2659:1: ( rule__Assertion__Group__0__Impl rule__Assertion__Group__1 )
-            // InternalProblem.g:2660:2: rule__Assertion__Group__0__Impl rule__Assertion__Group__1
+            // InternalProblem.g:3152:1: ( rule__Assertion__Group__0__Impl rule__Assertion__Group__1 )
+            // InternalProblem.g:3153:2: rule__Assertion__Group__0__Impl rule__Assertion__Group__1
             {
             pushFollow(FOLLOW_6);
             rule__Assertion__Group__0__Impl();
@@ -8412,21 +10042,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group__0__Impl"
-    // InternalProblem.g:2667:1: rule__Assertion__Group__0__Impl : ( ( rule__Assertion__Alternatives_0 ) ) ;
+    // InternalProblem.g:3160:1: rule__Assertion__Group__0__Impl : ( ( rule__Assertion__Alternatives_0 ) ) ;
     public final void rule__Assertion__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2671:1: ( ( ( rule__Assertion__Alternatives_0 ) ) )
-            // InternalProblem.g:2672:1: ( ( rule__Assertion__Alternatives_0 ) )
+            // InternalProblem.g:3164:1: ( ( ( rule__Assertion__Alternatives_0 ) ) )
+            // InternalProblem.g:3165:1: ( ( rule__Assertion__Alternatives_0 ) )
             {
-            // InternalProblem.g:2672:1: ( ( rule__Assertion__Alternatives_0 ) )
-            // InternalProblem.g:2673:2: ( rule__Assertion__Alternatives_0 )
+            // InternalProblem.g:3165:1: ( ( rule__Assertion__Alternatives_0 ) )
+            // InternalProblem.g:3166:2: ( rule__Assertion__Alternatives_0 )
             {
              before(grammarAccess.getAssertionAccess().getAlternatives_0()); 
-            // InternalProblem.g:2674:2: ( rule__Assertion__Alternatives_0 )
-            // InternalProblem.g:2674:3: rule__Assertion__Alternatives_0
+            // InternalProblem.g:3167:2: ( rule__Assertion__Alternatives_0 )
+            // InternalProblem.g:3167:3: rule__Assertion__Alternatives_0
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Alternatives_0();
@@ -8459,14 +10089,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group__1"
-    // InternalProblem.g:2682:1: rule__Assertion__Group__1 : rule__Assertion__Group__1__Impl ;
+    // InternalProblem.g:3175:1: rule__Assertion__Group__1 : rule__Assertion__Group__1__Impl ;
     public final void rule__Assertion__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2686:1: ( rule__Assertion__Group__1__Impl )
-            // InternalProblem.g:2687:2: rule__Assertion__Group__1__Impl
+            // InternalProblem.g:3179:1: ( rule__Assertion__Group__1__Impl )
+            // InternalProblem.g:3180:2: rule__Assertion__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group__1__Impl();
@@ -8492,17 +10122,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group__1__Impl"
-    // InternalProblem.g:2693:1: rule__Assertion__Group__1__Impl : ( '.' ) ;
+    // InternalProblem.g:3186:1: rule__Assertion__Group__1__Impl : ( '.' ) ;
     public final void rule__Assertion__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2697:1: ( ( '.' ) )
-            // InternalProblem.g:2698:1: ( '.' )
+            // InternalProblem.g:3190:1: ( ( '.' ) )
+            // InternalProblem.g:3191:1: ( '.' )
             {
-            // InternalProblem.g:2698:1: ( '.' )
-            // InternalProblem.g:2699:2: '.'
+            // InternalProblem.g:3191:1: ( '.' )
+            // InternalProblem.g:3192:2: '.'
             {
              before(grammarAccess.getAssertionAccess().getFullStopKeyword_1()); 
             match(input,12,FOLLOW_2); 
@@ -8529,16 +10159,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__0"
-    // InternalProblem.g:2709:1: rule__Assertion__Group_0_0__0 : rule__Assertion__Group_0_0__0__Impl rule__Assertion__Group_0_0__1 ;
+    // InternalProblem.g:3202:1: rule__Assertion__Group_0_0__0 : rule__Assertion__Group_0_0__0__Impl rule__Assertion__Group_0_0__1 ;
     public final void rule__Assertion__Group_0_0__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2713:1: ( rule__Assertion__Group_0_0__0__Impl rule__Assertion__Group_0_0__1 )
-            // InternalProblem.g:2714:2: rule__Assertion__Group_0_0__0__Impl rule__Assertion__Group_0_0__1
+            // InternalProblem.g:3206:1: ( rule__Assertion__Group_0_0__0__Impl rule__Assertion__Group_0_0__1 )
+            // InternalProblem.g:3207:2: rule__Assertion__Group_0_0__0__Impl rule__Assertion__Group_0_0__1
             {
-            pushFollow(FOLLOW_19);
+            pushFollow(FOLLOW_22);
             rule__Assertion__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -8567,21 +10197,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__0__Impl"
-    // InternalProblem.g:2721:1: rule__Assertion__Group_0_0__0__Impl : ( ( rule__Assertion__RelationAssignment_0_0_0 ) ) ;
+    // InternalProblem.g:3214:1: rule__Assertion__Group_0_0__0__Impl : ( ( rule__Assertion__RelationAssignment_0_0_0 ) ) ;
     public final void rule__Assertion__Group_0_0__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2725:1: ( ( ( rule__Assertion__RelationAssignment_0_0_0 ) ) )
-            // InternalProblem.g:2726:1: ( ( rule__Assertion__RelationAssignment_0_0_0 ) )
+            // InternalProblem.g:3218:1: ( ( ( rule__Assertion__RelationAssignment_0_0_0 ) ) )
+            // InternalProblem.g:3219:1: ( ( rule__Assertion__RelationAssignment_0_0_0 ) )
             {
-            // InternalProblem.g:2726:1: ( ( rule__Assertion__RelationAssignment_0_0_0 ) )
-            // InternalProblem.g:2727:2: ( rule__Assertion__RelationAssignment_0_0_0 )
+            // InternalProblem.g:3219:1: ( ( rule__Assertion__RelationAssignment_0_0_0 ) )
+            // InternalProblem.g:3220:2: ( rule__Assertion__RelationAssignment_0_0_0 )
             {
              before(grammarAccess.getAssertionAccess().getRelationAssignment_0_0_0()); 
-            // InternalProblem.g:2728:2: ( rule__Assertion__RelationAssignment_0_0_0 )
-            // InternalProblem.g:2728:3: rule__Assertion__RelationAssignment_0_0_0
+            // InternalProblem.g:3221:2: ( rule__Assertion__RelationAssignment_0_0_0 )
+            // InternalProblem.g:3221:3: rule__Assertion__RelationAssignment_0_0_0
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__RelationAssignment_0_0_0();
@@ -8614,16 +10244,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__1"
-    // InternalProblem.g:2736:1: rule__Assertion__Group_0_0__1 : rule__Assertion__Group_0_0__1__Impl rule__Assertion__Group_0_0__2 ;
+    // InternalProblem.g:3229:1: rule__Assertion__Group_0_0__1 : rule__Assertion__Group_0_0__1__Impl rule__Assertion__Group_0_0__2 ;
     public final void rule__Assertion__Group_0_0__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2740:1: ( rule__Assertion__Group_0_0__1__Impl rule__Assertion__Group_0_0__2 )
-            // InternalProblem.g:2741:2: rule__Assertion__Group_0_0__1__Impl rule__Assertion__Group_0_0__2
+            // InternalProblem.g:3233:1: ( rule__Assertion__Group_0_0__1__Impl rule__Assertion__Group_0_0__2 )
+            // InternalProblem.g:3234:2: rule__Assertion__Group_0_0__1__Impl rule__Assertion__Group_0_0__2
             {
-            pushFollow(FOLLOW_26);
+            pushFollow(FOLLOW_23);
             rule__Assertion__Group_0_0__1__Impl();
 
             state._fsp--;
@@ -8652,20 +10282,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__1__Impl"
-    // InternalProblem.g:2748:1: rule__Assertion__Group_0_0__1__Impl : ( '(' ) ;
+    // InternalProblem.g:3241:1: rule__Assertion__Group_0_0__1__Impl : ( '(' ) ;
     public final void rule__Assertion__Group_0_0__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2752:1: ( ( '(' ) )
-            // InternalProblem.g:2753:1: ( '(' )
+            // InternalProblem.g:3245:1: ( ( '(' ) )
+            // InternalProblem.g:3246:1: ( '(' )
             {
-            // InternalProblem.g:2753:1: ( '(' )
-            // InternalProblem.g:2754:2: '('
+            // InternalProblem.g:3246:1: ( '(' )
+            // InternalProblem.g:3247:2: '('
             {
              before(grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_0_1()); 
-            match(input,32,FOLLOW_2); 
+            match(input,33,FOLLOW_2); 
              after(grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_0_1()); 
 
             }
@@ -8689,16 +10319,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__2"
-    // InternalProblem.g:2763:1: rule__Assertion__Group_0_0__2 : rule__Assertion__Group_0_0__2__Impl rule__Assertion__Group_0_0__3 ;
+    // InternalProblem.g:3256:1: rule__Assertion__Group_0_0__2 : rule__Assertion__Group_0_0__2__Impl rule__Assertion__Group_0_0__3 ;
     public final void rule__Assertion__Group_0_0__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2767:1: ( rule__Assertion__Group_0_0__2__Impl rule__Assertion__Group_0_0__3 )
-            // InternalProblem.g:2768:2: rule__Assertion__Group_0_0__2__Impl rule__Assertion__Group_0_0__3
+            // InternalProblem.g:3260:1: ( rule__Assertion__Group_0_0__2__Impl rule__Assertion__Group_0_0__3 )
+            // InternalProblem.g:3261:2: rule__Assertion__Group_0_0__2__Impl rule__Assertion__Group_0_0__3
             {
-            pushFollow(FOLLOW_26);
+            pushFollow(FOLLOW_23);
             rule__Assertion__Group_0_0__2__Impl();
 
             state._fsp--;
@@ -8727,29 +10357,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__2__Impl"
-    // InternalProblem.g:2775:1: rule__Assertion__Group_0_0__2__Impl : ( ( rule__Assertion__Group_0_0_2__0 )? ) ;
+    // InternalProblem.g:3268:1: rule__Assertion__Group_0_0__2__Impl : ( ( rule__Assertion__Group_0_0_2__0 )? ) ;
     public final void rule__Assertion__Group_0_0__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2779:1: ( ( ( rule__Assertion__Group_0_0_2__0 )? ) )
-            // InternalProblem.g:2780:1: ( ( rule__Assertion__Group_0_0_2__0 )? )
+            // InternalProblem.g:3272:1: ( ( ( rule__Assertion__Group_0_0_2__0 )? ) )
+            // InternalProblem.g:3273:1: ( ( rule__Assertion__Group_0_0_2__0 )? )
             {
-            // InternalProblem.g:2780:1: ( ( rule__Assertion__Group_0_0_2__0 )? )
-            // InternalProblem.g:2781:2: ( rule__Assertion__Group_0_0_2__0 )?
+            // InternalProblem.g:3273:1: ( ( rule__Assertion__Group_0_0_2__0 )? )
+            // InternalProblem.g:3274:2: ( rule__Assertion__Group_0_0_2__0 )?
             {
              before(grammarAccess.getAssertionAccess().getGroup_0_0_2()); 
-            // InternalProblem.g:2782:2: ( rule__Assertion__Group_0_0_2__0 )?
-            int alt32=2;
-            int LA32_0 = input.LA(1);
+            // InternalProblem.g:3275:2: ( rule__Assertion__Group_0_0_2__0 )?
+            int alt41=2;
+            int LA41_0 = input.LA(1);
 
-            if ( ((LA32_0>=RULE_QUOTED_ID && LA32_0<=RULE_ID)) ) {
-                alt32=1;
+            if ( ((LA41_0>=RULE_QUOTED_ID && LA41_0<=RULE_ID)||(LA41_0>=19 && LA41_0<=20)) ) {
+                alt41=1;
             }
-            switch (alt32) {
+            switch (alt41) {
                 case 1 :
-                    // InternalProblem.g:2782:3: rule__Assertion__Group_0_0_2__0
+                    // InternalProblem.g:3275:3: rule__Assertion__Group_0_0_2__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Assertion__Group_0_0_2__0();
@@ -8785,16 +10415,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__3"
-    // InternalProblem.g:2790:1: rule__Assertion__Group_0_0__3 : rule__Assertion__Group_0_0__3__Impl rule__Assertion__Group_0_0__4 ;
+    // InternalProblem.g:3283:1: rule__Assertion__Group_0_0__3 : rule__Assertion__Group_0_0__3__Impl rule__Assertion__Group_0_0__4 ;
     public final void rule__Assertion__Group_0_0__3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2794:1: ( rule__Assertion__Group_0_0__3__Impl rule__Assertion__Group_0_0__4 )
-            // InternalProblem.g:2795:2: rule__Assertion__Group_0_0__3__Impl rule__Assertion__Group_0_0__4
+            // InternalProblem.g:3287:1: ( rule__Assertion__Group_0_0__3__Impl rule__Assertion__Group_0_0__4 )
+            // InternalProblem.g:3288:2: rule__Assertion__Group_0_0__3__Impl rule__Assertion__Group_0_0__4
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__Assertion__Group_0_0__3__Impl();
 
             state._fsp--;
@@ -8823,20 +10453,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__3__Impl"
-    // InternalProblem.g:2802:1: rule__Assertion__Group_0_0__3__Impl : ( ')' ) ;
+    // InternalProblem.g:3295:1: rule__Assertion__Group_0_0__3__Impl : ( ')' ) ;
     public final void rule__Assertion__Group_0_0__3__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2806:1: ( ( ')' ) )
-            // InternalProblem.g:2807:1: ( ')' )
+            // InternalProblem.g:3299:1: ( ( ')' ) )
+            // InternalProblem.g:3300:1: ( ')' )
             {
-            // InternalProblem.g:2807:1: ( ')' )
-            // InternalProblem.g:2808:2: ')'
+            // InternalProblem.g:3300:1: ( ')' )
+            // InternalProblem.g:3301:2: ')'
             {
              before(grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_0_3()); 
-            match(input,33,FOLLOW_2); 
+            match(input,34,FOLLOW_2); 
              after(grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_0_3()); 
 
             }
@@ -8860,16 +10490,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__4"
-    // InternalProblem.g:2817:1: rule__Assertion__Group_0_0__4 : rule__Assertion__Group_0_0__4__Impl rule__Assertion__Group_0_0__5 ;
+    // InternalProblem.g:3310:1: rule__Assertion__Group_0_0__4 : rule__Assertion__Group_0_0__4__Impl rule__Assertion__Group_0_0__5 ;
     public final void rule__Assertion__Group_0_0__4() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2821:1: ( rule__Assertion__Group_0_0__4__Impl rule__Assertion__Group_0_0__5 )
-            // InternalProblem.g:2822:2: rule__Assertion__Group_0_0__4__Impl rule__Assertion__Group_0_0__5
+            // InternalProblem.g:3314:1: ( rule__Assertion__Group_0_0__4__Impl rule__Assertion__Group_0_0__5 )
+            // InternalProblem.g:3315:2: rule__Assertion__Group_0_0__4__Impl rule__Assertion__Group_0_0__5
             {
-            pushFollow(FOLLOW_28);
+            pushFollow(FOLLOW_30);
             rule__Assertion__Group_0_0__4__Impl();
 
             state._fsp--;
@@ -8898,20 +10528,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__4__Impl"
-    // InternalProblem.g:2829:1: rule__Assertion__Group_0_0__4__Impl : ( ':' ) ;
+    // InternalProblem.g:3322:1: rule__Assertion__Group_0_0__4__Impl : ( ':' ) ;
     public final void rule__Assertion__Group_0_0__4__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2833:1: ( ( ':' ) )
-            // InternalProblem.g:2834:1: ( ':' )
+            // InternalProblem.g:3326:1: ( ( ':' ) )
+            // InternalProblem.g:3327:1: ( ':' )
             {
-            // InternalProblem.g:2834:1: ( ':' )
-            // InternalProblem.g:2835:2: ':'
+            // InternalProblem.g:3327:1: ( ':' )
+            // InternalProblem.g:3328:2: ':'
             {
              before(grammarAccess.getAssertionAccess().getColonKeyword_0_0_4()); 
-            match(input,35,FOLLOW_2); 
+            match(input,36,FOLLOW_2); 
              after(grammarAccess.getAssertionAccess().getColonKeyword_0_0_4()); 
 
             }
@@ -8935,14 +10565,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__5"
-    // InternalProblem.g:2844:1: rule__Assertion__Group_0_0__5 : rule__Assertion__Group_0_0__5__Impl ;
+    // InternalProblem.g:3337:1: rule__Assertion__Group_0_0__5 : rule__Assertion__Group_0_0__5__Impl ;
     public final void rule__Assertion__Group_0_0__5() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2848:1: ( rule__Assertion__Group_0_0__5__Impl )
-            // InternalProblem.g:2849:2: rule__Assertion__Group_0_0__5__Impl
+            // InternalProblem.g:3341:1: ( rule__Assertion__Group_0_0__5__Impl )
+            // InternalProblem.g:3342:2: rule__Assertion__Group_0_0__5__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group_0_0__5__Impl();
@@ -8968,21 +10598,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__5__Impl"
-    // InternalProblem.g:2855:1: rule__Assertion__Group_0_0__5__Impl : ( ( rule__Assertion__ValueAssignment_0_0_5 ) ) ;
+    // InternalProblem.g:3348:1: rule__Assertion__Group_0_0__5__Impl : ( ( rule__Assertion__ValueAssignment_0_0_5 ) ) ;
     public final void rule__Assertion__Group_0_0__5__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2859:1: ( ( ( rule__Assertion__ValueAssignment_0_0_5 ) ) )
-            // InternalProblem.g:2860:1: ( ( rule__Assertion__ValueAssignment_0_0_5 ) )
+            // InternalProblem.g:3352:1: ( ( ( rule__Assertion__ValueAssignment_0_0_5 ) ) )
+            // InternalProblem.g:3353:1: ( ( rule__Assertion__ValueAssignment_0_0_5 ) )
             {
-            // InternalProblem.g:2860:1: ( ( rule__Assertion__ValueAssignment_0_0_5 ) )
-            // InternalProblem.g:2861:2: ( rule__Assertion__ValueAssignment_0_0_5 )
+            // InternalProblem.g:3353:1: ( ( rule__Assertion__ValueAssignment_0_0_5 ) )
+            // InternalProblem.g:3354:2: ( rule__Assertion__ValueAssignment_0_0_5 )
             {
              before(grammarAccess.getAssertionAccess().getValueAssignment_0_0_5()); 
-            // InternalProblem.g:2862:2: ( rule__Assertion__ValueAssignment_0_0_5 )
-            // InternalProblem.g:2862:3: rule__Assertion__ValueAssignment_0_0_5
+            // InternalProblem.g:3355:2: ( rule__Assertion__ValueAssignment_0_0_5 )
+            // InternalProblem.g:3355:3: rule__Assertion__ValueAssignment_0_0_5
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__ValueAssignment_0_0_5();
@@ -9015,16 +10645,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2__0"
-    // InternalProblem.g:2871:1: rule__Assertion__Group_0_0_2__0 : rule__Assertion__Group_0_0_2__0__Impl rule__Assertion__Group_0_0_2__1 ;
+    // InternalProblem.g:3364:1: rule__Assertion__Group_0_0_2__0 : rule__Assertion__Group_0_0_2__0__Impl rule__Assertion__Group_0_0_2__1 ;
     public final void rule__Assertion__Group_0_0_2__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2875:1: ( rule__Assertion__Group_0_0_2__0__Impl rule__Assertion__Group_0_0_2__1 )
-            // InternalProblem.g:2876:2: rule__Assertion__Group_0_0_2__0__Impl rule__Assertion__Group_0_0_2__1
+            // InternalProblem.g:3368:1: ( rule__Assertion__Group_0_0_2__0__Impl rule__Assertion__Group_0_0_2__1 )
+            // InternalProblem.g:3369:2: rule__Assertion__Group_0_0_2__0__Impl rule__Assertion__Group_0_0_2__1
             {
-            pushFollow(FOLLOW_10);
+            pushFollow(FOLLOW_9);
             rule__Assertion__Group_0_0_2__0__Impl();
 
             state._fsp--;
@@ -9053,21 +10683,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2__0__Impl"
-    // InternalProblem.g:2883:1: rule__Assertion__Group_0_0_2__0__Impl : ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) ) ;
+    // InternalProblem.g:3376:1: rule__Assertion__Group_0_0_2__0__Impl : ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) ) ;
     public final void rule__Assertion__Group_0_0_2__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2887:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) ) )
-            // InternalProblem.g:2888:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) )
+            // InternalProblem.g:3380:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) ) )
+            // InternalProblem.g:3381:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) )
             {
-            // InternalProblem.g:2888:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) )
-            // InternalProblem.g:2889:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_0 )
+            // InternalProblem.g:3381:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) )
+            // InternalProblem.g:3382:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_0 )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsAssignment_0_0_2_0()); 
-            // InternalProblem.g:2890:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_0 )
-            // InternalProblem.g:2890:3: rule__Assertion__ArgumentsAssignment_0_0_2_0
+            // InternalProblem.g:3383:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_0 )
+            // InternalProblem.g:3383:3: rule__Assertion__ArgumentsAssignment_0_0_2_0
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__ArgumentsAssignment_0_0_2_0();
@@ -9100,14 +10730,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2__1"
-    // InternalProblem.g:2898:1: rule__Assertion__Group_0_0_2__1 : rule__Assertion__Group_0_0_2__1__Impl ;
+    // InternalProblem.g:3391:1: rule__Assertion__Group_0_0_2__1 : rule__Assertion__Group_0_0_2__1__Impl ;
     public final void rule__Assertion__Group_0_0_2__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2902:1: ( rule__Assertion__Group_0_0_2__1__Impl )
-            // InternalProblem.g:2903:2: rule__Assertion__Group_0_0_2__1__Impl
+            // InternalProblem.g:3395:1: ( rule__Assertion__Group_0_0_2__1__Impl )
+            // InternalProblem.g:3396:2: rule__Assertion__Group_0_0_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group_0_0_2__1__Impl();
@@ -9133,35 +10763,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2__1__Impl"
-    // InternalProblem.g:2909:1: rule__Assertion__Group_0_0_2__1__Impl : ( ( rule__Assertion__Group_0_0_2_1__0 )* ) ;
+    // InternalProblem.g:3402:1: rule__Assertion__Group_0_0_2__1__Impl : ( ( rule__Assertion__Group_0_0_2_1__0 )* ) ;
     public final void rule__Assertion__Group_0_0_2__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2913:1: ( ( ( rule__Assertion__Group_0_0_2_1__0 )* ) )
-            // InternalProblem.g:2914:1: ( ( rule__Assertion__Group_0_0_2_1__0 )* )
+            // InternalProblem.g:3406:1: ( ( ( rule__Assertion__Group_0_0_2_1__0 )* ) )
+            // InternalProblem.g:3407:1: ( ( rule__Assertion__Group_0_0_2_1__0 )* )
             {
-            // InternalProblem.g:2914:1: ( ( rule__Assertion__Group_0_0_2_1__0 )* )
-            // InternalProblem.g:2915:2: ( rule__Assertion__Group_0_0_2_1__0 )*
+            // InternalProblem.g:3407:1: ( ( rule__Assertion__Group_0_0_2_1__0 )* )
+            // InternalProblem.g:3408:2: ( rule__Assertion__Group_0_0_2_1__0 )*
             {
              before(grammarAccess.getAssertionAccess().getGroup_0_0_2_1()); 
-            // InternalProblem.g:2916:2: ( rule__Assertion__Group_0_0_2_1__0 )*
-            loop33:
+            // InternalProblem.g:3409:2: ( rule__Assertion__Group_0_0_2_1__0 )*
+            loop42:
             do {
-                int alt33=2;
-                int LA33_0 = input.LA(1);
+                int alt42=2;
+                int LA42_0 = input.LA(1);
 
-                if ( (LA33_0==25) ) {
-                    alt33=1;
+                if ( (LA42_0==13) ) {
+                    alt42=1;
                 }
 
 
-                switch (alt33) {
+                switch (alt42) {
                 case 1 :
-                    // InternalProblem.g:2916:3: rule__Assertion__Group_0_0_2_1__0
+                    // InternalProblem.g:3409:3: rule__Assertion__Group_0_0_2_1__0
                     {
-                    pushFollow(FOLLOW_11);
+                    pushFollow(FOLLOW_10);
                     rule__Assertion__Group_0_0_2_1__0();
 
                     state._fsp--;
@@ -9171,7 +10801,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop33;
+                    break loop42;
                 }
             } while (true);
 
@@ -9198,16 +10828,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2_1__0"
-    // InternalProblem.g:2925:1: rule__Assertion__Group_0_0_2_1__0 : rule__Assertion__Group_0_0_2_1__0__Impl rule__Assertion__Group_0_0_2_1__1 ;
+    // InternalProblem.g:3418:1: rule__Assertion__Group_0_0_2_1__0 : rule__Assertion__Group_0_0_2_1__0__Impl rule__Assertion__Group_0_0_2_1__1 ;
     public final void rule__Assertion__Group_0_0_2_1__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2929:1: ( rule__Assertion__Group_0_0_2_1__0__Impl rule__Assertion__Group_0_0_2_1__1 )
-            // InternalProblem.g:2930:2: rule__Assertion__Group_0_0_2_1__0__Impl rule__Assertion__Group_0_0_2_1__1
+            // InternalProblem.g:3422:1: ( rule__Assertion__Group_0_0_2_1__0__Impl rule__Assertion__Group_0_0_2_1__1 )
+            // InternalProblem.g:3423:2: rule__Assertion__Group_0_0_2_1__0__Impl rule__Assertion__Group_0_0_2_1__1
             {
-            pushFollow(FOLLOW_9);
+            pushFollow(FOLLOW_5);
             rule__Assertion__Group_0_0_2_1__0__Impl();
 
             state._fsp--;
@@ -9236,20 +10866,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2_1__0__Impl"
-    // InternalProblem.g:2937:1: rule__Assertion__Group_0_0_2_1__0__Impl : ( ',' ) ;
+    // InternalProblem.g:3430:1: rule__Assertion__Group_0_0_2_1__0__Impl : ( ',' ) ;
     public final void rule__Assertion__Group_0_0_2_1__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2941:1: ( ( ',' ) )
-            // InternalProblem.g:2942:1: ( ',' )
+            // InternalProblem.g:3434:1: ( ( ',' ) )
+            // InternalProblem.g:3435:1: ( ',' )
             {
-            // InternalProblem.g:2942:1: ( ',' )
-            // InternalProblem.g:2943:2: ','
+            // InternalProblem.g:3435:1: ( ',' )
+            // InternalProblem.g:3436:2: ','
             {
              before(grammarAccess.getAssertionAccess().getCommaKeyword_0_0_2_1_0()); 
-            match(input,25,FOLLOW_2); 
+            match(input,13,FOLLOW_2); 
              after(grammarAccess.getAssertionAccess().getCommaKeyword_0_0_2_1_0()); 
 
             }
@@ -9273,14 +10903,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2_1__1"
-    // InternalProblem.g:2952:1: rule__Assertion__Group_0_0_2_1__1 : rule__Assertion__Group_0_0_2_1__1__Impl ;
+    // InternalProblem.g:3445:1: rule__Assertion__Group_0_0_2_1__1 : rule__Assertion__Group_0_0_2_1__1__Impl ;
     public final void rule__Assertion__Group_0_0_2_1__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2956:1: ( rule__Assertion__Group_0_0_2_1__1__Impl )
-            // InternalProblem.g:2957:2: rule__Assertion__Group_0_0_2_1__1__Impl
+            // InternalProblem.g:3449:1: ( rule__Assertion__Group_0_0_2_1__1__Impl )
+            // InternalProblem.g:3450:2: rule__Assertion__Group_0_0_2_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group_0_0_2_1__1__Impl();
@@ -9306,21 +10936,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2_1__1__Impl"
-    // InternalProblem.g:2963:1: rule__Assertion__Group_0_0_2_1__1__Impl : ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) ) ;
+    // InternalProblem.g:3456:1: rule__Assertion__Group_0_0_2_1__1__Impl : ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) ) ;
     public final void rule__Assertion__Group_0_0_2_1__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2967:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) ) )
-            // InternalProblem.g:2968:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) )
+            // InternalProblem.g:3460:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) ) )
+            // InternalProblem.g:3461:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) )
             {
-            // InternalProblem.g:2968:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) )
-            // InternalProblem.g:2969:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 )
+            // InternalProblem.g:3461:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) )
+            // InternalProblem.g:3462:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsAssignment_0_0_2_1_1()); 
-            // InternalProblem.g:2970:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 )
-            // InternalProblem.g:2970:3: rule__Assertion__ArgumentsAssignment_0_0_2_1_1
+            // InternalProblem.g:3463:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 )
+            // InternalProblem.g:3463:3: rule__Assertion__ArgumentsAssignment_0_0_2_1_1
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__ArgumentsAssignment_0_0_2_1_1();
@@ -9353,16 +10983,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__0"
-    // InternalProblem.g:2979:1: rule__Assertion__Group_0_1__0 : rule__Assertion__Group_0_1__0__Impl rule__Assertion__Group_0_1__1 ;
+    // InternalProblem.g:3472:1: rule__Assertion__Group_0_1__0 : rule__Assertion__Group_0_1__0__Impl rule__Assertion__Group_0_1__1 ;
     public final void rule__Assertion__Group_0_1__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2983:1: ( rule__Assertion__Group_0_1__0__Impl rule__Assertion__Group_0_1__1 )
-            // InternalProblem.g:2984:2: rule__Assertion__Group_0_1__0__Impl rule__Assertion__Group_0_1__1
+            // InternalProblem.g:3476:1: ( rule__Assertion__Group_0_1__0__Impl rule__Assertion__Group_0_1__1 )
+            // InternalProblem.g:3477:2: rule__Assertion__Group_0_1__0__Impl rule__Assertion__Group_0_1__1
             {
-            pushFollow(FOLLOW_29);
+            pushFollow(FOLLOW_31);
             rule__Assertion__Group_0_1__0__Impl();
 
             state._fsp--;
@@ -9391,29 +11021,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__0__Impl"
-    // InternalProblem.g:2991:1: rule__Assertion__Group_0_1__0__Impl : ( ( rule__Assertion__ValueAssignment_0_1_0 )? ) ;
+    // InternalProblem.g:3484:1: rule__Assertion__Group_0_1__0__Impl : ( ( rule__Assertion__ValueAssignment_0_1_0 )? ) ;
     public final void rule__Assertion__Group_0_1__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2995:1: ( ( ( rule__Assertion__ValueAssignment_0_1_0 )? ) )
-            // InternalProblem.g:2996:1: ( ( rule__Assertion__ValueAssignment_0_1_0 )? )
+            // InternalProblem.g:3488:1: ( ( ( rule__Assertion__ValueAssignment_0_1_0 )? ) )
+            // InternalProblem.g:3489:1: ( ( rule__Assertion__ValueAssignment_0_1_0 )? )
             {
-            // InternalProblem.g:2996:1: ( ( rule__Assertion__ValueAssignment_0_1_0 )? )
-            // InternalProblem.g:2997:2: ( rule__Assertion__ValueAssignment_0_1_0 )?
+            // InternalProblem.g:3489:1: ( ( rule__Assertion__ValueAssignment_0_1_0 )? )
+            // InternalProblem.g:3490:2: ( rule__Assertion__ValueAssignment_0_1_0 )?
             {
              before(grammarAccess.getAssertionAccess().getValueAssignment_0_1_0()); 
-            // InternalProblem.g:2998:2: ( rule__Assertion__ValueAssignment_0_1_0 )?
-            int alt34=2;
-            int LA34_0 = input.LA(1);
+            // InternalProblem.g:3491:2: ( rule__Assertion__ValueAssignment_0_1_0 )?
+            int alt43=2;
+            int LA43_0 = input.LA(1);
 
-            if ( ((LA34_0>=20 && LA34_0<=21)) ) {
-                alt34=1;
+            if ( ((LA43_0>=22 && LA43_0<=23)) ) {
+                alt43=1;
             }
-            switch (alt34) {
+            switch (alt43) {
                 case 1 :
-                    // InternalProblem.g:2998:3: rule__Assertion__ValueAssignment_0_1_0
+                    // InternalProblem.g:3491:3: rule__Assertion__ValueAssignment_0_1_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Assertion__ValueAssignment_0_1_0();
@@ -9449,16 +11079,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__1"
-    // InternalProblem.g:3006:1: rule__Assertion__Group_0_1__1 : rule__Assertion__Group_0_1__1__Impl rule__Assertion__Group_0_1__2 ;
+    // InternalProblem.g:3499:1: rule__Assertion__Group_0_1__1 : rule__Assertion__Group_0_1__1__Impl rule__Assertion__Group_0_1__2 ;
     public final void rule__Assertion__Group_0_1__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3010:1: ( rule__Assertion__Group_0_1__1__Impl rule__Assertion__Group_0_1__2 )
-            // InternalProblem.g:3011:2: rule__Assertion__Group_0_1__1__Impl rule__Assertion__Group_0_1__2
+            // InternalProblem.g:3503:1: ( rule__Assertion__Group_0_1__1__Impl rule__Assertion__Group_0_1__2 )
+            // InternalProblem.g:3504:2: rule__Assertion__Group_0_1__1__Impl rule__Assertion__Group_0_1__2
             {
-            pushFollow(FOLLOW_19);
+            pushFollow(FOLLOW_22);
             rule__Assertion__Group_0_1__1__Impl();
 
             state._fsp--;
@@ -9487,21 +11117,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__1__Impl"
-    // InternalProblem.g:3018:1: rule__Assertion__Group_0_1__1__Impl : ( ( rule__Assertion__RelationAssignment_0_1_1 ) ) ;
+    // InternalProblem.g:3511:1: rule__Assertion__Group_0_1__1__Impl : ( ( rule__Assertion__RelationAssignment_0_1_1 ) ) ;
     public final void rule__Assertion__Group_0_1__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3022:1: ( ( ( rule__Assertion__RelationAssignment_0_1_1 ) ) )
-            // InternalProblem.g:3023:1: ( ( rule__Assertion__RelationAssignment_0_1_1 ) )
+            // InternalProblem.g:3515:1: ( ( ( rule__Assertion__RelationAssignment_0_1_1 ) ) )
+            // InternalProblem.g:3516:1: ( ( rule__Assertion__RelationAssignment_0_1_1 ) )
             {
-            // InternalProblem.g:3023:1: ( ( rule__Assertion__RelationAssignment_0_1_1 ) )
-            // InternalProblem.g:3024:2: ( rule__Assertion__RelationAssignment_0_1_1 )
+            // InternalProblem.g:3516:1: ( ( rule__Assertion__RelationAssignment_0_1_1 ) )
+            // InternalProblem.g:3517:2: ( rule__Assertion__RelationAssignment_0_1_1 )
             {
              before(grammarAccess.getAssertionAccess().getRelationAssignment_0_1_1()); 
-            // InternalProblem.g:3025:2: ( rule__Assertion__RelationAssignment_0_1_1 )
-            // InternalProblem.g:3025:3: rule__Assertion__RelationAssignment_0_1_1
+            // InternalProblem.g:3518:2: ( rule__Assertion__RelationAssignment_0_1_1 )
+            // InternalProblem.g:3518:3: rule__Assertion__RelationAssignment_0_1_1
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__RelationAssignment_0_1_1();
@@ -9534,16 +11164,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__2"
-    // InternalProblem.g:3033:1: rule__Assertion__Group_0_1__2 : rule__Assertion__Group_0_1__2__Impl rule__Assertion__Group_0_1__3 ;
+    // InternalProblem.g:3526:1: rule__Assertion__Group_0_1__2 : rule__Assertion__Group_0_1__2__Impl rule__Assertion__Group_0_1__3 ;
     public final void rule__Assertion__Group_0_1__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3037:1: ( rule__Assertion__Group_0_1__2__Impl rule__Assertion__Group_0_1__3 )
-            // InternalProblem.g:3038:2: rule__Assertion__Group_0_1__2__Impl rule__Assertion__Group_0_1__3
+            // InternalProblem.g:3530:1: ( rule__Assertion__Group_0_1__2__Impl rule__Assertion__Group_0_1__3 )
+            // InternalProblem.g:3531:2: rule__Assertion__Group_0_1__2__Impl rule__Assertion__Group_0_1__3
             {
-            pushFollow(FOLLOW_26);
+            pushFollow(FOLLOW_23);
             rule__Assertion__Group_0_1__2__Impl();
 
             state._fsp--;
@@ -9572,20 +11202,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__2__Impl"
-    // InternalProblem.g:3045:1: rule__Assertion__Group_0_1__2__Impl : ( '(' ) ;
+    // InternalProblem.g:3538:1: rule__Assertion__Group_0_1__2__Impl : ( '(' ) ;
     public final void rule__Assertion__Group_0_1__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3049:1: ( ( '(' ) )
-            // InternalProblem.g:3050:1: ( '(' )
+            // InternalProblem.g:3542:1: ( ( '(' ) )
+            // InternalProblem.g:3543:1: ( '(' )
             {
-            // InternalProblem.g:3050:1: ( '(' )
-            // InternalProblem.g:3051:2: '('
+            // InternalProblem.g:3543:1: ( '(' )
+            // InternalProblem.g:3544:2: '('
             {
              before(grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_1_2()); 
-            match(input,32,FOLLOW_2); 
+            match(input,33,FOLLOW_2); 
              after(grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_1_2()); 
 
             }
@@ -9609,16 +11239,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__3"
-    // InternalProblem.g:3060:1: rule__Assertion__Group_0_1__3 : rule__Assertion__Group_0_1__3__Impl rule__Assertion__Group_0_1__4 ;
+    // InternalProblem.g:3553:1: rule__Assertion__Group_0_1__3 : rule__Assertion__Group_0_1__3__Impl rule__Assertion__Group_0_1__4 ;
     public final void rule__Assertion__Group_0_1__3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3064:1: ( rule__Assertion__Group_0_1__3__Impl rule__Assertion__Group_0_1__4 )
-            // InternalProblem.g:3065:2: rule__Assertion__Group_0_1__3__Impl rule__Assertion__Group_0_1__4
+            // InternalProblem.g:3557:1: ( rule__Assertion__Group_0_1__3__Impl rule__Assertion__Group_0_1__4 )
+            // InternalProblem.g:3558:2: rule__Assertion__Group_0_1__3__Impl rule__Assertion__Group_0_1__4
             {
-            pushFollow(FOLLOW_26);
+            pushFollow(FOLLOW_23);
             rule__Assertion__Group_0_1__3__Impl();
 
             state._fsp--;
@@ -9647,29 +11277,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__3__Impl"
-    // InternalProblem.g:3072:1: rule__Assertion__Group_0_1__3__Impl : ( ( rule__Assertion__Group_0_1_3__0 )? ) ;
+    // InternalProblem.g:3565:1: rule__Assertion__Group_0_1__3__Impl : ( ( rule__Assertion__Group_0_1_3__0 )? ) ;
     public final void rule__Assertion__Group_0_1__3__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3076:1: ( ( ( rule__Assertion__Group_0_1_3__0 )? ) )
-            // InternalProblem.g:3077:1: ( ( rule__Assertion__Group_0_1_3__0 )? )
+            // InternalProblem.g:3569:1: ( ( ( rule__Assertion__Group_0_1_3__0 )? ) )
+            // InternalProblem.g:3570:1: ( ( rule__Assertion__Group_0_1_3__0 )? )
             {
-            // InternalProblem.g:3077:1: ( ( rule__Assertion__Group_0_1_3__0 )? )
-            // InternalProblem.g:3078:2: ( rule__Assertion__Group_0_1_3__0 )?
+            // InternalProblem.g:3570:1: ( ( rule__Assertion__Group_0_1_3__0 )? )
+            // InternalProblem.g:3571:2: ( rule__Assertion__Group_0_1_3__0 )?
             {
              before(grammarAccess.getAssertionAccess().getGroup_0_1_3()); 
-            // InternalProblem.g:3079:2: ( rule__Assertion__Group_0_1_3__0 )?
-            int alt35=2;
-            int LA35_0 = input.LA(1);
+            // InternalProblem.g:3572:2: ( rule__Assertion__Group_0_1_3__0 )?
+            int alt44=2;
+            int LA44_0 = input.LA(1);
 
-            if ( ((LA35_0>=RULE_QUOTED_ID && LA35_0<=RULE_ID)) ) {
-                alt35=1;
+            if ( ((LA44_0>=RULE_QUOTED_ID && LA44_0<=RULE_ID)||(LA44_0>=19 && LA44_0<=20)) ) {
+                alt44=1;
             }
-            switch (alt35) {
+            switch (alt44) {
                 case 1 :
-                    // InternalProblem.g:3079:3: rule__Assertion__Group_0_1_3__0
+                    // InternalProblem.g:3572:3: rule__Assertion__Group_0_1_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Assertion__Group_0_1_3__0();
@@ -9705,14 +11335,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__4"
-    // InternalProblem.g:3087:1: rule__Assertion__Group_0_1__4 : rule__Assertion__Group_0_1__4__Impl ;
+    // InternalProblem.g:3580:1: rule__Assertion__Group_0_1__4 : rule__Assertion__Group_0_1__4__Impl ;
     public final void rule__Assertion__Group_0_1__4() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3091:1: ( rule__Assertion__Group_0_1__4__Impl )
-            // InternalProblem.g:3092:2: rule__Assertion__Group_0_1__4__Impl
+            // InternalProblem.g:3584:1: ( rule__Assertion__Group_0_1__4__Impl )
+            // InternalProblem.g:3585:2: rule__Assertion__Group_0_1__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group_0_1__4__Impl();
@@ -9738,20 +11368,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__4__Impl"
-    // InternalProblem.g:3098:1: rule__Assertion__Group_0_1__4__Impl : ( ')' ) ;
+    // InternalProblem.g:3591:1: rule__Assertion__Group_0_1__4__Impl : ( ')' ) ;
     public final void rule__Assertion__Group_0_1__4__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3102:1: ( ( ')' ) )
-            // InternalProblem.g:3103:1: ( ')' )
+            // InternalProblem.g:3595:1: ( ( ')' ) )
+            // InternalProblem.g:3596:1: ( ')' )
             {
-            // InternalProblem.g:3103:1: ( ')' )
-            // InternalProblem.g:3104:2: ')'
+            // InternalProblem.g:3596:1: ( ')' )
+            // InternalProblem.g:3597:2: ')'
             {
              before(grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_1_4()); 
-            match(input,33,FOLLOW_2); 
+            match(input,34,FOLLOW_2); 
              after(grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_1_4()); 
 
             }
@@ -9775,16 +11405,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3__0"
-    // InternalProblem.g:3114:1: rule__Assertion__Group_0_1_3__0 : rule__Assertion__Group_0_1_3__0__Impl rule__Assertion__Group_0_1_3__1 ;
+    // InternalProblem.g:3607:1: rule__Assertion__Group_0_1_3__0 : rule__Assertion__Group_0_1_3__0__Impl rule__Assertion__Group_0_1_3__1 ;
     public final void rule__Assertion__Group_0_1_3__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3118:1: ( rule__Assertion__Group_0_1_3__0__Impl rule__Assertion__Group_0_1_3__1 )
-            // InternalProblem.g:3119:2: rule__Assertion__Group_0_1_3__0__Impl rule__Assertion__Group_0_1_3__1
+            // InternalProblem.g:3611:1: ( rule__Assertion__Group_0_1_3__0__Impl rule__Assertion__Group_0_1_3__1 )
+            // InternalProblem.g:3612:2: rule__Assertion__Group_0_1_3__0__Impl rule__Assertion__Group_0_1_3__1
             {
-            pushFollow(FOLLOW_10);
+            pushFollow(FOLLOW_9);
             rule__Assertion__Group_0_1_3__0__Impl();
 
             state._fsp--;
@@ -9813,21 +11443,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3__0__Impl"
-    // InternalProblem.g:3126:1: rule__Assertion__Group_0_1_3__0__Impl : ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) ) ;
+    // InternalProblem.g:3619:1: rule__Assertion__Group_0_1_3__0__Impl : ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) ) ;
     public final void rule__Assertion__Group_0_1_3__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3130:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) ) )
-            // InternalProblem.g:3131:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) )
+            // InternalProblem.g:3623:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) ) )
+            // InternalProblem.g:3624:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) )
             {
-            // InternalProblem.g:3131:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) )
-            // InternalProblem.g:3132:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_0 )
+            // InternalProblem.g:3624:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) )
+            // InternalProblem.g:3625:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_0 )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsAssignment_0_1_3_0()); 
-            // InternalProblem.g:3133:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_0 )
-            // InternalProblem.g:3133:3: rule__Assertion__ArgumentsAssignment_0_1_3_0
+            // InternalProblem.g:3626:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_0 )
+            // InternalProblem.g:3626:3: rule__Assertion__ArgumentsAssignment_0_1_3_0
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__ArgumentsAssignment_0_1_3_0();
@@ -9860,14 +11490,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3__1"
-    // InternalProblem.g:3141:1: rule__Assertion__Group_0_1_3__1 : rule__Assertion__Group_0_1_3__1__Impl ;
+    // InternalProblem.g:3634:1: rule__Assertion__Group_0_1_3__1 : rule__Assertion__Group_0_1_3__1__Impl ;
     public final void rule__Assertion__Group_0_1_3__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3145:1: ( rule__Assertion__Group_0_1_3__1__Impl )
-            // InternalProblem.g:3146:2: rule__Assertion__Group_0_1_3__1__Impl
+            // InternalProblem.g:3638:1: ( rule__Assertion__Group_0_1_3__1__Impl )
+            // InternalProblem.g:3639:2: rule__Assertion__Group_0_1_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group_0_1_3__1__Impl();
@@ -9893,35 +11523,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3__1__Impl"
-    // InternalProblem.g:3152:1: rule__Assertion__Group_0_1_3__1__Impl : ( ( rule__Assertion__Group_0_1_3_1__0 )* ) ;
+    // InternalProblem.g:3645:1: rule__Assertion__Group_0_1_3__1__Impl : ( ( rule__Assertion__Group_0_1_3_1__0 )* ) ;
     public final void rule__Assertion__Group_0_1_3__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3156:1: ( ( ( rule__Assertion__Group_0_1_3_1__0 )* ) )
-            // InternalProblem.g:3157:1: ( ( rule__Assertion__Group_0_1_3_1__0 )* )
+            // InternalProblem.g:3649:1: ( ( ( rule__Assertion__Group_0_1_3_1__0 )* ) )
+            // InternalProblem.g:3650:1: ( ( rule__Assertion__Group_0_1_3_1__0 )* )
             {
-            // InternalProblem.g:3157:1: ( ( rule__Assertion__Group_0_1_3_1__0 )* )
-            // InternalProblem.g:3158:2: ( rule__Assertion__Group_0_1_3_1__0 )*
+            // InternalProblem.g:3650:1: ( ( rule__Assertion__Group_0_1_3_1__0 )* )
+            // InternalProblem.g:3651:2: ( rule__Assertion__Group_0_1_3_1__0 )*
             {
              before(grammarAccess.getAssertionAccess().getGroup_0_1_3_1()); 
-            // InternalProblem.g:3159:2: ( rule__Assertion__Group_0_1_3_1__0 )*
-            loop36:
+            // InternalProblem.g:3652:2: ( rule__Assertion__Group_0_1_3_1__0 )*
+            loop45:
             do {
-                int alt36=2;
-                int LA36_0 = input.LA(1);
+                int alt45=2;
+                int LA45_0 = input.LA(1);
 
-                if ( (LA36_0==25) ) {
-                    alt36=1;
+                if ( (LA45_0==13) ) {
+                    alt45=1;
                 }
 
 
-                switch (alt36) {
+                switch (alt45) {
                 case 1 :
-                    // InternalProblem.g:3159:3: rule__Assertion__Group_0_1_3_1__0
+                    // InternalProblem.g:3652:3: rule__Assertion__Group_0_1_3_1__0
                     {
-                    pushFollow(FOLLOW_11);
+                    pushFollow(FOLLOW_10);
                     rule__Assertion__Group_0_1_3_1__0();
 
                     state._fsp--;
@@ -9931,7 +11561,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop36;
+                    break loop45;
                 }
             } while (true);
 
@@ -9958,16 +11588,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3_1__0"
-    // InternalProblem.g:3168:1: rule__Assertion__Group_0_1_3_1__0 : rule__Assertion__Group_0_1_3_1__0__Impl rule__Assertion__Group_0_1_3_1__1 ;
+    // InternalProblem.g:3661:1: rule__Assertion__Group_0_1_3_1__0 : rule__Assertion__Group_0_1_3_1__0__Impl rule__Assertion__Group_0_1_3_1__1 ;
     public final void rule__Assertion__Group_0_1_3_1__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3172:1: ( rule__Assertion__Group_0_1_3_1__0__Impl rule__Assertion__Group_0_1_3_1__1 )
-            // InternalProblem.g:3173:2: rule__Assertion__Group_0_1_3_1__0__Impl rule__Assertion__Group_0_1_3_1__1
+            // InternalProblem.g:3665:1: ( rule__Assertion__Group_0_1_3_1__0__Impl rule__Assertion__Group_0_1_3_1__1 )
+            // InternalProblem.g:3666:2: rule__Assertion__Group_0_1_3_1__0__Impl rule__Assertion__Group_0_1_3_1__1
             {
-            pushFollow(FOLLOW_9);
+            pushFollow(FOLLOW_5);
             rule__Assertion__Group_0_1_3_1__0__Impl();
 
             state._fsp--;
@@ -9996,20 +11626,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3_1__0__Impl"
-    // InternalProblem.g:3180:1: rule__Assertion__Group_0_1_3_1__0__Impl : ( ',' ) ;
+    // InternalProblem.g:3673:1: rule__Assertion__Group_0_1_3_1__0__Impl : ( ',' ) ;
     public final void rule__Assertion__Group_0_1_3_1__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3184:1: ( ( ',' ) )
-            // InternalProblem.g:3185:1: ( ',' )
+            // InternalProblem.g:3677:1: ( ( ',' ) )
+            // InternalProblem.g:3678:1: ( ',' )
             {
-            // InternalProblem.g:3185:1: ( ',' )
-            // InternalProblem.g:3186:2: ','
+            // InternalProblem.g:3678:1: ( ',' )
+            // InternalProblem.g:3679:2: ','
             {
              before(grammarAccess.getAssertionAccess().getCommaKeyword_0_1_3_1_0()); 
-            match(input,25,FOLLOW_2); 
+            match(input,13,FOLLOW_2); 
              after(grammarAccess.getAssertionAccess().getCommaKeyword_0_1_3_1_0()); 
 
             }
@@ -10033,14 +11663,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3_1__1"
-    // InternalProblem.g:3195:1: rule__Assertion__Group_0_1_3_1__1 : rule__Assertion__Group_0_1_3_1__1__Impl ;
+    // InternalProblem.g:3688:1: rule__Assertion__Group_0_1_3_1__1 : rule__Assertion__Group_0_1_3_1__1__Impl ;
     public final void rule__Assertion__Group_0_1_3_1__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3199:1: ( rule__Assertion__Group_0_1_3_1__1__Impl )
-            // InternalProblem.g:3200:2: rule__Assertion__Group_0_1_3_1__1__Impl
+            // InternalProblem.g:3692:1: ( rule__Assertion__Group_0_1_3_1__1__Impl )
+            // InternalProblem.g:3693:2: rule__Assertion__Group_0_1_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group_0_1_3_1__1__Impl();
@@ -10066,21 +11696,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3_1__1__Impl"
-    // InternalProblem.g:3206:1: rule__Assertion__Group_0_1_3_1__1__Impl : ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) ) ;
+    // InternalProblem.g:3699:1: rule__Assertion__Group_0_1_3_1__1__Impl : ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) ) ;
     public final void rule__Assertion__Group_0_1_3_1__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3210:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) ) )
-            // InternalProblem.g:3211:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) )
+            // InternalProblem.g:3703:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) ) )
+            // InternalProblem.g:3704:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) )
             {
-            // InternalProblem.g:3211:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) )
-            // InternalProblem.g:3212:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 )
+            // InternalProblem.g:3704:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) )
+            // InternalProblem.g:3705:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsAssignment_0_1_3_1_1()); 
-            // InternalProblem.g:3213:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 )
-            // InternalProblem.g:3213:3: rule__Assertion__ArgumentsAssignment_0_1_3_1_1
+            // InternalProblem.g:3706:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 )
+            // InternalProblem.g:3706:3: rule__Assertion__ArgumentsAssignment_0_1_3_1_1
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__ArgumentsAssignment_0_1_3_1_1();
@@ -10113,16 +11743,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__0"
-    // InternalProblem.g:3222:1: rule__ScopeDeclaration__Group__0 : rule__ScopeDeclaration__Group__0__Impl rule__ScopeDeclaration__Group__1 ;
+    // InternalProblem.g:3715:1: rule__ScopeDeclaration__Group__0 : rule__ScopeDeclaration__Group__0__Impl rule__ScopeDeclaration__Group__1 ;
     public final void rule__ScopeDeclaration__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3226:1: ( rule__ScopeDeclaration__Group__0__Impl rule__ScopeDeclaration__Group__1 )
-            // InternalProblem.g:3227:2: rule__ScopeDeclaration__Group__0__Impl rule__ScopeDeclaration__Group__1
+            // InternalProblem.g:3719:1: ( rule__ScopeDeclaration__Group__0__Impl rule__ScopeDeclaration__Group__1 )
+            // InternalProblem.g:3720:2: rule__ScopeDeclaration__Group__0__Impl rule__ScopeDeclaration__Group__1
             {
-            pushFollow(FOLLOW_5);
+            pushFollow(FOLLOW_32);
             rule__ScopeDeclaration__Group__0__Impl();
 
             state._fsp--;
@@ -10151,20 +11781,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__0__Impl"
-    // InternalProblem.g:3234:1: rule__ScopeDeclaration__Group__0__Impl : ( 'scope' ) ;
+    // InternalProblem.g:3727:1: rule__ScopeDeclaration__Group__0__Impl : ( 'scope' ) ;
     public final void rule__ScopeDeclaration__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3238:1: ( ( 'scope' ) )
-            // InternalProblem.g:3239:1: ( 'scope' )
+            // InternalProblem.g:3731:1: ( ( 'scope' ) )
+            // InternalProblem.g:3732:1: ( 'scope' )
             {
-            // InternalProblem.g:3239:1: ( 'scope' )
-            // InternalProblem.g:3240:2: 'scope'
+            // InternalProblem.g:3732:1: ( 'scope' )
+            // InternalProblem.g:3733:2: 'scope'
             {
              before(grammarAccess.getScopeDeclarationAccess().getScopeKeyword_0()); 
-            match(input,36,FOLLOW_2); 
+            match(input,37,FOLLOW_2); 
              after(grammarAccess.getScopeDeclarationAccess().getScopeKeyword_0()); 
 
             }
@@ -10188,16 +11818,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__1"
-    // InternalProblem.g:3249:1: rule__ScopeDeclaration__Group__1 : rule__ScopeDeclaration__Group__1__Impl rule__ScopeDeclaration__Group__2 ;
+    // InternalProblem.g:3742:1: rule__ScopeDeclaration__Group__1 : rule__ScopeDeclaration__Group__1__Impl rule__ScopeDeclaration__Group__2 ;
     public final void rule__ScopeDeclaration__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3253:1: ( rule__ScopeDeclaration__Group__1__Impl rule__ScopeDeclaration__Group__2 )
-            // InternalProblem.g:3254:2: rule__ScopeDeclaration__Group__1__Impl rule__ScopeDeclaration__Group__2
+            // InternalProblem.g:3746:1: ( rule__ScopeDeclaration__Group__1__Impl rule__ScopeDeclaration__Group__2 )
+            // InternalProblem.g:3747:2: rule__ScopeDeclaration__Group__1__Impl rule__ScopeDeclaration__Group__2
             {
-            pushFollow(FOLLOW_30);
+            pushFollow(FOLLOW_33);
             rule__ScopeDeclaration__Group__1__Impl();
 
             state._fsp--;
@@ -10226,21 +11856,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__1__Impl"
-    // InternalProblem.g:3261:1: rule__ScopeDeclaration__Group__1__Impl : ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) ) ;
+    // InternalProblem.g:3754:1: rule__ScopeDeclaration__Group__1__Impl : ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) ) ;
     public final void rule__ScopeDeclaration__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3265:1: ( ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) ) )
-            // InternalProblem.g:3266:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) )
+            // InternalProblem.g:3758:1: ( ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) ) )
+            // InternalProblem.g:3759:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) )
             {
-            // InternalProblem.g:3266:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) )
-            // InternalProblem.g:3267:2: ( rule__ScopeDeclaration__TypeScopesAssignment_1 )
+            // InternalProblem.g:3759:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) )
+            // InternalProblem.g:3760:2: ( rule__ScopeDeclaration__TypeScopesAssignment_1 )
             {
              before(grammarAccess.getScopeDeclarationAccess().getTypeScopesAssignment_1()); 
-            // InternalProblem.g:3268:2: ( rule__ScopeDeclaration__TypeScopesAssignment_1 )
-            // InternalProblem.g:3268:3: rule__ScopeDeclaration__TypeScopesAssignment_1
+            // InternalProblem.g:3761:2: ( rule__ScopeDeclaration__TypeScopesAssignment_1 )
+            // InternalProblem.g:3761:3: rule__ScopeDeclaration__TypeScopesAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__ScopeDeclaration__TypeScopesAssignment_1();
@@ -10273,16 +11903,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__2"
-    // InternalProblem.g:3276:1: rule__ScopeDeclaration__Group__2 : rule__ScopeDeclaration__Group__2__Impl rule__ScopeDeclaration__Group__3 ;
+    // InternalProblem.g:3769:1: rule__ScopeDeclaration__Group__2 : rule__ScopeDeclaration__Group__2__Impl rule__ScopeDeclaration__Group__3 ;
     public final void rule__ScopeDeclaration__Group__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3280:1: ( rule__ScopeDeclaration__Group__2__Impl rule__ScopeDeclaration__Group__3 )
-            // InternalProblem.g:3281:2: rule__ScopeDeclaration__Group__2__Impl rule__ScopeDeclaration__Group__3
+            // InternalProblem.g:3773:1: ( rule__ScopeDeclaration__Group__2__Impl rule__ScopeDeclaration__Group__3 )
+            // InternalProblem.g:3774:2: rule__ScopeDeclaration__Group__2__Impl rule__ScopeDeclaration__Group__3
             {
-            pushFollow(FOLLOW_30);
+            pushFollow(FOLLOW_33);
             rule__ScopeDeclaration__Group__2__Impl();
 
             state._fsp--;
@@ -10311,35 +11941,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__2__Impl"
-    // InternalProblem.g:3288:1: rule__ScopeDeclaration__Group__2__Impl : ( ( rule__ScopeDeclaration__Group_2__0 )* ) ;
+    // InternalProblem.g:3781:1: rule__ScopeDeclaration__Group__2__Impl : ( ( rule__ScopeDeclaration__Group_2__0 )* ) ;
     public final void rule__ScopeDeclaration__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3292:1: ( ( ( rule__ScopeDeclaration__Group_2__0 )* ) )
-            // InternalProblem.g:3293:1: ( ( rule__ScopeDeclaration__Group_2__0 )* )
+            // InternalProblem.g:3785:1: ( ( ( rule__ScopeDeclaration__Group_2__0 )* ) )
+            // InternalProblem.g:3786:1: ( ( rule__ScopeDeclaration__Group_2__0 )* )
             {
-            // InternalProblem.g:3293:1: ( ( rule__ScopeDeclaration__Group_2__0 )* )
-            // InternalProblem.g:3294:2: ( rule__ScopeDeclaration__Group_2__0 )*
+            // InternalProblem.g:3786:1: ( ( rule__ScopeDeclaration__Group_2__0 )* )
+            // InternalProblem.g:3787:2: ( rule__ScopeDeclaration__Group_2__0 )*
             {
              before(grammarAccess.getScopeDeclarationAccess().getGroup_2()); 
-            // InternalProblem.g:3295:2: ( rule__ScopeDeclaration__Group_2__0 )*
-            loop37:
+            // InternalProblem.g:3788:2: ( rule__ScopeDeclaration__Group_2__0 )*
+            loop46:
             do {
-                int alt37=2;
-                int LA37_0 = input.LA(1);
+                int alt46=2;
+                int LA46_0 = input.LA(1);
 
-                if ( (LA37_0==25) ) {
-                    alt37=1;
+                if ( (LA46_0==13) ) {
+                    alt46=1;
                 }
 
 
-                switch (alt37) {
+                switch (alt46) {
                 case 1 :
-                    // InternalProblem.g:3295:3: rule__ScopeDeclaration__Group_2__0
+                    // InternalProblem.g:3788:3: rule__ScopeDeclaration__Group_2__0
                     {
-                    pushFollow(FOLLOW_11);
+                    pushFollow(FOLLOW_10);
                     rule__ScopeDeclaration__Group_2__0();
 
                     state._fsp--;
@@ -10349,7 +11979,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop37;
+                    break loop46;
                 }
             } while (true);
 
@@ -10376,14 +12006,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__3"
-    // InternalProblem.g:3303:1: rule__ScopeDeclaration__Group__3 : rule__ScopeDeclaration__Group__3__Impl ;
+    // InternalProblem.g:3796:1: rule__ScopeDeclaration__Group__3 : rule__ScopeDeclaration__Group__3__Impl ;
     public final void rule__ScopeDeclaration__Group__3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3307:1: ( rule__ScopeDeclaration__Group__3__Impl )
-            // InternalProblem.g:3308:2: rule__ScopeDeclaration__Group__3__Impl
+            // InternalProblem.g:3800:1: ( rule__ScopeDeclaration__Group__3__Impl )
+            // InternalProblem.g:3801:2: rule__ScopeDeclaration__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ScopeDeclaration__Group__3__Impl();
@@ -10409,17 +12039,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__3__Impl"
-    // InternalProblem.g:3314:1: rule__ScopeDeclaration__Group__3__Impl : ( '.' ) ;
+    // InternalProblem.g:3807:1: rule__ScopeDeclaration__Group__3__Impl : ( '.' ) ;
     public final void rule__ScopeDeclaration__Group__3__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3318:1: ( ( '.' ) )
-            // InternalProblem.g:3319:1: ( '.' )
+            // InternalProblem.g:3811:1: ( ( '.' ) )
+            // InternalProblem.g:3812:1: ( '.' )
             {
-            // InternalProblem.g:3319:1: ( '.' )
-            // InternalProblem.g:3320:2: '.'
+            // InternalProblem.g:3812:1: ( '.' )
+            // InternalProblem.g:3813:2: '.'
             {
              before(grammarAccess.getScopeDeclarationAccess().getFullStopKeyword_3()); 
             match(input,12,FOLLOW_2); 
@@ -10446,16 +12076,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group_2__0"
-    // InternalProblem.g:3330:1: rule__ScopeDeclaration__Group_2__0 : rule__ScopeDeclaration__Group_2__0__Impl rule__ScopeDeclaration__Group_2__1 ;
+    // InternalProblem.g:3823:1: rule__ScopeDeclaration__Group_2__0 : rule__ScopeDeclaration__Group_2__0__Impl rule__ScopeDeclaration__Group_2__1 ;
     public final void rule__ScopeDeclaration__Group_2__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3334:1: ( rule__ScopeDeclaration__Group_2__0__Impl rule__ScopeDeclaration__Group_2__1 )
-            // InternalProblem.g:3335:2: rule__ScopeDeclaration__Group_2__0__Impl rule__ScopeDeclaration__Group_2__1
+            // InternalProblem.g:3827:1: ( rule__ScopeDeclaration__Group_2__0__Impl rule__ScopeDeclaration__Group_2__1 )
+            // InternalProblem.g:3828:2: rule__ScopeDeclaration__Group_2__0__Impl rule__ScopeDeclaration__Group_2__1
             {
-            pushFollow(FOLLOW_5);
+            pushFollow(FOLLOW_32);
             rule__ScopeDeclaration__Group_2__0__Impl();
 
             state._fsp--;
@@ -10484,20 +12114,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group_2__0__Impl"
-    // InternalProblem.g:3342:1: rule__ScopeDeclaration__Group_2__0__Impl : ( ',' ) ;
+    // InternalProblem.g:3835:1: rule__ScopeDeclaration__Group_2__0__Impl : ( ',' ) ;
     public final void rule__ScopeDeclaration__Group_2__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3346:1: ( ( ',' ) )
-            // InternalProblem.g:3347:1: ( ',' )
+            // InternalProblem.g:3839:1: ( ( ',' ) )
+            // InternalProblem.g:3840:1: ( ',' )
             {
-            // InternalProblem.g:3347:1: ( ',' )
-            // InternalProblem.g:3348:2: ','
+            // InternalProblem.g:3840:1: ( ',' )
+            // InternalProblem.g:3841:2: ','
             {
              before(grammarAccess.getScopeDeclarationAccess().getCommaKeyword_2_0()); 
-            match(input,25,FOLLOW_2); 
+            match(input,13,FOLLOW_2); 
              after(grammarAccess.getScopeDeclarationAccess().getCommaKeyword_2_0()); 
 
             }
@@ -10521,14 +12151,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group_2__1"
-    // InternalProblem.g:3357:1: rule__ScopeDeclaration__Group_2__1 : rule__ScopeDeclaration__Group_2__1__Impl ;
+    // InternalProblem.g:3850:1: rule__ScopeDeclaration__Group_2__1 : rule__ScopeDeclaration__Group_2__1__Impl ;
     public final void rule__ScopeDeclaration__Group_2__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3361:1: ( rule__ScopeDeclaration__Group_2__1__Impl )
-            // InternalProblem.g:3362:2: rule__ScopeDeclaration__Group_2__1__Impl
+            // InternalProblem.g:3854:1: ( rule__ScopeDeclaration__Group_2__1__Impl )
+            // InternalProblem.g:3855:2: rule__ScopeDeclaration__Group_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ScopeDeclaration__Group_2__1__Impl();
@@ -10554,21 +12184,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group_2__1__Impl"
-    // InternalProblem.g:3368:1: rule__ScopeDeclaration__Group_2__1__Impl : ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) ) ;
+    // InternalProblem.g:3861:1: rule__ScopeDeclaration__Group_2__1__Impl : ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) ) ;
     public final void rule__ScopeDeclaration__Group_2__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3372:1: ( ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) ) )
-            // InternalProblem.g:3373:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) )
+            // InternalProblem.g:3865:1: ( ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) ) )
+            // InternalProblem.g:3866:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) )
             {
-            // InternalProblem.g:3373:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) )
-            // InternalProblem.g:3374:2: ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 )
+            // InternalProblem.g:3866:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) )
+            // InternalProblem.g:3867:2: ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 )
             {
              before(grammarAccess.getScopeDeclarationAccess().getTypeScopesAssignment_2_1()); 
-            // InternalProblem.g:3375:2: ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 )
-            // InternalProblem.g:3375:3: rule__ScopeDeclaration__TypeScopesAssignment_2_1
+            // InternalProblem.g:3868:2: ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 )
+            // InternalProblem.g:3868:3: rule__ScopeDeclaration__TypeScopesAssignment_2_1
             {
             pushFollow(FOLLOW_2);
             rule__ScopeDeclaration__TypeScopesAssignment_2_1();
@@ -10601,16 +12231,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Group__0"
-    // InternalProblem.g:3384:1: rule__TypeScope__Group__0 : rule__TypeScope__Group__0__Impl rule__TypeScope__Group__1 ;
+    // InternalProblem.g:3877:1: rule__TypeScope__Group__0 : rule__TypeScope__Group__0__Impl rule__TypeScope__Group__1 ;
     public final void rule__TypeScope__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3388:1: ( rule__TypeScope__Group__0__Impl rule__TypeScope__Group__1 )
-            // InternalProblem.g:3389:2: rule__TypeScope__Group__0__Impl rule__TypeScope__Group__1
+            // InternalProblem.g:3881:1: ( rule__TypeScope__Group__0__Impl rule__TypeScope__Group__1 )
+            // InternalProblem.g:3882:2: rule__TypeScope__Group__0__Impl rule__TypeScope__Group__1
             {
-            pushFollow(FOLLOW_31);
+            pushFollow(FOLLOW_34);
             rule__TypeScope__Group__0__Impl();
 
             state._fsp--;
@@ -10639,21 +12269,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Group__0__Impl"
-    // InternalProblem.g:3396:1: rule__TypeScope__Group__0__Impl : ( ( rule__TypeScope__TargetTypeAssignment_0 ) ) ;
+    // InternalProblem.g:3889:1: rule__TypeScope__Group__0__Impl : ( ( rule__TypeScope__TargetTypeAssignment_0 ) ) ;
     public final void rule__TypeScope__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3400:1: ( ( ( rule__TypeScope__TargetTypeAssignment_0 ) ) )
-            // InternalProblem.g:3401:1: ( ( rule__TypeScope__TargetTypeAssignment_0 ) )
+            // InternalProblem.g:3893:1: ( ( ( rule__TypeScope__TargetTypeAssignment_0 ) ) )
+            // InternalProblem.g:3894:1: ( ( rule__TypeScope__TargetTypeAssignment_0 ) )
             {
-            // InternalProblem.g:3401:1: ( ( rule__TypeScope__TargetTypeAssignment_0 ) )
-            // InternalProblem.g:3402:2: ( rule__TypeScope__TargetTypeAssignment_0 )
+            // InternalProblem.g:3894:1: ( ( rule__TypeScope__TargetTypeAssignment_0 ) )
+            // InternalProblem.g:3895:2: ( rule__TypeScope__TargetTypeAssignment_0 )
             {
              before(grammarAccess.getTypeScopeAccess().getTargetTypeAssignment_0()); 
-            // InternalProblem.g:3403:2: ( rule__TypeScope__TargetTypeAssignment_0 )
-            // InternalProblem.g:3403:3: rule__TypeScope__TargetTypeAssignment_0
+            // InternalProblem.g:3896:2: ( rule__TypeScope__TargetTypeAssignment_0 )
+            // InternalProblem.g:3896:3: rule__TypeScope__TargetTypeAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__TypeScope__TargetTypeAssignment_0();
@@ -10686,16 +12316,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Group__1"
-    // InternalProblem.g:3411:1: rule__TypeScope__Group__1 : rule__TypeScope__Group__1__Impl rule__TypeScope__Group__2 ;
+    // InternalProblem.g:3904:1: rule__TypeScope__Group__1 : rule__TypeScope__Group__1__Impl rule__TypeScope__Group__2 ;
     public final void rule__TypeScope__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3415:1: ( rule__TypeScope__Group__1__Impl rule__TypeScope__Group__2 )
-            // InternalProblem.g:3416:2: rule__TypeScope__Group__1__Impl rule__TypeScope__Group__2
+            // InternalProblem.g:3908:1: ( rule__TypeScope__Group__1__Impl rule__TypeScope__Group__2 )
+            // InternalProblem.g:3909:2: rule__TypeScope__Group__1__Impl rule__TypeScope__Group__2
             {
-            pushFollow(FOLLOW_17);
+            pushFollow(FOLLOW_20);
             rule__TypeScope__Group__1__Impl();
 
             state._fsp--;
@@ -10724,21 +12354,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Group__1__Impl"
-    // InternalProblem.g:3423:1: rule__TypeScope__Group__1__Impl : ( ( rule__TypeScope__Alternatives_1 ) ) ;
+    // InternalProblem.g:3916:1: rule__TypeScope__Group__1__Impl : ( ( rule__TypeScope__Alternatives_1 ) ) ;
     public final void rule__TypeScope__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3427:1: ( ( ( rule__TypeScope__Alternatives_1 ) ) )
-            // InternalProblem.g:3428:1: ( ( rule__TypeScope__Alternatives_1 ) )
+            // InternalProblem.g:3920:1: ( ( ( rule__TypeScope__Alternatives_1 ) ) )
+            // InternalProblem.g:3921:1: ( ( rule__TypeScope__Alternatives_1 ) )
             {
-            // InternalProblem.g:3428:1: ( ( rule__TypeScope__Alternatives_1 ) )
-            // InternalProblem.g:3429:2: ( rule__TypeScope__Alternatives_1 )
+            // InternalProblem.g:3921:1: ( ( rule__TypeScope__Alternatives_1 ) )
+            // InternalProblem.g:3922:2: ( rule__TypeScope__Alternatives_1 )
             {
              before(grammarAccess.getTypeScopeAccess().getAlternatives_1()); 
-            // InternalProblem.g:3430:2: ( rule__TypeScope__Alternatives_1 )
-            // InternalProblem.g:3430:3: rule__TypeScope__Alternatives_1
+            // InternalProblem.g:3923:2: ( rule__TypeScope__Alternatives_1 )
+            // InternalProblem.g:3923:3: rule__TypeScope__Alternatives_1
             {
             pushFollow(FOLLOW_2);
             rule__TypeScope__Alternatives_1();
@@ -10771,14 +12401,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Group__2"
-    // InternalProblem.g:3438:1: rule__TypeScope__Group__2 : rule__TypeScope__Group__2__Impl ;
+    // InternalProblem.g:3931:1: rule__TypeScope__Group__2 : rule__TypeScope__Group__2__Impl ;
     public final void rule__TypeScope__Group__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3442:1: ( rule__TypeScope__Group__2__Impl )
-            // InternalProblem.g:3443:2: rule__TypeScope__Group__2__Impl
+            // InternalProblem.g:3935:1: ( rule__TypeScope__Group__2__Impl )
+            // InternalProblem.g:3936:2: rule__TypeScope__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TypeScope__Group__2__Impl();
@@ -10804,21 +12434,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Group__2__Impl"
-    // InternalProblem.g:3449:1: rule__TypeScope__Group__2__Impl : ( ( rule__TypeScope__MultiplicityAssignment_2 ) ) ;
+    // InternalProblem.g:3942:1: rule__TypeScope__Group__2__Impl : ( ( rule__TypeScope__MultiplicityAssignment_2 ) ) ;
     public final void rule__TypeScope__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3453:1: ( ( ( rule__TypeScope__MultiplicityAssignment_2 ) ) )
-            // InternalProblem.g:3454:1: ( ( rule__TypeScope__MultiplicityAssignment_2 ) )
+            // InternalProblem.g:3946:1: ( ( ( rule__TypeScope__MultiplicityAssignment_2 ) ) )
+            // InternalProblem.g:3947:1: ( ( rule__TypeScope__MultiplicityAssignment_2 ) )
             {
-            // InternalProblem.g:3454:1: ( ( rule__TypeScope__MultiplicityAssignment_2 ) )
-            // InternalProblem.g:3455:2: ( rule__TypeScope__MultiplicityAssignment_2 )
+            // InternalProblem.g:3947:1: ( ( rule__TypeScope__MultiplicityAssignment_2 ) )
+            // InternalProblem.g:3948:2: ( rule__TypeScope__MultiplicityAssignment_2 )
             {
              before(grammarAccess.getTypeScopeAccess().getMultiplicityAssignment_2()); 
-            // InternalProblem.g:3456:2: ( rule__TypeScope__MultiplicityAssignment_2 )
-            // InternalProblem.g:3456:3: rule__TypeScope__MultiplicityAssignment_2
+            // InternalProblem.g:3949:2: ( rule__TypeScope__MultiplicityAssignment_2 )
+            // InternalProblem.g:3949:3: rule__TypeScope__MultiplicityAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__TypeScope__MultiplicityAssignment_2();
@@ -10851,16 +12481,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__Group__0"
-    // InternalProblem.g:3465:1: rule__RangeMultiplicity__Group__0 : rule__RangeMultiplicity__Group__0__Impl rule__RangeMultiplicity__Group__1 ;
+    // InternalProblem.g:3958:1: rule__RangeMultiplicity__Group__0 : rule__RangeMultiplicity__Group__0__Impl rule__RangeMultiplicity__Group__1 ;
     public final void rule__RangeMultiplicity__Group__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3469:1: ( rule__RangeMultiplicity__Group__0__Impl rule__RangeMultiplicity__Group__1 )
-            // InternalProblem.g:3470:2: rule__RangeMultiplicity__Group__0__Impl rule__RangeMultiplicity__Group__1
+            // InternalProblem.g:3962:1: ( rule__RangeMultiplicity__Group__0__Impl rule__RangeMultiplicity__Group__1 )
+            // InternalProblem.g:3963:2: rule__RangeMultiplicity__Group__0__Impl rule__RangeMultiplicity__Group__1
             {
-            pushFollow(FOLLOW_32);
+            pushFollow(FOLLOW_35);
             rule__RangeMultiplicity__Group__0__Impl();
 
             state._fsp--;
@@ -10889,21 +12519,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__Group__0__Impl"
-    // InternalProblem.g:3477:1: rule__RangeMultiplicity__Group__0__Impl : ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) ) ;
+    // InternalProblem.g:3970:1: rule__RangeMultiplicity__Group__0__Impl : ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) ) ;
     public final void rule__RangeMultiplicity__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3481:1: ( ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) ) )
-            // InternalProblem.g:3482:1: ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) )
+            // InternalProblem.g:3974:1: ( ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) ) )
+            // InternalProblem.g:3975:1: ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) )
             {
-            // InternalProblem.g:3482:1: ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) )
-            // InternalProblem.g:3483:2: ( rule__RangeMultiplicity__LowerBoundAssignment_0 )
+            // InternalProblem.g:3975:1: ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) )
+            // InternalProblem.g:3976:2: ( rule__RangeMultiplicity__LowerBoundAssignment_0 )
             {
              before(grammarAccess.getRangeMultiplicityAccess().getLowerBoundAssignment_0()); 
-            // InternalProblem.g:3484:2: ( rule__RangeMultiplicity__LowerBoundAssignment_0 )
-            // InternalProblem.g:3484:3: rule__RangeMultiplicity__LowerBoundAssignment_0
+            // InternalProblem.g:3977:2: ( rule__RangeMultiplicity__LowerBoundAssignment_0 )
+            // InternalProblem.g:3977:3: rule__RangeMultiplicity__LowerBoundAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__RangeMultiplicity__LowerBoundAssignment_0();
@@ -10936,16 +12566,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__Group__1"
-    // InternalProblem.g:3492:1: rule__RangeMultiplicity__Group__1 : rule__RangeMultiplicity__Group__1__Impl rule__RangeMultiplicity__Group__2 ;
+    // InternalProblem.g:3985:1: rule__RangeMultiplicity__Group__1 : rule__RangeMultiplicity__Group__1__Impl rule__RangeMultiplicity__Group__2 ;
     public final void rule__RangeMultiplicity__Group__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3496:1: ( rule__RangeMultiplicity__Group__1__Impl rule__RangeMultiplicity__Group__2 )
-            // InternalProblem.g:3497:2: rule__RangeMultiplicity__Group__1__Impl rule__RangeMultiplicity__Group__2
+            // InternalProblem.g:3989:1: ( rule__RangeMultiplicity__Group__1__Impl rule__RangeMultiplicity__Group__2 )
+            // InternalProblem.g:3990:2: rule__RangeMultiplicity__Group__1__Impl rule__RangeMultiplicity__Group__2
             {
-            pushFollow(FOLLOW_33);
+            pushFollow(FOLLOW_36);
             rule__RangeMultiplicity__Group__1__Impl();
 
             state._fsp--;
@@ -10974,20 +12604,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__Group__1__Impl"
-    // InternalProblem.g:3504:1: rule__RangeMultiplicity__Group__1__Impl : ( '..' ) ;
+    // InternalProblem.g:3997:1: rule__RangeMultiplicity__Group__1__Impl : ( '..' ) ;
     public final void rule__RangeMultiplicity__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3508:1: ( ( '..' ) )
-            // InternalProblem.g:3509:1: ( '..' )
+            // InternalProblem.g:4001:1: ( ( '..' ) )
+            // InternalProblem.g:4002:1: ( '..' )
             {
-            // InternalProblem.g:3509:1: ( '..' )
-            // InternalProblem.g:3510:2: '..'
+            // InternalProblem.g:4002:1: ( '..' )
+            // InternalProblem.g:4003:2: '..'
             {
              before(grammarAccess.getRangeMultiplicityAccess().getFullStopFullStopKeyword_1()); 
-            match(input,37,FOLLOW_2); 
+            match(input,38,FOLLOW_2); 
              after(grammarAccess.getRangeMultiplicityAccess().getFullStopFullStopKeyword_1()); 
 
             }
@@ -11011,14 +12641,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__Group__2"
-    // InternalProblem.g:3519:1: rule__RangeMultiplicity__Group__2 : rule__RangeMultiplicity__Group__2__Impl ;
+    // InternalProblem.g:4012:1: rule__RangeMultiplicity__Group__2 : rule__RangeMultiplicity__Group__2__Impl ;
     public final void rule__RangeMultiplicity__Group__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3523:1: ( rule__RangeMultiplicity__Group__2__Impl )
-            // InternalProblem.g:3524:2: rule__RangeMultiplicity__Group__2__Impl
+            // InternalProblem.g:4016:1: ( rule__RangeMultiplicity__Group__2__Impl )
+            // InternalProblem.g:4017:2: rule__RangeMultiplicity__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__RangeMultiplicity__Group__2__Impl();
@@ -11044,21 +12674,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__Group__2__Impl"
-    // InternalProblem.g:3530:1: rule__RangeMultiplicity__Group__2__Impl : ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) ) ;
+    // InternalProblem.g:4023:1: rule__RangeMultiplicity__Group__2__Impl : ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) ) ;
     public final void rule__RangeMultiplicity__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3534:1: ( ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) ) )
-            // InternalProblem.g:3535:1: ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) )
+            // InternalProblem.g:4027:1: ( ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) ) )
+            // InternalProblem.g:4028:1: ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) )
             {
-            // InternalProblem.g:3535:1: ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) )
-            // InternalProblem.g:3536:2: ( rule__RangeMultiplicity__UpperBoundAssignment_2 )
+            // InternalProblem.g:4028:1: ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) )
+            // InternalProblem.g:4029:2: ( rule__RangeMultiplicity__UpperBoundAssignment_2 )
             {
              before(grammarAccess.getRangeMultiplicityAccess().getUpperBoundAssignment_2()); 
-            // InternalProblem.g:3537:2: ( rule__RangeMultiplicity__UpperBoundAssignment_2 )
-            // InternalProblem.g:3537:3: rule__RangeMultiplicity__UpperBoundAssignment_2
+            // InternalProblem.g:4030:2: ( rule__RangeMultiplicity__UpperBoundAssignment_2 )
+            // InternalProblem.g:4030:3: rule__RangeMultiplicity__UpperBoundAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__RangeMultiplicity__UpperBoundAssignment_2();
@@ -11091,16 +12721,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0"
-    // InternalProblem.g:3546:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
+    // InternalProblem.g:4039:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
     public final void rule__QualifiedName__Group_1__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3550:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
-            // InternalProblem.g:3551:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
+            // InternalProblem.g:4043:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
+            // InternalProblem.g:4044:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__QualifiedName__Group_1__0__Impl();
 
             state._fsp--;
@@ -11129,21 +12759,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0__Impl"
-    // InternalProblem.g:3558:1: rule__QualifiedName__Group_1__0__Impl : ( RULE_ID ) ;
+    // InternalProblem.g:4051:1: rule__QualifiedName__Group_1__0__Impl : ( ruleIdentifier ) ;
     public final void rule__QualifiedName__Group_1__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3562:1: ( ( RULE_ID ) )
-            // InternalProblem.g:3563:1: ( RULE_ID )
+            // InternalProblem.g:4055:1: ( ( ruleIdentifier ) )
+            // InternalProblem.g:4056:1: ( ruleIdentifier )
             {
-            // InternalProblem.g:3563:1: ( RULE_ID )
-            // InternalProblem.g:3564:2: RULE_ID
+            // InternalProblem.g:4056:1: ( ruleIdentifier )
+            // InternalProblem.g:4057:2: ruleIdentifier
             {
-             before(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_0()); 
+             before(grammarAccess.getQualifiedNameAccess().getIdentifierParserRuleCall_1_0()); 
+            pushFollow(FOLLOW_2);
+            ruleIdentifier();
+
+            state._fsp--;
+
+             after(grammarAccess.getQualifiedNameAccess().getIdentifierParserRuleCall_1_0()); 
 
             }
 
@@ -11166,16 +12800,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1"
-    // InternalProblem.g:3573:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl rule__QualifiedName__Group_1__2 ;
+    // InternalProblem.g:4066:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl rule__QualifiedName__Group_1__2 ;
     public final void rule__QualifiedName__Group_1__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3577:1: ( rule__QualifiedName__Group_1__1__Impl rule__QualifiedName__Group_1__2 )
-            // InternalProblem.g:3578:2: rule__QualifiedName__Group_1__1__Impl rule__QualifiedName__Group_1__2
+            // InternalProblem.g:4070:1: ( rule__QualifiedName__Group_1__1__Impl rule__QualifiedName__Group_1__2 )
+            // InternalProblem.g:4071:2: rule__QualifiedName__Group_1__1__Impl rule__QualifiedName__Group_1__2
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__QualifiedName__Group_1__1__Impl();
 
             state._fsp--;
@@ -11204,41 +12838,41 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1__Impl"
-    // InternalProblem.g:3585:1: rule__QualifiedName__Group_1__1__Impl : ( ( rule__QualifiedName__Group_1_1__0 )* ) ;
+    // InternalProblem.g:4078:1: rule__QualifiedName__Group_1__1__Impl : ( ( rule__QualifiedName__Group_1_1__0 )* ) ;
     public final void rule__QualifiedName__Group_1__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3589:1: ( ( ( rule__QualifiedName__Group_1_1__0 )* ) )
-            // InternalProblem.g:3590:1: ( ( rule__QualifiedName__Group_1_1__0 )* )
+            // InternalProblem.g:4082:1: ( ( ( rule__QualifiedName__Group_1_1__0 )* ) )
+            // InternalProblem.g:4083:1: ( ( rule__QualifiedName__Group_1_1__0 )* )
             {
-            // InternalProblem.g:3590:1: ( ( rule__QualifiedName__Group_1_1__0 )* )
-            // InternalProblem.g:3591:2: ( rule__QualifiedName__Group_1_1__0 )*
+            // InternalProblem.g:4083:1: ( ( rule__QualifiedName__Group_1_1__0 )* )
+            // InternalProblem.g:4084:2: ( rule__QualifiedName__Group_1_1__0 )*
             {
              before(grammarAccess.getQualifiedNameAccess().getGroup_1_1()); 
-            // InternalProblem.g:3592:2: ( rule__QualifiedName__Group_1_1__0 )*
-            loop38:
+            // InternalProblem.g:4085:2: ( rule__QualifiedName__Group_1_1__0 )*
+            loop47:
             do {
-                int alt38=2;
-                int LA38_0 = input.LA(1);
+                int alt47=2;
+                int LA47_0 = input.LA(1);
 
-                if ( (LA38_0==35) ) {
-                    int LA38_1 = input.LA(2);
+                if ( (LA47_0==36) ) {
+                    int LA47_1 = input.LA(2);
 
-                    if ( (LA38_1==RULE_ID) ) {
-                        alt38=1;
+                    if ( (LA47_1==RULE_ID||(LA47_1>=19 && LA47_1<=20)) ) {
+                        alt47=1;
                     }
 
 
                 }
 
 
-                switch (alt38) {
+                switch (alt47) {
                 case 1 :
-                    // InternalProblem.g:3592:3: rule__QualifiedName__Group_1_1__0
+                    // InternalProblem.g:4085:3: rule__QualifiedName__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_34);
+                    pushFollow(FOLLOW_37);
                     rule__QualifiedName__Group_1_1__0();
 
                     state._fsp--;
@@ -11248,7 +12882,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop38;
+                    break loop47;
                 }
             } while (true);
 
@@ -11275,14 +12909,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__2"
-    // InternalProblem.g:3600:1: rule__QualifiedName__Group_1__2 : rule__QualifiedName__Group_1__2__Impl ;
+    // InternalProblem.g:4093:1: rule__QualifiedName__Group_1__2 : rule__QualifiedName__Group_1__2__Impl ;
     public final void rule__QualifiedName__Group_1__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3604:1: ( rule__QualifiedName__Group_1__2__Impl )
-            // InternalProblem.g:3605:2: rule__QualifiedName__Group_1__2__Impl
+            // InternalProblem.g:4097:1: ( rule__QualifiedName__Group_1__2__Impl )
+            // InternalProblem.g:4098:2: rule__QualifiedName__Group_1__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedName__Group_1__2__Impl();
@@ -11308,29 +12942,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__2__Impl"
-    // InternalProblem.g:3611:1: rule__QualifiedName__Group_1__2__Impl : ( ( rule__QualifiedName__Group_1_2__0 )? ) ;
+    // InternalProblem.g:4104:1: rule__QualifiedName__Group_1__2__Impl : ( ( rule__QualifiedName__Group_1_2__0 )? ) ;
     public final void rule__QualifiedName__Group_1__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3615:1: ( ( ( rule__QualifiedName__Group_1_2__0 )? ) )
-            // InternalProblem.g:3616:1: ( ( rule__QualifiedName__Group_1_2__0 )? )
+            // InternalProblem.g:4108:1: ( ( ( rule__QualifiedName__Group_1_2__0 )? ) )
+            // InternalProblem.g:4109:1: ( ( rule__QualifiedName__Group_1_2__0 )? )
             {
-            // InternalProblem.g:3616:1: ( ( rule__QualifiedName__Group_1_2__0 )? )
-            // InternalProblem.g:3617:2: ( rule__QualifiedName__Group_1_2__0 )?
+            // InternalProblem.g:4109:1: ( ( rule__QualifiedName__Group_1_2__0 )? )
+            // InternalProblem.g:4110:2: ( rule__QualifiedName__Group_1_2__0 )?
             {
              before(grammarAccess.getQualifiedNameAccess().getGroup_1_2()); 
-            // InternalProblem.g:3618:2: ( rule__QualifiedName__Group_1_2__0 )?
-            int alt39=2;
-            int LA39_0 = input.LA(1);
+            // InternalProblem.g:4111:2: ( rule__QualifiedName__Group_1_2__0 )?
+            int alt48=2;
+            int LA48_0 = input.LA(1);
 
-            if ( (LA39_0==35) ) {
-                alt39=1;
+            if ( (LA48_0==36) ) {
+                alt48=1;
             }
-            switch (alt39) {
+            switch (alt48) {
                 case 1 :
-                    // InternalProblem.g:3618:3: rule__QualifiedName__Group_1_2__0
+                    // InternalProblem.g:4111:3: rule__QualifiedName__Group_1_2__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__QualifiedName__Group_1_2__0();
@@ -11366,14 +13000,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1_1__0"
-    // InternalProblem.g:3627:1: rule__QualifiedName__Group_1_1__0 : rule__QualifiedName__Group_1_1__0__Impl rule__QualifiedName__Group_1_1__1 ;
+    // InternalProblem.g:4120:1: rule__QualifiedName__Group_1_1__0 : rule__QualifiedName__Group_1_1__0__Impl rule__QualifiedName__Group_1_1__1 ;
     public final void rule__QualifiedName__Group_1_1__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3631:1: ( rule__QualifiedName__Group_1_1__0__Impl rule__QualifiedName__Group_1_1__1 )
-            // InternalProblem.g:3632:2: rule__QualifiedName__Group_1_1__0__Impl rule__QualifiedName__Group_1_1__1
+            // InternalProblem.g:4124:1: ( rule__QualifiedName__Group_1_1__0__Impl rule__QualifiedName__Group_1_1__1 )
+            // InternalProblem.g:4125:2: rule__QualifiedName__Group_1_1__0__Impl rule__QualifiedName__Group_1_1__1
             {
             pushFollow(FOLLOW_5);
             rule__QualifiedName__Group_1_1__0__Impl();
@@ -11404,20 +13038,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1_1__0__Impl"
-    // InternalProblem.g:3639:1: rule__QualifiedName__Group_1_1__0__Impl : ( ':' ) ;
+    // InternalProblem.g:4132:1: rule__QualifiedName__Group_1_1__0__Impl : ( ':' ) ;
     public final void rule__QualifiedName__Group_1_1__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3643:1: ( ( ':' ) )
-            // InternalProblem.g:3644:1: ( ':' )
+            // InternalProblem.g:4136:1: ( ( ':' ) )
+            // InternalProblem.g:4137:1: ( ':' )
             {
-            // InternalProblem.g:3644:1: ( ':' )
-            // InternalProblem.g:3645:2: ':'
+            // InternalProblem.g:4137:1: ( ':' )
+            // InternalProblem.g:4138:2: ':'
             {
              before(grammarAccess.getQualifiedNameAccess().getColonKeyword_1_1_0()); 
-            match(input,35,FOLLOW_2); 
+            match(input,36,FOLLOW_2); 
              after(grammarAccess.getQualifiedNameAccess().getColonKeyword_1_1_0()); 
 
             }
@@ -11441,14 +13075,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1_1__1"
-    // InternalProblem.g:3654:1: rule__QualifiedName__Group_1_1__1 : rule__QualifiedName__Group_1_1__1__Impl ;
+    // InternalProblem.g:4147:1: rule__QualifiedName__Group_1_1__1 : rule__QualifiedName__Group_1_1__1__Impl ;
     public final void rule__QualifiedName__Group_1_1__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3658:1: ( rule__QualifiedName__Group_1_1__1__Impl )
-            // InternalProblem.g:3659:2: rule__QualifiedName__Group_1_1__1__Impl
+            // InternalProblem.g:4151:1: ( rule__QualifiedName__Group_1_1__1__Impl )
+            // InternalProblem.g:4152:2: rule__QualifiedName__Group_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedName__Group_1_1__1__Impl();
@@ -11474,21 +13108,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1_1__1__Impl"
-    // InternalProblem.g:3665:1: rule__QualifiedName__Group_1_1__1__Impl : ( RULE_ID ) ;
+    // InternalProblem.g:4158:1: rule__QualifiedName__Group_1_1__1__Impl : ( ruleIdentifier ) ;
     public final void rule__QualifiedName__Group_1_1__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3669:1: ( ( RULE_ID ) )
-            // InternalProblem.g:3670:1: ( RULE_ID )
+            // InternalProblem.g:4162:1: ( ( ruleIdentifier ) )
+            // InternalProblem.g:4163:1: ( ruleIdentifier )
             {
-            // InternalProblem.g:3670:1: ( RULE_ID )
-            // InternalProblem.g:3671:2: RULE_ID
+            // InternalProblem.g:4163:1: ( ruleIdentifier )
+            // InternalProblem.g:4164:2: ruleIdentifier
             {
-             before(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1_1()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1_1()); 
+             before(grammarAccess.getQualifiedNameAccess().getIdentifierParserRuleCall_1_1_1()); 
+            pushFollow(FOLLOW_2);
+            ruleIdentifier();
+
+            state._fsp--;
+
+             after(grammarAccess.getQualifiedNameAccess().getIdentifierParserRuleCall_1_1_1()); 
 
             }
 
@@ -11511,16 +13149,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1_2__0"
-    // InternalProblem.g:3681:1: rule__QualifiedName__Group_1_2__0 : rule__QualifiedName__Group_1_2__0__Impl rule__QualifiedName__Group_1_2__1 ;
+    // InternalProblem.g:4174:1: rule__QualifiedName__Group_1_2__0 : rule__QualifiedName__Group_1_2__0__Impl rule__QualifiedName__Group_1_2__1 ;
     public final void rule__QualifiedName__Group_1_2__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3685:1: ( rule__QualifiedName__Group_1_2__0__Impl rule__QualifiedName__Group_1_2__1 )
-            // InternalProblem.g:3686:2: rule__QualifiedName__Group_1_2__0__Impl rule__QualifiedName__Group_1_2__1
+            // InternalProblem.g:4178:1: ( rule__QualifiedName__Group_1_2__0__Impl rule__QualifiedName__Group_1_2__1 )
+            // InternalProblem.g:4179:2: rule__QualifiedName__Group_1_2__0__Impl rule__QualifiedName__Group_1_2__1
             {
-            pushFollow(FOLLOW_35);
+            pushFollow(FOLLOW_38);
             rule__QualifiedName__Group_1_2__0__Impl();
 
             state._fsp--;
@@ -11549,20 +13187,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1_2__0__Impl"
-    // InternalProblem.g:3693:1: rule__QualifiedName__Group_1_2__0__Impl : ( ':' ) ;
+    // InternalProblem.g:4186:1: rule__QualifiedName__Group_1_2__0__Impl : ( ':' ) ;
     public final void rule__QualifiedName__Group_1_2__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3697:1: ( ( ':' ) )
-            // InternalProblem.g:3698:1: ( ':' )
+            // InternalProblem.g:4190:1: ( ( ':' ) )
+            // InternalProblem.g:4191:1: ( ':' )
             {
-            // InternalProblem.g:3698:1: ( ':' )
-            // InternalProblem.g:3699:2: ':'
+            // InternalProblem.g:4191:1: ( ':' )
+            // InternalProblem.g:4192:2: ':'
             {
              before(grammarAccess.getQualifiedNameAccess().getColonKeyword_1_2_0()); 
-            match(input,35,FOLLOW_2); 
+            match(input,36,FOLLOW_2); 
              after(grammarAccess.getQualifiedNameAccess().getColonKeyword_1_2_0()); 
 
             }
@@ -11586,14 +13224,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1_2__1"
-    // InternalProblem.g:3708:1: rule__QualifiedName__Group_1_2__1 : rule__QualifiedName__Group_1_2__1__Impl ;
+    // InternalProblem.g:4201:1: rule__QualifiedName__Group_1_2__1 : rule__QualifiedName__Group_1_2__1__Impl ;
     public final void rule__QualifiedName__Group_1_2__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3712:1: ( rule__QualifiedName__Group_1_2__1__Impl )
-            // InternalProblem.g:3713:2: rule__QualifiedName__Group_1_2__1__Impl
+            // InternalProblem.g:4205:1: ( rule__QualifiedName__Group_1_2__1__Impl )
+            // InternalProblem.g:4206:2: rule__QualifiedName__Group_1_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedName__Group_1_2__1__Impl();
@@ -11619,17 +13257,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1_2__1__Impl"
-    // InternalProblem.g:3719:1: rule__QualifiedName__Group_1_2__1__Impl : ( RULE_QUOTED_ID ) ;
+    // InternalProblem.g:4212:1: rule__QualifiedName__Group_1_2__1__Impl : ( RULE_QUOTED_ID ) ;
     public final void rule__QualifiedName__Group_1_2__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3723:1: ( ( RULE_QUOTED_ID ) )
-            // InternalProblem.g:3724:1: ( RULE_QUOTED_ID )
+            // InternalProblem.g:4216:1: ( ( RULE_QUOTED_ID ) )
+            // InternalProblem.g:4217:1: ( RULE_QUOTED_ID )
             {
-            // InternalProblem.g:3724:1: ( RULE_QUOTED_ID )
-            // InternalProblem.g:3725:2: RULE_QUOTED_ID
+            // InternalProblem.g:4217:1: ( RULE_QUOTED_ID )
+            // InternalProblem.g:4218:2: RULE_QUOTED_ID
             {
              before(grammarAccess.getQualifiedNameAccess().getQUOTED_IDTerminalRuleCall_1_2_1()); 
             match(input,RULE_QUOTED_ID,FOLLOW_2); 
@@ -11656,21 +13294,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__NameAssignment_0_1"
-    // InternalProblem.g:3735:1: rule__Problem__NameAssignment_0_1 : ( RULE_ID ) ;
+    // InternalProblem.g:4228:1: rule__Problem__NameAssignment_0_1 : ( ruleIdentifier ) ;
     public final void rule__Problem__NameAssignment_0_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3739:1: ( ( RULE_ID ) )
-            // InternalProblem.g:3740:2: ( RULE_ID )
+            // InternalProblem.g:4232:1: ( ( ruleIdentifier ) )
+            // InternalProblem.g:4233:2: ( ruleIdentifier )
             {
-            // InternalProblem.g:3740:2: ( RULE_ID )
-            // InternalProblem.g:3741:3: RULE_ID
+            // InternalProblem.g:4233:2: ( ruleIdentifier )
+            // InternalProblem.g:4234:3: ruleIdentifier
             {
-             before(grammarAccess.getProblemAccess().getNameIDTerminalRuleCall_0_1_0()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getProblemAccess().getNameIDTerminalRuleCall_0_1_0()); 
+             before(grammarAccess.getProblemAccess().getNameIdentifierParserRuleCall_0_1_0()); 
+            pushFollow(FOLLOW_2);
+            ruleIdentifier();
+
+            state._fsp--;
+
+             after(grammarAccess.getProblemAccess().getNameIdentifierParserRuleCall_0_1_0()); 
 
             }
 
@@ -11693,17 +13335,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__StatementsAssignment_1"
-    // InternalProblem.g:3750:1: rule__Problem__StatementsAssignment_1 : ( ruleStatement ) ;
+    // InternalProblem.g:4243:1: rule__Problem__StatementsAssignment_1 : ( ruleStatement ) ;
     public final void rule__Problem__StatementsAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3754:1: ( ( ruleStatement ) )
-            // InternalProblem.g:3755:2: ( ruleStatement )
+            // InternalProblem.g:4247:1: ( ( ruleStatement ) )
+            // InternalProblem.g:4248:2: ( ruleStatement )
             {
-            // InternalProblem.g:3755:2: ( ruleStatement )
-            // InternalProblem.g:3756:3: ruleStatement
+            // InternalProblem.g:4248:2: ( ruleStatement )
+            // InternalProblem.g:4249:3: ruleStatement
             {
              before(grammarAccess.getProblemAccess().getStatementsStatementParserRuleCall_1_0()); 
             pushFollow(FOLLOW_2);
@@ -11734,24 +13376,24 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__AbstractAssignment_0"
-    // InternalProblem.g:3765:1: rule__ClassDeclaration__AbstractAssignment_0 : ( ( 'abstract' ) ) ;
+    // InternalProblem.g:4258:1: rule__ClassDeclaration__AbstractAssignment_0 : ( ( 'abstract' ) ) ;
     public final void rule__ClassDeclaration__AbstractAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3769:1: ( ( ( 'abstract' ) ) )
-            // InternalProblem.g:3770:2: ( ( 'abstract' ) )
+            // InternalProblem.g:4262:1: ( ( ( 'abstract' ) ) )
+            // InternalProblem.g:4263:2: ( ( 'abstract' ) )
             {
-            // InternalProblem.g:3770:2: ( ( 'abstract' ) )
-            // InternalProblem.g:3771:3: ( 'abstract' )
+            // InternalProblem.g:4263:2: ( ( 'abstract' ) )
+            // InternalProblem.g:4264:3: ( 'abstract' )
             {
              before(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); 
-            // InternalProblem.g:3772:3: ( 'abstract' )
-            // InternalProblem.g:3773:4: 'abstract'
+            // InternalProblem.g:4265:3: ( 'abstract' )
+            // InternalProblem.g:4266:4: 'abstract'
             {
              before(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); 
-            match(input,38,FOLLOW_2); 
+            match(input,39,FOLLOW_2); 
              after(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); 
 
             }
@@ -11779,21 +13421,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__NameAssignment_2"
-    // InternalProblem.g:3784:1: rule__ClassDeclaration__NameAssignment_2 : ( RULE_ID ) ;
+    // InternalProblem.g:4277:1: rule__ClassDeclaration__NameAssignment_2 : ( ruleIdentifier ) ;
     public final void rule__ClassDeclaration__NameAssignment_2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3788:1: ( ( RULE_ID ) )
-            // InternalProblem.g:3789:2: ( RULE_ID )
+            // InternalProblem.g:4281:1: ( ( ruleIdentifier ) )
+            // InternalProblem.g:4282:2: ( ruleIdentifier )
             {
-            // InternalProblem.g:3789:2: ( RULE_ID )
-            // InternalProblem.g:3790:3: RULE_ID
+            // InternalProblem.g:4282:2: ( ruleIdentifier )
+            // InternalProblem.g:4283:3: ruleIdentifier
             {
-             before(grammarAccess.getClassDeclarationAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getClassDeclarationAccess().getNameIDTerminalRuleCall_2_0()); 
+             before(grammarAccess.getClassDeclarationAccess().getNameIdentifierParserRuleCall_2_0()); 
+            pushFollow(FOLLOW_2);
+            ruleIdentifier();
+
+            state._fsp--;
+
+             after(grammarAccess.getClassDeclarationAccess().getNameIdentifierParserRuleCall_2_0()); 
 
             }
 
@@ -11816,33 +13462,33 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__SuperTypesAssignment_3_1"
-    // InternalProblem.g:3799:1: rule__ClassDeclaration__SuperTypesAssignment_3_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:4292:1: rule__ClassDeclaration__SuperTypesAssignment_3_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__ClassDeclaration__SuperTypesAssignment_3_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3803:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:3804:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4296:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4297:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:3804:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:3805:3: ( ruleQualifiedName )
+            // InternalProblem.g:4297:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4298:3: ( ruleQualifiedName )
             {
-             before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_1_0()); 
-            // InternalProblem.g:3806:3: ( ruleQualifiedName )
-            // InternalProblem.g:3807:4: ruleQualifiedName
+             before(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationCrossReference_3_1_0()); 
+            // InternalProblem.g:4299:3: ( ruleQualifiedName )
+            // InternalProblem.g:4300:4: ruleQualifiedName
             {
-             before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_1_0_1()); 
+             before(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationQualifiedNameParserRuleCall_3_1_0_1()); 
             pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
 
-             after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_1_0_1()); 
+             after(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationQualifiedNameParserRuleCall_3_1_0_1()); 
 
             }
 
-             after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_1_0()); 
+             after(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationCrossReference_3_1_0()); 
 
             }
 
@@ -11865,33 +13511,33 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__SuperTypesAssignment_3_2_1"
-    // InternalProblem.g:3818:1: rule__ClassDeclaration__SuperTypesAssignment_3_2_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:4311:1: rule__ClassDeclaration__SuperTypesAssignment_3_2_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__ClassDeclaration__SuperTypesAssignment_3_2_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3822:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:3823:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4315:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4316:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:3823:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:3824:3: ( ruleQualifiedName )
+            // InternalProblem.g:4316:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4317:3: ( ruleQualifiedName )
             {
-             before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_2_1_0()); 
-            // InternalProblem.g:3825:3: ( ruleQualifiedName )
-            // InternalProblem.g:3826:4: ruleQualifiedName
+             before(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationCrossReference_3_2_1_0()); 
+            // InternalProblem.g:4318:3: ( ruleQualifiedName )
+            // InternalProblem.g:4319:4: ruleQualifiedName
             {
-             before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_2_1_0_1()); 
+             before(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationQualifiedNameParserRuleCall_3_2_1_0_1()); 
             pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
 
-             after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_2_1_0_1()); 
+             after(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationQualifiedNameParserRuleCall_3_2_1_0_1()); 
 
             }
 
-             after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_2_1_0()); 
+             after(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationCrossReference_3_2_1_0()); 
 
             }
 
@@ -11914,17 +13560,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0"
-    // InternalProblem.g:3837:1: rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 : ( ruleReferenceDeclaration ) ;
+    // InternalProblem.g:4330:1: rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 : ( ruleReferenceDeclaration ) ;
     public final void rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3841:1: ( ( ruleReferenceDeclaration ) )
-            // InternalProblem.g:3842:2: ( ruleReferenceDeclaration )
+            // InternalProblem.g:4334:1: ( ( ruleReferenceDeclaration ) )
+            // InternalProblem.g:4335:2: ( ruleReferenceDeclaration )
             {
-            // InternalProblem.g:3842:2: ( ruleReferenceDeclaration )
-            // InternalProblem.g:3843:3: ruleReferenceDeclaration
+            // InternalProblem.g:4335:2: ( ruleReferenceDeclaration )
+            // InternalProblem.g:4336:3: ruleReferenceDeclaration
             {
              before(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_0_1_0_0()); 
             pushFollow(FOLLOW_2);
@@ -11954,25 +13600,189 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0"
 
 
+    // $ANTLR start "rule__EnumDeclaration__NameAssignment_1"
+    // InternalProblem.g:4345:1: rule__EnumDeclaration__NameAssignment_1 : ( ruleIdentifier ) ;
+    public final void rule__EnumDeclaration__NameAssignment_1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4349:1: ( ( ruleIdentifier ) )
+            // InternalProblem.g:4350:2: ( ruleIdentifier )
+            {
+            // InternalProblem.g:4350:2: ( ruleIdentifier )
+            // InternalProblem.g:4351:3: ruleIdentifier
+            {
+             before(grammarAccess.getEnumDeclarationAccess().getNameIdentifierParserRuleCall_1_0()); 
+            pushFollow(FOLLOW_2);
+            ruleIdentifier();
+
+            state._fsp--;
+
+             after(grammarAccess.getEnumDeclarationAccess().getNameIdentifierParserRuleCall_1_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__NameAssignment_1"
+
+
+    // $ANTLR start "rule__EnumDeclaration__LiteralsAssignment_2_0_1_0"
+    // InternalProblem.g:4360:1: rule__EnumDeclaration__LiteralsAssignment_2_0_1_0 : ( ruleEnumLiteral ) ;
+    public final void rule__EnumDeclaration__LiteralsAssignment_2_0_1_0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4364:1: ( ( ruleEnumLiteral ) )
+            // InternalProblem.g:4365:2: ( ruleEnumLiteral )
+            {
+            // InternalProblem.g:4365:2: ( ruleEnumLiteral )
+            // InternalProblem.g:4366:3: ruleEnumLiteral
+            {
+             before(grammarAccess.getEnumDeclarationAccess().getLiteralsEnumLiteralParserRuleCall_2_0_1_0_0()); 
+            pushFollow(FOLLOW_2);
+            ruleEnumLiteral();
+
+            state._fsp--;
+
+             after(grammarAccess.getEnumDeclarationAccess().getLiteralsEnumLiteralParserRuleCall_2_0_1_0_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__LiteralsAssignment_2_0_1_0"
+
+
+    // $ANTLR start "rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1"
+    // InternalProblem.g:4375:1: rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1 : ( ruleEnumLiteral ) ;
+    public final void rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4379:1: ( ( ruleEnumLiteral ) )
+            // InternalProblem.g:4380:2: ( ruleEnumLiteral )
+            {
+            // InternalProblem.g:4380:2: ( ruleEnumLiteral )
+            // InternalProblem.g:4381:3: ruleEnumLiteral
+            {
+             before(grammarAccess.getEnumDeclarationAccess().getLiteralsEnumLiteralParserRuleCall_2_0_1_1_1_0()); 
+            pushFollow(FOLLOW_2);
+            ruleEnumLiteral();
+
+            state._fsp--;
+
+             after(grammarAccess.getEnumDeclarationAccess().getLiteralsEnumLiteralParserRuleCall_2_0_1_1_1_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1"
+
+
+    // $ANTLR start "rule__EnumLiteral__NameAssignment"
+    // InternalProblem.g:4390:1: rule__EnumLiteral__NameAssignment : ( ruleQuotedOrUnquotedId ) ;
+    public final void rule__EnumLiteral__NameAssignment() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4394:1: ( ( ruleQuotedOrUnquotedId ) )
+            // InternalProblem.g:4395:2: ( ruleQuotedOrUnquotedId )
+            {
+            // InternalProblem.g:4395:2: ( ruleQuotedOrUnquotedId )
+            // InternalProblem.g:4396:3: ruleQuotedOrUnquotedId
+            {
+             before(grammarAccess.getEnumLiteralAccess().getNameQuotedOrUnquotedIdParserRuleCall_0()); 
+            pushFollow(FOLLOW_2);
+            ruleQuotedOrUnquotedId();
+
+            state._fsp--;
+
+             after(grammarAccess.getEnumLiteralAccess().getNameQuotedOrUnquotedIdParserRuleCall_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__EnumLiteral__NameAssignment"
+
+
     // $ANTLR start "rule__ReferenceDeclaration__ContainmentAssignment_0_0"
-    // InternalProblem.g:3852:1: rule__ReferenceDeclaration__ContainmentAssignment_0_0 : ( ( 'contains' ) ) ;
+    // InternalProblem.g:4405:1: rule__ReferenceDeclaration__ContainmentAssignment_0_0 : ( ( 'contains' ) ) ;
     public final void rule__ReferenceDeclaration__ContainmentAssignment_0_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3856:1: ( ( ( 'contains' ) ) )
-            // InternalProblem.g:3857:2: ( ( 'contains' ) )
+            // InternalProblem.g:4409:1: ( ( ( 'contains' ) ) )
+            // InternalProblem.g:4410:2: ( ( 'contains' ) )
             {
-            // InternalProblem.g:3857:2: ( ( 'contains' ) )
-            // InternalProblem.g:3858:3: ( 'contains' )
+            // InternalProblem.g:4410:2: ( ( 'contains' ) )
+            // InternalProblem.g:4411:3: ( 'contains' )
             {
              before(grammarAccess.getReferenceDeclarationAccess().getContainmentContainsKeyword_0_0_0()); 
-            // InternalProblem.g:3859:3: ( 'contains' )
-            // InternalProblem.g:3860:4: 'contains'
+            // InternalProblem.g:4412:3: ( 'contains' )
+            // InternalProblem.g:4413:4: 'contains'
             {
              before(grammarAccess.getReferenceDeclarationAccess().getContainmentContainsKeyword_0_0_0()); 
-            match(input,39,FOLLOW_2); 
+            match(input,40,FOLLOW_2); 
              after(grammarAccess.getReferenceDeclarationAccess().getContainmentContainsKeyword_0_0_0()); 
 
             }
@@ -12000,33 +13810,33 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__ReferenceTypeAssignment_1"
-    // InternalProblem.g:3871:1: rule__ReferenceDeclaration__ReferenceTypeAssignment_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:4424:1: rule__ReferenceDeclaration__ReferenceTypeAssignment_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__ReferenceDeclaration__ReferenceTypeAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3875:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:3876:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4428:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4429:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:3876:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:3877:3: ( ruleQualifiedName )
+            // InternalProblem.g:4429:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4430:3: ( ruleQualifiedName )
             {
-             before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationCrossReference_1_0()); 
-            // InternalProblem.g:3878:3: ( ruleQualifiedName )
-            // InternalProblem.g:3879:4: ruleQualifiedName
+             before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeRelationCrossReference_1_0()); 
+            // InternalProblem.g:4431:3: ( ruleQualifiedName )
+            // InternalProblem.g:4432:4: ruleQualifiedName
             {
-             before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationQualifiedNameParserRuleCall_1_0_1()); 
+             before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeRelationQualifiedNameParserRuleCall_1_0_1()); 
             pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
 
-             after(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationQualifiedNameParserRuleCall_1_0_1()); 
+             after(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeRelationQualifiedNameParserRuleCall_1_0_1()); 
 
             }
 
-             after(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationCrossReference_1_0()); 
+             after(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeRelationCrossReference_1_0()); 
 
             }
 
@@ -12049,17 +13859,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__MultiplicityAssignment_2_1"
-    // InternalProblem.g:3890:1: rule__ReferenceDeclaration__MultiplicityAssignment_2_1 : ( ruleMultiplicity ) ;
+    // InternalProblem.g:4443:1: rule__ReferenceDeclaration__MultiplicityAssignment_2_1 : ( ruleMultiplicity ) ;
     public final void rule__ReferenceDeclaration__MultiplicityAssignment_2_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3894:1: ( ( ruleMultiplicity ) )
-            // InternalProblem.g:3895:2: ( ruleMultiplicity )
+            // InternalProblem.g:4447:1: ( ( ruleMultiplicity ) )
+            // InternalProblem.g:4448:2: ( ruleMultiplicity )
             {
-            // InternalProblem.g:3895:2: ( ruleMultiplicity )
-            // InternalProblem.g:3896:3: ruleMultiplicity
+            // InternalProblem.g:4448:2: ( ruleMultiplicity )
+            // InternalProblem.g:4449:3: ruleMultiplicity
             {
              before(grammarAccess.getReferenceDeclarationAccess().getMultiplicityMultiplicityParserRuleCall_2_1_0()); 
             pushFollow(FOLLOW_2);
@@ -12090,21 +13900,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__NameAssignment_3"
-    // InternalProblem.g:3905:1: rule__ReferenceDeclaration__NameAssignment_3 : ( RULE_ID ) ;
+    // InternalProblem.g:4458:1: rule__ReferenceDeclaration__NameAssignment_3 : ( ruleIdentifier ) ;
     public final void rule__ReferenceDeclaration__NameAssignment_3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3909:1: ( ( RULE_ID ) )
-            // InternalProblem.g:3910:2: ( RULE_ID )
+            // InternalProblem.g:4462:1: ( ( ruleIdentifier ) )
+            // InternalProblem.g:4463:2: ( ruleIdentifier )
             {
-            // InternalProblem.g:3910:2: ( RULE_ID )
-            // InternalProblem.g:3911:3: RULE_ID
+            // InternalProblem.g:4463:2: ( ruleIdentifier )
+            // InternalProblem.g:4464:3: ruleIdentifier
             {
-             before(grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_3_0()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_3_0()); 
+             before(grammarAccess.getReferenceDeclarationAccess().getNameIdentifierParserRuleCall_3_0()); 
+            pushFollow(FOLLOW_2);
+            ruleIdentifier();
+
+            state._fsp--;
+
+             after(grammarAccess.getReferenceDeclarationAccess().getNameIdentifierParserRuleCall_3_0()); 
 
             }
 
@@ -12127,21 +13941,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__OppositeAssignment_4_1"
-    // InternalProblem.g:3920:1: rule__ReferenceDeclaration__OppositeAssignment_4_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:4473:1: rule__ReferenceDeclaration__OppositeAssignment_4_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__ReferenceDeclaration__OppositeAssignment_4_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3924:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:3925:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4477:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4478:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:3925:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:3926:3: ( ruleQualifiedName )
+            // InternalProblem.g:4478:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4479:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationCrossReference_4_1_0()); 
-            // InternalProblem.g:3927:3: ( ruleQualifiedName )
-            // InternalProblem.g:3928:4: ruleQualifiedName
+            // InternalProblem.g:4480:3: ( ruleQualifiedName )
+            // InternalProblem.g:4481:4: ruleQualifiedName
             {
              before(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationQualifiedNameParserRuleCall_4_1_0_1()); 
             pushFollow(FOLLOW_2);
@@ -12176,24 +13990,24 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__ErrorAssignment_0_0_0"
-    // InternalProblem.g:3939:1: rule__PredicateDefinition__ErrorAssignment_0_0_0 : ( ( 'error' ) ) ;
+    // InternalProblem.g:4492:1: rule__PredicateDefinition__ErrorAssignment_0_0_0 : ( ( 'error' ) ) ;
     public final void rule__PredicateDefinition__ErrorAssignment_0_0_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3943:1: ( ( ( 'error' ) ) )
-            // InternalProblem.g:3944:2: ( ( 'error' ) )
+            // InternalProblem.g:4496:1: ( ( ( 'error' ) ) )
+            // InternalProblem.g:4497:2: ( ( 'error' ) )
             {
-            // InternalProblem.g:3944:2: ( ( 'error' ) )
-            // InternalProblem.g:3945:3: ( 'error' )
+            // InternalProblem.g:4497:2: ( ( 'error' ) )
+            // InternalProblem.g:4498:3: ( 'error' )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getErrorErrorKeyword_0_0_0_0()); 
-            // InternalProblem.g:3946:3: ( 'error' )
-            // InternalProblem.g:3947:4: 'error'
+            // InternalProblem.g:4499:3: ( 'error' )
+            // InternalProblem.g:4500:4: 'error'
             {
              before(grammarAccess.getPredicateDefinitionAccess().getErrorErrorKeyword_0_0_0_0()); 
-            match(input,40,FOLLOW_2); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getPredicateDefinitionAccess().getErrorErrorKeyword_0_0_0_0()); 
 
             }
@@ -12221,21 +14035,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__NameAssignment_1"
-    // InternalProblem.g:3958:1: rule__PredicateDefinition__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalProblem.g:4511:1: rule__PredicateDefinition__NameAssignment_1 : ( ruleIdentifier ) ;
     public final void rule__PredicateDefinition__NameAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3962:1: ( ( RULE_ID ) )
-            // InternalProblem.g:3963:2: ( RULE_ID )
+            // InternalProblem.g:4515:1: ( ( ruleIdentifier ) )
+            // InternalProblem.g:4516:2: ( ruleIdentifier )
             {
-            // InternalProblem.g:3963:2: ( RULE_ID )
-            // InternalProblem.g:3964:3: RULE_ID
+            // InternalProblem.g:4516:2: ( ruleIdentifier )
+            // InternalProblem.g:4517:3: ruleIdentifier
             {
-             before(grammarAccess.getPredicateDefinitionAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getPredicateDefinitionAccess().getNameIDTerminalRuleCall_1_0()); 
+             before(grammarAccess.getPredicateDefinitionAccess().getNameIdentifierParserRuleCall_1_0()); 
+            pushFollow(FOLLOW_2);
+            ruleIdentifier();
+
+            state._fsp--;
+
+             after(grammarAccess.getPredicateDefinitionAccess().getNameIdentifierParserRuleCall_1_0()); 
 
             }
 
@@ -12258,17 +14076,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__ParametersAssignment_3_0"
-    // InternalProblem.g:3973:1: rule__PredicateDefinition__ParametersAssignment_3_0 : ( ruleParameter ) ;
+    // InternalProblem.g:4526:1: rule__PredicateDefinition__ParametersAssignment_3_0 : ( ruleParameter ) ;
     public final void rule__PredicateDefinition__ParametersAssignment_3_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3977:1: ( ( ruleParameter ) )
-            // InternalProblem.g:3978:2: ( ruleParameter )
+            // InternalProblem.g:4530:1: ( ( ruleParameter ) )
+            // InternalProblem.g:4531:2: ( ruleParameter )
             {
-            // InternalProblem.g:3978:2: ( ruleParameter )
-            // InternalProblem.g:3979:3: ruleParameter
+            // InternalProblem.g:4531:2: ( ruleParameter )
+            // InternalProblem.g:4532:3: ruleParameter
             {
              before(grammarAccess.getPredicateDefinitionAccess().getParametersParameterParserRuleCall_3_0_0()); 
             pushFollow(FOLLOW_2);
@@ -12299,17 +14117,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__ParametersAssignment_3_1_1"
-    // InternalProblem.g:3988:1: rule__PredicateDefinition__ParametersAssignment_3_1_1 : ( ruleParameter ) ;
+    // InternalProblem.g:4541:1: rule__PredicateDefinition__ParametersAssignment_3_1_1 : ( ruleParameter ) ;
     public final void rule__PredicateDefinition__ParametersAssignment_3_1_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3992:1: ( ( ruleParameter ) )
-            // InternalProblem.g:3993:2: ( ruleParameter )
+            // InternalProblem.g:4545:1: ( ( ruleParameter ) )
+            // InternalProblem.g:4546:2: ( ruleParameter )
             {
-            // InternalProblem.g:3993:2: ( ruleParameter )
-            // InternalProblem.g:3994:3: ruleParameter
+            // InternalProblem.g:4546:2: ( ruleParameter )
+            // InternalProblem.g:4547:3: ruleParameter
             {
              before(grammarAccess.getPredicateDefinitionAccess().getParametersParameterParserRuleCall_3_1_1_0()); 
             pushFollow(FOLLOW_2);
@@ -12340,17 +14158,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__BodiesAssignment_5_1"
-    // InternalProblem.g:4003:1: rule__PredicateDefinition__BodiesAssignment_5_1 : ( ruleConjunction ) ;
+    // InternalProblem.g:4556:1: rule__PredicateDefinition__BodiesAssignment_5_1 : ( ruleConjunction ) ;
     public final void rule__PredicateDefinition__BodiesAssignment_5_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4007:1: ( ( ruleConjunction ) )
-            // InternalProblem.g:4008:2: ( ruleConjunction )
+            // InternalProblem.g:4560:1: ( ( ruleConjunction ) )
+            // InternalProblem.g:4561:2: ( ruleConjunction )
             {
-            // InternalProblem.g:4008:2: ( ruleConjunction )
-            // InternalProblem.g:4009:3: ruleConjunction
+            // InternalProblem.g:4561:2: ( ruleConjunction )
+            // InternalProblem.g:4562:3: ruleConjunction
             {
              before(grammarAccess.getPredicateDefinitionAccess().getBodiesConjunctionParserRuleCall_5_1_0()); 
             pushFollow(FOLLOW_2);
@@ -12381,17 +14199,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__BodiesAssignment_5_2_1"
-    // InternalProblem.g:4018:1: rule__PredicateDefinition__BodiesAssignment_5_2_1 : ( ruleConjunction ) ;
+    // InternalProblem.g:4571:1: rule__PredicateDefinition__BodiesAssignment_5_2_1 : ( ruleConjunction ) ;
     public final void rule__PredicateDefinition__BodiesAssignment_5_2_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4022:1: ( ( ruleConjunction ) )
-            // InternalProblem.g:4023:2: ( ruleConjunction )
+            // InternalProblem.g:4575:1: ( ( ruleConjunction ) )
+            // InternalProblem.g:4576:2: ( ruleConjunction )
             {
-            // InternalProblem.g:4023:2: ( ruleConjunction )
-            // InternalProblem.g:4024:3: ruleConjunction
+            // InternalProblem.g:4576:2: ( ruleConjunction )
+            // InternalProblem.g:4577:3: ruleConjunction
             {
              before(grammarAccess.getPredicateDefinitionAccess().getBodiesConjunctionParserRuleCall_5_2_1_0()); 
             pushFollow(FOLLOW_2);
@@ -12422,29 +14240,33 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Parameter__ParameterTypeAssignment_0"
-    // InternalProblem.g:4033:1: rule__Parameter__ParameterTypeAssignment_0 : ( ( RULE_ID ) ) ;
+    // InternalProblem.g:4586:1: rule__Parameter__ParameterTypeAssignment_0 : ( ( ruleQualifiedName ) ) ;
     public final void rule__Parameter__ParameterTypeAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4037:1: ( ( ( RULE_ID ) ) )
-            // InternalProblem.g:4038:2: ( ( RULE_ID ) )
+            // InternalProblem.g:4590:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4591:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4038:2: ( ( RULE_ID ) )
-            // InternalProblem.g:4039:3: ( RULE_ID )
+            // InternalProblem.g:4591:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4592:3: ( ruleQualifiedName )
             {
-             before(grammarAccess.getParameterAccess().getParameterTypeClassDeclarationCrossReference_0_0()); 
-            // InternalProblem.g:4040:3: ( RULE_ID )
-            // InternalProblem.g:4041:4: RULE_ID
+             before(grammarAccess.getParameterAccess().getParameterTypeRelationCrossReference_0_0()); 
+            // InternalProblem.g:4593:3: ( ruleQualifiedName )
+            // InternalProblem.g:4594:4: ruleQualifiedName
             {
-             before(grammarAccess.getParameterAccess().getParameterTypeClassDeclarationIDTerminalRuleCall_0_0_1()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getParameterAccess().getParameterTypeClassDeclarationIDTerminalRuleCall_0_0_1()); 
+             before(grammarAccess.getParameterAccess().getParameterTypeRelationQualifiedNameParserRuleCall_0_0_1()); 
+            pushFollow(FOLLOW_2);
+            ruleQualifiedName();
+
+            state._fsp--;
+
+             after(grammarAccess.getParameterAccess().getParameterTypeRelationQualifiedNameParserRuleCall_0_0_1()); 
 
             }
 
-             after(grammarAccess.getParameterAccess().getParameterTypeClassDeclarationCrossReference_0_0()); 
+             after(grammarAccess.getParameterAccess().getParameterTypeRelationCrossReference_0_0()); 
 
             }
 
@@ -12467,21 +14289,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Parameter__NameAssignment_1"
-    // InternalProblem.g:4052:1: rule__Parameter__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalProblem.g:4605:1: rule__Parameter__NameAssignment_1 : ( ruleIdentifier ) ;
     public final void rule__Parameter__NameAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4056:1: ( ( RULE_ID ) )
-            // InternalProblem.g:4057:2: ( RULE_ID )
+            // InternalProblem.g:4609:1: ( ( ruleIdentifier ) )
+            // InternalProblem.g:4610:2: ( ruleIdentifier )
             {
-            // InternalProblem.g:4057:2: ( RULE_ID )
-            // InternalProblem.g:4058:3: RULE_ID
+            // InternalProblem.g:4610:2: ( ruleIdentifier )
+            // InternalProblem.g:4611:3: ruleIdentifier
             {
-             before(grammarAccess.getParameterAccess().getNameIDTerminalRuleCall_1_0()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getParameterAccess().getNameIDTerminalRuleCall_1_0()); 
+             before(grammarAccess.getParameterAccess().getNameIdentifierParserRuleCall_1_0()); 
+            pushFollow(FOLLOW_2);
+            ruleIdentifier();
+
+            state._fsp--;
+
+             after(grammarAccess.getParameterAccess().getNameIdentifierParserRuleCall_1_0()); 
 
             }
 
@@ -12504,17 +14330,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__LiteralsAssignment_0"
-    // InternalProblem.g:4067:1: rule__Conjunction__LiteralsAssignment_0 : ( ruleLiteral ) ;
+    // InternalProblem.g:4620:1: rule__Conjunction__LiteralsAssignment_0 : ( ruleLiteral ) ;
     public final void rule__Conjunction__LiteralsAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4071:1: ( ( ruleLiteral ) )
-            // InternalProblem.g:4072:2: ( ruleLiteral )
+            // InternalProblem.g:4624:1: ( ( ruleLiteral ) )
+            // InternalProblem.g:4625:2: ( ruleLiteral )
             {
-            // InternalProblem.g:4072:2: ( ruleLiteral )
-            // InternalProblem.g:4073:3: ruleLiteral
+            // InternalProblem.g:4625:2: ( ruleLiteral )
+            // InternalProblem.g:4626:3: ruleLiteral
             {
              before(grammarAccess.getConjunctionAccess().getLiteralsLiteralParserRuleCall_0_0()); 
             pushFollow(FOLLOW_2);
@@ -12545,17 +14371,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__LiteralsAssignment_1_1"
-    // InternalProblem.g:4082:1: rule__Conjunction__LiteralsAssignment_1_1 : ( ruleLiteral ) ;
+    // InternalProblem.g:4635:1: rule__Conjunction__LiteralsAssignment_1_1 : ( ruleLiteral ) ;
     public final void rule__Conjunction__LiteralsAssignment_1_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4086:1: ( ( ruleLiteral ) )
-            // InternalProblem.g:4087:2: ( ruleLiteral )
+            // InternalProblem.g:4639:1: ( ( ruleLiteral ) )
+            // InternalProblem.g:4640:2: ( ruleLiteral )
             {
-            // InternalProblem.g:4087:2: ( ruleLiteral )
-            // InternalProblem.g:4088:3: ruleLiteral
+            // InternalProblem.g:4640:2: ( ruleLiteral )
+            // InternalProblem.g:4641:3: ruleLiteral
             {
              before(grammarAccess.getConjunctionAccess().getLiteralsLiteralParserRuleCall_1_1_0()); 
             pushFollow(FOLLOW_2);
@@ -12586,17 +14412,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NegativeLiteral__AtomAssignment_1"
-    // InternalProblem.g:4097:1: rule__NegativeLiteral__AtomAssignment_1 : ( ruleAtom ) ;
+    // InternalProblem.g:4650:1: rule__NegativeLiteral__AtomAssignment_1 : ( ruleAtom ) ;
     public final void rule__NegativeLiteral__AtomAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4101:1: ( ( ruleAtom ) )
-            // InternalProblem.g:4102:2: ( ruleAtom )
+            // InternalProblem.g:4654:1: ( ( ruleAtom ) )
+            // InternalProblem.g:4655:2: ( ruleAtom )
             {
-            // InternalProblem.g:4102:2: ( ruleAtom )
-            // InternalProblem.g:4103:3: ruleAtom
+            // InternalProblem.g:4655:2: ( ruleAtom )
+            // InternalProblem.g:4656:3: ruleAtom
             {
              before(grammarAccess.getNegativeLiteralAccess().getAtomAtomParserRuleCall_1_0()); 
             pushFollow(FOLLOW_2);
@@ -12627,21 +14453,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__RelationAssignment_0"
-    // InternalProblem.g:4112:1: rule__Atom__RelationAssignment_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:4665:1: rule__Atom__RelationAssignment_0 : ( ( ruleQualifiedName ) ) ;
     public final void rule__Atom__RelationAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4116:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4117:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4669:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4670:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4117:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4118:3: ( ruleQualifiedName )
+            // InternalProblem.g:4670:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4671:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getAtomAccess().getRelationRelationCrossReference_0_0()); 
-            // InternalProblem.g:4119:3: ( ruleQualifiedName )
-            // InternalProblem.g:4120:4: ruleQualifiedName
+            // InternalProblem.g:4672:3: ( ruleQualifiedName )
+            // InternalProblem.g:4673:4: ruleQualifiedName
             {
              before(grammarAccess.getAtomAccess().getRelationRelationQualifiedNameParserRuleCall_0_0_1()); 
             pushFollow(FOLLOW_2);
@@ -12676,24 +14502,24 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__TransitiveClosureAssignment_1"
-    // InternalProblem.g:4131:1: rule__Atom__TransitiveClosureAssignment_1 : ( ( '+' ) ) ;
+    // InternalProblem.g:4684:1: rule__Atom__TransitiveClosureAssignment_1 : ( ( '+' ) ) ;
     public final void rule__Atom__TransitiveClosureAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4135:1: ( ( ( '+' ) ) )
-            // InternalProblem.g:4136:2: ( ( '+' ) )
+            // InternalProblem.g:4688:1: ( ( ( '+' ) ) )
+            // InternalProblem.g:4689:2: ( ( '+' ) )
             {
-            // InternalProblem.g:4136:2: ( ( '+' ) )
-            // InternalProblem.g:4137:3: ( '+' )
+            // InternalProblem.g:4689:2: ( ( '+' ) )
+            // InternalProblem.g:4690:3: ( '+' )
             {
              before(grammarAccess.getAtomAccess().getTransitiveClosurePlusSignKeyword_1_0()); 
-            // InternalProblem.g:4138:3: ( '+' )
-            // InternalProblem.g:4139:4: '+'
+            // InternalProblem.g:4691:3: ( '+' )
+            // InternalProblem.g:4692:4: '+'
             {
              before(grammarAccess.getAtomAccess().getTransitiveClosurePlusSignKeyword_1_0()); 
-            match(input,41,FOLLOW_2); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getAtomAccess().getTransitiveClosurePlusSignKeyword_1_0()); 
 
             }
@@ -12721,17 +14547,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__ArgumentsAssignment_3_0"
-    // InternalProblem.g:4150:1: rule__Atom__ArgumentsAssignment_3_0 : ( ruleArgument ) ;
+    // InternalProblem.g:4703:1: rule__Atom__ArgumentsAssignment_3_0 : ( ruleArgument ) ;
     public final void rule__Atom__ArgumentsAssignment_3_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4154:1: ( ( ruleArgument ) )
-            // InternalProblem.g:4155:2: ( ruleArgument )
+            // InternalProblem.g:4707:1: ( ( ruleArgument ) )
+            // InternalProblem.g:4708:2: ( ruleArgument )
             {
-            // InternalProblem.g:4155:2: ( ruleArgument )
-            // InternalProblem.g:4156:3: ruleArgument
+            // InternalProblem.g:4708:2: ( ruleArgument )
+            // InternalProblem.g:4709:3: ruleArgument
             {
              before(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_0_0()); 
             pushFollow(FOLLOW_2);
@@ -12762,17 +14588,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__ArgumentsAssignment_3_1_1"
-    // InternalProblem.g:4165:1: rule__Atom__ArgumentsAssignment_3_1_1 : ( ruleArgument ) ;
+    // InternalProblem.g:4718:1: rule__Atom__ArgumentsAssignment_3_1_1 : ( ruleArgument ) ;
     public final void rule__Atom__ArgumentsAssignment_3_1_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4169:1: ( ( ruleArgument ) )
-            // InternalProblem.g:4170:2: ( ruleArgument )
+            // InternalProblem.g:4722:1: ( ( ruleArgument ) )
+            // InternalProblem.g:4723:2: ( ruleArgument )
             {
-            // InternalProblem.g:4170:2: ( ruleArgument )
-            // InternalProblem.g:4171:3: ruleArgument
+            // InternalProblem.g:4723:2: ( ruleArgument )
+            // InternalProblem.g:4724:3: ruleArgument
             {
              before(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_1_1_0()); 
             pushFollow(FOLLOW_2);
@@ -12802,30 +14628,34 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__Atom__ArgumentsAssignment_3_1_1"
 
 
-    // $ANTLR start "rule__Argument__VariableAssignment"
-    // InternalProblem.g:4180:1: rule__Argument__VariableAssignment : ( ( RULE_ID ) ) ;
-    public final void rule__Argument__VariableAssignment() throws RecognitionException {
+    // $ANTLR start "rule__Argument__VariableOrNodeAssignment"
+    // InternalProblem.g:4733:1: rule__Argument__VariableOrNodeAssignment : ( ( ruleQualifiedName ) ) ;
+    public final void rule__Argument__VariableOrNodeAssignment() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4184:1: ( ( ( RULE_ID ) ) )
-            // InternalProblem.g:4185:2: ( ( RULE_ID ) )
+            // InternalProblem.g:4737:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4738:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4185:2: ( ( RULE_ID ) )
-            // InternalProblem.g:4186:3: ( RULE_ID )
+            // InternalProblem.g:4738:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4739:3: ( ruleQualifiedName )
             {
-             before(grammarAccess.getArgumentAccess().getVariableVariableCrossReference_0()); 
-            // InternalProblem.g:4187:3: ( RULE_ID )
-            // InternalProblem.g:4188:4: RULE_ID
+             before(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0()); 
+            // InternalProblem.g:4740:3: ( ruleQualifiedName )
+            // InternalProblem.g:4741:4: ruleQualifiedName
             {
-             before(grammarAccess.getArgumentAccess().getVariableVariableIDTerminalRuleCall_0_1()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getArgumentAccess().getVariableVariableIDTerminalRuleCall_0_1()); 
+             before(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1()); 
+            pushFollow(FOLLOW_2);
+            ruleQualifiedName();
+
+            state._fsp--;
+
+             after(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1()); 
 
             }
 
-             after(grammarAccess.getArgumentAccess().getVariableVariableCrossReference_0()); 
+             after(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0()); 
 
             }
 
@@ -12844,25 +14674,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__Argument__VariableAssignment"
+    // $ANTLR end "rule__Argument__VariableOrNodeAssignment"
 
 
     // $ANTLR start "rule__Assertion__RelationAssignment_0_0_0"
-    // InternalProblem.g:4199:1: rule__Assertion__RelationAssignment_0_0_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:4752:1: rule__Assertion__RelationAssignment_0_0_0 : ( ( ruleQualifiedName ) ) ;
     public final void rule__Assertion__RelationAssignment_0_0_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4203:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4204:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4756:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4757:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4204:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4205:3: ( ruleQualifiedName )
+            // InternalProblem.g:4757:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4758:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getAssertionAccess().getRelationRelationCrossReference_0_0_0_0()); 
-            // InternalProblem.g:4206:3: ( ruleQualifiedName )
-            // InternalProblem.g:4207:4: ruleQualifiedName
+            // InternalProblem.g:4759:3: ( ruleQualifiedName )
+            // InternalProblem.g:4760:4: ruleQualifiedName
             {
              before(grammarAccess.getAssertionAccess().getRelationRelationQualifiedNameParserRuleCall_0_0_0_0_1()); 
             pushFollow(FOLLOW_2);
@@ -12897,21 +14727,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__ArgumentsAssignment_0_0_2_0"
-    // InternalProblem.g:4218:1: rule__Assertion__ArgumentsAssignment_0_0_2_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:4771:1: rule__Assertion__ArgumentsAssignment_0_0_2_0 : ( ( ruleQualifiedName ) ) ;
     public final void rule__Assertion__ArgumentsAssignment_0_0_2_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4222:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4223:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4775:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4776:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4223:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4224:3: ( ruleQualifiedName )
+            // InternalProblem.g:4776:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4777:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_0_0()); 
-            // InternalProblem.g:4225:3: ( ruleQualifiedName )
-            // InternalProblem.g:4226:4: ruleQualifiedName
+            // InternalProblem.g:4778:3: ( ruleQualifiedName )
+            // InternalProblem.g:4779:4: ruleQualifiedName
             {
              before(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_0_2_0_0_1()); 
             pushFollow(FOLLOW_2);
@@ -12946,21 +14776,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__ArgumentsAssignment_0_0_2_1_1"
-    // InternalProblem.g:4237:1: rule__Assertion__ArgumentsAssignment_0_0_2_1_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:4790:1: rule__Assertion__ArgumentsAssignment_0_0_2_1_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__Assertion__ArgumentsAssignment_0_0_2_1_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4241:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4242:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4794:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4795:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4242:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4243:3: ( ruleQualifiedName )
+            // InternalProblem.g:4795:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4796:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_1_1_0()); 
-            // InternalProblem.g:4244:3: ( ruleQualifiedName )
-            // InternalProblem.g:4245:4: ruleQualifiedName
+            // InternalProblem.g:4797:3: ( ruleQualifiedName )
+            // InternalProblem.g:4798:4: ruleQualifiedName
             {
              before(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_0_2_1_1_0_1()); 
             pushFollow(FOLLOW_2);
@@ -12995,17 +14825,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__ValueAssignment_0_0_5"
-    // InternalProblem.g:4256:1: rule__Assertion__ValueAssignment_0_0_5 : ( ruleLogicValue ) ;
+    // InternalProblem.g:4809:1: rule__Assertion__ValueAssignment_0_0_5 : ( ruleLogicValue ) ;
     public final void rule__Assertion__ValueAssignment_0_0_5() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4260:1: ( ( ruleLogicValue ) )
-            // InternalProblem.g:4261:2: ( ruleLogicValue )
+            // InternalProblem.g:4813:1: ( ( ruleLogicValue ) )
+            // InternalProblem.g:4814:2: ( ruleLogicValue )
             {
-            // InternalProblem.g:4261:2: ( ruleLogicValue )
-            // InternalProblem.g:4262:3: ruleLogicValue
+            // InternalProblem.g:4814:2: ( ruleLogicValue )
+            // InternalProblem.g:4815:3: ruleLogicValue
             {
              before(grammarAccess.getAssertionAccess().getValueLogicValueEnumRuleCall_0_0_5_0()); 
             pushFollow(FOLLOW_2);
@@ -13036,17 +14866,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__ValueAssignment_0_1_0"
-    // InternalProblem.g:4271:1: rule__Assertion__ValueAssignment_0_1_0 : ( ruleShortLogicValue ) ;
+    // InternalProblem.g:4824:1: rule__Assertion__ValueAssignment_0_1_0 : ( ruleShortLogicValue ) ;
     public final void rule__Assertion__ValueAssignment_0_1_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4275:1: ( ( ruleShortLogicValue ) )
-            // InternalProblem.g:4276:2: ( ruleShortLogicValue )
+            // InternalProblem.g:4828:1: ( ( ruleShortLogicValue ) )
+            // InternalProblem.g:4829:2: ( ruleShortLogicValue )
             {
-            // InternalProblem.g:4276:2: ( ruleShortLogicValue )
-            // InternalProblem.g:4277:3: ruleShortLogicValue
+            // InternalProblem.g:4829:2: ( ruleShortLogicValue )
+            // InternalProblem.g:4830:3: ruleShortLogicValue
             {
              before(grammarAccess.getAssertionAccess().getValueShortLogicValueEnumRuleCall_0_1_0_0()); 
             pushFollow(FOLLOW_2);
@@ -13077,21 +14907,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__RelationAssignment_0_1_1"
-    // InternalProblem.g:4286:1: rule__Assertion__RelationAssignment_0_1_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:4839:1: rule__Assertion__RelationAssignment_0_1_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__Assertion__RelationAssignment_0_1_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4290:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4291:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4843:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4844:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4291:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4292:3: ( ruleQualifiedName )
+            // InternalProblem.g:4844:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4845:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getAssertionAccess().getRelationRelationCrossReference_0_1_1_0()); 
-            // InternalProblem.g:4293:3: ( ruleQualifiedName )
-            // InternalProblem.g:4294:4: ruleQualifiedName
+            // InternalProblem.g:4846:3: ( ruleQualifiedName )
+            // InternalProblem.g:4847:4: ruleQualifiedName
             {
              before(grammarAccess.getAssertionAccess().getRelationRelationQualifiedNameParserRuleCall_0_1_1_0_1()); 
             pushFollow(FOLLOW_2);
@@ -13126,21 +14956,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__ArgumentsAssignment_0_1_3_0"
-    // InternalProblem.g:4305:1: rule__Assertion__ArgumentsAssignment_0_1_3_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:4858:1: rule__Assertion__ArgumentsAssignment_0_1_3_0 : ( ( ruleQualifiedName ) ) ;
     public final void rule__Assertion__ArgumentsAssignment_0_1_3_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4309:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4310:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4862:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4863:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4310:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4311:3: ( ruleQualifiedName )
+            // InternalProblem.g:4863:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4864:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_0_0()); 
-            // InternalProblem.g:4312:3: ( ruleQualifiedName )
-            // InternalProblem.g:4313:4: ruleQualifiedName
+            // InternalProblem.g:4865:3: ( ruleQualifiedName )
+            // InternalProblem.g:4866:4: ruleQualifiedName
             {
              before(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_1_3_0_0_1()); 
             pushFollow(FOLLOW_2);
@@ -13175,21 +15005,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__ArgumentsAssignment_0_1_3_1_1"
-    // InternalProblem.g:4324:1: rule__Assertion__ArgumentsAssignment_0_1_3_1_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:4877:1: rule__Assertion__ArgumentsAssignment_0_1_3_1_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__Assertion__ArgumentsAssignment_0_1_3_1_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4328:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4329:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4881:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4882:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4329:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4330:3: ( ruleQualifiedName )
+            // InternalProblem.g:4882:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4883:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_1_1_0()); 
-            // InternalProblem.g:4331:3: ( ruleQualifiedName )
-            // InternalProblem.g:4332:4: ruleQualifiedName
+            // InternalProblem.g:4884:3: ( ruleQualifiedName )
+            // InternalProblem.g:4885:4: ruleQualifiedName
             {
              before(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_1_3_1_1_0_1()); 
             pushFollow(FOLLOW_2);
@@ -13224,17 +15054,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__TypeScopesAssignment_1"
-    // InternalProblem.g:4343:1: rule__ScopeDeclaration__TypeScopesAssignment_1 : ( ruleTypeScope ) ;
+    // InternalProblem.g:4896:1: rule__ScopeDeclaration__TypeScopesAssignment_1 : ( ruleTypeScope ) ;
     public final void rule__ScopeDeclaration__TypeScopesAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4347:1: ( ( ruleTypeScope ) )
-            // InternalProblem.g:4348:2: ( ruleTypeScope )
+            // InternalProblem.g:4900:1: ( ( ruleTypeScope ) )
+            // InternalProblem.g:4901:2: ( ruleTypeScope )
             {
-            // InternalProblem.g:4348:2: ( ruleTypeScope )
-            // InternalProblem.g:4349:3: ruleTypeScope
+            // InternalProblem.g:4901:2: ( ruleTypeScope )
+            // InternalProblem.g:4902:3: ruleTypeScope
             {
              before(grammarAccess.getScopeDeclarationAccess().getTypeScopesTypeScopeParserRuleCall_1_0()); 
             pushFollow(FOLLOW_2);
@@ -13265,17 +15095,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__TypeScopesAssignment_2_1"
-    // InternalProblem.g:4358:1: rule__ScopeDeclaration__TypeScopesAssignment_2_1 : ( ruleTypeScope ) ;
+    // InternalProblem.g:4911:1: rule__ScopeDeclaration__TypeScopesAssignment_2_1 : ( ruleTypeScope ) ;
     public final void rule__ScopeDeclaration__TypeScopesAssignment_2_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4362:1: ( ( ruleTypeScope ) )
-            // InternalProblem.g:4363:2: ( ruleTypeScope )
+            // InternalProblem.g:4915:1: ( ( ruleTypeScope ) )
+            // InternalProblem.g:4916:2: ( ruleTypeScope )
             {
-            // InternalProblem.g:4363:2: ( ruleTypeScope )
-            // InternalProblem.g:4364:3: ruleTypeScope
+            // InternalProblem.g:4916:2: ( ruleTypeScope )
+            // InternalProblem.g:4917:3: ruleTypeScope
             {
              before(grammarAccess.getScopeDeclarationAccess().getTypeScopesTypeScopeParserRuleCall_2_1_0()); 
             pushFollow(FOLLOW_2);
@@ -13306,21 +15136,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__TargetTypeAssignment_0"
-    // InternalProblem.g:4373:1: rule__TypeScope__TargetTypeAssignment_0 : ( ( RULE_ID ) ) ;
+    // InternalProblem.g:4926:1: rule__TypeScope__TargetTypeAssignment_0 : ( ( RULE_ID ) ) ;
     public final void rule__TypeScope__TargetTypeAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4377:1: ( ( ( RULE_ID ) ) )
-            // InternalProblem.g:4378:2: ( ( RULE_ID ) )
+            // InternalProblem.g:4930:1: ( ( ( RULE_ID ) ) )
+            // InternalProblem.g:4931:2: ( ( RULE_ID ) )
             {
-            // InternalProblem.g:4378:2: ( ( RULE_ID ) )
-            // InternalProblem.g:4379:3: ( RULE_ID )
+            // InternalProblem.g:4931:2: ( ( RULE_ID ) )
+            // InternalProblem.g:4932:3: ( RULE_ID )
             {
              before(grammarAccess.getTypeScopeAccess().getTargetTypeClassDeclarationCrossReference_0_0()); 
-            // InternalProblem.g:4380:3: ( RULE_ID )
-            // InternalProblem.g:4381:4: RULE_ID
+            // InternalProblem.g:4933:3: ( RULE_ID )
+            // InternalProblem.g:4934:4: RULE_ID
             {
              before(grammarAccess.getTypeScopeAccess().getTargetTypeClassDeclarationIDTerminalRuleCall_0_0_1()); 
             match(input,RULE_ID,FOLLOW_2); 
@@ -13351,24 +15181,24 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__IncrementAssignment_1_0"
-    // InternalProblem.g:4392:1: rule__TypeScope__IncrementAssignment_1_0 : ( ( '+=' ) ) ;
+    // InternalProblem.g:4945:1: rule__TypeScope__IncrementAssignment_1_0 : ( ( '+=' ) ) ;
     public final void rule__TypeScope__IncrementAssignment_1_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4396:1: ( ( ( '+=' ) ) )
-            // InternalProblem.g:4397:2: ( ( '+=' ) )
+            // InternalProblem.g:4949:1: ( ( ( '+=' ) ) )
+            // InternalProblem.g:4950:2: ( ( '+=' ) )
             {
-            // InternalProblem.g:4397:2: ( ( '+=' ) )
-            // InternalProblem.g:4398:3: ( '+=' )
+            // InternalProblem.g:4950:2: ( ( '+=' ) )
+            // InternalProblem.g:4951:3: ( '+=' )
             {
              before(grammarAccess.getTypeScopeAccess().getIncrementPlusSignEqualsSignKeyword_1_0_0()); 
-            // InternalProblem.g:4399:3: ( '+=' )
-            // InternalProblem.g:4400:4: '+='
+            // InternalProblem.g:4952:3: ( '+=' )
+            // InternalProblem.g:4953:4: '+='
             {
              before(grammarAccess.getTypeScopeAccess().getIncrementPlusSignEqualsSignKeyword_1_0_0()); 
-            match(input,42,FOLLOW_2); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getTypeScopeAccess().getIncrementPlusSignEqualsSignKeyword_1_0_0()); 
 
             }
@@ -13396,17 +15226,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__MultiplicityAssignment_2"
-    // InternalProblem.g:4411:1: rule__TypeScope__MultiplicityAssignment_2 : ( ruleDefiniteMultiplicity ) ;
+    // InternalProblem.g:4964:1: rule__TypeScope__MultiplicityAssignment_2 : ( ruleDefiniteMultiplicity ) ;
     public final void rule__TypeScope__MultiplicityAssignment_2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4415:1: ( ( ruleDefiniteMultiplicity ) )
-            // InternalProblem.g:4416:2: ( ruleDefiniteMultiplicity )
+            // InternalProblem.g:4968:1: ( ( ruleDefiniteMultiplicity ) )
+            // InternalProblem.g:4969:2: ( ruleDefiniteMultiplicity )
             {
-            // InternalProblem.g:4416:2: ( ruleDefiniteMultiplicity )
-            // InternalProblem.g:4417:3: ruleDefiniteMultiplicity
+            // InternalProblem.g:4969:2: ( ruleDefiniteMultiplicity )
+            // InternalProblem.g:4970:3: ruleDefiniteMultiplicity
             {
              before(grammarAccess.getTypeScopeAccess().getMultiplicityDefiniteMultiplicityParserRuleCall_2_0()); 
             pushFollow(FOLLOW_2);
@@ -13437,17 +15267,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__LowerBoundAssignment_0"
-    // InternalProblem.g:4426:1: rule__RangeMultiplicity__LowerBoundAssignment_0 : ( RULE_INT ) ;
+    // InternalProblem.g:4979:1: rule__RangeMultiplicity__LowerBoundAssignment_0 : ( RULE_INT ) ;
     public final void rule__RangeMultiplicity__LowerBoundAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4430:1: ( ( RULE_INT ) )
-            // InternalProblem.g:4431:2: ( RULE_INT )
+            // InternalProblem.g:4983:1: ( ( RULE_INT ) )
+            // InternalProblem.g:4984:2: ( RULE_INT )
             {
-            // InternalProblem.g:4431:2: ( RULE_INT )
-            // InternalProblem.g:4432:3: RULE_INT
+            // InternalProblem.g:4984:2: ( RULE_INT )
+            // InternalProblem.g:4985:3: RULE_INT
             {
              before(grammarAccess.getRangeMultiplicityAccess().getLowerBoundINTTerminalRuleCall_0_0()); 
             match(input,RULE_INT,FOLLOW_2); 
@@ -13474,17 +15304,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__UpperBoundAssignment_2"
-    // InternalProblem.g:4441:1: rule__RangeMultiplicity__UpperBoundAssignment_2 : ( ruleUpperBound ) ;
+    // InternalProblem.g:4994:1: rule__RangeMultiplicity__UpperBoundAssignment_2 : ( ruleUpperBound ) ;
     public final void rule__RangeMultiplicity__UpperBoundAssignment_2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4445:1: ( ( ruleUpperBound ) )
-            // InternalProblem.g:4446:2: ( ruleUpperBound )
+            // InternalProblem.g:4998:1: ( ( ruleUpperBound ) )
+            // InternalProblem.g:4999:2: ( ruleUpperBound )
             {
-            // InternalProblem.g:4446:2: ( ruleUpperBound )
-            // InternalProblem.g:4447:3: ruleUpperBound
+            // InternalProblem.g:4999:2: ( ruleUpperBound )
+            // InternalProblem.g:5000:3: ruleUpperBound
             {
              before(grammarAccess.getRangeMultiplicityAccess().getUpperBoundUpperBoundParserRuleCall_2_0()); 
             pushFollow(FOLLOW_2);
@@ -13515,17 +15345,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExactMultiplicity__ExactValueAssignment"
-    // InternalProblem.g:4456:1: rule__ExactMultiplicity__ExactValueAssignment : ( RULE_INT ) ;
+    // InternalProblem.g:5009:1: rule__ExactMultiplicity__ExactValueAssignment : ( RULE_INT ) ;
     public final void rule__ExactMultiplicity__ExactValueAssignment() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4460:1: ( ( RULE_INT ) )
-            // InternalProblem.g:4461:2: ( RULE_INT )
+            // InternalProblem.g:5013:1: ( ( RULE_INT ) )
+            // InternalProblem.g:5014:2: ( RULE_INT )
             {
-            // InternalProblem.g:4461:2: ( RULE_INT )
-            // InternalProblem.g:4462:3: RULE_INT
+            // InternalProblem.g:5014:2: ( RULE_INT )
+            // InternalProblem.g:5015:3: RULE_INT
             {
              before(grammarAccess.getExactMultiplicityAccess().getExactValueINTTerminalRuleCall_0()); 
             match(input,RULE_INT,FOLLOW_2); 
@@ -13553,34 +15383,46 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // Delegated rules
 
 
-    protected DFA6 dfa6 = new DFA6(this);
-    static final String dfa_1s = "\25\uffff";
-    static final String dfa_2s = "\1\5\2\40\1\uffff\2\5\2\31\1\14\2\40\2\5\1\uffff\4\31\1\5\2\31";
-    static final String dfa_3s = "\1\25\1\40\1\43\1\uffff\1\41\1\6\1\41\3\43\1\40\2\6\1\uffff\1\41\2\43\1\41\1\6\1\43\1\41";
-    static final String dfa_4s = "\3\uffff\1\2\11\uffff\1\1\7\uffff";
-    static final String dfa_5s = "\25\uffff}>";
+    protected DFA8 dfa8 = new DFA8(this);
+    static final String dfa_1s = "\41\uffff";
+    static final String dfa_2s = "\1\5\4\41\1\uffff\2\5\4\15\1\14\4\41\2\5\1\uffff\10\15\1\5\4\15";
+    static final String dfa_3s = "\1\27\1\41\3\44\1\uffff\1\42\1\24\1\42\4\44\1\41\3\44\2\24\1\uffff\1\42\6\44\1\42\1\24\1\42\3\44";
+    static final String dfa_4s = "\5\uffff\1\2\15\uffff\1\1\15\uffff";
+    static final String dfa_5s = "\41\uffff}>";
     static final String[] dfa_6s = {
-            "\1\1\1\2\15\uffff\2\3",
-            "\1\4",
-            "\1\4\2\uffff\1\5",
+            "\1\1\1\2\14\uffff\1\3\1\4\1\uffff\2\5",
+            "\1\6",
+            "\1\6\2\uffff\1\7",
+            "\1\6\2\uffff\1\7",
+            "\1\6\2\uffff\1\7",
             "",
-            "\1\6\1\7\32\uffff\1\10",
-            "\1\12\1\11",
-            "\1\13\7\uffff\1\10",
-            "\1\13\7\uffff\1\10\1\uffff\1\14",
-            "\1\3\26\uffff\1\15",
-            "\1\4\2\uffff\1\5",
-            "\1\4",
-            "\1\16\1\17",
-            "\1\21\1\20",
+            "\1\10\1\11\14\uffff\1\12\1\13\15\uffff\1\14",
+            "\1\15\1\16\14\uffff\1\17\1\20",
+            "\1\21\24\uffff\1\14",
+            "\1\21\24\uffff\1\14\1\uffff\1\22",
+            "\1\21\24\uffff\1\14\1\uffff\1\22",
+            "\1\21\24\uffff\1\14\1\uffff\1\22",
+            "\1\5\27\uffff\1\23",
+            "\1\6",
+            "\1\6\2\uffff\1\7",
+            "\1\6\2\uffff\1\7",
+            "\1\6\2\uffff\1\7",
+            "\1\24\1\25\14\uffff\1\26\1\27",
+            "\1\33\1\30\14\uffff\1\31\1\32",
             "",
-            "\1\13\7\uffff\1\10",
-            "\1\13\7\uffff\1\10\1\uffff\1\22",
-            "\1\13\7\uffff\1\10\1\uffff\1\14",
-            "\1\13\7\uffff\1\10",
-            "\1\24\1\23",
-            "\1\13\7\uffff\1\10\1\uffff\1\22",
-            "\1\13\7\uffff\1\10"
+            "\1\21\24\uffff\1\14",
+            "\1\21\24\uffff\1\14\1\uffff\1\34",
+            "\1\21\24\uffff\1\14\1\uffff\1\34",
+            "\1\21\24\uffff\1\14\1\uffff\1\34",
+            "\1\21\24\uffff\1\14\1\uffff\1\22",
+            "\1\21\24\uffff\1\14\1\uffff\1\22",
+            "\1\21\24\uffff\1\14\1\uffff\1\22",
+            "\1\21\24\uffff\1\14",
+            "\1\35\1\36\14\uffff\1\37\1\40",
+            "\1\21\24\uffff\1\14",
+            "\1\21\24\uffff\1\14\1\uffff\1\34",
+            "\1\21\24\uffff\1\14\1\uffff\1\34",
+            "\1\21\24\uffff\1\14\1\uffff\1\34"
     };
 
     static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
@@ -13590,11 +15432,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
     static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
 
-    class DFA6 extends DFA {
+    class DFA8 extends DFA {
 
-        public DFA6(BaseRecognizer recognizer) {
+        public DFA8(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 6;
+            this.decisionNumber = 8;
             this.eot = dfa_1;
             this.eof = dfa_1;
             this.min = dfa_2;
@@ -13604,45 +15446,48 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_6;
         }
         public String getDescription() {
-            return "726:1: rule__Assertion__Alternatives_0 : ( ( ( rule__Assertion__Group_0_0__0 ) ) | ( ( rule__Assertion__Group_0_1__0 ) ) );";
+            return "874:1: rule__Assertion__Alternatives_0 : ( ( ( rule__Assertion__Group_0_0__0 ) ) | ( ( rule__Assertion__Group_0_1__0 ) ) );";
         }
     }
  
 
     public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
     public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000015000B04060L});
-    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000015000B04062L});
-    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x000002A022D90060L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x000002A022D90062L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000180060L});
     public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000001000L});
-    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000004000800000L});
-    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000005001000L});
-    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000000060L});
-    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000002000002L});
-    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000008008002000L});
-    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000008000002002L});
-    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000020000040L});
-    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000008002000000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x000000000C001000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000002002L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000010010188060L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000010000188062L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000008001000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000010180060L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000006000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000010000188060L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000040180060L});
     public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000100000000L});
-    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000200000040L});
-    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000400001000L});
-    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000000004000L});
-    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000000100060L});
-    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000010000002L});
-    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000020100000000L});
-    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000200000060L});
-    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000800000000L});
-    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x00000000000E0000L});
-    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000000300060L});
-    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000002001000L});
-    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000040000008000L});
-    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000010010L});
-    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000800000002L});
-    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000400180060L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000800001000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000000010000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000000580060L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000000004002L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000040200000000L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000001000000000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000000380000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000000D80060L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000003000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000080000020000L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000004000000000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000000040010L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000001000000002L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000000000020L});
 
 }
\ No newline at end of file
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/problem.aird b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/problem.aird
index 1769c224..047b72a2 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/problem.aird
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/problem.aird
@@ -5,7 +5,7 @@
     <semanticResources>src/main/resources/model/problem.genmodel</semanticResources>
     <ownedViews xmi:type="viewpoint:DView" uid="_CsAAYKA4EeuqkpDnuik1sg">
       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_CsYa4KA4EeuqkpDnuik1sg" name="problem" repPath="#_CsUwgKA4EeuqkpDnuik1sg" changeId="21ccbdb3-d7f2-4782-aa2a-5fc2003467bb">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_CsYa4KA4EeuqkpDnuik1sg" name="problem" repPath="#_CsUwgKA4EeuqkpDnuik1sg" changeId="c29543bd-4d24-42d3-8f5b-82d41af742bd">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
         <target xmi:type="ecore:EPackage" href="src/main/resources/model/problem.ecore#/"/>
       </ownedRepresentationDescriptors>
@@ -82,7 +82,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_fit3lqA5EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_fit3kaA5EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fit3kqA5EeuqkpDnuik1sg" x="1236" y="720" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fit3kqA5EeuqkpDnuik1sg" x="1416" y="720" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_QKLK0KA6EeuqkpDnuik1sg" type="2003" element="_QKD2EKA6EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_QKLK06A6EeuqkpDnuik1sg" type="5007"/>
@@ -91,7 +91,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_QKLK1qA6EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_QKLK0aA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QKLK0qA6EeuqkpDnuik1sg" x="1068" y="960" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QKLK0qA6EeuqkpDnuik1sg" x="1248" y="960" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_jP6FkKA6EeuqkpDnuik1sg" type="2003" element="_jPpm4KA6EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_jP6soKA6EeuqkpDnuik1sg" type="5007"/>
@@ -100,7 +100,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_jP6so6A6EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_jP6FkaA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jP6FkqA6EeuqkpDnuik1sg" x="1056" y="720" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jP6FkqA6EeuqkpDnuik1sg" x="1236" y="720" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_sdPX0KA6EeuqkpDnuik1sg" type="2003" element="_sc_gMKA6EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_sdP-4KA6EeuqkpDnuik1sg" type="5007"/>
@@ -109,7 +109,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_sdP-46A6EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_sdPX0aA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sdPX0qA6EeuqkpDnuik1sg" x="1236" y="960" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sdPX0qA6EeuqkpDnuik1sg" x="1416" y="960" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_4k5GIKA6EeuqkpDnuik1sg" type="2003" element="_4k00sKA6EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_4k5GI6A6EeuqkpDnuik1sg" type="5007"/>
@@ -118,7 +118,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_4k5GJqA6EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_4k5GIaA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4k5GIqA6EeuqkpDnuik1sg" x="1236" y="1128" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4k5GIqA6EeuqkpDnuik1sg" x="1416" y="1128" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_6KEUMKA6EeuqkpDnuik1sg" type="2003" element="_6J_bsKA6EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_6KEUM6A6EeuqkpDnuik1sg" type="5007"/>
@@ -131,7 +131,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_6KEUNqA6EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_6KEUMaA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KEUMqA6EeuqkpDnuik1sg" x="1164" y="1284" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KEUMqA6EeuqkpDnuik1sg" x="1344" y="1284" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_-O-UEKA6EeuqkpDnuik1sg" type="2003" element="_-O6CoKA6EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_-O-7IKA6EeuqkpDnuik1sg" type="5007"/>
@@ -140,7 +140,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_-O-7I6A6EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_-O-UEaA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-O-UEqA6EeuqkpDnuik1sg" x="1464" y="960" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-O-UEqA6EeuqkpDnuik1sg" x="1644" y="960" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_V6pfMKA7EeuqkpDnuik1sg" type="2003" element="_V6YZcKA7EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_V6qGQKA7EeuqkpDnuik1sg" type="5007"/>
@@ -149,7 +149,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_V6qGQ6A7EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_V6pfMaA7EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V6pfMqA7EeuqkpDnuik1sg" x="1368" y="1284" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V6pfMqA7EeuqkpDnuik1sg" x="1548" y="1284" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_rRhWIKA7EeuqkpDnuik1sg" type="2003" element="_rRcdoKA7EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_rRh9MKA7EeuqkpDnuik1sg" type="5007"/>
@@ -158,7 +158,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_rRh9M6A7EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_rRhWIaA7EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rRhWIqA7EeuqkpDnuik1sg" x="1450" y="720" width="147" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rRhWIqA7EeuqkpDnuik1sg" x="1630" y="720" width="147" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_p9wywKA8EeuqkpDnuik1sg" type="2003" element="_p9d30KA8EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_p9xZ0KA8EeuqkpDnuik1sg" type="5007"/>
@@ -171,7 +171,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_p9xZ06A8EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_p9wywaA8EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p9wywqA8EeuqkpDnuik1sg" x="1464" y="528" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p9wywqA8EeuqkpDnuik1sg" x="1644" y="528" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_xsq_MKA8EeuqkpDnuik1sg" type="2003" element="_xsYrUKA8EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_xsrmQKA8EeuqkpDnuik1sg" type="5007"/>
@@ -180,7 +180,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_xsrmQ6A8EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_xsq_MaA8EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xsq_MqA8EeuqkpDnuik1sg" x="1692" y="528" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xsq_MqA8EeuqkpDnuik1sg" x="1020" y="336" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_BMfjMKA9EeuqkpDnuik1sg" type="2003" element="_BMXnYKA9EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_BMfjM6A9EeuqkpDnuik1sg" type="5007"/>
@@ -201,7 +201,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_BMfjNqA9EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_BMfjMaA9EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BMfjMqA9EeuqkpDnuik1sg" x="1692" y="720" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BMfjMqA9EeuqkpDnuik1sg" x="1872" y="720" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_QUDYMKA9EeuqkpDnuik1sg" type="2003" element="_QTzgkKA9EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_QUDYM6A9EeuqkpDnuik1sg" type="5007"/>
@@ -289,7 +289,25 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_IwtR09YPEeuF_d0WEhR3Xw"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_IwsqwdYPEeuF_d0WEhR3Xw" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwsqwtYPEeuF_d0WEhR3Xw" x="996" y="1476" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwsqwtYPEeuF_d0WEhR3Xw" x="1353" y="1476" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_M6O-0NbGEeuymriYTNxK2g" type="2003" element="_M58q8NbGEeuymriYTNxK2g">
+          <children xmi:type="notation:Node" xmi:id="_M6Pl4NbGEeuymriYTNxK2g" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_M6Pl4dbGEeuymriYTNxK2g" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_M6Pl4tbGEeuymriYTNxK2g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_M6Pl49bGEeuymriYTNxK2g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_M6O-0dbGEeuymriYTNxK2g" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M6O-0tbGEeuymriYTNxK2g" x="903" y="720" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_Kw-vINbNEeuymriYTNxK2g" type="2003" element="_KwtCUNbNEeuymriYTNxK2g">
+          <children xmi:type="notation:Node" xmi:id="_Kw_WMNbNEeuymriYTNxK2g" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_Kw_WMdbNEeuymriYTNxK2g" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Kw_WMtbNEeuymriYTNxK2g"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Kw_WM9bNEeuymriYTNxK2g"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_Kw-vIdbNEeuymriYTNxK2g" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Kw-vItbNEeuymriYTNxK2g" x="1137" y="180" width="120" height="100"/>
         </children>
         <styles xmi:type="notation:DiagramStyle" xmi:id="_CsZB8qA4EeuqkpDnuik1sg"/>
         <edges xmi:type="notation:Edge" xmi:id="_ODhSQKA4EeuqkpDnuik1sg" type="4001" element="_ODPlcKA4EeuqkpDnuik1sg" source="_JT0o8KA4EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg">
@@ -308,22 +326,6 @@
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ODh5VKA4EeuqkpDnuik1sg" id="(0.5,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ODh5VaA4EeuqkpDnuik1sg" id="(0.5,0.5)"/>
         </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_VtWKYKA4EeuqkpDnuik1sg" type="4001" element="_VtPctqA4EeuqkpDnuik1sg" source="_JT0o8KA4EeuqkpDnuik1sg" target="_JT0o8KA4EeuqkpDnuik1sg">
-          <children xmi:type="notation:Node" xmi:id="_VtWKZKA4EeuqkpDnuik1sg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VtWKZaA4EeuqkpDnuik1sg" x="-31" y="-17"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_VtWKZqA4EeuqkpDnuik1sg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VtWKZ6A4EeuqkpDnuik1sg" x="-5" y="-108"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_VtWKaKA4EeuqkpDnuik1sg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VtWKaaA4EeuqkpDnuik1sg" x="-88" y="-14"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_VtWKYaA4EeuqkpDnuik1sg" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_VtWKYqA4EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VtWKY6A4EeuqkpDnuik1sg" points="[24, 0, 37, 98]$[24, 58, 37, 156]$[132, 58, 145, 156]$[132, -26, 145, 72]$[94, -26, 107, 72]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VtX_kKA4EeuqkpDnuik1sg" id="(0.2033898305084746,1.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VtX_kaA4EeuqkpDnuik1sg" id="(0.09322033898305085,0.0)"/>
-        </edges>
         <edges xmi:type="notation:Edge" xmi:id="_gR35EKA4EeuqkpDnuik1sg" type="4001" element="_gRoBcKA4EeuqkpDnuik1sg" source="_c-HCQKA4EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_gR4gIKA4EeuqkpDnuik1sg" type="6001">
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gR4gIaA4EeuqkpDnuik1sg" y="-10"/>
@@ -356,22 +358,6 @@
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jlBr4KA4EeuqkpDnuik1sg" id="(0.4067796610169492,1.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_jlBr4aA4EeuqkpDnuik1sg" id="(0.503448275862069,0.0)"/>
         </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_ufaV0KA4EeuqkpDnuik1sg" type="4001" element="_ufJ3IKA4EeuqkpDnuik1sg" source="_c-HCQKA4EeuqkpDnuik1sg" target="_JT0o8KA4EeuqkpDnuik1sg">
-          <children xmi:type="notation:Node" xmi:id="_ufa84KA4EeuqkpDnuik1sg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ufa84aA4EeuqkpDnuik1sg" x="-60" y="-58"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_ufa84qA4EeuqkpDnuik1sg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ufa846A4EeuqkpDnuik1sg" x="18" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_ufa85KA4EeuqkpDnuik1sg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ufa85aA4EeuqkpDnuik1sg" x="12" y="-10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_ufaV0aA4EeuqkpDnuik1sg" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_ufaV0qA4EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ufaV06A4EeuqkpDnuik1sg" points="[37, 36, -35, 178]$[156, 36, 84, 178]$[156, -180, 84, -38]$[94, -180, 22, -38]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ufa85qA4EeuqkpDnuik1sg" id="(0.7448275862068966,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ufa856A4EeuqkpDnuik1sg" id="(0.8135593220338984,1.0)"/>
-        </edges>
         <edges xmi:type="notation:Edge" xmi:id="_0V8EUKA4EeuqkpDnuik1sg" type="4001" element="_0V3L1qA4EeuqkpDnuik1sg" source="_c-HCQKA4EeuqkpDnuik1sg" target="_c-HCQKA4EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_0V8rYKA4EeuqkpDnuik1sg" type="6001">
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0V8rYaA4EeuqkpDnuik1sg" x="30" y="11"/>
@@ -436,38 +422,6 @@
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UzJhEKA6EeuqkpDnuik1sg" id="(0.3050847457627119,1.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UzJhEaA6EeuqkpDnuik1sg" id="(0.4322033898305085,0.0)"/>
         </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_Z7WJ8KA6EeuqkpDnuik1sg" type="4001" element="_Z7FrQKA6EeuqkpDnuik1sg" source="_QKLK0KA6EeuqkpDnuik1sg" target="_JT0o8KA4EeuqkpDnuik1sg">
-          <children xmi:type="notation:Node" xmi:id="_Z7WJ9KA6EeuqkpDnuik1sg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z7WJ9aA6EeuqkpDnuik1sg" x="-49" y="113"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_Z7WJ9qA6EeuqkpDnuik1sg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z7WJ96A6EeuqkpDnuik1sg" x="104" y="113"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_Z7WJ-KA6EeuqkpDnuik1sg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z7WJ-aA6EeuqkpDnuik1sg" x="14" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_Z7WJ8aA6EeuqkpDnuik1sg" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_Z7WJ8qA6EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Z7WJ86A6EeuqkpDnuik1sg" points="[-75, 50, 278, 266]$[-267, 50, 86, 266]$[-267, -192, 86, 24]$[-353, -192, 0, 24]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z7WxAKA6EeuqkpDnuik1sg" id="(0.635593220338983,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Z7WxAaA6EeuqkpDnuik1sg" id="(1.0,0.24489795918367346)"/>
-        </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_l7e7AKA6EeuqkpDnuik1sg" type="4001" element="_l7apoqA6EeuqkpDnuik1sg" source="_jP6FkKA6EeuqkpDnuik1sg" target="_RzZA0KA5EeuqkpDnuik1sg">
-          <children xmi:type="notation:Node" xmi:id="_l7e7BKA6EeuqkpDnuik1sg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l7e7BaA6EeuqkpDnuik1sg" x="131" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_l7e7BqA6EeuqkpDnuik1sg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l7e7B6A6EeuqkpDnuik1sg" x="145" y="-21"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_l7e7CKA6EeuqkpDnuik1sg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l7e7CaA6EeuqkpDnuik1sg" x="26" y="27"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_l7e7AaA6EeuqkpDnuik1sg" routing="Tree"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_l7e7AqA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l7e7A6A6EeuqkpDnuik1sg" points="[0, 0, 337, 335]$[0, -228, 337, 107]$[-336, -228, 1, 107]$[-336, -286, 1, 49]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l7e7CqA6EeuqkpDnuik1sg" id="(0.711864406779661,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l7e7C6A6EeuqkpDnuik1sg" id="(0.5,0.5)"/>
-        </edges>
         <edges xmi:type="notation:Edge" xmi:id="_onzXUKA6EeuqkpDnuik1sg" type="4001" element="_oni4rKA6EeuqkpDnuik1sg" source="_QKLK0KA6EeuqkpDnuik1sg" target="_jP6FkKA6EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_onz-YKA6EeuqkpDnuik1sg" type="6001">
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_onz-YaA6EeuqkpDnuik1sg" x="-21" y="23"/>
@@ -614,82 +568,66 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_Vj1sQKA8EeuqkpDnuik1sg" type="4001" element="_VjwMzqA8EeuqkpDnuik1sg" source="_6KEUMKA6EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_Vj1sRKA8EeuqkpDnuik1sg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vj1sRaA8EeuqkpDnuik1sg" x="-79" y="526"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vj1sRaA8EeuqkpDnuik1sg" x="11" y="526"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_Vj1sRqA8EeuqkpDnuik1sg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vj1sR6A8EeuqkpDnuik1sg" x="113" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vj1sR6A8EeuqkpDnuik1sg" x="266" y="-10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_Vj1sSKA8EeuqkpDnuik1sg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vj1sSaA8EeuqkpDnuik1sg" x="-62" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vj1sSaA8EeuqkpDnuik1sg" x="-35" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_Vj1sQaA8EeuqkpDnuik1sg" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_Vj1sQqA8EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Vj1sQ6A8EeuqkpDnuik1sg" points="[-48, 24, 481, 682]$[-648, 24, -119, 682]$[-648, -708, -119, -50]$[-588, -708, -59, -50]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Vj1sQ6A8EeuqkpDnuik1sg" points="[-48, 24, 661, 682]$[-828, 24, -119, 682]$[-828, -708, -119, -50]$[-768, -708, -59, -50]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Vj1sSqA8EeuqkpDnuik1sg" id="(0.4067796610169492,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Vj1sS6A8EeuqkpDnuik1sg" id="(0.5,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_w-zMkKA8EeuqkpDnuik1sg" type="4001" element="_w-iG36A8EeuqkpDnuik1sg" source="_p9wywKA8EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_w-zMlKA8EeuqkpDnuik1sg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zMlaA8EeuqkpDnuik1sg" x="174" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zMlaA8EeuqkpDnuik1sg" x="-221" y="18"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_w-zzoKA8EeuqkpDnuik1sg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zzoaA8EeuqkpDnuik1sg" x="296" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zzoaA8EeuqkpDnuik1sg" x="449" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_w-zzoqA8EeuqkpDnuik1sg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zzo6A8EeuqkpDnuik1sg" x="52" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zzo6A8EeuqkpDnuik1sg" x="79" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_w-zMkaA8EeuqkpDnuik1sg" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_w-zMkqA8EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w-zMk6A8EeuqkpDnuik1sg" points="[0, 0, 722, 0]$[-722, 0, 0, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w-zMk6A8EeuqkpDnuik1sg" points="[0, -25, 902, -25]$[-902, -25, 0, -25]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w-zzpKA8EeuqkpDnuik1sg" id="(0.0,0.5)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w-zzpaA8EeuqkpDnuik1sg" id="(1.0,0.5)"/>
         </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_2VC4gKA8EeuqkpDnuik1sg" type="4001" element="_2U4ggqA8EeuqkpDnuik1sg" source="_xsq_MKA8EeuqkpDnuik1sg" target="_RzZA0KA5EeuqkpDnuik1sg">
-          <children xmi:type="notation:Node" xmi:id="_2VC4hKA8EeuqkpDnuik1sg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2VC4haA8EeuqkpDnuik1sg" x="-328" y="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_2VC4hqA8EeuqkpDnuik1sg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2VC4h6A8EeuqkpDnuik1sg" x="-125" y="-38"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_2VC4iKA8EeuqkpDnuik1sg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2VC4iaA8EeuqkpDnuik1sg" x="-17" y="103"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_2VC4gaA8EeuqkpDnuik1sg" routing="Tree"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_2VC4gqA8EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2VC4g6A8EeuqkpDnuik1sg" points="[0, -6, 1048, 455]$[0, -78, 1048, 383]$[-1047, -78, 1, 383]$[-1047, -412, 1, 49]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2VC4iqA8EeuqkpDnuik1sg" id="(0.3305084745762712,0.061224489795918366)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2VC4i6A8EeuqkpDnuik1sg" id="(0.5,0.5)"/>
-        </edges>
         <edges xmi:type="notation:Edge" xmi:id="_4eaYwKA8EeuqkpDnuik1sg" type="4001" element="_4eU5TqA8EeuqkpDnuik1sg" source="_D1D6MKA4EeuqkpDnuik1sg" target="_xsq_MKA8EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_4ea_06A8EeuqkpDnuik1sg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ea_1KA8EeuqkpDnuik1sg" x="-410" y="-17"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ea_1KA8EeuqkpDnuik1sg" x="-36" y="-17"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_4ea_1aA8EeuqkpDnuik1sg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ea_1qA8EeuqkpDnuik1sg" x="-19" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ea_1qA8EeuqkpDnuik1sg" x="8" y="-14"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_4ea_16A8EeuqkpDnuik1sg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ea_2KA8EeuqkpDnuik1sg" x="-37" y="522"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4ea_2KA8EeuqkpDnuik1sg" x="-124" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_4ea_0KA8EeuqkpDnuik1sg" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_4ea_0aA8EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4ea_0qA8EeuqkpDnuik1sg" points="[-34, 50, -804, -274]$[-34, 84, -804, -240]$[840, 84, 70, -240]$[840, 300, 70, -24]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4ea_0qA8EeuqkpDnuik1sg" points="[-21, 50, -159, -58]$[-34, 84, -172, -24]$[137, 84, -1, -24]$[137, 107, -1, -1]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4ea_2aA8EeuqkpDnuik1sg" id="(1.0,0.4897959183673469)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4ea_2qA8EeuqkpDnuik1sg" id="(0.0,0.24489795918367346)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4ea_2qA8EeuqkpDnuik1sg" id="(0.3389830508474576,0.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_79_eAKA8EeuqkpDnuik1sg" type="4001" element="_79nqlqA8EeuqkpDnuik1sg" source="_p9wywKA8EeuqkpDnuik1sg" target="_xsq_MKA8EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_79_eBKA8EeuqkpDnuik1sg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_79_eBaA8EeuqkpDnuik1sg" x="1" y="-18"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_79_eBaA8EeuqkpDnuik1sg" x="87" y="18"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_79_eBqA8EeuqkpDnuik1sg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_79_eB6A8EeuqkpDnuik1sg" x="-3" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_79_eB6A8EeuqkpDnuik1sg" x="-19" y="-10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_79_eCKA8EeuqkpDnuik1sg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_79_eCaA8EeuqkpDnuik1sg" x="-19" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_79_eCaA8EeuqkpDnuik1sg" x="-58" y="-10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_79_eAaA8EeuqkpDnuik1sg" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_79_eAqA8EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_79_eA6A8EeuqkpDnuik1sg" points="[0, 0, -110, 0]$[110, 0, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_79_eCqA8EeuqkpDnuik1sg" id="(1.0,0.5)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_79_eA6A8EeuqkpDnuik1sg" points="[41, -3, 708, 143]$[41, -146, 708, 0]$[-549, -146, 118, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_79_eCqA8EeuqkpDnuik1sg" id="(0.3644067796610169,0.030612244897959183)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_79_eC6A8EeuqkpDnuik1sg" id="(0.0,0.5)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_hU_wsKA9EeuqkpDnuik1sg" type="4001" element="_hU64ZqA9EeuqkpDnuik1sg" source="_D1D6MKA4EeuqkpDnuik1sg" target="_e73WIKA9EeuqkpDnuik1sg">
@@ -918,68 +856,212 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_KnGywNYPEeuF_d0WEhR3Xw" type="4001" element="_KmxbkNYPEeuF_d0WEhR3Xw" source="_6KEUMKA6EeuqkpDnuik1sg" target="_IwsqwNYPEeuF_d0WEhR3Xw">
           <children xmi:type="notation:Node" xmi:id="_KnHZ0NYPEeuF_d0WEhR3Xw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KnHZ0dYPEeuF_d0WEhR3Xw" x="-23" y="-60"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KnHZ0dYPEeuF_d0WEhR3Xw" x="-10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_KnHZ0tYPEeuF_d0WEhR3Xw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KnHZ09YPEeuF_d0WEhR3Xw" x="1" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KnHZ09YPEeuF_d0WEhR3Xw" x="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_KnHZ1NYPEeuF_d0WEhR3Xw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KnHZ1dYPEeuF_d0WEhR3Xw" x="-1" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KnHZ1dYPEeuF_d0WEhR3Xw" x="-23" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_KnGywdYPEeuF_d0WEhR3Xw" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_KnGywtYPEeuF_d0WEhR3Xw" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KnGyw9YPEeuF_d0WEhR3Xw" points="[0, 0, 89, -138]$[-110, 0, -21, -138]$[-110, 132, -21, -6]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KnGyw9YPEeuF_d0WEhR3Xw" points="[67, 38, -21, -100]$[67, 132, -21, -6]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KnHZ1tYPEeuF_d0WEhR3Xw" id="(0.0,0.6122448979591837)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KnHZ19YPEeuF_d0WEhR3Xw" id="(0.6694915254237288,0.061224489795918366)"/>
         </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_T1qNANYPEeuF_d0WEhR3Xw" type="4001" element="_T1fN5tYPEeuF_d0WEhR3Xw" source="_IwsqwNYPEeuF_d0WEhR3Xw" target="_jP6FkKA6EeuqkpDnuik1sg">
-          <children xmi:type="notation:Node" xmi:id="_T1qNBNYPEeuF_d0WEhR3Xw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T1qNBdYPEeuF_d0WEhR3Xw" x="-390" y="43"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_T1qNBtYPEeuF_d0WEhR3Xw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T1qNB9YPEeuF_d0WEhR3Xw" x="94" y="10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_T1qNCNYPEeuF_d0WEhR3Xw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T1qNCdYPEeuF_d0WEhR3Xw" x="-154" y="10"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_T1qNAdYPEeuF_d0WEhR3Xw" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_T1qNAtYPEeuF_d0WEhR3Xw" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_T1qNA9YPEeuF_d0WEhR3Xw" points="[-36, 50, -96, 708]$[-120, 50, -180, 708]$[-120, -708, -180, -50]$[24, -708, -36, -50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T1qNCtYPEeuF_d0WEhR3Xw" id="(0.3050847457627119,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T1qNC9YPEeuF_d0WEhR3Xw" id="(0.3050847457627119,1.0)"/>
-        </edges>
         <edges xmi:type="notation:Edge" xmi:id="_byTTcNYPEeuF_d0WEhR3Xw" type="4001" element="_bx-jYtYPEeuF_d0WEhR3Xw" source="_IwsqwNYPEeuF_d0WEhR3Xw" target="_-O-UEKA6EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_byTTdNYPEeuF_d0WEhR3Xw" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_byTTddYPEeuF_d0WEhR3Xw" x="-18" y="-246"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_byTTddYPEeuF_d0WEhR3Xw" x="-106" y="-140"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_byTTdtYPEeuF_d0WEhR3Xw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_byTTd9YPEeuF_d0WEhR3Xw" x="-2" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_byTTd9YPEeuF_d0WEhR3Xw" x="-31" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_byTTeNYPEeuF_d0WEhR3Xw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_byTTedYPEeuF_d0WEhR3Xw" x="-1" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_byTTedYPEeuF_d0WEhR3Xw" x="-28" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_byTTcdYPEeuF_d0WEhR3Xw" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_byTTctYPEeuF_d0WEhR3Xw" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_byTTc9YPEeuF_d0WEhR3Xw" points="[70, 48, -398, 466]$[480, 48, 12, 466]$[480, -418, 12, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_byTTc9YPEeuF_d0WEhR3Xw" points="[70, 48, -221, 466]$[303, 48, 12, 466]$[303, -418, 12, 0]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_byT6gNYPEeuF_d0WEhR3Xw" id="(0.4067796610169492,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_byT6gdYPEeuF_d0WEhR3Xw" id="(0.4067796610169492,1.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_-X6xcNawEeuymriYTNxK2g" type="4001" element="_-XLKltawEeuymriYTNxK2g" source="_JT0o8KA4EeuqkpDnuik1sg" target="_xsq_MKA8EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_-X_C4NawEeuymriYTNxK2g" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-X_C4dawEeuymriYTNxK2g" x="-421" y="79"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-X_C4dawEeuymriYTNxK2g" x="-2" y="-308"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_-X_p8NawEeuymriYTNxK2g" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-X_p8dawEeuymriYTNxK2g" x="-71" y="82"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-X_p8dawEeuymriYTNxK2g" x="-2" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_-YARANawEeuymriYTNxK2g" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-YARAdawEeuymriYTNxK2g" x="-90" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-YARAdawEeuymriYTNxK2g" x="-316" y="-140"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_-X6xcdawEeuymriYTNxK2g" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_-X6xctawEeuymriYTNxK2g" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-X6xc9awEeuymriYTNxK2g" points="[0, 0, -902, 144]$[50, 0, -852, 144]$[50, -72, -852, 72]$[962, -72, 60, 72]$[962, -106, 60, 38]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-X6xc9awEeuymriYTNxK2g" points="[-58, 86, -288, 422]$[-58, 132, -288, 468]$[288, 132, 58, 468]$[288, -298, 58, 38]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-YCtQNawEeuymriYTNxK2g" id="(1.0,0.12244897959183673)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-YCtQdawEeuymriYTNxK2g" id="(0.0,0.6122448979591837)"/>
         </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_W89dcNbFEeuymriYTNxK2g" type="4001" element="_Z7FrQKA6EeuqkpDnuik1sg" source="_QKLK0KA6EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_W89ddNbFEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W89dddbFEeuymriYTNxK2g" x="-349" y="-67"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_W8-EgNbFEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W8-EgdbFEeuymriYTNxK2g" x="-12" y="3"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_W8-EgtbFEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W8-Eg9bFEeuymriYTNxK2g" x="32" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_W89dcdbFEeuymriYTNxK2g" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_W89dctbFEeuymriYTNxK2g" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_W89dc9bFEeuymriYTNxK2g" points="[-75, 50, 517, 414]$[-195, 50, 397, 414]$[-195, -396, 397, -32]$[-581, -396, 11, -32]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W8_SoNbFEeuymriYTNxK2g" id="(0.635593220338983,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W8_SodbFEeuymriYTNxK2g" id="(0.9067796610169492,0.6938775510204082)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_ev0VwNbFEeuymriYTNxK2g" type="4001" element="_ufJ3IKA4EeuqkpDnuik1sg" source="_c-HCQKA4EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_ev0VxNbFEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ev0VxdbFEeuymriYTNxK2g" x="-206" y="-22"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ev0VxtbFEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ev0Vx9bFEeuymriYTNxK2g" x="6" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_ev0VyNbFEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ev0VydbFEeuymriYTNxK2g" x="-6" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_ev0VwdbFEeuymriYTNxK2g" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_ev0VwtbFEeuymriYTNxK2g" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ev0Vw9bFEeuymriYTNxK2g" points="[37, 36, -4, 419]$[156, 36, 115, 419]$[156, -348, 115, 35]$[46, -348, 5, 35]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ev0VytbFEeuymriYTNxK2g" id="(0.7448275862068966,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ev080NbFEeuymriYTNxK2g" id="(0.9576271186440678,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_f-FfsNbFEeuymriYTNxK2g" type="4001" element="_VtPctqA4EeuqkpDnuik1sg" source="_JT0o8KA4EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_f-FftNbFEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f-FftdbFEeuymriYTNxK2g" x="6" y="31"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_f-FfttbFEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f-Fft9bFEeuymriYTNxK2g" x="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_f-FfuNbFEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f-FfudbFEeuymriYTNxK2g" x="-10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_f-FfsdbFEeuymriYTNxK2g" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_f-FfstbFEeuymriYTNxK2g" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f-Ffs9bFEeuymriYTNxK2g" points="[24, -98, -17, 129]$[24, -192, -17, 35]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f-GGwNbFEeuymriYTNxK2g" id="(0.2033898305084746,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f-GGwdbFEeuymriYTNxK2g" id="(0.9576271186440678,0.6428571428571429)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_UwuZ8NbGEeuymriYTNxK2g" type="4001" element="_UwbfHtbGEeuymriYTNxK2g" source="_M6O-0NbGEeuymriYTNxK2g" target="_EfWNUKA4EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_UwuZ9NbGEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UwuZ9dbGEeuymriYTNxK2g" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UwuZ9tbGEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UwuZ99bGEeuymriYTNxK2g" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UwuZ-NbGEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UwuZ-dbGEeuymriYTNxK2g" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_UwuZ8dbGEeuymriYTNxK2g" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_UwuZ8tbGEeuymriYTNxK2g" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UwuZ89bGEeuymriYTNxK2g" points="[0, 0, 220, 180]$[-220, -180, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UwvBANbGEeuymriYTNxK2g" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UwvBAdbGEeuymriYTNxK2g" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_WYV4ANbGEeuymriYTNxK2g" type="4001" element="_WX_5w9bGEeuymriYTNxK2g" source="_M6O-0NbGEeuymriYTNxK2g" target="_e73WIKA9EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_WYV4BNbGEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WYV4BdbGEeuymriYTNxK2g" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_WYV4BtbGEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WYV4B9bGEeuymriYTNxK2g" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_WYV4CNbGEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WYV4CdbGEeuymriYTNxK2g" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_WYV4AdbGEeuymriYTNxK2g" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_WYV4AtbGEeuymriYTNxK2g" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WYV4A9bGEeuymriYTNxK2g" points="[0, 0, 99, 384]$[0, -240, 99, 144]$[-98, -240, 1, 144]$[-98, -286, 1, 98]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WYV4CtbGEeuymriYTNxK2g" id="(0.3220338983050847,0.030612244897959183)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WYV4C9bGEeuymriYTNxK2g" id="(0.5,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_gRXLkNbGEeuymriYTNxK2g" type="4001" element="_gRDCgNbGEeuymriYTNxK2g" source="_M6O-0NbGEeuymriYTNxK2g" target="_xsq_MKA8EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_gRXLlNbGEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gRXLldbGEeuymriYTNxK2g" x="-13" y="-41"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_gRXyoNbGEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gRXyodbGEeuymriYTNxK2g" x="79" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_gRXyotbGEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gRXyo9bGEeuymriYTNxK2g" x="4" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_gRXLkdbGEeuymriYTNxK2g" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_gRXLktbGEeuymriYTNxK2g" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gRXLk9bGEeuymriYTNxK2g" points="[25, 48, -35, 334]$[60, 48, 0, 334]$[60, -286, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gRXypNbGEeuymriYTNxK2g" id="(0.788135593220339,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gRXypdbGEeuymriYTNxK2g" id="(0.3050847457627119,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_Ql_asNbNEeuymriYTNxK2g" type="4001" element="_QlymotbNEeuymriYTNxK2g" source="_xsq_MKA8EeuqkpDnuik1sg" target="_Kw-vINbNEeuymriYTNxK2g">
+          <children xmi:type="notation:Node" xmi:id="_Ql_atNbNEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ql_atdbNEeuymriYTNxK2g" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_QmABwNbNEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QmABwdbNEeuymriYTNxK2g" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_QmABwtbNEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QmABw9bNEeuymriYTNxK2g" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ql_asdbNEeuymriYTNxK2g" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_Ql_astbNEeuymriYTNxK2g" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ql_as9bNEeuymriYTNxK2g" points="[0, 0, -84, 58]$[84, -58, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QmABxNbNEeuymriYTNxK2g" id="(0.7796610169491526,0.01020408163265306)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QmABxdbNEeuymriYTNxK2g" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_SmujYNbNEeuymriYTNxK2g" type="4001" element="_Smi9eNbNEeuymriYTNxK2g" source="_Kw-vINbNEeuymriYTNxK2g" target="_RzZA0KA5EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_SmvKcNbNEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SmvKcdbNEeuymriYTNxK2g" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_SmvKctbNEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SmvKc9bNEeuymriYTNxK2g" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_SmvKdNbNEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SmvKddbNEeuymriYTNxK2g" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_SmujYdbNEeuymriYTNxK2g" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_SmujYtbNEeuymriYTNxK2g" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SmujY9bNEeuymriYTNxK2g" points="[0, 0, 84, 58]$[-84, -58, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SmvKdtbNEeuymriYTNxK2g" id="(0.5423728813559322,0.07142857142857142)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SmvKd9bNEeuymriYTNxK2g" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_TuLToNbNEeuymriYTNxK2g" type="4001" element="_Tt9RRtbNEeuymriYTNxK2g" source="_jP6FkKA6EeuqkpDnuik1sg" target="_Kw-vINbNEeuymriYTNxK2g">
+          <children xmi:type="notation:Node" xmi:id="_TuLTpNbNEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TuLTpdbNEeuymriYTNxK2g" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_TuL6sNbNEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TuL6sdbNEeuymriYTNxK2g" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_TuL6stbNEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TuL6s9bNEeuymriYTNxK2g" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_TuLTodbNEeuymriYTNxK2g" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_TuLTotbNEeuymriYTNxK2g" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TuLTo9bNEeuymriYTNxK2g" points="[0, 0, 96, 442]$[-96, -442, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TuL6tNbNEeuymriYTNxK2g" id="(0.4067796610169492,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_TuL6tdbNEeuymriYTNxK2g" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_UosbINbNEeuymriYTNxK2g" type="4001" element="_T1fN5tYPEeuF_d0WEhR3Xw" source="_IwsqwNYPEeuF_d0WEhR3Xw" target="_Kw-vINbNEeuymriYTNxK2g">
+          <children xmi:type="notation:Node" xmi:id="_UosbJNbNEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UosbJdbNEeuymriYTNxK2g" x="-516" y="82"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UotCMNbNEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UotCMdbNEeuymriYTNxK2g" x="21" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_UotCMtbNEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UotCM9bNEeuymriYTNxK2g" x="3" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_UosbIdbNEeuymriYTNxK2g" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_UosbItbNEeuymriYTNxK2g" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UosbI9bNEeuymriYTNxK2g" points="[-36, 50, 197, 1259]$[-213, 50, 20, 1259]$[-213, -1198, 20, 11]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UotCNNbNEeuymriYTNxK2g" id="(0.3050847457627119,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UotCNdbNEeuymriYTNxK2g" id="(0.16101694915254236,0.8877551020408163)"/>
+        </edges>
       </data>
     </ownedAnnotationEntries>
     <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_Csiy8KA4EeuqkpDnuik1sg" source="DANNOTATION_CUSTOMIZATION_KEY">
@@ -1006,7 +1088,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_EfNqcKA4EeuqkpDnuik1sg" name="Relation" tooltipText="" outgoingEdges="_XWbypqA5EeuqkpDnuik1sg" incomingEdges="_ODPlcKA4EeuqkpDnuik1sg _gRoBcKA4EeuqkpDnuik1sg _rUgDkKA5EeuqkpDnuik1sg _VjwMzqA8EeuqkpDnuik1sg _w-iG36A8EeuqkpDnuik1sg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_EfNqcKA4EeuqkpDnuik1sg" name="Relation" tooltipText="" outgoingEdges="_XWbypqA5EeuqkpDnuik1sg" incomingEdges="_ODPlcKA4EeuqkpDnuik1sg _gRoBcKA4EeuqkpDnuik1sg _rUgDkKA5EeuqkpDnuik1sg _VjwMzqA8EeuqkpDnuik1sg _w-iG36A8EeuqkpDnuik1sg _Z7FrQKA6EeuqkpDnuik1sg _ufJ3IKA4EeuqkpDnuik1sg _VtPctqA4EeuqkpDnuik1sg _UwbfHtbGEeuymriYTNxK2g" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Relation"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Relation"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -1018,7 +1100,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_JTstIKA4EeuqkpDnuik1sg" name="ClassDeclaration" tooltipText="" outgoingEdges="_ODPlcKA4EeuqkpDnuik1sg _VtPctqA4EeuqkpDnuik1sg _jk6-PKA4EeuqkpDnuik1sg _plK3JqA9EeuqkpDnuik1sg _-XLKltawEeuymriYTNxK2g" incomingEdges="_VtPctqA4EeuqkpDnuik1sg _ufJ3IKA4EeuqkpDnuik1sg _Z7FrQKA6EeuqkpDnuik1sg _2kWqbKA9EeuqkpDnuik1sg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_JTstIKA4EeuqkpDnuik1sg" name="ClassDeclaration" tooltipText="" outgoingEdges="_ODPlcKA4EeuqkpDnuik1sg _VtPctqA4EeuqkpDnuik1sg _jk6-PKA4EeuqkpDnuik1sg _plK3JqA9EeuqkpDnuik1sg _-XLKltawEeuymriYTNxK2g" incomingEdges="_2kWqbKA9EeuqkpDnuik1sg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ClassDeclaration"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ClassDeclaration"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -1049,7 +1131,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_VtPctqA4EeuqkpDnuik1sg" name="[0..*] superTypes" sourceNode="_JTstIKA4EeuqkpDnuik1sg" targetNode="_JTstIKA4EeuqkpDnuik1sg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_VtPctqA4EeuqkpDnuik1sg" name="[0..*] superTypes" sourceNode="_JTstIKA4EeuqkpDnuik1sg" targetNode="_EfNqcKA4EeuqkpDnuik1sg">
       <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ClassDeclaration/superTypes"/>
       <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ClassDeclaration/superTypes"/>
       <ownedStyle xmi:type="diagram:EdgeStyle" uid="_VtQDwKA4EeuqkpDnuik1sg" routingStyle="manhattan" strokeColor="0,0,0">
@@ -1107,7 +1189,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ufJ3IKA4EeuqkpDnuik1sg" name="[0..1] referenceType" sourceNode="_c-A7oKA4EeuqkpDnuik1sg" targetNode="_JTstIKA4EeuqkpDnuik1sg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_ufJ3IKA4EeuqkpDnuik1sg" name="[0..1] referenceType" sourceNode="_c-A7oKA4EeuqkpDnuik1sg" targetNode="_EfNqcKA4EeuqkpDnuik1sg">
       <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ReferenceDeclaration/referenceType"/>
       <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ReferenceDeclaration/referenceType"/>
       <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ufLFQKA4EeuqkpDnuik1sg" routingStyle="manhattan" strokeColor="0,0,0">
@@ -1135,7 +1217,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_RzK-YKA5EeuqkpDnuik1sg" name="NamedElement" tooltipText="" incomingEdges="_XWbypqA5EeuqkpDnuik1sg _l7apoqA6EeuqkpDnuik1sg _2U4ggqA8EeuqkpDnuik1sg _m-6OTNXtEeuF_d0WEhR3Xw" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_RzK-YKA5EeuqkpDnuik1sg" name="NamedElement" tooltipText="" incomingEdges="_XWbypqA5EeuqkpDnuik1sg _m-6OTNXtEeuF_d0WEhR3Xw _Smi9eNbNEeuymriYTNxK2g" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NamedElement"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NamedElement"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -1222,7 +1304,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Z7FrQKA6EeuqkpDnuik1sg" name="[0..1] parameterType" sourceNode="_QKD2EKA6EeuqkpDnuik1sg" targetNode="_JTstIKA4EeuqkpDnuik1sg">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Z7FrQKA6EeuqkpDnuik1sg" name="[0..1] parameterType" sourceNode="_QKD2EKA6EeuqkpDnuik1sg" targetNode="_EfNqcKA4EeuqkpDnuik1sg">
       <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Parameter/parameterType"/>
       <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Parameter/parameterType"/>
       <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Z7GSUKA6EeuqkpDnuik1sg" routingStyle="manhattan" strokeColor="0,0,0">
@@ -1236,7 +1318,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_jPpm4KA6EeuqkpDnuik1sg" name="Variable" tooltipText="" outgoingEdges="_l7apoqA6EeuqkpDnuik1sg" incomingEdges="_oni4rKA6EeuqkpDnuik1sg _BVyUAKA7EeuqkpDnuik1sg _T1fN5tYPEeuF_d0WEhR3Xw" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_jPpm4KA6EeuqkpDnuik1sg" name="Variable" tooltipText="" outgoingEdges="_Tt9RRtbNEeuymriYTNxK2g" incomingEdges="_oni4rKA6EeuqkpDnuik1sg _BVyUAKA7EeuqkpDnuik1sg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Variable"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Variable"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -1248,18 +1330,6 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_l7apoqA6EeuqkpDnuik1sg" sourceNode="_jPpm4KA6EeuqkpDnuik1sg" targetNode="_RzK-YKA5EeuqkpDnuik1sg">
-      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Variable"/>
-      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Variable"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_l7apo6A6EeuqkpDnuik1sg" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_l7appKA6EeuqkpDnuik1sg" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_l7appaA6EeuqkpDnuik1sg" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
     <ownedDiagramElements xmi:type="diagram:DEdge" uid="_oni4rKA6EeuqkpDnuik1sg" sourceNode="_QKD2EKA6EeuqkpDnuik1sg" targetNode="_jPpm4KA6EeuqkpDnuik1sg">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Parameter"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Parameter"/>
@@ -1494,7 +1564,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_xsYrUKA8EeuqkpDnuik1sg" name="Node" tooltipText="" outgoingEdges="_2U4ggqA8EeuqkpDnuik1sg" incomingEdges="_4eU5TqA8EeuqkpDnuik1sg _79nqlqA8EeuqkpDnuik1sg _-XLKltawEeuymriYTNxK2g" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_xsYrUKA8EeuqkpDnuik1sg" name="Node" tooltipText="" outgoingEdges="_QlymotbNEeuymriYTNxK2g" incomingEdges="_4eU5TqA8EeuqkpDnuik1sg _79nqlqA8EeuqkpDnuik1sg _-XLKltawEeuymriYTNxK2g _gRDCgNbGEeuymriYTNxK2g" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Node"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Node"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -1505,18 +1575,6 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_2U4ggqA8EeuqkpDnuik1sg" sourceNode="_xsYrUKA8EeuqkpDnuik1sg" targetNode="_RzK-YKA5EeuqkpDnuik1sg">
-      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Node"/>
-      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Node"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Mca_kqA9EeuqkpDnuik1sg" targetArrow="InputClosedArrow" routingStyle="tree">
-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_Mca_k6A9EeuqkpDnuik1sg" showIcon="false">
-          <labelFormat>italic</labelFormat>
-        </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Mca_lKA9EeuqkpDnuik1sg" showIcon="false"/>
-      </ownedStyle>
-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
-    </ownedDiagramElements>
     <ownedDiagramElements xmi:type="diagram:DEdge" uid="_4eU5TqA8EeuqkpDnuik1sg" name="[0..*] nodes" sourceNode="_D05iIKA4EeuqkpDnuik1sg" targetNode="_xsYrUKA8EeuqkpDnuik1sg">
       <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Problem/nodes"/>
       <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Problem/nodes"/>
@@ -1590,7 +1648,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_e7ydoKA9EeuqkpDnuik1sg" name="Statement" tooltipText="" incomingEdges="_hU64ZqA9EeuqkpDnuik1sg _mQFKsqA9EeuqkpDnuik1sg _mzziwKA9EeuqkpDnuik1sg _plK3JqA9EeuqkpDnuik1sg _vdptgqA9EeuqkpDnuik1sg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_e7ydoKA9EeuqkpDnuik1sg" name="Statement" tooltipText="" incomingEdges="_hU64ZqA9EeuqkpDnuik1sg _mQFKsqA9EeuqkpDnuik1sg _mzziwKA9EeuqkpDnuik1sg _plK3JqA9EeuqkpDnuik1sg _vdptgqA9EeuqkpDnuik1sg _WX_5w9bGEeuymriYTNxK2g" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Statement"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Statement"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -1885,9 +1943,9 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_T1fN5tYPEeuF_d0WEhR3Xw" name="[0..1] variable" sourceNode="_IwJ4MNYPEeuF_d0WEhR3Xw" targetNode="_jPpm4KA6EeuqkpDnuik1sg">
-      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Argument/variable"/>
-      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Argument/variable"/>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_T1fN5tYPEeuF_d0WEhR3Xw" name="[0..1] variableOrNode" sourceNode="_IwJ4MNYPEeuF_d0WEhR3Xw" targetNode="_KwtCUNbNEeuymriYTNxK2g">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Argument/variableOrNode"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Argument/variableOrNode"/>
       <ownedStyle xmi:type="diagram:EdgeStyle" uid="_T1fN59YPEeuF_d0WEhR3Xw" routingStyle="manhattan" strokeColor="0,0,0">
         <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
         <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_T1fN6dYPEeuF_d0WEhR3Xw" showIcon="false">
@@ -1921,6 +1979,102 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_M58q8NbGEeuymriYTNxK2g" name="EnumDeclaration" tooltipText="" outgoingEdges="_UwbfHtbGEeuymriYTNxK2g _WX_5w9bGEeuymriYTNxK2g _gRDCgNbGEeuymriYTNxK2g" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//EnumDeclaration"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//EnumDeclaration"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_M59SANbGEeuymriYTNxK2g" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_UwbfHtbGEeuymriYTNxK2g" sourceNode="_M58q8NbGEeuymriYTNxK2g" targetNode="_EfNqcKA4EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//EnumDeclaration"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//EnumDeclaration"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_UwcGENbGEeuymriYTNxK2g" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_UwcGEdbGEeuymriYTNxK2g" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_UwcGEtbGEeuymriYTNxK2g" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_WX_5w9bGEeuymriYTNxK2g" sourceNode="_M58q8NbGEeuymriYTNxK2g" targetNode="_e7ydoKA9EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//EnumDeclaration"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//EnumDeclaration"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_WYAg0NbGEeuymriYTNxK2g" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@conditionnalStyles.0/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_WYAg0dbGEeuymriYTNxK2g" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_WYAg0tbGEeuymriYTNxK2g" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_gRDCgNbGEeuymriYTNxK2g" name="[0..*] literals" sourceNode="_M58q8NbGEeuymriYTNxK2g" targetNode="_xsYrUKA8EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//EnumDeclaration/literals"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//EnumDeclaration/literals"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_gRDpkNbGEeuymriYTNxK2g" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_gRDpktbGEeuymriYTNxK2g" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_gRDpkdbGEeuymriYTNxK2g" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_KwtCUNbNEeuymriYTNxK2g" name="VariableOrNode" tooltipText="" outgoingEdges="_Smi9eNbNEeuymriYTNxK2g" incomingEdges="_QlymotbNEeuymriYTNxK2g _Tt9RRtbNEeuymriYTNxK2g _T1fN5tYPEeuF_d0WEhR3Xw" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNode"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNode"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_QMf8vdbNEeuymriYTNxK2g" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">
+        <labelFormat>italic</labelFormat>
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_QlymotbNEeuymriYTNxK2g" sourceNode="_xsYrUKA8EeuqkpDnuik1sg" targetNode="_KwtCUNbNEeuymriYTNxK2g">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Node"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Node"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_QlzNcNbNEeuymriYTNxK2g" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_QlzNcdbNEeuymriYTNxK2g" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_QlzNctbNEeuymriYTNxK2g" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Smi9eNbNEeuymriYTNxK2g" sourceNode="_KwtCUNbNEeuymriYTNxK2g" targetNode="_RzK-YKA5EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNode"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNode"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_SmjkQNbNEeuymriYTNxK2g" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_SmjkQdbNEeuymriYTNxK2g" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_SmjkQtbNEeuymriYTNxK2g" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Tt9RRtbNEeuymriYTNxK2g" sourceNode="_jPpm4KA6EeuqkpDnuik1sg" targetNode="_KwtCUNbNEeuymriYTNxK2g">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Variable"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Variable"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Tt94QNbNEeuymriYTNxK2g" targetArrow="InputClosedArrow" routingStyle="tree">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_Tt94QdbNEeuymriYTNxK2g" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Tt94QtbNEeuymriYTNxK2g" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
+    </ownedDiagramElements>
     <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
     <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_CsWlsKA4EeuqkpDnuik1sg"/>
     <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Argument.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Argument.java
index 5442f8e0..4857b38a 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Argument.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Argument.java
@@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.model.problem.Argument#getVariable <em>Variable</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.Argument#getVariableOrNode <em>Variable Or Node</em>}</li>
  *   <li>{@link org.eclipse.viatra.solver.language.model.problem.Argument#getSingletonVariable <em>Singleton Variable</em>}</li>
  * </ul>
  *
@@ -23,26 +23,26 @@ import org.eclipse.emf.ecore.EObject;
  */
 public interface Argument extends EObject {
         /**
-         * Returns the value of the '<em><b>Variable</b></em>' reference.
+         * Returns the value of the '<em><b>Variable Or Node</b></em>' reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @return the value of the '<em>Variable</em>' reference.
-         * @see #setVariable(Variable)
-         * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getArgument_Variable()
+         * @return the value of the '<em>Variable Or Node</em>' reference.
+         * @see #setVariableOrNode(VariableOrNode)
+         * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getArgument_VariableOrNode()
          * @model
          * @generated
          */
-        Variable getVariable();
+        VariableOrNode getVariableOrNode();
 
         /**
-         * Sets the value of the '{@link org.eclipse.viatra.solver.language.model.problem.Argument#getVariable <em>Variable</em>}' reference.
+         * Sets the value of the '{@link org.eclipse.viatra.solver.language.model.problem.Argument#getVariableOrNode <em>Variable Or Node</em>}' reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @param value the new value of the '<em>Variable</em>' reference.
-         * @see #getVariable()
+         * @param value the new value of the '<em>Variable Or Node</em>' reference.
+         * @see #getVariableOrNode()
          * @generated
          */
-        void setVariable(Variable value);
+        void setVariableOrNode(VariableOrNode value);
 
         /**
          * Returns the value of the '<em><b>Singleton Variable</b></em>' containment reference.
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ClassDeclaration.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ClassDeclaration.java
index 1387575a..d0f471be 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ClassDeclaration.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ClassDeclaration.java
@@ -48,7 +48,7 @@ public interface ClassDeclaration extends Relation, Statement {
 
         /**
          * Returns the value of the '<em><b>Super Types</b></em>' reference list.
-         * The list contents are of type {@link org.eclipse.viatra.solver.language.model.problem.ClassDeclaration}.
+         * The list contents are of type {@link org.eclipse.viatra.solver.language.model.problem.Relation}.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @return the value of the '<em>Super Types</em>' reference list.
@@ -56,7 +56,7 @@ public interface ClassDeclaration extends Relation, Statement {
          * @model
          * @generated
          */
-        EList<ClassDeclaration> getSuperTypes();
+        EList<Relation> getSuperTypes();
 
         /**
          * Returns the value of the '<em><b>Reference Declarations</b></em>' containment reference list.
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/EnumDeclaration.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/EnumDeclaration.java
new file mode 100644
index 00000000..81f2967d
--- /dev/null
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/EnumDeclaration.java
@@ -0,0 +1,36 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Enum Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.EnumDeclaration#getLiterals <em>Literals</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getEnumDeclaration()
+ * @model
+ * @generated
+ */
+public interface EnumDeclaration extends Relation, Statement {
+        /**
+         * Returns the value of the '<em><b>Literals</b></em>' containment reference list.
+         * The list contents are of type {@link org.eclipse.viatra.solver.language.model.problem.Node}.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Literals</em>' containment reference list.
+         * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getEnumDeclaration_Literals()
+         * @model containment="true"
+         * @generated
+         */
+        EList<Node> getLiterals();
+
+} // EnumDeclaration
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Node.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Node.java
index e6547083..3da08af3 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Node.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Node.java
@@ -12,5 +12,5 @@ package org.eclipse.viatra.solver.language.model.problem;
  * @model
  * @generated
  */
-public interface Node extends NamedElement {
+public interface Node extends VariableOrNode {
 } // Node
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Parameter.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Parameter.java
index 5ed8ac3c..7bedca1b 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Parameter.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Parameter.java
@@ -24,12 +24,12 @@ public interface Parameter extends Variable {
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @return the value of the '<em>Parameter Type</em>' reference.
-         * @see #setParameterType(ClassDeclaration)
+         * @see #setParameterType(Relation)
          * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getParameter_ParameterType()
          * @model
          * @generated
          */
-        ClassDeclaration getParameterType();
+        Relation getParameterType();
 
         /**
          * Sets the value of the '{@link org.eclipse.viatra.solver.language.model.problem.Parameter#getParameterType <em>Parameter Type</em>}' reference.
@@ -39,6 +39,6 @@ public interface Parameter extends Variable {
          * @see #getParameterType()
          * @generated
          */
-        void setParameterType(ClassDeclaration value);
+        void setParameterType(Relation value);
 
 } // Parameter
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemFactory.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemFactory.java
index bdfc326b..e4332d19 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemFactory.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemFactory.java
@@ -175,6 +175,15 @@ public interface ProblemFactory extends EFactory {
         Argument createArgument();
 
         /**
+         * Returns a new object of class '<em>Enum Declaration</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Enum Declaration</em>'.
+         * @generated
+         */
+        EnumDeclaration createEnumDeclaration();
+
+        /**
          * Returns the package supported by this factory.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemPackage.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemPackage.java
index 1358eaeb..ec96501d 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemPackage.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemPackage.java
@@ -397,6 +397,43 @@ public interface ProblemPackage extends EPackage {
         int PREDICATE_DEFINITION_OPERATION_COUNT = RELATION_OPERATION_COUNT + 0;
 
         /**
+         * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.VariableOrNodeImpl <em>Variable Or Node</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.VariableOrNodeImpl
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getVariableOrNode()
+         * @generated
+         */
+        int VARIABLE_OR_NODE = 25;
+
+        /**
+         * The feature id for the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int VARIABLE_OR_NODE__NAME = NAMED_ELEMENT__NAME;
+
+        /**
+         * The number of structural features of the '<em>Variable Or Node</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int VARIABLE_OR_NODE_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 0;
+
+        /**
+         * The number of operations of the '<em>Variable Or Node</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int VARIABLE_OR_NODE_OPERATION_COUNT = NAMED_ELEMENT_OPERATION_COUNT + 0;
+
+        /**
          * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.VariableImpl <em>Variable</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -413,7 +450,7 @@ public interface ProblemPackage extends EPackage {
          * @generated
          * @ordered
          */
-        int VARIABLE__NAME = NAMED_ELEMENT__NAME;
+        int VARIABLE__NAME = VARIABLE_OR_NODE__NAME;
 
         /**
          * The number of structural features of the '<em>Variable</em>' class.
@@ -422,7 +459,7 @@ public interface ProblemPackage extends EPackage {
          * @generated
          * @ordered
          */
-        int VARIABLE_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 0;
+        int VARIABLE_FEATURE_COUNT = VARIABLE_OR_NODE_FEATURE_COUNT + 0;
 
         /**
          * The number of operations of the '<em>Variable</em>' class.
@@ -431,7 +468,7 @@ public interface ProblemPackage extends EPackage {
          * @generated
          * @ordered
          */
-        int VARIABLE_OPERATION_COUNT = NAMED_ELEMENT_OPERATION_COUNT + 0;
+        int VARIABLE_OPERATION_COUNT = VARIABLE_OR_NODE_OPERATION_COUNT + 0;
 
         /**
          * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.ParameterImpl <em>Parameter</em>}' class.
@@ -828,7 +865,7 @@ public interface ProblemPackage extends EPackage {
          * @generated
          * @ordered
          */
-        int NODE__NAME = NAMED_ELEMENT__NAME;
+        int NODE__NAME = VARIABLE_OR_NODE__NAME;
 
         /**
          * The number of structural features of the '<em>Node</em>' class.
@@ -837,7 +874,7 @@ public interface ProblemPackage extends EPackage {
          * @generated
          * @ordered
          */
-        int NODE_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 0;
+        int NODE_FEATURE_COUNT = VARIABLE_OR_NODE_FEATURE_COUNT + 0;
 
         /**
          * The number of operations of the '<em>Node</em>' class.
@@ -846,7 +883,7 @@ public interface ProblemPackage extends EPackage {
          * @generated
          * @ordered
          */
-        int NODE_OPERATION_COUNT = NAMED_ELEMENT_OPERATION_COUNT + 0;
+        int NODE_OPERATION_COUNT = VARIABLE_OR_NODE_OPERATION_COUNT + 0;
 
         /**
          * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.ScopeDeclarationImpl <em>Scope Declaration</em>}' class.
@@ -1090,13 +1127,13 @@ public interface ProblemPackage extends EPackage {
         int ARGUMENT = 23;
 
         /**
-         * The feature id for the '<em><b>Variable</b></em>' reference.
+         * The feature id for the '<em><b>Variable Or Node</b></em>' reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int ARGUMENT__VARIABLE = 0;
+        int ARGUMENT__VARIABLE_OR_NODE = 0;
 
         /**
          * The feature id for the '<em><b>Singleton Variable</b></em>' containment reference.
@@ -1126,6 +1163,52 @@ public interface ProblemPackage extends EPackage {
         int ARGUMENT_OPERATION_COUNT = 0;
 
         /**
+         * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.EnumDeclarationImpl <em>Enum Declaration</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.EnumDeclarationImpl
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getEnumDeclaration()
+         * @generated
+         */
+        int ENUM_DECLARATION = 24;
+
+        /**
+         * The feature id for the '<em><b>Name</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int ENUM_DECLARATION__NAME = RELATION__NAME;
+
+        /**
+         * The feature id for the '<em><b>Literals</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int ENUM_DECLARATION__LITERALS = RELATION_FEATURE_COUNT + 0;
+
+        /**
+         * The number of structural features of the '<em>Enum Declaration</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int ENUM_DECLARATION_FEATURE_COUNT = RELATION_FEATURE_COUNT + 1;
+
+        /**
+         * The number of operations of the '<em>Enum Declaration</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int ENUM_DECLARATION_OPERATION_COUNT = RELATION_OPERATION_COUNT + 0;
+
+        /**
          * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.LogicValue <em>Logic Value</em>}' enum.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -1133,7 +1216,7 @@ public interface ProblemPackage extends EPackage {
          * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getLogicValue()
          * @generated
          */
-        int LOGIC_VALUE = 24;
+        int LOGIC_VALUE = 26;
 
         /**
          * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.Problem <em>Problem</em>}'.
@@ -1717,15 +1800,15 @@ public interface ProblemPackage extends EPackage {
         EClass getArgument();
 
         /**
-         * Returns the meta object for the reference '{@link org.eclipse.viatra.solver.language.model.problem.Argument#getVariable <em>Variable</em>}'.
+         * Returns the meta object for the reference '{@link org.eclipse.viatra.solver.language.model.problem.Argument#getVariableOrNode <em>Variable Or Node</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @return the meta object for the reference '<em>Variable</em>'.
-         * @see org.eclipse.viatra.solver.language.model.problem.Argument#getVariable()
+         * @return the meta object for the reference '<em>Variable Or Node</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.Argument#getVariableOrNode()
          * @see #getArgument()
          * @generated
          */
-        EReference getArgument_Variable();
+        EReference getArgument_VariableOrNode();
 
         /**
          * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.model.problem.Argument#getSingletonVariable <em>Singleton Variable</em>}'.
@@ -1739,6 +1822,37 @@ public interface ProblemPackage extends EPackage {
         EReference getArgument_SingletonVariable();
 
         /**
+         * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.EnumDeclaration <em>Enum Declaration</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Enum Declaration</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.EnumDeclaration
+         * @generated
+         */
+        EClass getEnumDeclaration();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.model.problem.EnumDeclaration#getLiterals <em>Literals</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Literals</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.EnumDeclaration#getLiterals()
+         * @see #getEnumDeclaration()
+         * @generated
+         */
+        EReference getEnumDeclaration_Literals();
+
+        /**
+         * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.VariableOrNode <em>Variable Or Node</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Variable Or Node</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.VariableOrNode
+         * @generated
+         */
+        EClass getVariableOrNode();
+
+        /**
          * Returns the meta object for enum '{@link org.eclipse.viatra.solver.language.model.problem.LogicValue <em>Logic Value</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -2260,12 +2374,12 @@ public interface ProblemPackage extends EPackage {
                 EClass ARGUMENT = eINSTANCE.getArgument();
 
                 /**
-                 * The meta object literal for the '<em><b>Variable</b></em>' reference feature.
+                 * The meta object literal for the '<em><b>Variable Or Node</b></em>' reference feature.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
                  * @generated
                  */
-                EReference ARGUMENT__VARIABLE = eINSTANCE.getArgument_Variable();
+                EReference ARGUMENT__VARIABLE_OR_NODE = eINSTANCE.getArgument_VariableOrNode();
 
                 /**
                  * The meta object literal for the '<em><b>Singleton Variable</b></em>' containment reference feature.
@@ -2276,6 +2390,34 @@ public interface ProblemPackage extends EPackage {
                 EReference ARGUMENT__SINGLETON_VARIABLE = eINSTANCE.getArgument_SingletonVariable();
 
                 /**
+                 * The meta object literal for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.EnumDeclarationImpl <em>Enum Declaration</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.EnumDeclarationImpl
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getEnumDeclaration()
+                 * @generated
+                 */
+                EClass ENUM_DECLARATION = eINSTANCE.getEnumDeclaration();
+
+                /**
+                 * The meta object literal for the '<em><b>Literals</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference ENUM_DECLARATION__LITERALS = eINSTANCE.getEnumDeclaration_Literals();
+
+                /**
+                 * The meta object literal for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.VariableOrNodeImpl <em>Variable Or Node</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.VariableOrNodeImpl
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getVariableOrNode()
+                 * @generated
+                 */
+                EClass VARIABLE_OR_NODE = eINSTANCE.getVariableOrNode();
+
+                /**
                  * The meta object literal for the '{@link org.eclipse.viatra.solver.language.model.problem.LogicValue <em>Logic Value</em>}' enum.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ReferenceDeclaration.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ReferenceDeclaration.java
index f07ee7d1..38650d66 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ReferenceDeclaration.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ReferenceDeclaration.java
@@ -27,12 +27,12 @@ public interface ReferenceDeclaration extends Relation {
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @return the value of the '<em>Reference Type</em>' reference.
-         * @see #setReferenceType(ClassDeclaration)
+         * @see #setReferenceType(Relation)
          * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getReferenceDeclaration_ReferenceType()
          * @model
          * @generated
          */
-        ClassDeclaration getReferenceType();
+        Relation getReferenceType();
 
         /**
          * Sets the value of the '{@link org.eclipse.viatra.solver.language.model.problem.ReferenceDeclaration#getReferenceType <em>Reference Type</em>}' reference.
@@ -42,7 +42,7 @@ public interface ReferenceDeclaration extends Relation {
          * @see #getReferenceType()
          * @generated
          */
-        void setReferenceType(ClassDeclaration value);
+        void setReferenceType(Relation value);
 
         /**
          * Returns the value of the '<em><b>Opposite</b></em>' reference.
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Variable.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Variable.java
index 26637a35..cba5740c 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Variable.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Variable.java
@@ -12,5 +12,5 @@ package org.eclipse.viatra.solver.language.model.problem;
  * @model abstract="true"
  * @generated
  */
-public interface Variable extends NamedElement {
+public interface Variable extends VariableOrNode {
 } // Variable
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/VariableOrNode.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/VariableOrNode.java
new file mode 100644
index 00000000..65c315e2
--- /dev/null
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/VariableOrNode.java
@@ -0,0 +1,16 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Variable Or Node</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getVariableOrNode()
+ * @model abstract="true"
+ * @generated
+ */
+public interface VariableOrNode extends NamedElement {
+} // VariableOrNode
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ArgumentImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ArgumentImpl.java
index 9f6bc7ae..f7d045ca 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ArgumentImpl.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ArgumentImpl.java
@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.viatra.solver.language.model.problem.Argument;
 import org.eclipse.viatra.solver.language.model.problem.ImplicitVariable;
 import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
-import org.eclipse.viatra.solver.language.model.problem.Variable;
+import org.eclipse.viatra.solver.language.model.problem.VariableOrNode;
 
 /**
  * <!-- begin-user-doc -->
@@ -24,7 +24,7 @@ import org.eclipse.viatra.solver.language.model.problem.Variable;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.ArgumentImpl#getVariable <em>Variable</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.ArgumentImpl#getVariableOrNode <em>Variable Or Node</em>}</li>
  *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.ArgumentImpl#getSingletonVariable <em>Singleton Variable</em>}</li>
  * </ul>
  *
@@ -32,14 +32,14 @@ import org.eclipse.viatra.solver.language.model.problem.Variable;
  */
 public class ArgumentImpl extends MinimalEObjectImpl.Container implements Argument {
         /**
-         * The cached value of the '{@link #getVariable() <em>Variable</em>}' reference.
+         * The cached value of the '{@link #getVariableOrNode() <em>Variable Or Node</em>}' reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see #getVariable()
+         * @see #getVariableOrNode()
          * @generated
          * @ordered
          */
-        protected Variable variable;
+        protected VariableOrNode variableOrNode;
 
         /**
          * The cached value of the '{@link #getSingletonVariable() <em>Singleton Variable</em>}' containment reference.
@@ -75,17 +75,17 @@ public class ArgumentImpl extends MinimalEObjectImpl.Container implements Argume
          * <!-- end-user-doc -->
          * @generated
          */
-        public Variable getVariable() {
-                if (variable != null && variable.eIsProxy()) {
-                        InternalEObject oldVariable = (InternalEObject) variable;
-                        variable = (Variable) eResolveProxy(oldVariable);
-                        if (variable != oldVariable) {
+        public VariableOrNode getVariableOrNode() {
+                if (variableOrNode != null && variableOrNode.eIsProxy()) {
+                        InternalEObject oldVariableOrNode = (InternalEObject) variableOrNode;
+                        variableOrNode = (VariableOrNode) eResolveProxy(oldVariableOrNode);
+                        if (variableOrNode != oldVariableOrNode) {
                                 if (eNotificationRequired())
-                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, ProblemPackage.ARGUMENT__VARIABLE,
-                                                        oldVariable, variable));
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, ProblemPackage.ARGUMENT__VARIABLE_OR_NODE,
+                                                        oldVariableOrNode, variableOrNode));
                         }
                 }
-                return variable;
+                return variableOrNode;
         }
 
         /**
@@ -93,8 +93,8 @@ public class ArgumentImpl extends MinimalEObjectImpl.Container implements Argume
          * <!-- end-user-doc -->
          * @generated
          */
-        public Variable basicGetVariable() {
-                return variable;
+        public VariableOrNode basicGetVariableOrNode() {
+                return variableOrNode;
         }
 
         /**
@@ -102,12 +102,12 @@ public class ArgumentImpl extends MinimalEObjectImpl.Container implements Argume
          * <!-- end-user-doc -->
          * @generated
          */
-        public void setVariable(Variable newVariable) {
-                Variable oldVariable = variable;
-                variable = newVariable;
+        public void setVariableOrNode(VariableOrNode newVariableOrNode) {
+                VariableOrNode oldVariableOrNode = variableOrNode;
+                variableOrNode = newVariableOrNode;
                 if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET, ProblemPackage.ARGUMENT__VARIABLE, oldVariable,
-                                        variable));
+                        eNotify(new ENotificationImpl(this, Notification.SET, ProblemPackage.ARGUMENT__VARIABLE_OR_NODE,
+                                        oldVariableOrNode, variableOrNode));
         }
 
         /**
@@ -182,10 +182,10 @@ public class ArgumentImpl extends MinimalEObjectImpl.Container implements Argume
         @Override
         public Object eGet(int featureID, boolean resolve, boolean coreType) {
                 switch (featureID) {
-                case ProblemPackage.ARGUMENT__VARIABLE:
+                case ProblemPackage.ARGUMENT__VARIABLE_OR_NODE:
                         if (resolve)
-                                return getVariable();
-                        return basicGetVariable();
+                                return getVariableOrNode();
+                        return basicGetVariableOrNode();
                 case ProblemPackage.ARGUMENT__SINGLETON_VARIABLE:
                         return getSingletonVariable();
                 }
@@ -200,8 +200,8 @@ public class ArgumentImpl extends MinimalEObjectImpl.Container implements Argume
         @Override
         public void eSet(int featureID, Object newValue) {
                 switch (featureID) {
-                case ProblemPackage.ARGUMENT__VARIABLE:
-                        setVariable((Variable) newValue);
+                case ProblemPackage.ARGUMENT__VARIABLE_OR_NODE:
+                        setVariableOrNode((VariableOrNode) newValue);
                         return;
                 case ProblemPackage.ARGUMENT__SINGLETON_VARIABLE:
                         setSingletonVariable((ImplicitVariable) newValue);
@@ -218,8 +218,8 @@ public class ArgumentImpl extends MinimalEObjectImpl.Container implements Argume
         @Override
         public void eUnset(int featureID) {
                 switch (featureID) {
-                case ProblemPackage.ARGUMENT__VARIABLE:
-                        setVariable((Variable) null);
+                case ProblemPackage.ARGUMENT__VARIABLE_OR_NODE:
+                        setVariableOrNode((VariableOrNode) null);
                         return;
                 case ProblemPackage.ARGUMENT__SINGLETON_VARIABLE:
                         setSingletonVariable((ImplicitVariable) null);
@@ -236,8 +236,8 @@ public class ArgumentImpl extends MinimalEObjectImpl.Container implements Argume
         @Override
         public boolean eIsSet(int featureID) {
                 switch (featureID) {
-                case ProblemPackage.ARGUMENT__VARIABLE:
-                        return variable != null;
+                case ProblemPackage.ARGUMENT__VARIABLE_OR_NODE:
+                        return variableOrNode != null;
                 case ProblemPackage.ARGUMENT__SINGLETON_VARIABLE:
                         return singletonVariable != null;
                 }
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ClassDeclarationImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ClassDeclarationImpl.java
index 89de4d01..774a6e33 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ClassDeclarationImpl.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ClassDeclarationImpl.java
@@ -22,6 +22,7 @@ import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration;
 import org.eclipse.viatra.solver.language.model.problem.Node;
 import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
 import org.eclipse.viatra.solver.language.model.problem.ReferenceDeclaration;
+import org.eclipse.viatra.solver.language.model.problem.Relation;
 
 /**
  * <!-- begin-user-doc -->
@@ -68,7 +69,7 @@ public class ClassDeclarationImpl extends RelationImpl implements ClassDeclarati
          * @generated
          * @ordered
          */
-        protected EList<ClassDeclaration> superTypes;
+        protected EList<Relation> superTypes;
 
         /**
          * The cached value of the '{@link #getReferenceDeclarations() <em>Reference Declarations</em>}' containment reference list.
@@ -136,9 +137,9 @@ public class ClassDeclarationImpl extends RelationImpl implements ClassDeclarati
          * <!-- end-user-doc -->
          * @generated
          */
-        public EList<ClassDeclaration> getSuperTypes() {
+        public EList<Relation> getSuperTypes() {
                 if (superTypes == null) {
-                        superTypes = new EObjectResolvingEList<ClassDeclaration>(ClassDeclaration.class, this,
+                        superTypes = new EObjectResolvingEList<Relation>(Relation.class, this,
                                         ProblemPackage.CLASS_DECLARATION__SUPER_TYPES);
                 }
                 return superTypes;
@@ -257,7 +258,7 @@ public class ClassDeclarationImpl extends RelationImpl implements ClassDeclarati
                         return;
                 case ProblemPackage.CLASS_DECLARATION__SUPER_TYPES:
                         getSuperTypes().clear();
-                        getSuperTypes().addAll((Collection<? extends ClassDeclaration>) newValue);
+                        getSuperTypes().addAll((Collection<? extends Relation>) newValue);
                         return;
                 case ProblemPackage.CLASS_DECLARATION__REFERENCE_DECLARATIONS:
                         getReferenceDeclarations().clear();
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/EnumDeclarationImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/EnumDeclarationImpl.java
new file mode 100644
index 00000000..aac00423
--- /dev/null
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/EnumDeclarationImpl.java
@@ -0,0 +1,150 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.viatra.solver.language.model.problem.EnumDeclaration;
+import org.eclipse.viatra.solver.language.model.problem.Node;
+import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Enum Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.EnumDeclarationImpl#getLiterals <em>Literals</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class EnumDeclarationImpl extends RelationImpl implements EnumDeclaration {
+        /**
+         * The cached value of the '{@link #getLiterals() <em>Literals</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getLiterals()
+         * @generated
+         * @ordered
+         */
+        protected EList<Node> literals;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected EnumDeclarationImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return ProblemPackage.Literals.ENUM_DECLARATION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Node> getLiterals() {
+                if (literals == null) {
+                        literals = new EObjectContainmentEList<Node>(Node.class, this, ProblemPackage.ENUM_DECLARATION__LITERALS);
+                }
+                return literals;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case ProblemPackage.ENUM_DECLARATION__LITERALS:
+                        return ((InternalEList<?>) getLiterals()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case ProblemPackage.ENUM_DECLARATION__LITERALS:
+                        return getLiterals();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                case ProblemPackage.ENUM_DECLARATION__LITERALS:
+                        getLiterals().clear();
+                        getLiterals().addAll((Collection<? extends Node>) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case ProblemPackage.ENUM_DECLARATION__LITERALS:
+                        getLiterals().clear();
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case ProblemPackage.ENUM_DECLARATION__LITERALS:
+                        return literals != null && !literals.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //EnumDeclarationImpl
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/NodeImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/NodeImpl.java
index 23b85a9c..0c08bb1b 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/NodeImpl.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/NodeImpl.java
@@ -14,7 +14,7 @@ import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
  *
  * @generated
  */
-public class NodeImpl extends NamedElementImpl implements Node {
+public class NodeImpl extends VariableOrNodeImpl implements Node {
         /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ParameterImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ParameterImpl.java
index cfbf25b0..06eea3f3 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ParameterImpl.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ParameterImpl.java
@@ -8,10 +8,9 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration;
 import org.eclipse.viatra.solver.language.model.problem.Parameter;
 import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
+import org.eclipse.viatra.solver.language.model.problem.Relation;
 
 /**
  * <!-- begin-user-doc -->
@@ -35,7 +34,7 @@ public class ParameterImpl extends VariableImpl implements Parameter {
          * @generated
          * @ordered
          */
-        protected ClassDeclaration parameterType;
+        protected Relation parameterType;
 
         /**
          * <!-- begin-user-doc -->
@@ -61,10 +60,10 @@ public class ParameterImpl extends VariableImpl implements Parameter {
          * <!-- end-user-doc -->
          * @generated
          */
-        public ClassDeclaration getParameterType() {
+        public Relation getParameterType() {
                 if (parameterType != null && parameterType.eIsProxy()) {
                         InternalEObject oldParameterType = (InternalEObject) parameterType;
-                        parameterType = (ClassDeclaration) eResolveProxy(oldParameterType);
+                        parameterType = (Relation) eResolveProxy(oldParameterType);
                         if (parameterType != oldParameterType) {
                                 if (eNotificationRequired())
                                         eNotify(new ENotificationImpl(this, Notification.RESOLVE, ProblemPackage.PARAMETER__PARAMETER_TYPE,
@@ -79,7 +78,7 @@ public class ParameterImpl extends VariableImpl implements Parameter {
          * <!-- end-user-doc -->
          * @generated
          */
-        public ClassDeclaration basicGetParameterType() {
+        public Relation basicGetParameterType() {
                 return parameterType;
         }
 
@@ -88,8 +87,8 @@ public class ParameterImpl extends VariableImpl implements Parameter {
          * <!-- end-user-doc -->
          * @generated
          */
-        public void setParameterType(ClassDeclaration newParameterType) {
-                ClassDeclaration oldParameterType = parameterType;
+        public void setParameterType(Relation newParameterType) {
+                Relation oldParameterType = parameterType;
                 parameterType = newParameterType;
                 if (eNotificationRequired())
                         eNotify(new ENotificationImpl(this, Notification.SET, ProblemPackage.PARAMETER__PARAMETER_TYPE,
@@ -121,7 +120,7 @@ public class ParameterImpl extends VariableImpl implements Parameter {
         public void eSet(int featureID, Object newValue) {
                 switch (featureID) {
                 case ProblemPackage.PARAMETER__PARAMETER_TYPE:
-                        setParameterType((ClassDeclaration) newValue);
+                        setParameterType((Relation) newValue);
                         return;
                 }
                 super.eSet(featureID, newValue);
@@ -136,7 +135,7 @@ public class ParameterImpl extends VariableImpl implements Parameter {
         public void eUnset(int featureID) {
                 switch (featureID) {
                 case ProblemPackage.PARAMETER__PARAMETER_TYPE:
-                        setParameterType((ClassDeclaration) null);
+                        setParameterType((Relation) null);
                         return;
                 }
                 super.eUnset(featureID);
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemFactoryImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemFactoryImpl.java
index 3bb50cfe..2f4144b9 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemFactoryImpl.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemFactoryImpl.java
@@ -91,6 +91,8 @@ public class ProblemFactoryImpl extends EFactoryImpl implements ProblemFactory {
                         return createUnboundedMultiplicity();
                 case ProblemPackage.ARGUMENT:
                         return createArgument();
+                case ProblemPackage.ENUM_DECLARATION:
+                        return createEnumDeclaration();
                 default:
                         throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
                 }
@@ -301,6 +303,16 @@ public class ProblemFactoryImpl extends EFactoryImpl implements ProblemFactory {
          * <!-- end-user-doc -->
          * @generated
          */
+        public EnumDeclaration createEnumDeclaration() {
+                EnumDeclarationImpl enumDeclaration = new EnumDeclarationImpl();
+                return enumDeclaration;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         public LogicValue createLogicValueFromString(EDataType eDataType, String initialValue) {
                 LogicValue result = LogicValue.get(initialValue);
                 if (result == null)
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemPackageImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemPackageImpl.java
index f412addc..d10ff2f0 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemPackageImpl.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemPackageImpl.java
@@ -15,6 +15,7 @@ import org.eclipse.viatra.solver.language.model.problem.Assertion;
 import org.eclipse.viatra.solver.language.model.problem.Atom;
 import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration;
 import org.eclipse.viatra.solver.language.model.problem.Conjunction;
+import org.eclipse.viatra.solver.language.model.problem.EnumDeclaration;
 import org.eclipse.viatra.solver.language.model.problem.ExactMultiplicity;
 import org.eclipse.viatra.solver.language.model.problem.ExistentialQuantifier;
 import org.eclipse.viatra.solver.language.model.problem.ImplicitVariable;
@@ -37,6 +38,7 @@ import org.eclipse.viatra.solver.language.model.problem.Statement;
 import org.eclipse.viatra.solver.language.model.problem.TypeScope;
 import org.eclipse.viatra.solver.language.model.problem.UnboundedMultiplicity;
 import org.eclipse.viatra.solver.language.model.problem.Variable;
+import org.eclipse.viatra.solver.language.model.problem.VariableOrNode;
 
 /**
  * <!-- begin-user-doc -->
@@ -218,6 +220,20 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
          * <!-- end-user-doc -->
          * @generated
          */
+        private EClass enumDeclarationEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass variableOrNodeEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         private EEnum logicValueEEnum = null;
 
         /**
@@ -784,7 +800,7 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        public EReference getArgument_Variable() {
+        public EReference getArgument_VariableOrNode() {
                 return (EReference) argumentEClass.getEStructuralFeatures().get(0);
         }
 
@@ -802,6 +818,33 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
          * <!-- end-user-doc -->
          * @generated
          */
+        public EClass getEnumDeclaration() {
+                return enumDeclarationEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getEnumDeclaration_Literals() {
+                return (EReference) enumDeclarationEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getVariableOrNode() {
+                return variableOrNodeEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         public EEnum getLogicValue() {
                 return logicValueEEnum;
         }
@@ -913,9 +956,14 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
                 unboundedMultiplicityEClass = createEClass(UNBOUNDED_MULTIPLICITY);
 
                 argumentEClass = createEClass(ARGUMENT);
-                createEReference(argumentEClass, ARGUMENT__VARIABLE);
+                createEReference(argumentEClass, ARGUMENT__VARIABLE_OR_NODE);
                 createEReference(argumentEClass, ARGUMENT__SINGLETON_VARIABLE);
 
+                enumDeclarationEClass = createEClass(ENUM_DECLARATION);
+                createEReference(enumDeclarationEClass, ENUM_DECLARATION__LITERALS);
+
+                variableOrNodeEClass = createEClass(VARIABLE_OR_NODE);
+
                 // Create enums
                 logicValueEEnum = createEEnum(LOGIC_VALUE);
         }
@@ -957,18 +1005,21 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
                 predicateDefinitionEClass.getESuperTypes().add(this.getRelation());
                 predicateDefinitionEClass.getESuperTypes().add(this.getStatement());
                 parameterEClass.getESuperTypes().add(this.getVariable());
-                variableEClass.getESuperTypes().add(this.getNamedElement());
+                variableEClass.getESuperTypes().add(this.getVariableOrNode());
                 conjunctionEClass.getESuperTypes().add(this.getExistentialQuantifier());
                 atomEClass.getESuperTypes().add(this.getLiteral());
                 implicitVariableEClass.getESuperTypes().add(this.getVariable());
                 negativeLiteralEClass.getESuperTypes().add(this.getExistentialQuantifier());
                 negativeLiteralEClass.getESuperTypes().add(this.getLiteral());
                 assertionEClass.getESuperTypes().add(this.getStatement());
-                nodeEClass.getESuperTypes().add(this.getNamedElement());
+                nodeEClass.getESuperTypes().add(this.getVariableOrNode());
                 scopeDeclarationEClass.getESuperTypes().add(this.getStatement());
                 rangeMultiplicityEClass.getESuperTypes().add(this.getMultiplicity());
                 exactMultiplicityEClass.getESuperTypes().add(this.getMultiplicity());
                 unboundedMultiplicityEClass.getESuperTypes().add(this.getMultiplicity());
+                enumDeclarationEClass.getESuperTypes().add(this.getRelation());
+                enumDeclarationEClass.getESuperTypes().add(this.getStatement());
+                variableOrNodeEClass.getESuperTypes().add(this.getNamedElement());
 
                 // Initialize classes, features, and operations; add parameters
                 initEClass(problemEClass, Problem.class, "Problem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -986,7 +1037,7 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
                 initEAttribute(getClassDeclaration_Abstract(), ecorePackage.getEBoolean(), "abstract", null, 0, 1,
                                 ClassDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                                 !IS_DERIVED, IS_ORDERED);
-                initEReference(getClassDeclaration_SuperTypes(), this.getClassDeclaration(), null, "superTypes", null, 0, -1,
+                initEReference(getClassDeclaration_SuperTypes(), this.getRelation(), null, "superTypes", null, 0, -1,
                                 ClassDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
                                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEReference(getClassDeclaration_ReferenceDeclarations(), this.getReferenceDeclaration(), null,
@@ -998,8 +1049,8 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
 
                 initEClass(referenceDeclarationEClass, ReferenceDeclaration.class, "ReferenceDeclaration", !IS_ABSTRACT,
                                 !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-                initEReference(getReferenceDeclaration_ReferenceType(), this.getClassDeclaration(), null, "referenceType", null,
-                                0, 1, ReferenceDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+                initEReference(getReferenceDeclaration_ReferenceType(), this.getRelation(), null, "referenceType", null, 0, 1,
+                                ReferenceDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
                                 IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEReference(getReferenceDeclaration_Opposite(), this.getReferenceDeclaration(), null, "opposite", null, 0, 1,
                                 ReferenceDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
@@ -1030,7 +1081,7 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
 
                 initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE,
                                 IS_GENERATED_INSTANCE_CLASS);
-                initEReference(getParameter_ParameterType(), this.getClassDeclaration(), null, "parameterType", null, 0, 1,
+                initEReference(getParameter_ParameterType(), this.getRelation(), null, "parameterType", null, 0, 1,
                                 Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
                                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -1126,13 +1177,22 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
 
                 initEClass(argumentEClass, Argument.class, "Argument", !IS_ABSTRACT, !IS_INTERFACE,
                                 IS_GENERATED_INSTANCE_CLASS);
-                initEReference(getArgument_Variable(), this.getVariable(), null, "variable", null, 0, 1, Argument.class,
-                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getArgument_VariableOrNode(), this.getVariableOrNode(), null, "variableOrNode", null, 0, 1,
+                                Argument.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEReference(getArgument_SingletonVariable(), this.getImplicitVariable(), null, "singletonVariable", null, 0,
                                 1, Argument.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
                                 !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
+                initEClass(enumDeclarationEClass, EnumDeclaration.class, "EnumDeclaration", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getEnumDeclaration_Literals(), this.getNode(), null, "literals", null, 0, -1,
+                                EnumDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(variableOrNodeEClass, VariableOrNode.class, "VariableOrNode", IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
                 // Initialize enums and add enum literals
                 initEEnum(logicValueEEnum, LogicValue.class, "LogicValue");
                 addEEnumLiteral(logicValueEEnum, LogicValue.TRUE);
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ReferenceDeclarationImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ReferenceDeclarationImpl.java
index 424db23d..8df2715f 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ReferenceDeclarationImpl.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ReferenceDeclarationImpl.java
@@ -9,11 +9,10 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration;
 import org.eclipse.viatra.solver.language.model.problem.Multiplicity;
 import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
 import org.eclipse.viatra.solver.language.model.problem.ReferenceDeclaration;
+import org.eclipse.viatra.solver.language.model.problem.Relation;
 
 /**
  * <!-- begin-user-doc -->
@@ -40,7 +39,7 @@ public class ReferenceDeclarationImpl extends RelationImpl implements ReferenceD
          * @generated
          * @ordered
          */
-        protected ClassDeclaration referenceType;
+        protected Relation referenceType;
 
         /**
          * The cached value of the '{@link #getOpposite() <em>Opposite</em>}' reference.
@@ -106,10 +105,10 @@ public class ReferenceDeclarationImpl extends RelationImpl implements ReferenceD
          * <!-- end-user-doc -->
          * @generated
          */
-        public ClassDeclaration getReferenceType() {
+        public Relation getReferenceType() {
                 if (referenceType != null && referenceType.eIsProxy()) {
                         InternalEObject oldReferenceType = (InternalEObject) referenceType;
-                        referenceType = (ClassDeclaration) eResolveProxy(oldReferenceType);
+                        referenceType = (Relation) eResolveProxy(oldReferenceType);
                         if (referenceType != oldReferenceType) {
                                 if (eNotificationRequired())
                                         eNotify(new ENotificationImpl(this, Notification.RESOLVE,
@@ -124,7 +123,7 @@ public class ReferenceDeclarationImpl extends RelationImpl implements ReferenceD
          * <!-- end-user-doc -->
          * @generated
          */
-        public ClassDeclaration basicGetReferenceType() {
+        public Relation basicGetReferenceType() {
                 return referenceType;
         }
 
@@ -133,8 +132,8 @@ public class ReferenceDeclarationImpl extends RelationImpl implements ReferenceD
          * <!-- end-user-doc -->
          * @generated
          */
-        public void setReferenceType(ClassDeclaration newReferenceType) {
-                ClassDeclaration oldReferenceType = referenceType;
+        public void setReferenceType(Relation newReferenceType) {
+                Relation oldReferenceType = referenceType;
                 referenceType = newReferenceType;
                 if (eNotificationRequired())
                         eNotify(new ENotificationImpl(this, Notification.SET, ProblemPackage.REFERENCE_DECLARATION__REFERENCE_TYPE,
@@ -300,7 +299,7 @@ public class ReferenceDeclarationImpl extends RelationImpl implements ReferenceD
         public void eSet(int featureID, Object newValue) {
                 switch (featureID) {
                 case ProblemPackage.REFERENCE_DECLARATION__REFERENCE_TYPE:
-                        setReferenceType((ClassDeclaration) newValue);
+                        setReferenceType((Relation) newValue);
                         return;
                 case ProblemPackage.REFERENCE_DECLARATION__OPPOSITE:
                         setOpposite((ReferenceDeclaration) newValue);
@@ -324,7 +323,7 @@ public class ReferenceDeclarationImpl extends RelationImpl implements ReferenceD
         public void eUnset(int featureID) {
                 switch (featureID) {
                 case ProblemPackage.REFERENCE_DECLARATION__REFERENCE_TYPE:
-                        setReferenceType((ClassDeclaration) null);
+                        setReferenceType((Relation) null);
                         return;
                 case ProblemPackage.REFERENCE_DECLARATION__OPPOSITE:
                         setOpposite((ReferenceDeclaration) null);
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/VariableImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/VariableImpl.java
index 0a8cde48..645ac39c 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/VariableImpl.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/VariableImpl.java
@@ -14,7 +14,7 @@ import org.eclipse.viatra.solver.language.model.problem.Variable;
  *
  * @generated
  */
-public abstract class VariableImpl extends NamedElementImpl implements Variable {
+public abstract class VariableImpl extends VariableOrNodeImpl implements Variable {
         /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/VariableOrNodeImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/VariableOrNodeImpl.java
new file mode 100644
index 00000000..4964a019
--- /dev/null
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/VariableOrNodeImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
+import org.eclipse.viatra.solver.language.model.problem.VariableOrNode;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Variable Or Node</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class VariableOrNodeImpl extends NamedElementImpl implements VariableOrNode {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected VariableOrNodeImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return ProblemPackage.Literals.VARIABLE_OR_NODE;
+        }
+
+} //VariableOrNodeImpl
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemAdapterFactory.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemAdapterFactory.java
index c41a4034..3fc3ca75 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemAdapterFactory.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemAdapterFactory.java
@@ -187,6 +187,16 @@ public class ProblemAdapterFactory extends AdapterFactoryImpl {
                 }
 
                 @Override
+                public Adapter caseEnumDeclaration(EnumDeclaration object) {
+                        return createEnumDeclarationAdapter();
+                }
+
+                @Override
+                public Adapter caseVariableOrNode(VariableOrNode object) {
+                        return createVariableOrNodeAdapter();
+                }
+
+                @Override
                 public Adapter defaultCase(EObject object) {
                         return createEObjectAdapter();
                 }
@@ -542,6 +552,34 @@ public class ProblemAdapterFactory extends AdapterFactoryImpl {
         }
 
         /**
+         * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.model.problem.EnumDeclaration <em>Enum Declaration</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see org.eclipse.viatra.solver.language.model.problem.EnumDeclaration
+         * @generated
+         */
+        public Adapter createEnumDeclarationAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.model.problem.VariableOrNode <em>Variable Or Node</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see org.eclipse.viatra.solver.language.model.problem.VariableOrNode
+         * @generated
+         */
+        public Adapter createVariableOrNodeAdapter() {
+                return null;
+        }
+
+        /**
          * Creates a new adapter for the default case.
          * <!-- begin-user-doc -->
          * This default implementation returns null.
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemSwitch.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemSwitch.java
index 361b663c..b74718b5 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemSwitch.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemSwitch.java
@@ -134,6 +134,8 @@ public class ProblemSwitch<T> extends Switch<T> {
                         if (result == null)
                                 result = caseVariable(parameter);
                         if (result == null)
+                                result = caseVariableOrNode(parameter);
+                        if (result == null)
                                 result = caseNamedElement(parameter);
                         if (result == null)
                                 result = defaultCase(theEObject);
@@ -143,6 +145,8 @@ public class ProblemSwitch<T> extends Switch<T> {
                         Variable variable = (Variable) theEObject;
                         T result = caseVariable(variable);
                         if (result == null)
+                                result = caseVariableOrNode(variable);
+                        if (result == null)
                                 result = caseNamedElement(variable);
                         if (result == null)
                                 result = defaultCase(theEObject);
@@ -179,6 +183,8 @@ public class ProblemSwitch<T> extends Switch<T> {
                         if (result == null)
                                 result = caseVariable(implicitVariable);
                         if (result == null)
+                                result = caseVariableOrNode(implicitVariable);
+                        if (result == null)
                                 result = caseNamedElement(implicitVariable);
                         if (result == null)
                                 result = defaultCase(theEObject);
@@ -215,6 +221,8 @@ public class ProblemSwitch<T> extends Switch<T> {
                         Node node = (Node) theEObject;
                         T result = caseNode(node);
                         if (result == null)
+                                result = caseVariableOrNode(node);
+                        if (result == null)
                                 result = caseNamedElement(node);
                         if (result == null)
                                 result = defaultCase(theEObject);
@@ -284,6 +292,28 @@ public class ProblemSwitch<T> extends Switch<T> {
                                 result = defaultCase(theEObject);
                         return result;
                 }
+                case ProblemPackage.ENUM_DECLARATION: {
+                        EnumDeclaration enumDeclaration = (EnumDeclaration) theEObject;
+                        T result = caseEnumDeclaration(enumDeclaration);
+                        if (result == null)
+                                result = caseRelation(enumDeclaration);
+                        if (result == null)
+                                result = caseStatement(enumDeclaration);
+                        if (result == null)
+                                result = caseNamedElement(enumDeclaration);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case ProblemPackage.VARIABLE_OR_NODE: {
+                        VariableOrNode variableOrNode = (VariableOrNode) theEObject;
+                        T result = caseVariableOrNode(variableOrNode);
+                        if (result == null)
+                                result = caseNamedElement(variableOrNode);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
                 default:
                         return defaultCase(theEObject);
                 }
@@ -650,6 +680,36 @@ public class ProblemSwitch<T> extends Switch<T> {
         }
 
         /**
+         * Returns the result of interpreting the object as an instance of '<em>Enum Declaration</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Enum Declaration</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseEnumDeclaration(EnumDeclaration object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Variable Or Node</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Variable Or Node</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseVariableOrNode(VariableOrNode object) {
+                return null;
+        }
+
+        /**
          * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
          * <!-- begin-user-doc -->
          * This implementation returns null;
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.ecore b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.ecore
index dd52134b..99404f61 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.ecore
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.ecore
@@ -12,14 +12,14 @@
   <eClassifiers xsi:type="ecore:EClass" name="ClassDeclaration" eSuperTypes="#//Relation #//Statement">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="superTypes" upperBound="-1"
-        eType="#//ClassDeclaration"/>
+        eType="#//Relation"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="referenceDeclarations"
         upperBound="-1" eType="#//ReferenceDeclaration" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="newNode" eType="#//Node"
         containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ReferenceDeclaration" eSuperTypes="#//Relation">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="referenceType" eType="#//ClassDeclaration"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="referenceType" eType="#//Relation"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="opposite" eType="#//ReferenceDeclaration"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="containment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="multiplicity" eType="#//Multiplicity"
@@ -36,9 +36,9 @@
         eType="#//Conjunction" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Parameter" eSuperTypes="#//Variable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parameterType" eType="#//ClassDeclaration"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="parameterType" eType="#//Relation"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Variable" abstract="true" eSuperTypes="#//NamedElement"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Variable" abstract="true" eSuperTypes="#//VariableOrNode"/>
   <eClassifiers xsi:type="ecore:EClass" name="Conjunction" eSuperTypes="#//ExistentialQuantifier">
     <eStructuralFeatures xsi:type="ecore:EReference" name="literals" upperBound="-1"
         eType="#//Literal" containment="true"/>
@@ -65,7 +65,7 @@
         eType="#//Node"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//LogicValue"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Node" eSuperTypes="#//NamedElement"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Node" eSuperTypes="#//VariableOrNode"/>
   <eClassifiers xsi:type="ecore:EEnum" name="LogicValue">
     <eLiterals name="TRUE" literal="TRUE"/>
     <eLiterals name="FALSE" value="1"/>
@@ -95,8 +95,13 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="UnboundedMultiplicity" eSuperTypes="#//Multiplicity"/>
   <eClassifiers xsi:type="ecore:EClass" name="Argument">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//Variable"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="variableOrNode" eType="#//VariableOrNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="singletonVariable" eType="#//ImplicitVariable"
         containment="true"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="EnumDeclaration" eSuperTypes="#//Relation #//Statement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="literals" upperBound="-1"
+        eType="#//Node" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="VariableOrNode" abstract="true" eSuperTypes="#//NamedElement"/>
 </ecore:EPackage>
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.genmodel b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.genmodel
index 379cb028..2eb9a988 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.genmodel
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.genmodel
@@ -86,8 +86,12 @@
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//UnboundedMultiplicity"/>
     <genClasses ecoreClass="problem.ecore#//Argument">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Argument/variable"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Argument/variableOrNode"/>
       <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Argument/singletonVariable"/>
     </genClasses>
+    <genClasses ecoreClass="problem.ecore#//EnumDeclaration">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//EnumDeclaration/literals"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//VariableOrNode"/>
   </genPackages>
 </genmodel:GenModel>
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/index.html b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/index.html
index 112adb74..3fb66d62 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/index.html
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/index.html
@@ -21,14 +21,17 @@
 }
 
 class Person {
-    refers Person[] children opposite parent
-    refers Person parent opposite children
+    Person[] children opposite parent
+    Person parent opposite children
+    TaxStatus[1] taxStatus
 }
 
-error loop(Person p) :- children+(p, p).
+enum TaxStatus {
+        child, student, adult, retired
+}
 
-error multipleRoots(Person p, Person q) :-
-    !equals(p, q), !parent(p, _), !parent(q, _).
+error invalidTaxStatus(Person p) :-
+        taxStatus(p, child), children(p, _q).
 
 Family('family').
 members('family', anne).
@@ -36,6 +39,7 @@ members('family', bob).
 members('family', ciri).
 children(anne, ciri).
 ?children(bob, ciri).
+taxStatus(anne, adult).
 
 scope Family = 1, Person += 5..10.</pre></div>
         </div>
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/style.css b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/style.css
index b24610f4..9a89dd81 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/style.css
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/style.css
@@ -70,6 +70,10 @@ a:hover {
         color: #8b8816;
 }
 
+.problem-enum {
+        color: #644632;
+}
+
 .problem-reference {
         color: #0000c0;
 }
@@ -78,11 +82,13 @@ a:hover {
         font-weight: bold;
 }
 
-.problem-node {
-        color: inherit !important;
+
+.CodeMirror .problem-node {
+        color: inherit;
 }
 
 .problem-enum-node {
+        color: #1a1a1a !important;
         font-weight: bold;
 }
 
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/xtext-resources/generated/mode-problem.js b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/xtext-resources/generated/mode-problem.js
index 0abfa5ee..84515ad6 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/xtext-resources/generated/mode-problem.js
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/xtext-resources/generated/mode-problem.js
@@ -1,5 +1,5 @@
 define(["codemirror", "codemirror/addon/mode/simple"], function(CodeMirror, SimpleMode) {
-        var keywords = "abstract|class|contains|error|extends|false|opposite|pred|problem|refers|scope|true|unknown";
+        var keywords = "abstract|class|contains|enum|error|extends|false|opposite|pred|problem|refers|scope|true|unknown";
         CodeMirror.defineSimpleMode("xtext/problem", {
                 start: [
                         {token: "comment", regex: "\\/\\/.*$"},
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext
index 2d4eb1b9..5f8b35f3 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext
@@ -4,34 +4,42 @@ import "http://www.eclipse.org/emf/2002/Ecore" as ecore
 import "http://www.eclipse.org/viatra/solver/language/model/Problem"
 
 Problem:
-        ("problem" name=ID ".")?
+        ("problem" name=Identifier ".")?
         statements+=Statement*;
 
 Statement:
-        ClassDeclaration | PredicateDefinition | Assertion | ScopeDeclaration;
+        ClassDeclaration | EnumDeclaration | PredicateDefinition | Assertion | ScopeDeclaration;
 
 ClassDeclaration:
         abstract?="abstract"? "class"
-        name=ID
-        ("extends" superTypes+=[ClassDeclaration|QualifiedName] ("," superTypes+=[ClassDeclaration|QualifiedName])*)?
+        name=Identifier
+        ("extends" superTypes+=[Relation|QualifiedName] ("," superTypes+=[Relation|QualifiedName])*)?
         ("{" (referenceDeclarations+=ReferenceDeclaration ";"?)* "}" | ".");
 
+EnumDeclaration:
+        "enum"
+        name=Identifier
+        ("{" (literals+=EnumLiteral ("," literals+=EnumLiteral)* ("," | ";")?)? "}" | ".");
+
+EnumLiteral returns Node:
+        name=QuotedOrUnquotedId;
+
 ReferenceDeclaration:
-        (containment?="contains" | "refers")
-        referenceType=[ClassDeclaration|QualifiedName]
+        (containment?="contains" | "refers")?
+        referenceType=[Relation|QualifiedName]
         ("[" multiplicity=Multiplicity "]")?
-        name=ID
+        name=Identifier
         ("opposite" opposite=[ReferenceDeclaration|QualifiedName])?;
 
 PredicateDefinition:
         (error?="error" "pred"? | "pred")
-        name=ID
+        name=Identifier
         "(" (parameters+=Parameter ("," parameters+=Parameter)*)? ")"
         (":-" bodies+=Conjunction (";" bodies+=Conjunction)*)?
         ".";
 
 Parameter:
-        parameterType=[ClassDeclaration] name=ID;
+        parameterType=[Relation|QualifiedName]? name=Identifier;
 
 Conjunction:
         literals+=Literal ("," literals+=Literal)*;
@@ -48,7 +56,7 @@ Atom:
         "(" (arguments+=Argument ("," arguments+=Argument)*)? ")";
 
 Argument:
-        variable=[Variable];
+        variableOrNode=[VariableOrNode|QualifiedName];
 
 Assertion:
         (relation=[Relation|QualifiedName]
@@ -91,10 +99,18 @@ ExactMultiplicity:
 UpperBound returns ecore::EInt:
         INT | "*";
 
+QuotedOrUnquotedId:
+        QUOTED_ID | Identifier;
+
 QualifiedName:
-        QUOTED_ID | ID (":" ID)* (":" QUOTED_ID)?;
+        QUOTED_ID | Identifier (":" Identifier)* (":" QUOTED_ID)?;
+
+Identifier:
+        ID | "true" | "false";
 
 @Override
-terminal STRING: '"' ( '\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\'|'"') )* '"';
+terminal STRING:
+        '"' ('\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\' | '"'))* '"';
 
-terminal QUOTED_ID: "'" ( '\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\'|"'") )* "'";
+terminal QUOTED_ID:
+        "'" ('\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\' | "'"))* "'";
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java
index 3e7d515f..09f062f5 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java
@@ -14,6 +14,7 @@ import org.eclipse.viatra.solver.language.model.problem.Node;
 import org.eclipse.viatra.solver.language.model.problem.Problem;
 import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
 import org.eclipse.viatra.solver.language.model.problem.ReferenceDeclaration;
+import org.eclipse.viatra.solver.language.model.problem.Relation;
 import org.eclipse.viatra.solver.language.model.problem.Variable;
 import org.eclipse.viatra.solver.language.scoping.ProblemGlobalScopeProvider;
 
@@ -40,9 +41,15 @@ public final class ProblemUtil {
                 return variable.eContainingFeature() == ProblemPackage.Literals.ARGUMENT__SINGLETON_VARIABLE;
         }
 
+        public static boolean isEnumLiteral(Node node) {
+                return node.eContainingFeature() == ProblemPackage.Literals.ENUM_DECLARATION__LITERALS;
+        }
+        
         public static boolean isEnumNode(Node node) {
                 String name = node.getName();
-                return name != null && name.startsWith(ENUM_NODE_NAME_QUOTE) && name.endsWith(ENUM_NODE_NAME_QUOTE);
+                boolean isNameQuoted = name != null && name.startsWith(ENUM_NODE_NAME_QUOTE)
+                                && name.endsWith(ENUM_NODE_NAME_QUOTE);
+                return isNameQuoted || isEnumLiteral(node);
         }
 
         public static boolean isNewNode(Node node) {
@@ -71,7 +78,11 @@ public final class ProblemUtil {
                         ClassDeclaration current = queue.removeFirst();
                         if (!found.contains(current)) {
                                 found.add(current);
-                                queue.addAll(current.getSuperTypes());
+                                for (Relation superType : current.getSuperTypes()) {
+                                        if (superType instanceof ClassDeclaration) {
+                                                queue.addLast((ClassDeclaration) superType);
+                                        }
+                                }
                         }
                 }
                 return found;
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java
index c161de22..b885ce0e 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java
@@ -3,9 +3,11 @@ package org.eclipse.viatra.solver.language.resource;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.viatra.solver.language.ProblemUtil;
 import org.eclipse.viatra.solver.language.model.problem.Argument;
 import org.eclipse.viatra.solver.language.model.problem.Assertion;
@@ -30,18 +32,21 @@ import org.eclipse.xtext.nodemodel.INode;
 import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.resource.DerivedStateAwareResource;
 import org.eclipse.xtext.resource.IDerivedStateComputer;
-import org.eclipse.xtext.scoping.IGlobalScopeProvider;
 import org.eclipse.xtext.scoping.IScope;
+import org.eclipse.xtext.scoping.IScopeProvider;
+import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider;
 
-import com.google.common.base.Predicates;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+import com.google.inject.name.Named;
 
 @Singleton
 public class ProblemDerivedStateComputer implements IDerivedStateComputer {
         public static final String NEW_NODE = "new";
 
-        private static final Pattern ID_REGEX = Pattern.compile("[_a-zA-Z][_0-9a-zA-Z]*|'(\\\\.|[^\\'])*'");
+        private static final Pattern ID_REGEX = Pattern.compile("[_a-zA-Z][_0-9a-zA-Z]*");
+
+        private static final Pattern QUOTED_ID_REGEX = Pattern.compile("'(\\\\.|[^\\'])*'");
 
         @Inject
         private LinkingHelper linkingHelper;
@@ -50,7 +55,8 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
         private IQualifiedNameConverter qualifiedNameConverter;
 
         @Inject
-        private IGlobalScopeProvider scopeProvider;
+        @Named(AbstractDeclarativeScopeProvider.NAMED_DELEGATE)
+        private IScopeProvider scopeProvider;
 
         @Override
         public void installDerivedState(DerivedStateAwareResource resource, boolean preLinkingPhase) {
@@ -65,11 +71,11 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
                 installNewNodes(problem);
                 if (!preLinkingPhase) {
                         installDerivedNodes(problem);
-                }
-                for (Statement statement : problem.getStatements()) {
-                        if (statement instanceof PredicateDefinition) {
-                                PredicateDefinition definition = (PredicateDefinition) statement;
-                                installDerivedPredicateDefinitionState(definition);
+                        for (Statement statement : problem.getStatements()) {
+                                if (statement instanceof PredicateDefinition) {
+                                        PredicateDefinition definition = (PredicateDefinition) statement;
+                                        installDerivedPredicateDefinitionState(definition);
+                                }
                         }
                 }
         }
@@ -87,20 +93,30 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
         }
 
         protected void installDerivedNodes(Problem problem) {
-                IScope nodeScope = scopeProvider.getScope(problem.eResource(), ProblemPackage.Literals.ASSERTION__ARGUMENTS,
-                                Predicates.alwaysTrue());
+                IScope nodeScope = scopeProvider.getScope(problem, ProblemPackage.Literals.ASSERTION__ARGUMENTS);
                 Set<String> nodeNames = new HashSet<>();
                 for (Statement statement : problem.getStatements()) {
                         if (statement instanceof Assertion) {
-                                Assertion assertion = (Assertion) statement;
-                                List<INode> nodes = NodeModelUtils.findNodesForFeature(assertion,
-                                                ProblemPackage.Literals.ASSERTION__ARGUMENTS);
-                                for (INode node : nodes) {
-                                        String nodeName = linkingHelper.getCrossRefNodeAsString(node, true);
-                                        if (validId(nodeName)) {
-                                                QualifiedName qualifiedName = qualifiedNameConverter.toQualifiedName(nodeName);
-                                                if (!nodeNames.contains(nodeName) && nodeScope.getSingleElement(qualifiedName) == null) {
-                                                        nodeNames.add(nodeName);
+                                addNodeNames(nodeNames, nodeScope, statement, ProblemPackage.Literals.ASSERTION__ARGUMENTS,
+                                                ProblemDerivedStateComputer::validNodeName);
+                        } else if (statement instanceof PredicateDefinition) {
+                                PredicateDefinition predicateDefinition = (PredicateDefinition) statement;
+                                for (Conjunction body : predicateDefinition.getBodies()) {
+                                        for (Literal literal : body.getLiterals()) {
+                                                Atom atom = null;
+                                                if (literal instanceof Atom) {
+                                                        atom = (Atom) literal;
+                                                } else if (literal instanceof NegativeLiteral) {
+                                                        NegativeLiteral negativeLiteral = (NegativeLiteral) literal;
+                                                        atom = negativeLiteral.getAtom();
+                                                }
+                                                if (atom == null) {
+                                                        continue;
+                                                }
+                                                for (Argument argument : atom.getArguments()) {
+                                                        addNodeNames(nodeNames, nodeScope, argument,
+                                                                        ProblemPackage.Literals.ARGUMENT__VARIABLE_OR_NODE,
+                                                                        ProblemDerivedStateComputer::validQuotedId);
                                                 }
                                         }
                                 }
@@ -113,6 +129,21 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
                 }
         }
 
+        private void addNodeNames(Set<String> nodeNames, IScope nodeScope, EObject eObject, EStructuralFeature feature,
+                        Predicate<String> condition) {
+                List<INode> nodes = NodeModelUtils.findNodesForFeature(eObject, feature);
+                for (INode node : nodes) {
+                        String nodeName = linkingHelper.getCrossRefNodeAsString(node, true);
+                        if (!condition.test(nodeName)) {
+                                continue;
+                        }
+                        QualifiedName qualifiedName = qualifiedNameConverter.toQualifiedName(nodeName);
+                        if (!nodeNames.contains(nodeName) && nodeScope.getSingleElement(qualifiedName) == null) {
+                                nodeNames.add(nodeName);
+                        }
+                }
+        }
+
         protected Node createNode(String name) {
                 Node node = ProblemFactory.eINSTANCE.createNode();
                 node.setName(name);
@@ -158,6 +189,7 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
 
         protected void createSigletonVariablesAndCollectVariables(Atom atom, Set<String> knownVariables,
                         Set<String> newVariables) {
+                IScope scope = scopeProvider.getScope(atom, ProblemPackage.Literals.ARGUMENT__VARIABLE_OR_NODE);
                 List<INode> nodes = NodeModelUtils.findNodesForFeature(atom, ProblemPackage.Literals.ATOM__ARGUMENTS);
                 int nodesSize = nodes.size();
                 List<Argument> arguments = atom.getArguments();
@@ -165,6 +197,13 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
                 for (int i = 0; i < nodesSize; i++) {
                         INode node = nodes.get(i);
                         String variableName = linkingHelper.getCrossRefNodeAsString(node, true);
+                        if (!validId(variableName)) {
+                                continue;
+                        }
+                        QualifiedName qualifiedName = qualifiedNameConverter.toQualifiedName(variableName);
+                        if (scope.getSingleElement(qualifiedName) != null) {
+                                continue;
+                        }
                         if (ProblemUtil.isSingletonVariableName(variableName)) {
                                 if (i < argumentsSize) {
                                         createSingletonVariable(arguments.get(i), variableName);
@@ -223,9 +262,13 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
                                 for (Conjunction body : definition.getBodies()) {
                                         body.getImplicitVariables().clear();
                                         for (Literal literal : body.getLiterals()) {
+                                                if (literal instanceof Atom) {
+                                                        discardDerivedAtomState((Atom) literal);
+                                                }
                                                 if (literal instanceof NegativeLiteral) {
                                                         NegativeLiteral negativeLiteral = (NegativeLiteral) literal;
                                                         negativeLiteral.getImplicitVariables().clear();
+                                                        discardDerivedAtomState(negativeLiteral.getAtom());
                                                 }
                                         }
                                 }
@@ -233,7 +276,24 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
                 }
         }
 
+        protected void discardDerivedAtomState(Atom atom) {
+                if (atom == null) {
+                        return;
+                }
+                for (Argument argument : atom.getArguments()) {
+                        argument.setSingletonVariable(null);
+                }
+        }
+
         protected static boolean validId(String name) {
                 return name != null && ID_REGEX.matcher(name).matches();
         }
+
+        protected static boolean validQuotedId(String name) {
+                return name != null && QUOTED_ID_REGEX.matcher(name).matches();
+        }
+
+        protected static boolean validNodeName(String name) {
+                return validId(name) || validQuotedId(name);
+        }
 }
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java
index d3976ec5..94dbdfee 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java
@@ -1,21 +1,9 @@
 package org.eclipse.viatra.solver.language.resource;
 
-import java.util.Iterator;
-
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.viatra.solver.language.ProblemUtil;
-import org.eclipse.viatra.solver.language.model.problem.Argument;
-import org.eclipse.viatra.solver.language.model.problem.Assertion;
-import org.eclipse.viatra.solver.language.model.problem.Atom;
-import org.eclipse.viatra.solver.language.model.problem.Conjunction;
 import org.eclipse.viatra.solver.language.model.problem.ImplicitVariable;
-import org.eclipse.viatra.solver.language.model.problem.Literal;
-import org.eclipse.viatra.solver.language.model.problem.NegativeLiteral;
 import org.eclipse.viatra.solver.language.model.problem.Node;
-import org.eclipse.viatra.solver.language.model.problem.Problem;
-import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
-import org.eclipse.viatra.solver.language.model.problem.Statement;
-import org.eclipse.xtext.EcoreUtil2;
 import org.eclipse.xtext.resource.DefaultLocationInFileProvider;
 import org.eclipse.xtext.util.ITextRegion;
 
@@ -26,90 +14,19 @@ public class ProblemLocationInFileProvider extends DefaultLocationInFileProvider
                         return getNodeTextRegion((Node) obj, query);
                 }
                 if (obj instanceof ImplicitVariable) {
-                        return getVariableTextRegion((ImplicitVariable) obj, query);
+                        return ITextRegion.EMPTY_REGION;
                 }
                 return super.doGetTextRegion(obj, query);
         }
 
         protected ITextRegion getNodeTextRegion(Node node, RegionDescription query) {
-                ITextRegion newNodeRegion = getNewNodeTextRegion(node, query);
-                if (newNodeRegion != null) {
-                        return newNodeRegion;
+                if (ProblemUtil.isEnumLiteral(node)) {
+                        return super.doGetTextRegion(node, query);
                 }
-                return getNodeFirstReferenceTextRegion(node, query);
-        }
-        
-        protected ITextRegion getNewNodeTextRegion(Node node, RegionDescription query) {
                 if (ProblemUtil.isNewNode(node)) {
                         EObject container = node.eContainer();
                         return doGetTextRegion(container, query);
                 }
-                return null;
-        }
-
-        protected ITextRegion getNodeFirstReferenceTextRegion(Node node, RegionDescription query) {
-                Problem problem = EcoreUtil2.getContainerOfType(node, Problem.class);
-                if (problem == null) {
-                        return ITextRegion.EMPTY_REGION;
-                }
-                for (Statement statement : problem.getStatements()) {
-                        if (statement instanceof Assertion) {
-                                Assertion assertion = (Assertion) statement;
-                                int index = assertion.getArguments().indexOf(node);
-                                if (index >= 0) {
-                                        return doGetLocationOfFeature(assertion, ProblemPackage.Literals.ASSERTION__ARGUMENTS, index,
-                                                        query);
-                                }
-                        }
-                }
-                return ITextRegion.EMPTY_REGION;
-        }
-
-        protected ITextRegion getVariableTextRegion(ImplicitVariable variable, RegionDescription query) {
-                EObject container = variable.eContainer();
-                if (container instanceof Argument) {
-                        return getArgumentTextRegion((Argument) container, query);
-                }
-                if (container instanceof Conjunction) {
-                        return getFirstReferenceToVariableInConjunction(variable, (Conjunction) container, query);
-                }
-                if (container instanceof NegativeLiteral) {
-                        return getFirstReferenceToVariableInNegativeLiteral(variable, (NegativeLiteral) container, query);
-                }
-                return ITextRegion.EMPTY_REGION;
-        }
-
-        protected ITextRegion getFirstReferenceToVariableInConjunction(ImplicitVariable variable, Conjunction conjunction,
-                        RegionDescription query) {
-                Iterator<Literal> iterator = conjunction.getLiterals().iterator();
-                ITextRegion found = ITextRegion.EMPTY_REGION;
-                while (found == ITextRegion.EMPTY_REGION && iterator.hasNext()) {
-                        Literal literal = iterator.next();
-                        if (literal instanceof Atom) {
-                                found = getFirstReferenceToVariableInAtom(variable, (Atom) literal, query);
-                        } else if (literal instanceof NegativeLiteral) {
-                                found = getFirstReferenceToVariableInNegativeLiteral(variable, (NegativeLiteral) literal, query);
-                        }
-                }
-                return found;
-        }
-
-        protected ITextRegion getFirstReferenceToVariableInNegativeLiteral(ImplicitVariable variable,
-                        NegativeLiteral literal, RegionDescription query) {
-                return getFirstReferenceToVariableInAtom(variable, literal.getAtom(), query);
-        }
-
-        protected ITextRegion getFirstReferenceToVariableInAtom(ImplicitVariable variable, Atom atom,
-                        RegionDescription query) {
-                for (Argument argument : atom.getArguments()) {
-                        if (argument.getVariable().equals(variable)) {
-                                return getArgumentTextRegion(argument, query);
-                        }
-                }
                 return ITextRegion.EMPTY_REGION;
         }
-        
-        protected ITextRegion getArgumentTextRegion(Argument argument, RegionDescription query) {
-                return doGetLocationOfFeature(argument, ProblemPackage.Literals.ARGUMENT__VARIABLE, 0, query);
-        }
 }
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemResourceDescriptionStrategy.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemResourceDescriptionStrategy.java
index 95a9fe6b..edb25a1c 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemResourceDescriptionStrategy.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemResourceDescriptionStrategy.java
@@ -1,7 +1,9 @@
 package org.eclipse.viatra.solver.language.resource;
 
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.viatra.solver.language.ProblemUtil;
 import org.eclipse.viatra.solver.language.model.problem.NamedElement;
+import org.eclipse.viatra.solver.language.model.problem.Node;
 import org.eclipse.viatra.solver.language.model.problem.Problem;
 import org.eclipse.viatra.solver.language.model.problem.Variable;
 import org.eclipse.xtext.EcoreUtil2;
@@ -73,6 +75,9 @@ public class ProblemResourceDescriptionStrategy extends DefaultResourceDescripti
         }
 
         protected boolean shouldExportSimpleName(EObject eObject) {
+                if (eObject instanceof Node) {
+                        return !ProblemUtil.isNewNode((Node) eObject);
+                }
                 return true;
         }
 
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java
index c639f24c..fc4034ae 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java
@@ -16,6 +16,7 @@ import org.eclipse.viatra.solver.language.model.problem.ExistentialQuantifier;
 import org.eclipse.viatra.solver.language.model.problem.PredicateDefinition;
 import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
 import org.eclipse.viatra.solver.language.model.problem.ReferenceDeclaration;
+import org.eclipse.viatra.solver.language.model.problem.Relation;
 import org.eclipse.viatra.solver.language.model.problem.Variable;
 import org.eclipse.xtext.EcoreUtil2;
 import org.eclipse.xtext.scoping.IScope;
@@ -33,7 +34,7 @@ public class ProblemScopeProvider extends AbstractProblemScopeProvider {
         @Override
         public IScope getScope(EObject context, EReference reference) {
                 IScope scope = super.getScope(context, reference);
-                if (reference == ProblemPackage.Literals.ARGUMENT__VARIABLE) {
+                if (reference == ProblemPackage.Literals.ARGUMENT__VARIABLE_OR_NODE) {
                         return getVariableScope(context, scope);
                 } else if (reference == ProblemPackage.Literals.REFERENCE_DECLARATION__OPPOSITE) {
                         return getOppositeScope(context, scope);
@@ -62,7 +63,7 @@ public class ProblemScopeProvider extends AbstractProblemScopeProvider {
                         PredicateDefinition definition = (PredicateDefinition) currentContext;
                         variables.addAll(definition.getParameters());
                 }
-                return Scopes.scopeFor(variables);
+                return Scopes.scopeFor(variables, delegateScope);
         }
 
         protected IScope getOppositeScope(EObject context, IScope delegateScope) {
@@ -70,10 +71,11 @@ public class ProblemScopeProvider extends AbstractProblemScopeProvider {
                 if (referenceDeclaration == null) {
                         return delegateScope;
                 }
-                ClassDeclaration classDeclaration = referenceDeclaration.getReferenceType();
-                if (classDeclaration == null) {
+                Relation relation = referenceDeclaration.getReferenceType();
+                if (!(relation instanceof ClassDeclaration)) {
                         return delegateScope;
                 }
+                ClassDeclaration classDeclaration = (ClassDeclaration) relation;
                 Collection<ReferenceDeclaration> referenceDeclarations = ProblemUtil
                                 .getAllReferenceDeclarations(classDeclaration);
                 return Scopes.scopeFor(referenceDeclarations, delegateScope);
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/resources/org/eclipse/viatra/solver/language/builtin.problem b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/resources/org/eclipse/viatra/solver/language/builtin.problem
index 4975dad6..49b67d5a 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/resources/org/eclipse/viatra/solver/language/builtin.problem
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/resources/org/eclipse/viatra/solver/language/builtin.problem
@@ -1,7 +1,17 @@
 problem builtin.
 
 abstract class node {
-        refers node[0..*] equals opposite equals
+        node[] equals opposite equals
 }
 
-predicate exists(node node).
\ No newline at end of file
+pred exists(node node).
+
+enum bool {
+        true, false
+}
+
+class double.
+
+class int extends double.
+
+class string.
\ No newline at end of file
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/Problem.xtextbin b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/Problem.xtextbin
index 6b594f53..cabf6537 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/Problem.xtextbin
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/Problem.xtextbin
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.g b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.g
index bbce5660..64db0417 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.g
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.g
@@ -84,19 +84,20 @@ ruleProblem returns [EObject current=null]
                         }
                         (
                                 (
-                                        lv_name_1_0=RULE_ID
                                         {
-                                                newLeafNode(lv_name_1_0, grammarAccess.getProblemAccess().getNameIDTerminalRuleCall_0_1_0());
+                                                newCompositeNode(grammarAccess.getProblemAccess().getNameIdentifierParserRuleCall_0_1_0());
                                         }
+                                        lv_name_1_0=ruleIdentifier
                                         {
                                                 if ($current==null) {
-                                                        $current = createModelElement(grammarAccess.getProblemRule());
+                                                        $current = createModelElementForParent(grammarAccess.getProblemRule());
                                                 }
-                                                setWithLastConsumed(
+                                                set(
                                                         $current,
                                                         "name",
                                                         lv_name_1_0,
-                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                        "org.eclipse.viatra.solver.language.Problem.Identifier");
+                                                afterParserOrEnumRuleCall();
                                         }
                                 )
                         )
@@ -153,29 +154,38 @@ ruleStatement returns [EObject current=null]
                 }
                     |
                 {
-                        newCompositeNode(grammarAccess.getStatementAccess().getPredicateDefinitionParserRuleCall_1());
+                        newCompositeNode(grammarAccess.getStatementAccess().getEnumDeclarationParserRuleCall_1());
+                }
+                this_EnumDeclaration_1=ruleEnumDeclaration
+                {
+                        $current = $this_EnumDeclaration_1.current;
+                        afterParserOrEnumRuleCall();
+                }
+                    |
+                {
+                        newCompositeNode(grammarAccess.getStatementAccess().getPredicateDefinitionParserRuleCall_2());
                 }
-                this_PredicateDefinition_1=rulePredicateDefinition
+                this_PredicateDefinition_2=rulePredicateDefinition
                 {
-                        $current = $this_PredicateDefinition_1.current;
+                        $current = $this_PredicateDefinition_2.current;
                         afterParserOrEnumRuleCall();
                 }
                     |
                 {
-                        newCompositeNode(grammarAccess.getStatementAccess().getAssertionParserRuleCall_2());
+                        newCompositeNode(grammarAccess.getStatementAccess().getAssertionParserRuleCall_3());
                 }
-                this_Assertion_2=ruleAssertion
+                this_Assertion_3=ruleAssertion
                 {
-                        $current = $this_Assertion_2.current;
+                        $current = $this_Assertion_3.current;
                         afterParserOrEnumRuleCall();
                 }
                     |
                 {
-                        newCompositeNode(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_3());
+                        newCompositeNode(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_4());
                 }
-                this_ScopeDeclaration_3=ruleScopeDeclaration
+                this_ScopeDeclaration_4=ruleScopeDeclaration
                 {
-                        $current = $this_ScopeDeclaration_3.current;
+                        $current = $this_ScopeDeclaration_4.current;
                         afterParserOrEnumRuleCall();
                 }
         )
@@ -217,19 +227,20 @@ ruleClassDeclaration returns [EObject current=null]
                 }
                 (
                         (
-                                lv_name_2_0=RULE_ID
                                 {
-                                        newLeafNode(lv_name_2_0, grammarAccess.getClassDeclarationAccess().getNameIDTerminalRuleCall_2_0());
+                                        newCompositeNode(grammarAccess.getClassDeclarationAccess().getNameIdentifierParserRuleCall_2_0());
                                 }
+                                lv_name_2_0=ruleIdentifier
                                 {
                                         if ($current==null) {
-                                                $current = createModelElement(grammarAccess.getClassDeclarationRule());
+                                                $current = createModelElementForParent(grammarAccess.getClassDeclarationRule());
                                         }
-                                        setWithLastConsumed(
+                                        set(
                                                 $current,
                                                 "name",
                                                 lv_name_2_0,
-                                                "org.eclipse.xtext.common.Terminals.ID");
+                                                "org.eclipse.viatra.solver.language.Problem.Identifier");
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )
@@ -246,7 +257,7 @@ ruleClassDeclaration returns [EObject current=null]
                                                 }
                                         }
                                         {
-                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_1_0());
+                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationCrossReference_3_1_0());
                                         }
                                         ruleQualifiedName
                                         {
@@ -267,7 +278,7 @@ ruleClassDeclaration returns [EObject current=null]
                                                         }
                                                 }
                                                 {
-                                                        newCompositeNode(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_2_1_0());
+                                                        newCompositeNode(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationCrossReference_3_2_1_0());
                                                 }
                                                 ruleQualifiedName
                                                 {
@@ -324,6 +335,158 @@ ruleClassDeclaration returns [EObject current=null]
         )
 ;
 
+// Entry rule entryRuleEnumDeclaration
+entryRuleEnumDeclaration returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getEnumDeclarationRule()); }
+        iv_ruleEnumDeclaration=ruleEnumDeclaration
+        { $current=$iv_ruleEnumDeclaration.current; }
+        EOF;
+
+// Rule EnumDeclaration
+ruleEnumDeclaration returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                otherlv_0='enum'
+                {
+                        newLeafNode(otherlv_0, grammarAccess.getEnumDeclarationAccess().getEnumKeyword_0());
+                }
+                (
+                        (
+                                {
+                                        newCompositeNode(grammarAccess.getEnumDeclarationAccess().getNameIdentifierParserRuleCall_1_0());
+                                }
+                                lv_name_1_0=ruleIdentifier
+                                {
+                                        if ($current==null) {
+                                                $current = createModelElementForParent(grammarAccess.getEnumDeclarationRule());
+                                        }
+                                        set(
+                                                $current,
+                                                "name",
+                                                lv_name_1_0,
+                                                "org.eclipse.viatra.solver.language.Problem.Identifier");
+                                        afterParserOrEnumRuleCall();
+                                }
+                        )
+                )
+                (
+                        (
+                                otherlv_2='{'
+                                {
+                                        newLeafNode(otherlv_2, grammarAccess.getEnumDeclarationAccess().getLeftCurlyBracketKeyword_2_0_0());
+                                }
+                                (
+                                        (
+                                                (
+                                                        {
+                                                                newCompositeNode(grammarAccess.getEnumDeclarationAccess().getLiteralsEnumLiteralParserRuleCall_2_0_1_0_0());
+                                                        }
+                                                        lv_literals_3_0=ruleEnumLiteral
+                                                        {
+                                                                if ($current==null) {
+                                                                        $current = createModelElementForParent(grammarAccess.getEnumDeclarationRule());
+                                                                }
+                                                                add(
+                                                                        $current,
+                                                                        "literals",
+                                                                        lv_literals_3_0,
+                                                                        "org.eclipse.viatra.solver.language.Problem.EnumLiteral");
+                                                                afterParserOrEnumRuleCall();
+                                                        }
+                                                )
+                                        )
+                                        (
+                                                otherlv_4=','
+                                                {
+                                                        newLeafNode(otherlv_4, grammarAccess.getEnumDeclarationAccess().getCommaKeyword_2_0_1_1_0());
+                                                }
+                                                (
+                                                        (
+                                                                {
+                                                                        newCompositeNode(grammarAccess.getEnumDeclarationAccess().getLiteralsEnumLiteralParserRuleCall_2_0_1_1_1_0());
+                                                                }
+                                                                lv_literals_5_0=ruleEnumLiteral
+                                                                {
+                                                                        if ($current==null) {
+                                                                                $current = createModelElementForParent(grammarAccess.getEnumDeclarationRule());
+                                                                        }
+                                                                        add(
+                                                                                $current,
+                                                                                "literals",
+                                                                                lv_literals_5_0,
+                                                                                "org.eclipse.viatra.solver.language.Problem.EnumLiteral");
+                                                                        afterParserOrEnumRuleCall();
+                                                                }
+                                                        )
+                                                )
+                                        )*
+                                        (
+                                                otherlv_6=','
+                                                {
+                                                        newLeafNode(otherlv_6, grammarAccess.getEnumDeclarationAccess().getCommaKeyword_2_0_1_2_0());
+                                                }
+                                                    |
+                                                otherlv_7=';'
+                                                {
+                                                        newLeafNode(otherlv_7, grammarAccess.getEnumDeclarationAccess().getSemicolonKeyword_2_0_1_2_1());
+                                                }
+                                        )?
+                                )?
+                                otherlv_8='}'
+                                {
+                                        newLeafNode(otherlv_8, grammarAccess.getEnumDeclarationAccess().getRightCurlyBracketKeyword_2_0_2());
+                                }
+                        )
+                            |
+                        otherlv_9='.'
+                        {
+                                newLeafNode(otherlv_9, grammarAccess.getEnumDeclarationAccess().getFullStopKeyword_2_1());
+                        }
+                )
+        )
+;
+
+// Entry rule entryRuleEnumLiteral
+entryRuleEnumLiteral returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getEnumLiteralRule()); }
+        iv_ruleEnumLiteral=ruleEnumLiteral
+        { $current=$iv_ruleEnumLiteral.current; }
+        EOF;
+
+// Rule EnumLiteral
+ruleEnumLiteral returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                (
+                        {
+                                newCompositeNode(grammarAccess.getEnumLiteralAccess().getNameQuotedOrUnquotedIdParserRuleCall_0());
+                        }
+                        lv_name_0_0=ruleQuotedOrUnquotedId
+                        {
+                                if ($current==null) {
+                                        $current = createModelElementForParent(grammarAccess.getEnumLiteralRule());
+                                }
+                                set(
+                                        $current,
+                                        "name",
+                                        lv_name_0_0,
+                                        "org.eclipse.viatra.solver.language.Problem.QuotedOrUnquotedId");
+                                afterParserOrEnumRuleCall();
+                        }
+                )
+        )
+;
+
 // Entry rule entryRuleReferenceDeclaration
 entryRuleReferenceDeclaration returns [EObject current=null]:
         { newCompositeNode(grammarAccess.getReferenceDeclarationRule()); }
@@ -360,7 +523,7 @@ ruleReferenceDeclaration returns [EObject current=null]
                         {
                                 newLeafNode(otherlv_1, grammarAccess.getReferenceDeclarationAccess().getRefersKeyword_0_1());
                         }
-                )
+                )?
                 (
                         (
                                 {
@@ -369,7 +532,7 @@ ruleReferenceDeclaration returns [EObject current=null]
                                         }
                                 }
                                 {
-                                        newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationCrossReference_1_0());
+                                        newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeRelationCrossReference_1_0());
                                 }
                                 ruleQualifiedName
                                 {
@@ -408,19 +571,20 @@ ruleReferenceDeclaration returns [EObject current=null]
                 )?
                 (
                         (
-                                lv_name_6_0=RULE_ID
                                 {
-                                        newLeafNode(lv_name_6_0, grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_3_0());
+                                        newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getNameIdentifierParserRuleCall_3_0());
                                 }
+                                lv_name_6_0=ruleIdentifier
                                 {
                                         if ($current==null) {
-                                                $current = createModelElement(grammarAccess.getReferenceDeclarationRule());
+                                                $current = createModelElementForParent(grammarAccess.getReferenceDeclarationRule());
                                         }
-                                        setWithLastConsumed(
+                                        set(
                                                 $current,
                                                 "name",
                                                 lv_name_6_0,
-                                                "org.eclipse.xtext.common.Terminals.ID");
+                                                "org.eclipse.viatra.solver.language.Problem.Identifier");
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )
@@ -496,19 +660,20 @@ rulePredicateDefinition returns [EObject current=null]
                 )
                 (
                         (
-                                lv_name_3_0=RULE_ID
                                 {
-                                        newLeafNode(lv_name_3_0, grammarAccess.getPredicateDefinitionAccess().getNameIDTerminalRuleCall_1_0());
+                                        newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getNameIdentifierParserRuleCall_1_0());
                                 }
+                                lv_name_3_0=ruleIdentifier
                                 {
                                         if ($current==null) {
-                                                $current = createModelElement(grammarAccess.getPredicateDefinitionRule());
+                                                $current = createModelElementForParent(grammarAccess.getPredicateDefinitionRule());
                                         }
-                                        setWithLastConsumed(
+                                        set(
                                                 $current,
                                                 "name",
                                                 lv_name_3_0,
-                                                "org.eclipse.xtext.common.Terminals.ID");
+                                                "org.eclipse.viatra.solver.language.Problem.Identifier");
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )
@@ -646,27 +811,31 @@ ruleParameter returns [EObject current=null]
                                                 $current = createModelElement(grammarAccess.getParameterRule());
                                         }
                                 }
-                                otherlv_0=RULE_ID
                                 {
-                                        newLeafNode(otherlv_0, grammarAccess.getParameterAccess().getParameterTypeClassDeclarationCrossReference_0_0());
+                                        newCompositeNode(grammarAccess.getParameterAccess().getParameterTypeRelationCrossReference_0_0());
+                                }
+                                ruleQualifiedName
+                                {
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
-                )
+                )?
                 (
                         (
-                                lv_name_1_0=RULE_ID
                                 {
-                                        newLeafNode(lv_name_1_0, grammarAccess.getParameterAccess().getNameIDTerminalRuleCall_1_0());
+                                        newCompositeNode(grammarAccess.getParameterAccess().getNameIdentifierParserRuleCall_1_0());
                                 }
+                                lv_name_1_0=ruleIdentifier
                                 {
                                         if ($current==null) {
-                                                $current = createModelElement(grammarAccess.getParameterRule());
+                                                $current = createModelElementForParent(grammarAccess.getParameterRule());
                                         }
-                                        setWithLastConsumed(
+                                        set(
                                                 $current,
                                                 "name",
                                                 lv_name_1_0,
-                                                "org.eclipse.xtext.common.Terminals.ID");
+                                                "org.eclipse.viatra.solver.language.Problem.Identifier");
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )
@@ -939,9 +1108,12 @@ ruleArgument returns [EObject current=null]
                                         $current = createModelElement(grammarAccess.getArgumentRule());
                                 }
                         }
-                        otherlv_0=RULE_ID
                         {
-                                newLeafNode(otherlv_0, grammarAccess.getArgumentAccess().getVariableVariableCrossReference_0());
+                                newCompositeNode(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0());
+                        }
+                        ruleQualifiedName
+                        {
+                                afterParserOrEnumRuleCall();
                         }
                 )
         )
@@ -1513,6 +1685,43 @@ ruleUpperBound returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToke
         )
 ;
 
+// Entry rule entryRuleQuotedOrUnquotedId
+entryRuleQuotedOrUnquotedId returns [String current=null]:
+        { newCompositeNode(grammarAccess.getQuotedOrUnquotedIdRule()); }
+        iv_ruleQuotedOrUnquotedId=ruleQuotedOrUnquotedId
+        { $current=$iv_ruleQuotedOrUnquotedId.current.getText(); }
+        EOF;
+
+// Rule QuotedOrUnquotedId
+ruleQuotedOrUnquotedId returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                this_QUOTED_ID_0=RULE_QUOTED_ID
+                {
+                        $current.merge(this_QUOTED_ID_0);
+                }
+                {
+                        newLeafNode(this_QUOTED_ID_0, grammarAccess.getQuotedOrUnquotedIdAccess().getQUOTED_IDTerminalRuleCall_0());
+                }
+                    |
+                {
+                        newCompositeNode(grammarAccess.getQuotedOrUnquotedIdAccess().getIdentifierParserRuleCall_1());
+                }
+                this_Identifier_1=ruleIdentifier
+                {
+                        $current.merge(this_Identifier_1);
+                }
+                {
+                        afterParserOrEnumRuleCall();
+                }
+        )
+;
+
 // Entry rule entryRuleQualifiedName
 entryRuleQualifiedName returns [String current=null]:
         { newCompositeNode(grammarAccess.getQualifiedNameRule()); }
@@ -1538,12 +1747,15 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT
                 }
                     |
                 (
-                        this_ID_1=RULE_ID
                         {
-                                $current.merge(this_ID_1);
+                                newCompositeNode(grammarAccess.getQualifiedNameAccess().getIdentifierParserRuleCall_1_0());
                         }
+                        this_Identifier_1=ruleIdentifier
                         {
-                                newLeafNode(this_ID_1, grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_0());
+                                $current.merge(this_Identifier_1);
+                        }
+                        {
+                                afterParserOrEnumRuleCall();
                         }
                         (
                                 kw=':'
@@ -1551,12 +1763,15 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT
                                         $current.merge(kw);
                                         newLeafNode(kw, grammarAccess.getQualifiedNameAccess().getColonKeyword_1_1_0());
                                 }
-                                this_ID_3=RULE_ID
                                 {
-                                        $current.merge(this_ID_3);
+                                        newCompositeNode(grammarAccess.getQualifiedNameAccess().getIdentifierParserRuleCall_1_1_1());
                                 }
+                                this_Identifier_3=ruleIdentifier
                                 {
-                                        newLeafNode(this_ID_3, grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1_1());
+                                        $current.merge(this_Identifier_3);
+                                }
+                                {
+                                        afterParserOrEnumRuleCall();
                                 }
                         )*
                         (
@@ -1577,6 +1792,44 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT
         )
 ;
 
+// Entry rule entryRuleIdentifier
+entryRuleIdentifier returns [String current=null]:
+        { newCompositeNode(grammarAccess.getIdentifierRule()); }
+        iv_ruleIdentifier=ruleIdentifier
+        { $current=$iv_ruleIdentifier.current.getText(); }
+        EOF;
+
+// Rule Identifier
+ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                this_ID_0=RULE_ID
+                {
+                        $current.merge(this_ID_0);
+                }
+                {
+                        newLeafNode(this_ID_0, grammarAccess.getIdentifierAccess().getIDTerminalRuleCall_0());
+                }
+                    |
+                kw='true'
+                {
+                        $current.merge(kw);
+                        newLeafNode(kw, grammarAccess.getIdentifierAccess().getTrueKeyword_1());
+                }
+                    |
+                kw='false'
+                {
+                        $current.merge(kw);
+                        newLeafNode(kw, grammarAccess.getIdentifierAccess().getFalseKeyword_2());
+                }
+        )
+;
+
 // Rule LogicValue
 ruleLogicValue returns [Enumerator current=null]
 @init {
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.tokens b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.tokens
index 862a9a36..e968ac14 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.tokens
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.tokens
@@ -1,32 +1,33 @@
-'!'=31
-'('=28
-')'=29
-'*'=38
-'+'=32
-'+='=35
+'!'=32
+'('=29
+')'=30
+'*'=39
+'+'=33
+'+='=36
 ','=17
 '.'=13
-'..'=37
-':'=33
-':-'=30
+'..'=38
+':'=34
+':-'=31
 ';'=19
-'='=36
-'?'=42
-'['=23
-']'=24
+'='=37
+'?'=43
+'['=24
+']'=25
 'abstract'=14
 'class'=15
-'contains'=21
-'error'=26
+'contains'=22
+'enum'=21
+'error'=27
 'extends'=16
-'false'=40
-'opposite'=25
-'pred'=27
+'false'=41
+'opposite'=26
+'pred'=28
 'problem'=12
-'refers'=22
-'scope'=34
-'true'=39
-'unknown'=41
+'refers'=23
+'scope'=35
+'true'=40
+'unknown'=42
 '{'=18
 '}'=20
 RULE_ANY_OTHER=11
@@ -68,3 +69,4 @@ T__39=39
 T__40=40
 T__41=41
 T__42=42
+T__43=43
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemLexer.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemLexer.java
index a1703c93..1fd1e166 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemLexer.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemLexer.java
@@ -12,31 +12,16 @@ import java.util.ArrayList;
 
 @SuppressWarnings("all")
 public class InternalProblemLexer extends Lexer {
-    public static final int RULE_STRING=7;
-    public static final int RULE_SL_COMMENT=9;
     public static final int T__19=19;
     public static final int T__15=15;
-    public static final int T__37=37;
     public static final int T__16=16;
-    public static final int T__38=38;
     public static final int T__17=17;
-    public static final int T__39=39;
     public static final int T__18=18;
-    public static final int T__33=33;
     public static final int T__12=12;
-    public static final int T__34=34;
     public static final int T__13=13;
-    public static final int T__35=35;
     public static final int T__14=14;
-    public static final int T__36=36;
-    public static final int EOF=-1;
-    public static final int T__30=30;
-    public static final int T__31=31;
-    public static final int T__32=32;
     public static final int RULE_ID=4;
-    public static final int RULE_WS=10;
     public static final int RULE_QUOTED_ID=6;
-    public static final int RULE_ANY_OTHER=11;
     public static final int T__26=26;
     public static final int T__27=27;
     public static final int T__28=28;
@@ -47,11 +32,27 @@ public class InternalProblemLexer extends Lexer {
     public static final int T__23=23;
     public static final int T__24=24;
     public static final int T__25=25;
+    public static final int T__20=20;
+    public static final int T__21=21;
+    public static final int RULE_STRING=7;
+    public static final int RULE_SL_COMMENT=9;
+    public static final int T__37=37;
+    public static final int T__38=38;
+    public static final int T__39=39;
+    public static final int T__33=33;
+    public static final int T__34=34;
+    public static final int T__35=35;
+    public static final int T__36=36;
+    public static final int EOF=-1;
+    public static final int T__30=30;
+    public static final int T__31=31;
+    public static final int T__32=32;
+    public static final int RULE_WS=10;
+    public static final int RULE_ANY_OTHER=11;
     public static final int T__40=40;
     public static final int T__41=41;
-    public static final int T__20=20;
     public static final int T__42=42;
-    public static final int T__21=21;
+    public static final int T__43=43;
 
     // delegates
     // delegators
@@ -255,10 +256,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:20:7: ( 'contains' )
-            // InternalProblem.g:20:9: 'contains'
+            // InternalProblem.g:20:7: ( 'enum' )
+            // InternalProblem.g:20:9: 'enum'
             {
-            match("contains"); 
+            match("enum"); 
 
 
             }
@@ -276,10 +277,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:21:7: ( 'refers' )
-            // InternalProblem.g:21:9: 'refers'
+            // InternalProblem.g:21:7: ( 'contains' )
+            // InternalProblem.g:21:9: 'contains'
             {
-            match("refers"); 
+            match("contains"); 
 
 
             }
@@ -297,10 +298,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:22:7: ( '[' )
-            // InternalProblem.g:22:9: '['
+            // InternalProblem.g:22:7: ( 'refers' )
+            // InternalProblem.g:22:9: 'refers'
             {
-            match('['); 
+            match("refers"); 
+
 
             }
 
@@ -317,10 +319,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:23:7: ( ']' )
-            // InternalProblem.g:23:9: ']'
+            // InternalProblem.g:23:7: ( '[' )
+            // InternalProblem.g:23:9: '['
             {
-            match(']'); 
+            match('['); 
 
             }
 
@@ -337,11 +339,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:24:7: ( 'opposite' )
-            // InternalProblem.g:24:9: 'opposite'
+            // InternalProblem.g:24:7: ( ']' )
+            // InternalProblem.g:24:9: ']'
             {
-            match("opposite"); 
-
+            match(']'); 
 
             }
 
@@ -358,10 +359,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:25:7: ( 'error' )
-            // InternalProblem.g:25:9: 'error'
+            // InternalProblem.g:25:7: ( 'opposite' )
+            // InternalProblem.g:25:9: 'opposite'
             {
-            match("error"); 
+            match("opposite"); 
 
 
             }
@@ -379,10 +380,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:26:7: ( 'pred' )
-            // InternalProblem.g:26:9: 'pred'
+            // InternalProblem.g:26:7: ( 'error' )
+            // InternalProblem.g:26:9: 'error'
             {
-            match("pred"); 
+            match("error"); 
 
 
             }
@@ -400,10 +401,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:27:7: ( '(' )
-            // InternalProblem.g:27:9: '('
+            // InternalProblem.g:27:7: ( 'pred' )
+            // InternalProblem.g:27:9: 'pred'
             {
-            match('('); 
+            match("pred"); 
+
 
             }
 
@@ -420,10 +422,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:28:7: ( ')' )
-            // InternalProblem.g:28:9: ')'
+            // InternalProblem.g:28:7: ( '(' )
+            // InternalProblem.g:28:9: '('
             {
-            match(')'); 
+            match('('); 
 
             }
 
@@ -440,11 +442,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:29:7: ( ':-' )
-            // InternalProblem.g:29:9: ':-'
+            // InternalProblem.g:29:7: ( ')' )
+            // InternalProblem.g:29:9: ')'
             {
-            match(":-"); 
-
+            match(')'); 
 
             }
 
@@ -461,10 +462,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:30:7: ( '!' )
-            // InternalProblem.g:30:9: '!'
+            // InternalProblem.g:30:7: ( ':-' )
+            // InternalProblem.g:30:9: ':-'
             {
-            match('!'); 
+            match(":-"); 
+
 
             }
 
@@ -481,10 +483,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:31:7: ( '+' )
-            // InternalProblem.g:31:9: '+'
+            // InternalProblem.g:31:7: ( '!' )
+            // InternalProblem.g:31:9: '!'
             {
-            match('+'); 
+            match('!'); 
 
             }
 
@@ -501,10 +503,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:32:7: ( ':' )
-            // InternalProblem.g:32:9: ':'
+            // InternalProblem.g:32:7: ( '+' )
+            // InternalProblem.g:32:9: '+'
             {
-            match(':'); 
+            match('+'); 
 
             }
 
@@ -521,11 +523,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:33:7: ( 'scope' )
-            // InternalProblem.g:33:9: 'scope'
+            // InternalProblem.g:33:7: ( ':' )
+            // InternalProblem.g:33:9: ':'
             {
-            match("scope"); 
-
+            match(':'); 
 
             }
 
@@ -542,10 +543,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:34:7: ( '+=' )
-            // InternalProblem.g:34:9: '+='
+            // InternalProblem.g:34:7: ( 'scope' )
+            // InternalProblem.g:34:9: 'scope'
             {
-            match("+="); 
+            match("scope"); 
 
 
             }
@@ -563,10 +564,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:35:7: ( '=' )
-            // InternalProblem.g:35:9: '='
+            // InternalProblem.g:35:7: ( '+=' )
+            // InternalProblem.g:35:9: '+='
             {
-            match('='); 
+            match("+="); 
+
 
             }
 
@@ -583,11 +585,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:36:7: ( '..' )
-            // InternalProblem.g:36:9: '..'
+            // InternalProblem.g:36:7: ( '=' )
+            // InternalProblem.g:36:9: '='
             {
-            match(".."); 
-
+            match('='); 
 
             }
 
@@ -604,10 +605,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:37:7: ( '*' )
-            // InternalProblem.g:37:9: '*'
+            // InternalProblem.g:37:7: ( '..' )
+            // InternalProblem.g:37:9: '..'
             {
-            match('*'); 
+            match(".."); 
+
 
             }
 
@@ -624,11 +626,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:38:7: ( 'true' )
-            // InternalProblem.g:38:9: 'true'
+            // InternalProblem.g:38:7: ( '*' )
+            // InternalProblem.g:38:9: '*'
             {
-            match("true"); 
-
+            match('*'); 
 
             }
 
@@ -645,10 +646,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:39:7: ( 'false' )
-            // InternalProblem.g:39:9: 'false'
+            // InternalProblem.g:39:7: ( 'true' )
+            // InternalProblem.g:39:9: 'true'
             {
-            match("false"); 
+            match("true"); 
 
 
             }
@@ -666,10 +667,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:40:7: ( 'unknown' )
-            // InternalProblem.g:40:9: 'unknown'
+            // InternalProblem.g:40:7: ( 'false' )
+            // InternalProblem.g:40:9: 'false'
             {
-            match("unknown"); 
+            match("false"); 
 
 
             }
@@ -687,10 +688,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:41:7: ( '?' )
-            // InternalProblem.g:41:9: '?'
+            // InternalProblem.g:41:7: ( 'unknown' )
+            // InternalProblem.g:41:9: 'unknown'
             {
-            match('?'); 
+            match("unknown"); 
+
 
             }
 
@@ -702,16 +704,36 @@ public class InternalProblemLexer extends Lexer {
     }
     // $ANTLR end "T__42"
 
+    // $ANTLR start "T__43"
+    public final void mT__43() throws RecognitionException {
+        try {
+            int _type = T__43;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:42:7: ( '?' )
+            // InternalProblem.g:42:9: '?'
+            {
+            match('?'); 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__43"
+
     // $ANTLR start "RULE_STRING"
     public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1642:13: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
-            // InternalProblem.g:1642:15: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+            // InternalProblem.g:1895:13: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
+            // InternalProblem.g:1895:15: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
             {
             match('\"'); 
-            // InternalProblem.g:1642:19: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+            // InternalProblem.g:1895:19: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
             loop1:
             do {
                 int alt1=3;
@@ -727,7 +749,7 @@ public class InternalProblemLexer extends Lexer {
 
                 switch (alt1) {
                 case 1 :
-                    // InternalProblem.g:1642:20: '\\\\' .
+                    // InternalProblem.g:1895:20: '\\\\' .
                     {
                     match('\\'); 
                     matchAny(); 
@@ -735,7 +757,7 @@ public class InternalProblemLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1642:27: ~ ( ( '\\\\' | '\"' ) )
+                    // InternalProblem.g:1895:27: ~ ( ( '\\\\' | '\"' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -772,11 +794,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_QUOTED_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1644:16: ( '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
-            // InternalProblem.g:1644:18: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+            // InternalProblem.g:1897:16: ( '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalProblem.g:1897:18: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
             {
             match('\''); 
-            // InternalProblem.g:1644:23: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+            // InternalProblem.g:1897:23: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
             loop2:
             do {
                 int alt2=3;
@@ -792,7 +814,7 @@ public class InternalProblemLexer extends Lexer {
 
                 switch (alt2) {
                 case 1 :
-                    // InternalProblem.g:1644:24: '\\\\' .
+                    // InternalProblem.g:1897:24: '\\\\' .
                     {
                     match('\\'); 
                     matchAny(); 
@@ -800,7 +822,7 @@ public class InternalProblemLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1644:31: ~ ( ( '\\\\' | '\\'' ) )
+                    // InternalProblem.g:1897:31: ~ ( ( '\\\\' | '\\'' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -837,10 +859,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1646:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // InternalProblem.g:1646:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalProblem.g:1899:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalProblem.g:1899:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // InternalProblem.g:1646:11: ( '^' )?
+            // InternalProblem.g:1899:11: ( '^' )?
             int alt3=2;
             int LA3_0 = input.LA(1);
 
@@ -849,7 +871,7 @@ public class InternalProblemLexer extends Lexer {
             }
             switch (alt3) {
                 case 1 :
-                    // InternalProblem.g:1646:11: '^'
+                    // InternalProblem.g:1899:11: '^'
                     {
                     match('^'); 
 
@@ -867,7 +889,7 @@ public class InternalProblemLexer extends Lexer {
                 recover(mse);
                 throw mse;}
 
-            // InternalProblem.g:1646:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalProblem.g:1899:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             loop4:
             do {
                 int alt4=2;
@@ -916,10 +938,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1648:10: ( ( '0' .. '9' )+ )
-            // InternalProblem.g:1648:12: ( '0' .. '9' )+
+            // InternalProblem.g:1901:10: ( ( '0' .. '9' )+ )
+            // InternalProblem.g:1901:12: ( '0' .. '9' )+
             {
-            // InternalProblem.g:1648:12: ( '0' .. '9' )+
+            // InternalProblem.g:1901:12: ( '0' .. '9' )+
             int cnt5=0;
             loop5:
             do {
@@ -933,7 +955,7 @@ public class InternalProblemLexer extends Lexer {
 
                 switch (alt5) {
                 case 1 :
-                    // InternalProblem.g:1648:13: '0' .. '9'
+                    // InternalProblem.g:1901:13: '0' .. '9'
                     {
                     matchRange('0','9'); 
 
@@ -965,12 +987,12 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1650:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // InternalProblem.g:1650:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalProblem.g:1903:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalProblem.g:1903:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // InternalProblem.g:1650:24: ( options {greedy=false; } : . )*
+            // InternalProblem.g:1903:24: ( options {greedy=false; } : . )*
             loop6:
             do {
                 int alt6=2;
@@ -995,7 +1017,7 @@ public class InternalProblemLexer extends Lexer {
 
                 switch (alt6) {
                 case 1 :
-                    // InternalProblem.g:1650:52: .
+                    // InternalProblem.g:1903:52: .
                     {
                     matchAny(); 
 
@@ -1025,12 +1047,12 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1652:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // InternalProblem.g:1652:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalProblem.g:1905:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalProblem.g:1905:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // InternalProblem.g:1652:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            // InternalProblem.g:1905:24: (~ ( ( '\\n' | '\\r' ) ) )*
             loop7:
             do {
                 int alt7=2;
@@ -1043,7 +1065,7 @@ public class InternalProblemLexer extends Lexer {
 
                 switch (alt7) {
                 case 1 :
-                    // InternalProblem.g:1652:24: ~ ( ( '\\n' | '\\r' ) )
+                    // InternalProblem.g:1905:24: ~ ( ( '\\n' | '\\r' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -1063,7 +1085,7 @@ public class InternalProblemLexer extends Lexer {
                 }
             } while (true);
 
-            // InternalProblem.g:1652:40: ( ( '\\r' )? '\\n' )?
+            // InternalProblem.g:1905:40: ( ( '\\r' )? '\\n' )?
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -1072,9 +1094,9 @@ public class InternalProblemLexer extends Lexer {
             }
             switch (alt9) {
                 case 1 :
-                    // InternalProblem.g:1652:41: ( '\\r' )? '\\n'
+                    // InternalProblem.g:1905:41: ( '\\r' )? '\\n'
                     {
-                    // InternalProblem.g:1652:41: ( '\\r' )?
+                    // InternalProblem.g:1905:41: ( '\\r' )?
                     int alt8=2;
                     int LA8_0 = input.LA(1);
 
@@ -1083,7 +1105,7 @@ public class InternalProblemLexer extends Lexer {
                     }
                     switch (alt8) {
                         case 1 :
-                            // InternalProblem.g:1652:41: '\\r'
+                            // InternalProblem.g:1905:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1115,10 +1137,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1654:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // InternalProblem.g:1654:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalProblem.g:1907:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalProblem.g:1907:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // InternalProblem.g:1654:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalProblem.g:1907:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             int cnt10=0;
             loop10:
             do {
@@ -1172,8 +1194,8 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1656:16: ( . )
-            // InternalProblem.g:1656:18: .
+            // InternalProblem.g:1909:16: ( . )
+            // InternalProblem.g:1909:18: .
             {
             matchAny(); 
 
@@ -1188,8 +1210,8 @@ public class InternalProblemLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // InternalProblem.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | RULE_STRING | RULE_QUOTED_ID | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt11=39;
+        // InternalProblem.g:1:8: ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | RULE_STRING | RULE_QUOTED_ID | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt11=40;
         alt11 = dfa11.predict(input);
         switch (alt11) {
             case 1 :
@@ -1410,56 +1432,63 @@ public class InternalProblemLexer extends Lexer {
                 }
                 break;
             case 32 :
-                // InternalProblem.g:1:196: RULE_STRING
+                // InternalProblem.g:1:196: T__43
                 {
-                mRULE_STRING(); 
+                mT__43(); 
 
                 }
                 break;
             case 33 :
-                // InternalProblem.g:1:208: RULE_QUOTED_ID
+                // InternalProblem.g:1:202: RULE_STRING
                 {
-                mRULE_QUOTED_ID(); 
+                mRULE_STRING(); 
 
                 }
                 break;
             case 34 :
-                // InternalProblem.g:1:223: RULE_ID
+                // InternalProblem.g:1:214: RULE_QUOTED_ID
                 {
-                mRULE_ID(); 
+                mRULE_QUOTED_ID(); 
 
                 }
                 break;
             case 35 :
-                // InternalProblem.g:1:231: RULE_INT
+                // InternalProblem.g:1:229: RULE_ID
                 {
-                mRULE_INT(); 
+                mRULE_ID(); 
 
                 }
                 break;
             case 36 :
-                // InternalProblem.g:1:240: RULE_ML_COMMENT
+                // InternalProblem.g:1:237: RULE_INT
                 {
-                mRULE_ML_COMMENT(); 
+                mRULE_INT(); 
 
                 }
                 break;
             case 37 :
-                // InternalProblem.g:1:256: RULE_SL_COMMENT
+                // InternalProblem.g:1:246: RULE_ML_COMMENT
                 {
-                mRULE_SL_COMMENT(); 
+                mRULE_ML_COMMENT(); 
 
                 }
                 break;
             case 38 :
-                // InternalProblem.g:1:272: RULE_WS
+                // InternalProblem.g:1:262: RULE_SL_COMMENT
                 {
-                mRULE_WS(); 
+                mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 39 :
-                // InternalProblem.g:1:280: RULE_ANY_OTHER
+                // InternalProblem.g:1:278: RULE_WS
+                {
+                mRULE_WS(); 
+
+                }
+                break;
+            case 40 :
+                // InternalProblem.g:1:286: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1473,69 +1502,70 @@ public class InternalProblemLexer extends Lexer {
 
     protected DFA11 dfa11 = new DFA11(this);
     static final String DFA11_eotS =
-        "\1\uffff\1\43\1\45\3\43\4\uffff\1\43\2\uffff\1\43\2\uffff\1\66\1\uffff\1\71\1\43\2\uffff\3\43\1\uffff\3\41\2\uffff\1\41\2\uffff\1\43\3\uffff\5\43\4\uffff\1\43\2\uffff\1\43\7\uffff\1\43\2\uffff\3\43\7\uffff\16\43\1\142\10\43\1\153\3\43\1\uffff\1\43\1\160\2\43\1\163\2\43\1\166\1\uffff\1\167\3\43\1\uffff\2\43\1\uffff\1\175\1\43\2\uffff\1\43\1\u0080\2\43\1\u0083\1\uffff\1\43\1\u0085\1\uffff\1\u0086\1\u0087\1\uffff\1\u0088\4\uffff";
+        "\1\uffff\1\43\1\45\3\43\4\uffff\1\43\2\uffff\1\43\2\uffff\1\67\1\uffff\1\72\1\43\2\uffff\3\43\1\uffff\3\41\2\uffff\1\41\2\uffff\1\43\3\uffff\6\43\4\uffff\1\43\2\uffff\1\43\7\uffff\1\43\2\uffff\3\43\7\uffff\17\43\1\145\4\43\1\152\4\43\1\157\3\43\1\uffff\1\43\1\164\2\43\1\uffff\1\167\2\43\1\172\1\uffff\1\173\3\43\1\uffff\2\43\1\uffff\1\u0081\1\43\2\uffff\1\43\1\u0084\2\43\1\u0087\1\uffff\1\43\1\u0089\1\uffff\1\u008a\1\u008b\1\uffff\1\u008c\4\uffff";
     static final String DFA11_eofS =
-        "\u0089\uffff";
+        "\u008d\uffff";
     static final String DFA11_minS =
-        "\1\0\1\162\1\56\1\142\1\154\1\162\4\uffff\1\145\2\uffff\1\160\2\uffff\1\55\1\uffff\1\75\1\143\2\uffff\1\162\1\141\1\156\1\uffff\2\0\1\101\2\uffff\1\52\2\uffff\1\145\3\uffff\1\163\1\141\1\156\1\164\1\162\4\uffff\1\146\2\uffff\1\160\7\uffff\1\157\2\uffff\1\165\1\154\1\153\7\uffff\1\142\1\144\1\164\1\163\1\164\1\145\1\157\1\145\1\157\1\160\1\145\1\163\1\156\1\154\1\60\1\162\1\163\1\141\1\156\2\162\1\163\1\145\1\60\1\145\1\157\1\145\1\uffff\1\141\1\60\1\151\1\144\1\60\1\163\1\151\1\60\1\uffff\1\60\1\167\1\155\1\143\1\uffff\1\156\1\163\1\uffff\1\60\1\164\2\uffff\1\156\1\60\1\164\1\163\1\60\1\uffff\1\145\1\60\1\uffff\2\60\1\uffff\1\60\4\uffff";
+        "\1\0\1\162\1\56\1\142\1\154\1\156\4\uffff\1\145\2\uffff\1\160\2\uffff\1\55\1\uffff\1\75\1\143\2\uffff\1\162\1\141\1\156\1\uffff\2\0\1\101\2\uffff\1\52\2\uffff\1\145\3\uffff\1\163\1\141\1\156\1\164\1\165\1\162\4\uffff\1\146\2\uffff\1\160\7\uffff\1\157\2\uffff\1\165\1\154\1\153\7\uffff\1\142\1\144\1\164\1\163\1\164\1\145\1\155\1\157\1\145\1\157\1\160\1\145\1\163\1\156\1\154\1\60\1\162\1\163\1\141\1\156\1\60\2\162\1\163\1\145\1\60\1\145\1\157\1\145\1\uffff\1\141\1\60\1\151\1\144\1\uffff\1\60\1\163\1\151\1\60\1\uffff\1\60\1\167\1\155\1\143\1\uffff\1\156\1\163\1\uffff\1\60\1\164\2\uffff\1\156\1\60\1\164\1\163\1\60\1\uffff\1\145\1\60\1\uffff\2\60\1\uffff\1\60\4\uffff";
     static final String DFA11_maxS =
-        "\1\uffff\1\162\1\56\1\142\1\157\1\170\4\uffff\1\145\2\uffff\1\160\2\uffff\1\55\1\uffff\1\75\1\143\2\uffff\1\162\1\141\1\156\1\uffff\2\uffff\1\172\2\uffff\1\57\2\uffff\1\157\3\uffff\1\163\1\141\1\156\1\164\1\162\4\uffff\1\146\2\uffff\1\160\7\uffff\1\157\2\uffff\1\165\1\154\1\153\7\uffff\1\142\1\144\1\164\1\163\1\164\1\145\1\157\1\145\1\157\1\160\1\145\1\163\1\156\1\154\1\172\1\162\1\163\1\141\1\156\2\162\1\163\1\145\1\172\1\145\1\157\1\145\1\uffff\1\141\1\172\1\151\1\144\1\172\1\163\1\151\1\172\1\uffff\1\172\1\167\1\155\1\143\1\uffff\1\156\1\163\1\uffff\1\172\1\164\2\uffff\1\156\1\172\1\164\1\163\1\172\1\uffff\1\145\1\172\1\uffff\2\172\1\uffff\1\172\4\uffff";
+        "\1\uffff\1\162\1\56\1\142\1\157\1\170\4\uffff\1\145\2\uffff\1\160\2\uffff\1\55\1\uffff\1\75\1\143\2\uffff\1\162\1\141\1\156\1\uffff\2\uffff\1\172\2\uffff\1\57\2\uffff\1\157\3\uffff\1\163\1\141\1\156\1\164\1\165\1\162\4\uffff\1\146\2\uffff\1\160\7\uffff\1\157\2\uffff\1\165\1\154\1\153\7\uffff\1\142\1\144\1\164\1\163\1\164\1\145\1\155\1\157\1\145\1\157\1\160\1\145\1\163\1\156\1\154\1\172\1\162\1\163\1\141\1\156\1\172\2\162\1\163\1\145\1\172\1\145\1\157\1\145\1\uffff\1\141\1\172\1\151\1\144\1\uffff\1\172\1\163\1\151\1\172\1\uffff\1\172\1\167\1\155\1\143\1\uffff\1\156\1\163\1\uffff\1\172\1\164\2\uffff\1\156\1\172\1\164\1\163\1\172\1\uffff\1\145\1\172\1\uffff\2\172\1\uffff\1\172\4\uffff";
     static final String DFA11_acceptS =
-        "\6\uffff\1\6\1\7\1\10\1\11\1\uffff\1\14\1\15\1\uffff\1\21\1\22\1\uffff\1\24\2\uffff\1\31\1\33\3\uffff\1\37\3\uffff\1\42\1\43\1\uffff\1\46\1\47\1\uffff\1\42\1\32\1\2\5\uffff\1\6\1\7\1\10\1\11\1\uffff\1\14\1\15\1\uffff\1\21\1\22\1\23\1\26\1\24\1\30\1\25\1\uffff\1\31\1\33\3\uffff\1\37\1\40\1\41\1\43\1\44\1\45\1\46\33\uffff\1\20\10\uffff\1\34\4\uffff\1\4\2\uffff\1\17\2\uffff\1\27\1\35\5\uffff\1\13\2\uffff\1\1\2\uffff\1\5\1\uffff\1\36\1\3\1\12\1\16";
+        "\6\uffff\1\6\1\7\1\10\1\11\1\uffff\1\15\1\16\1\uffff\1\22\1\23\1\uffff\1\25\2\uffff\1\32\1\34\3\uffff\1\40\3\uffff\1\43\1\44\1\uffff\1\47\1\50\1\uffff\1\43\1\33\1\2\6\uffff\1\6\1\7\1\10\1\11\1\uffff\1\15\1\16\1\uffff\1\22\1\23\1\24\1\27\1\25\1\31\1\26\1\uffff\1\32\1\34\3\uffff\1\40\1\41\1\42\1\44\1\45\1\46\1\47\35\uffff\1\21\4\uffff\1\12\4\uffff\1\35\4\uffff\1\4\2\uffff\1\20\2\uffff\1\30\1\36\5\uffff\1\14\2\uffff\1\1\2\uffff\1\5\1\uffff\1\37\1\3\1\13\1\17";
     static final String DFA11_specialS =
-        "\1\1\31\uffff\1\2\1\0\155\uffff}>";
+        "\1\2\31\uffff\1\1\1\0\161\uffff}>";
     static final String[] DFA11_transitionS = {
             "\11\41\2\40\2\41\1\40\22\41\1\40\1\21\1\32\4\41\1\33\1\16\1\17\1\25\1\22\1\6\1\41\1\2\1\37\12\36\1\20\1\10\1\41\1\24\1\41\1\31\1\41\32\35\1\13\1\41\1\14\1\34\1\35\1\41\1\3\1\35\1\4\1\35\1\5\1\27\10\35\1\15\1\1\1\35\1\12\1\23\1\26\1\30\5\35\1\7\1\41\1\11\uff82\41",
             "\1\42",
             "\1\44",
             "\1\46",
             "\1\47\2\uffff\1\50",
-            "\1\52\5\uffff\1\51",
+            "\1\52\3\uffff\1\53\5\uffff\1\51",
             "",
             "",
             "",
             "",
-            "\1\57",
+            "\1\60",
             "",
             "",
-            "\1\62",
+            "\1\63",
             "",
             "",
-            "\1\65",
+            "\1\66",
             "",
-            "\1\70",
-            "\1\72",
+            "\1\71",
+            "\1\73",
             "",
             "",
-            "\1\75",
             "\1\76",
             "\1\77",
+            "\1\100",
             "",
-            "\0\101",
             "\0\102",
+            "\0\103",
             "\32\43\4\uffff\1\43\1\uffff\32\43",
             "",
             "",
-            "\1\104\4\uffff\1\105",
+            "\1\105\4\uffff\1\106",
             "",
             "",
-            "\1\110\11\uffff\1\107",
+            "\1\111\11\uffff\1\110",
             "",
             "",
             "",
-            "\1\111",
             "\1\112",
             "\1\113",
             "\1\114",
             "\1\115",
+            "\1\116",
+            "\1\117",
             "",
             "",
             "",
             "",
-            "\1\116",
+            "\1\120",
             "",
             "",
-            "\1\117",
+            "\1\121",
             "",
             "",
             "",
@@ -1543,12 +1573,12 @@ public class InternalProblemLexer extends Lexer {
             "",
             "",
             "",
-            "\1\120",
+            "\1\122",
             "",
             "",
-            "\1\121",
-            "\1\122",
             "\1\123",
+            "\1\124",
+            "\1\125",
             "",
             "",
             "",
@@ -1556,8 +1586,6 @@ public class InternalProblemLexer extends Lexer {
             "",
             "",
             "",
-            "\1\124",
-            "\1\125",
             "\1\126",
             "\1\127",
             "\1\130",
@@ -1570,48 +1598,53 @@ public class InternalProblemLexer extends Lexer {
             "\1\137",
             "\1\140",
             "\1\141",
-            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "\1\142",
             "\1\143",
             "\1\144",
-            "\1\145",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "\1\146",
             "\1\147",
             "\1\150",
             "\1\151",
-            "\1\152",
             "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "\1\153",
             "\1\154",
             "\1\155",
             "\1\156",
-            "",
-            "\1\157",
             "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "\1\160",
             "\1\161",
             "\1\162",
+            "",
+            "\1\163",
             "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
-            "\1\164",
             "\1\165",
-            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "\1\166",
             "",
             "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "\1\170",
             "\1\171",
-            "\1\172",
-            "",
-            "\1\173",
-            "\1\174",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "",
             "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "\1\174",
+            "\1\175",
             "\1\176",
             "",
-            "",
             "\1\177",
+            "\1\u0080",
+            "",
             "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
-            "\1\u0081",
             "\1\u0082",
+            "",
+            "",
+            "\1\u0083",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "\1\u0085",
+            "\1\u0086",
             "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "",
-            "\1\u0084",
+            "\1\u0088",
             "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "",
             "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
@@ -1654,7 +1687,7 @@ public class InternalProblemLexer extends Lexer {
             this.transition = DFA11_transition;
         }
         public String getDescription() {
-            return "1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | RULE_STRING | RULE_QUOTED_ID | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+            return "1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | T__43 | RULE_STRING | RULE_QUOTED_ID | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             IntStream input = _input;
@@ -1664,13 +1697,23 @@ public class InternalProblemLexer extends Lexer {
                         int LA11_27 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA11_27>='\u0000' && LA11_27<='\uFFFF')) ) {s = 66;}
+                        if ( ((LA11_27>='\u0000' && LA11_27<='\uFFFF')) ) {s = 67;}
 
                         else s = 33;
 
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
+                        int LA11_26 = input.LA(1);
+
+                        s = -1;
+                        if ( ((LA11_26>='\u0000' && LA11_26<='\uFFFF')) ) {s = 66;}
+
+                        else s = 33;
+
+                        if ( s>=0 ) return s;
+                        break;
+                    case 2 : 
                         int LA11_0 = input.LA(1);
 
                         s = -1;
@@ -1742,16 +1785,6 @@ public class InternalProblemLexer extends Lexer {
 
                         if ( s>=0 ) return s;
                         break;
-                    case 2 : 
-                        int LA11_26 = input.LA(1);
-
-                        s = -1;
-                        if ( ((LA11_26>='\u0000' && LA11_26<='\uFFFF')) ) {s = 65;}
-
-                        else s = 33;
-
-                        if ( s>=0 ) return s;
-                        break;
             }
             NoViableAltException nvae =
                 new NoViableAltException(getDescription(), 11, _s, input);
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemParser.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemParser.java
index c4f19943..28b54551 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemParser.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemParser.java
@@ -22,33 +22,18 @@ import java.util.ArrayList;
 @SuppressWarnings("all")
 public class InternalProblemParser extends AbstractInternalAntlrParser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INT", "RULE_QUOTED_ID", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'problem'", "'.'", "'abstract'", "'class'", "'extends'", "','", "'{'", "';'", "'}'", "'contains'", "'refers'", "'['", "']'", "'opposite'", "'error'", "'pred'", "'('", "')'", "':-'", "'!'", "'+'", "':'", "'scope'", "'+='", "'='", "'..'", "'*'", "'true'", "'false'", "'unknown'", "'?'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INT", "RULE_QUOTED_ID", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'problem'", "'.'", "'abstract'", "'class'", "'extends'", "','", "'{'", "';'", "'}'", "'enum'", "'contains'", "'refers'", "'['", "']'", "'opposite'", "'error'", "'pred'", "'('", "')'", "':-'", "'!'", "'+'", "':'", "'scope'", "'+='", "'='", "'..'", "'*'", "'true'", "'false'", "'unknown'", "'?'"
     };
-    public static final int RULE_STRING=7;
-    public static final int RULE_SL_COMMENT=9;
     public static final int T__19=19;
     public static final int T__15=15;
-    public static final int T__37=37;
     public static final int T__16=16;
-    public static final int T__38=38;
     public static final int T__17=17;
-    public static final int T__39=39;
     public static final int T__18=18;
-    public static final int T__33=33;
     public static final int T__12=12;
-    public static final int T__34=34;
     public static final int T__13=13;
-    public static final int T__35=35;
     public static final int T__14=14;
-    public static final int T__36=36;
-    public static final int EOF=-1;
-    public static final int T__30=30;
-    public static final int T__31=31;
-    public static final int T__32=32;
     public static final int RULE_ID=4;
-    public static final int RULE_WS=10;
     public static final int RULE_QUOTED_ID=6;
-    public static final int RULE_ANY_OTHER=11;
     public static final int T__26=26;
     public static final int T__27=27;
     public static final int T__28=28;
@@ -59,11 +44,27 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     public static final int T__23=23;
     public static final int T__24=24;
     public static final int T__25=25;
+    public static final int T__20=20;
+    public static final int T__21=21;
+    public static final int RULE_STRING=7;
+    public static final int RULE_SL_COMMENT=9;
+    public static final int T__37=37;
+    public static final int T__38=38;
+    public static final int T__39=39;
+    public static final int T__33=33;
+    public static final int T__34=34;
+    public static final int T__35=35;
+    public static final int T__36=36;
+    public static final int EOF=-1;
+    public static final int T__30=30;
+    public static final int T__31=31;
+    public static final int T__32=32;
+    public static final int RULE_WS=10;
+    public static final int RULE_ANY_OTHER=11;
     public static final int T__40=40;
     public static final int T__41=41;
-    public static final int T__20=20;
     public static final int T__42=42;
-    public static final int T__21=21;
+    public static final int T__43=43;
 
     // delegates
     // delegators
@@ -141,13 +142,14 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleProblem"
-    // InternalProblem.g:72:1: ruleProblem returns [EObject current=null] : ( (otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* ) ;
+    // InternalProblem.g:72:1: ruleProblem returns [EObject current=null] : ( (otherlv_0= 'problem' ( (lv_name_1_0= ruleIdentifier ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* ) ;
     public final EObject ruleProblem() throws RecognitionException {
         EObject current = null;
 
         Token otherlv_0=null;
-        Token lv_name_1_0=null;
         Token otherlv_2=null;
+        AntlrDatatypeRuleToken lv_name_1_0 = null;
+
         EObject lv_statements_3_0 = null;
 
 
@@ -155,13 +157,13 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:78:2: ( ( (otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* ) )
-            // InternalProblem.g:79:2: ( (otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* )
+            // InternalProblem.g:78:2: ( ( (otherlv_0= 'problem' ( (lv_name_1_0= ruleIdentifier ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* ) )
+            // InternalProblem.g:79:2: ( (otherlv_0= 'problem' ( (lv_name_1_0= ruleIdentifier ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* )
             {
-            // InternalProblem.g:79:2: ( (otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* )
-            // InternalProblem.g:80:3: (otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )*
+            // InternalProblem.g:79:2: ( (otherlv_0= 'problem' ( (lv_name_1_0= ruleIdentifier ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* )
+            // InternalProblem.g:80:3: (otherlv_0= 'problem' ( (lv_name_1_0= ruleIdentifier ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )*
             {
-            // InternalProblem.g:80:3: (otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.' )?
+            // InternalProblem.g:80:3: (otherlv_0= 'problem' ( (lv_name_1_0= ruleIdentifier ) ) otherlv_2= '.' )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -170,31 +172,36 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             switch (alt1) {
                 case 1 :
-                    // InternalProblem.g:81:4: otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.'
+                    // InternalProblem.g:81:4: otherlv_0= 'problem' ( (lv_name_1_0= ruleIdentifier ) ) otherlv_2= '.'
                     {
                     otherlv_0=(Token)match(input,12,FOLLOW_3); 
 
                                                 newLeafNode(otherlv_0, grammarAccess.getProblemAccess().getProblemKeyword_0_0());
                                         
-                    // InternalProblem.g:85:4: ( (lv_name_1_0= RULE_ID ) )
-                    // InternalProblem.g:86:5: (lv_name_1_0= RULE_ID )
+                    // InternalProblem.g:85:4: ( (lv_name_1_0= ruleIdentifier ) )
+                    // InternalProblem.g:86:5: (lv_name_1_0= ruleIdentifier )
                     {
-                    // InternalProblem.g:86:5: (lv_name_1_0= RULE_ID )
-                    // InternalProblem.g:87:6: lv_name_1_0= RULE_ID
+                    // InternalProblem.g:86:5: (lv_name_1_0= ruleIdentifier )
+                    // InternalProblem.g:87:6: lv_name_1_0= ruleIdentifier
                     {
-                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_4); 
 
-                                                                newLeafNode(lv_name_1_0, grammarAccess.getProblemAccess().getNameIDTerminalRuleCall_0_1_0());
+                                                                newCompositeNode(grammarAccess.getProblemAccess().getNameIdentifierParserRuleCall_0_1_0());
                                                         
+                    pushFollow(FOLLOW_4);
+                    lv_name_1_0=ruleIdentifier();
+
+                    state._fsp--;
+
 
                                                                 if (current==null) {
-                                                                        current = createModelElement(grammarAccess.getProblemRule());
+                                                                        current = createModelElementForParent(grammarAccess.getProblemRule());
                                                                 }
-                                                                setWithLastConsumed(
+                                                                set(
                                                                         current,
                                                                         "name",
                                                                         lv_name_1_0,
-                                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                                        "org.eclipse.viatra.solver.language.Problem.Identifier");
+                                                                afterParserOrEnumRuleCall();
                                                         
 
                     }
@@ -212,23 +219,23 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:108:3: ( (lv_statements_3_0= ruleStatement ) )*
+            // InternalProblem.g:109:3: ( (lv_statements_3_0= ruleStatement ) )*
             loop2:
             do {
                 int alt2=2;
                 int LA2_0 = input.LA(1);
 
-                if ( (LA2_0==RULE_ID||LA2_0==RULE_QUOTED_ID||(LA2_0>=14 && LA2_0<=15)||(LA2_0>=26 && LA2_0<=27)||LA2_0==31||LA2_0==34||LA2_0==42) ) {
+                if ( (LA2_0==RULE_ID||LA2_0==RULE_QUOTED_ID||(LA2_0>=14 && LA2_0<=15)||LA2_0==21||(LA2_0>=27 && LA2_0<=28)||LA2_0==32||LA2_0==35||(LA2_0>=40 && LA2_0<=41)||LA2_0==43) ) {
                     alt2=1;
                 }
 
 
                 switch (alt2) {
                 case 1 :
-                    // InternalProblem.g:109:4: (lv_statements_3_0= ruleStatement )
+                    // InternalProblem.g:110:4: (lv_statements_3_0= ruleStatement )
                     {
-                    // InternalProblem.g:109:4: (lv_statements_3_0= ruleStatement )
-                    // InternalProblem.g:110:5: lv_statements_3_0= ruleStatement
+                    // InternalProblem.g:110:4: (lv_statements_3_0= ruleStatement )
+                    // InternalProblem.g:111:5: lv_statements_3_0= ruleStatement
                     {
 
                                                         newCompositeNode(grammarAccess.getProblemAccess().getStatementsStatementParserRuleCall_1_0());
@@ -284,7 +291,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStatement"
-    // InternalProblem.g:131:1: entryRuleStatement returns [EObject current=null] : iv_ruleStatement= ruleStatement EOF ;
+    // InternalProblem.g:132:1: entryRuleStatement returns [EObject current=null] : iv_ruleStatement= ruleStatement EOF ;
     public final EObject entryRuleStatement() throws RecognitionException {
         EObject current = null;
 
@@ -292,8 +299,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:131:50: (iv_ruleStatement= ruleStatement EOF )
-            // InternalProblem.g:132:2: iv_ruleStatement= ruleStatement EOF
+            // InternalProblem.g:132:50: (iv_ruleStatement= ruleStatement EOF )
+            // InternalProblem.g:133:2: iv_ruleStatement= ruleStatement EOF
             {
              newCompositeNode(grammarAccess.getStatementRule()); 
             pushFollow(FOLLOW_1);
@@ -320,28 +327,30 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStatement"
-    // InternalProblem.g:138:1: ruleStatement returns [EObject current=null] : (this_ClassDeclaration_0= ruleClassDeclaration | this_PredicateDefinition_1= rulePredicateDefinition | this_Assertion_2= ruleAssertion | this_ScopeDeclaration_3= ruleScopeDeclaration ) ;
+    // InternalProblem.g:139:1: ruleStatement returns [EObject current=null] : (this_ClassDeclaration_0= ruleClassDeclaration | this_EnumDeclaration_1= ruleEnumDeclaration | this_PredicateDefinition_2= rulePredicateDefinition | this_Assertion_3= ruleAssertion | this_ScopeDeclaration_4= ruleScopeDeclaration ) ;
     public final EObject ruleStatement() throws RecognitionException {
         EObject current = null;
 
         EObject this_ClassDeclaration_0 = null;
 
-        EObject this_PredicateDefinition_1 = null;
+        EObject this_EnumDeclaration_1 = null;
+
+        EObject this_PredicateDefinition_2 = null;
 
-        EObject this_Assertion_2 = null;
+        EObject this_Assertion_3 = null;
 
-        EObject this_ScopeDeclaration_3 = null;
+        EObject this_ScopeDeclaration_4 = null;
 
 
 
                 enterRule();
 
         try {
-            // InternalProblem.g:144:2: ( (this_ClassDeclaration_0= ruleClassDeclaration | this_PredicateDefinition_1= rulePredicateDefinition | this_Assertion_2= ruleAssertion | this_ScopeDeclaration_3= ruleScopeDeclaration ) )
-            // InternalProblem.g:145:2: (this_ClassDeclaration_0= ruleClassDeclaration | this_PredicateDefinition_1= rulePredicateDefinition | this_Assertion_2= ruleAssertion | this_ScopeDeclaration_3= ruleScopeDeclaration )
+            // InternalProblem.g:145:2: ( (this_ClassDeclaration_0= ruleClassDeclaration | this_EnumDeclaration_1= ruleEnumDeclaration | this_PredicateDefinition_2= rulePredicateDefinition | this_Assertion_3= ruleAssertion | this_ScopeDeclaration_4= ruleScopeDeclaration ) )
+            // InternalProblem.g:146:2: (this_ClassDeclaration_0= ruleClassDeclaration | this_EnumDeclaration_1= ruleEnumDeclaration | this_PredicateDefinition_2= rulePredicateDefinition | this_Assertion_3= ruleAssertion | this_ScopeDeclaration_4= ruleScopeDeclaration )
             {
-            // InternalProblem.g:145:2: (this_ClassDeclaration_0= ruleClassDeclaration | this_PredicateDefinition_1= rulePredicateDefinition | this_Assertion_2= ruleAssertion | this_ScopeDeclaration_3= ruleScopeDeclaration )
-            int alt3=4;
+            // InternalProblem.g:146:2: (this_ClassDeclaration_0= ruleClassDeclaration | this_EnumDeclaration_1= ruleEnumDeclaration | this_PredicateDefinition_2= rulePredicateDefinition | this_Assertion_3= ruleAssertion | this_ScopeDeclaration_4= ruleScopeDeclaration )
+            int alt3=5;
             switch ( input.LA(1) ) {
             case 14:
             case 15:
@@ -349,25 +358,32 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 alt3=1;
                 }
                 break;
-            case 26:
-            case 27:
+            case 21:
                 {
                 alt3=2;
                 }
                 break;
-            case RULE_ID:
-            case RULE_QUOTED_ID:
-            case 31:
-            case 42:
+            case 27:
+            case 28:
                 {
                 alt3=3;
                 }
                 break;
-            case 34:
+            case RULE_ID:
+            case RULE_QUOTED_ID:
+            case 32:
+            case 40:
+            case 41:
+            case 43:
                 {
                 alt3=4;
                 }
                 break;
+            case 35:
+                {
+                alt3=5;
+                }
+                break;
             default:
                 NoViableAltException nvae =
                     new NoViableAltException("", 3, 0, input);
@@ -377,7 +393,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             switch (alt3) {
                 case 1 :
-                    // InternalProblem.g:146:3: this_ClassDeclaration_0= ruleClassDeclaration
+                    // InternalProblem.g:147:3: this_ClassDeclaration_0= ruleClassDeclaration
                     {
 
                                         newCompositeNode(grammarAccess.getStatementAccess().getClassDeclarationParserRuleCall_0());
@@ -395,54 +411,72 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:155:3: this_PredicateDefinition_1= rulePredicateDefinition
+                    // InternalProblem.g:156:3: this_EnumDeclaration_1= ruleEnumDeclaration
                     {
 
-                                        newCompositeNode(grammarAccess.getStatementAccess().getPredicateDefinitionParserRuleCall_1());
+                                        newCompositeNode(grammarAccess.getStatementAccess().getEnumDeclarationParserRuleCall_1());
                                 
                     pushFollow(FOLLOW_2);
-                    this_PredicateDefinition_1=rulePredicateDefinition();
+                    this_EnumDeclaration_1=ruleEnumDeclaration();
 
                     state._fsp--;
 
 
-                                        current = this_PredicateDefinition_1;
+                                        current = this_EnumDeclaration_1;
                                         afterParserOrEnumRuleCall();
                                 
 
                     }
                     break;
                 case 3 :
-                    // InternalProblem.g:164:3: this_Assertion_2= ruleAssertion
+                    // InternalProblem.g:165:3: this_PredicateDefinition_2= rulePredicateDefinition
                     {
 
-                                        newCompositeNode(grammarAccess.getStatementAccess().getAssertionParserRuleCall_2());
+                                        newCompositeNode(grammarAccess.getStatementAccess().getPredicateDefinitionParserRuleCall_2());
                                 
                     pushFollow(FOLLOW_2);
-                    this_Assertion_2=ruleAssertion();
+                    this_PredicateDefinition_2=rulePredicateDefinition();
 
                     state._fsp--;
 
 
-                                        current = this_Assertion_2;
+                                        current = this_PredicateDefinition_2;
                                         afterParserOrEnumRuleCall();
                                 
 
                     }
                     break;
                 case 4 :
-                    // InternalProblem.g:173:3: this_ScopeDeclaration_3= ruleScopeDeclaration
+                    // InternalProblem.g:174:3: this_Assertion_3= ruleAssertion
+                    {
+
+                                        newCompositeNode(grammarAccess.getStatementAccess().getAssertionParserRuleCall_3());
+                                
+                    pushFollow(FOLLOW_2);
+                    this_Assertion_3=ruleAssertion();
+
+                    state._fsp--;
+
+
+                                        current = this_Assertion_3;
+                                        afterParserOrEnumRuleCall();
+                                
+
+                    }
+                    break;
+                case 5 :
+                    // InternalProblem.g:183:3: this_ScopeDeclaration_4= ruleScopeDeclaration
                     {
 
-                                        newCompositeNode(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_3());
+                                        newCompositeNode(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_4());
                                 
                     pushFollow(FOLLOW_2);
-                    this_ScopeDeclaration_3=ruleScopeDeclaration();
+                    this_ScopeDeclaration_4=ruleScopeDeclaration();
 
                     state._fsp--;
 
 
-                                        current = this_ScopeDeclaration_3;
+                                        current = this_ScopeDeclaration_4;
                                         afterParserOrEnumRuleCall();
                                 
 
@@ -471,7 +505,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleClassDeclaration"
-    // InternalProblem.g:185:1: entryRuleClassDeclaration returns [EObject current=null] : iv_ruleClassDeclaration= ruleClassDeclaration EOF ;
+    // InternalProblem.g:195:1: entryRuleClassDeclaration returns [EObject current=null] : iv_ruleClassDeclaration= ruleClassDeclaration EOF ;
     public final EObject entryRuleClassDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -479,8 +513,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:185:57: (iv_ruleClassDeclaration= ruleClassDeclaration EOF )
-            // InternalProblem.g:186:2: iv_ruleClassDeclaration= ruleClassDeclaration EOF
+            // InternalProblem.g:195:57: (iv_ruleClassDeclaration= ruleClassDeclaration EOF )
+            // InternalProblem.g:196:2: iv_ruleClassDeclaration= ruleClassDeclaration EOF
             {
              newCompositeNode(grammarAccess.getClassDeclarationRule()); 
             pushFollow(FOLLOW_1);
@@ -507,19 +541,20 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleClassDeclaration"
-    // InternalProblem.g:192:1: ruleClassDeclaration returns [EObject current=null] : ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) ) ;
+    // InternalProblem.g:202:1: ruleClassDeclaration returns [EObject current=null] : ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= ruleIdentifier ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) ) ;
     public final EObject ruleClassDeclaration() throws RecognitionException {
         EObject current = null;
 
         Token lv_abstract_0_0=null;
         Token otherlv_1=null;
-        Token lv_name_2_0=null;
         Token otherlv_3=null;
         Token otherlv_5=null;
         Token otherlv_7=null;
         Token otherlv_9=null;
         Token otherlv_10=null;
         Token otherlv_11=null;
+        AntlrDatatypeRuleToken lv_name_2_0 = null;
+
         EObject lv_referenceDeclarations_8_0 = null;
 
 
@@ -527,13 +562,13 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:198:2: ( ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) ) )
-            // InternalProblem.g:199:2: ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) )
+            // InternalProblem.g:208:2: ( ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= ruleIdentifier ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) ) )
+            // InternalProblem.g:209:2: ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= ruleIdentifier ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) )
             {
-            // InternalProblem.g:199:2: ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) )
-            // InternalProblem.g:200:3: ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' )
+            // InternalProblem.g:209:2: ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= ruleIdentifier ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) )
+            // InternalProblem.g:210:3: ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= ruleIdentifier ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' )
             {
-            // InternalProblem.g:200:3: ( (lv_abstract_0_0= 'abstract' ) )?
+            // InternalProblem.g:210:3: ( (lv_abstract_0_0= 'abstract' ) )?
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -542,10 +577,10 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             switch (alt4) {
                 case 1 :
-                    // InternalProblem.g:201:4: (lv_abstract_0_0= 'abstract' )
+                    // InternalProblem.g:211:4: (lv_abstract_0_0= 'abstract' )
                     {
-                    // InternalProblem.g:201:4: (lv_abstract_0_0= 'abstract' )
-                    // InternalProblem.g:202:5: lv_abstract_0_0= 'abstract'
+                    // InternalProblem.g:211:4: (lv_abstract_0_0= 'abstract' )
+                    // InternalProblem.g:212:5: lv_abstract_0_0= 'abstract'
                     {
                     lv_abstract_0_0=(Token)match(input,14,FOLLOW_6); 
 
@@ -570,25 +605,30 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                 newLeafNode(otherlv_1, grammarAccess.getClassDeclarationAccess().getClassKeyword_1());
                         
-            // InternalProblem.g:218:3: ( (lv_name_2_0= RULE_ID ) )
-            // InternalProblem.g:219:4: (lv_name_2_0= RULE_ID )
+            // InternalProblem.g:228:3: ( (lv_name_2_0= ruleIdentifier ) )
+            // InternalProblem.g:229:4: (lv_name_2_0= ruleIdentifier )
             {
-            // InternalProblem.g:219:4: (lv_name_2_0= RULE_ID )
-            // InternalProblem.g:220:5: lv_name_2_0= RULE_ID
+            // InternalProblem.g:229:4: (lv_name_2_0= ruleIdentifier )
+            // InternalProblem.g:230:5: lv_name_2_0= ruleIdentifier
             {
-            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_7); 
 
-                                                newLeafNode(lv_name_2_0, grammarAccess.getClassDeclarationAccess().getNameIDTerminalRuleCall_2_0());
+                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getNameIdentifierParserRuleCall_2_0());
                                         
+            pushFollow(FOLLOW_7);
+            lv_name_2_0=ruleIdentifier();
+
+            state._fsp--;
+
 
                                                 if (current==null) {
-                                                        current = createModelElement(grammarAccess.getClassDeclarationRule());
+                                                        current = createModelElementForParent(grammarAccess.getClassDeclarationRule());
                                                 }
-                                                setWithLastConsumed(
+                                                set(
                                                         current,
                                                         "name",
                                                         lv_name_2_0,
-                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                        "org.eclipse.viatra.solver.language.Problem.Identifier");
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -596,7 +636,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:236:3: (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )?
+            // InternalProblem.g:247:3: (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )?
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -605,17 +645,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             switch (alt6) {
                 case 1 :
-                    // InternalProblem.g:237:4: otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )*
+                    // InternalProblem.g:248:4: otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )*
                     {
                     otherlv_3=(Token)match(input,16,FOLLOW_8); 
 
                                                 newLeafNode(otherlv_3, grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0());
                                         
-                    // InternalProblem.g:241:4: ( ( ruleQualifiedName ) )
-                    // InternalProblem.g:242:5: ( ruleQualifiedName )
+                    // InternalProblem.g:252:4: ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:253:5: ( ruleQualifiedName )
                     {
-                    // InternalProblem.g:242:5: ( ruleQualifiedName )
-                    // InternalProblem.g:243:6: ruleQualifiedName
+                    // InternalProblem.g:253:5: ( ruleQualifiedName )
+                    // InternalProblem.g:254:6: ruleQualifiedName
                     {
 
                                                                 if (current==null) {
@@ -623,7 +663,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                                                 }
                                                         
 
-                                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_1_0());
+                                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationCrossReference_3_1_0());
                                                         
                     pushFollow(FOLLOW_9);
                     ruleQualifiedName();
@@ -639,7 +679,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:257:4: (otherlv_5= ',' ( ( ruleQualifiedName ) ) )*
+                    // InternalProblem.g:268:4: (otherlv_5= ',' ( ( ruleQualifiedName ) ) )*
                     loop5:
                     do {
                         int alt5=2;
@@ -652,17 +692,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                         switch (alt5) {
                         case 1 :
-                            // InternalProblem.g:258:5: otherlv_5= ',' ( ( ruleQualifiedName ) )
+                            // InternalProblem.g:269:5: otherlv_5= ',' ( ( ruleQualifiedName ) )
                             {
                             otherlv_5=(Token)match(input,17,FOLLOW_8); 
 
                                                                 newLeafNode(otherlv_5, grammarAccess.getClassDeclarationAccess().getCommaKeyword_3_2_0());
                                                         
-                            // InternalProblem.g:262:5: ( ( ruleQualifiedName ) )
-                            // InternalProblem.g:263:6: ( ruleQualifiedName )
+                            // InternalProblem.g:273:5: ( ( ruleQualifiedName ) )
+                            // InternalProblem.g:274:6: ( ruleQualifiedName )
                             {
-                            // InternalProblem.g:263:6: ( ruleQualifiedName )
-                            // InternalProblem.g:264:7: ruleQualifiedName
+                            // InternalProblem.g:274:6: ( ruleQualifiedName )
+                            // InternalProblem.g:275:7: ruleQualifiedName
                             {
 
                                                                                 if (current==null) {
@@ -670,7 +710,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                                                                 }
                                                                         
 
-                                                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_2_1_0());
+                                                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationCrossReference_3_2_1_0());
                                                                         
                             pushFollow(FOLLOW_9);
                             ruleQualifiedName();
@@ -701,7 +741,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:280:3: ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' )
+            // InternalProblem.g:291:3: ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' )
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -719,35 +759,35 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             switch (alt9) {
                 case 1 :
-                    // InternalProblem.g:281:4: (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' )
+                    // InternalProblem.g:292:4: (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' )
                     {
-                    // InternalProblem.g:281:4: (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' )
-                    // InternalProblem.g:282:5: otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}'
+                    // InternalProblem.g:292:4: (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' )
+                    // InternalProblem.g:293:5: otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}'
                     {
                     otherlv_7=(Token)match(input,18,FOLLOW_10); 
 
                                                         newLeafNode(otherlv_7, grammarAccess.getClassDeclarationAccess().getLeftCurlyBracketKeyword_4_0_0());
                                                 
-                    // InternalProblem.g:286:5: ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )*
+                    // InternalProblem.g:297:5: ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )*
                     loop8:
                     do {
                         int alt8=2;
                         int LA8_0 = input.LA(1);
 
-                        if ( ((LA8_0>=21 && LA8_0<=22)) ) {
+                        if ( (LA8_0==RULE_ID||LA8_0==RULE_QUOTED_ID||(LA8_0>=22 && LA8_0<=23)||(LA8_0>=40 && LA8_0<=41)) ) {
                             alt8=1;
                         }
 
 
                         switch (alt8) {
                         case 1 :
-                            // InternalProblem.g:287:6: ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )?
+                            // InternalProblem.g:298:6: ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )?
                             {
-                            // InternalProblem.g:287:6: ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) )
-                            // InternalProblem.g:288:7: (lv_referenceDeclarations_8_0= ruleReferenceDeclaration )
+                            // InternalProblem.g:298:6: ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) )
+                            // InternalProblem.g:299:7: (lv_referenceDeclarations_8_0= ruleReferenceDeclaration )
                             {
-                            // InternalProblem.g:288:7: (lv_referenceDeclarations_8_0= ruleReferenceDeclaration )
-                            // InternalProblem.g:289:8: lv_referenceDeclarations_8_0= ruleReferenceDeclaration
+                            // InternalProblem.g:299:7: (lv_referenceDeclarations_8_0= ruleReferenceDeclaration )
+                            // InternalProblem.g:300:8: lv_referenceDeclarations_8_0= ruleReferenceDeclaration
                             {
 
                                                                                         newCompositeNode(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_0_1_0_0());
@@ -774,7 +814,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalProblem.g:306:6: (otherlv_9= ';' )?
+                            // InternalProblem.g:317:6: (otherlv_9= ';' )?
                             int alt7=2;
                             int LA7_0 = input.LA(1);
 
@@ -783,7 +823,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                             }
                             switch (alt7) {
                                 case 1 :
-                                    // InternalProblem.g:307:7: otherlv_9= ';'
+                                    // InternalProblem.g:318:7: otherlv_9= ';'
                                     {
                                     otherlv_9=(Token)match(input,19,FOLLOW_10); 
 
@@ -815,7 +855,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:319:4: otherlv_11= '.'
+                    // InternalProblem.g:330:4: otherlv_11= '.'
                     {
                     otherlv_11=(Token)match(input,13,FOLLOW_2); 
 
@@ -849,8 +889,428 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     // $ANTLR end "ruleClassDeclaration"
 
 
+    // $ANTLR start "entryRuleEnumDeclaration"
+    // InternalProblem.g:339:1: entryRuleEnumDeclaration returns [EObject current=null] : iv_ruleEnumDeclaration= ruleEnumDeclaration EOF ;
+    public final EObject entryRuleEnumDeclaration() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleEnumDeclaration = null;
+
+
+        try {
+            // InternalProblem.g:339:56: (iv_ruleEnumDeclaration= ruleEnumDeclaration EOF )
+            // InternalProblem.g:340:2: iv_ruleEnumDeclaration= ruleEnumDeclaration EOF
+            {
+             newCompositeNode(grammarAccess.getEnumDeclarationRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleEnumDeclaration=ruleEnumDeclaration();
+
+            state._fsp--;
+
+             current =iv_ruleEnumDeclaration; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleEnumDeclaration"
+
+
+    // $ANTLR start "ruleEnumDeclaration"
+    // InternalProblem.g:346:1: ruleEnumDeclaration returns [EObject current=null] : (otherlv_0= 'enum' ( (lv_name_1_0= ruleIdentifier ) ) ( (otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}' ) | otherlv_9= '.' ) ) ;
+    public final EObject ruleEnumDeclaration() throws RecognitionException {
+        EObject current = null;
+
+        Token otherlv_0=null;
+        Token otherlv_2=null;
+        Token otherlv_4=null;
+        Token otherlv_6=null;
+        Token otherlv_7=null;
+        Token otherlv_8=null;
+        Token otherlv_9=null;
+        AntlrDatatypeRuleToken lv_name_1_0 = null;
+
+        EObject lv_literals_3_0 = null;
+
+        EObject lv_literals_5_0 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:352:2: ( (otherlv_0= 'enum' ( (lv_name_1_0= ruleIdentifier ) ) ( (otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}' ) | otherlv_9= '.' ) ) )
+            // InternalProblem.g:353:2: (otherlv_0= 'enum' ( (lv_name_1_0= ruleIdentifier ) ) ( (otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}' ) | otherlv_9= '.' ) )
+            {
+            // InternalProblem.g:353:2: (otherlv_0= 'enum' ( (lv_name_1_0= ruleIdentifier ) ) ( (otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}' ) | otherlv_9= '.' ) )
+            // InternalProblem.g:354:3: otherlv_0= 'enum' ( (lv_name_1_0= ruleIdentifier ) ) ( (otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}' ) | otherlv_9= '.' )
+            {
+            otherlv_0=(Token)match(input,21,FOLLOW_3); 
+
+                                newLeafNode(otherlv_0, grammarAccess.getEnumDeclarationAccess().getEnumKeyword_0());
+                        
+            // InternalProblem.g:358:3: ( (lv_name_1_0= ruleIdentifier ) )
+            // InternalProblem.g:359:4: (lv_name_1_0= ruleIdentifier )
+            {
+            // InternalProblem.g:359:4: (lv_name_1_0= ruleIdentifier )
+            // InternalProblem.g:360:5: lv_name_1_0= ruleIdentifier
+            {
+
+                                                newCompositeNode(grammarAccess.getEnumDeclarationAccess().getNameIdentifierParserRuleCall_1_0());
+                                        
+            pushFollow(FOLLOW_12);
+            lv_name_1_0=ruleIdentifier();
+
+            state._fsp--;
+
+
+                                                if (current==null) {
+                                                        current = createModelElementForParent(grammarAccess.getEnumDeclarationRule());
+                                                }
+                                                set(
+                                                        current,
+                                                        "name",
+                                                        lv_name_1_0,
+                                                        "org.eclipse.viatra.solver.language.Problem.Identifier");
+                                                afterParserOrEnumRuleCall();
+                                        
+
+            }
+
+
+            }
+
+            // InternalProblem.g:377:3: ( (otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}' ) | otherlv_9= '.' )
+            int alt13=2;
+            int LA13_0 = input.LA(1);
+
+            if ( (LA13_0==18) ) {
+                alt13=1;
+            }
+            else if ( (LA13_0==13) ) {
+                alt13=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 13, 0, input);
+
+                throw nvae;
+            }
+            switch (alt13) {
+                case 1 :
+                    // InternalProblem.g:378:4: (otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}' )
+                    {
+                    // InternalProblem.g:378:4: (otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}' )
+                    // InternalProblem.g:379:5: otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}'
+                    {
+                    otherlv_2=(Token)match(input,18,FOLLOW_13); 
+
+                                                        newLeafNode(otherlv_2, grammarAccess.getEnumDeclarationAccess().getLeftCurlyBracketKeyword_2_0_0());
+                                                
+                    // InternalProblem.g:383:5: ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )?
+                    int alt12=2;
+                    int LA12_0 = input.LA(1);
+
+                    if ( (LA12_0==RULE_ID||LA12_0==RULE_QUOTED_ID||(LA12_0>=40 && LA12_0<=41)) ) {
+                        alt12=1;
+                    }
+                    switch (alt12) {
+                        case 1 :
+                            // InternalProblem.g:384:6: ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )?
+                            {
+                            // InternalProblem.g:384:6: ( (lv_literals_3_0= ruleEnumLiteral ) )
+                            // InternalProblem.g:385:7: (lv_literals_3_0= ruleEnumLiteral )
+                            {
+                            // InternalProblem.g:385:7: (lv_literals_3_0= ruleEnumLiteral )
+                            // InternalProblem.g:386:8: lv_literals_3_0= ruleEnumLiteral
+                            {
+
+                                                                                        newCompositeNode(grammarAccess.getEnumDeclarationAccess().getLiteralsEnumLiteralParserRuleCall_2_0_1_0_0());
+                                                                                
+                            pushFollow(FOLLOW_14);
+                            lv_literals_3_0=ruleEnumLiteral();
+
+                            state._fsp--;
+
+
+                                                                                        if (current==null) {
+                                                                                                current = createModelElementForParent(grammarAccess.getEnumDeclarationRule());
+                                                                                        }
+                                                                                        add(
+                                                                                                current,
+                                                                                                "literals",
+                                                                                                lv_literals_3_0,
+                                                                                                "org.eclipse.viatra.solver.language.Problem.EnumLiteral");
+                                                                                        afterParserOrEnumRuleCall();
+                                                                                
+
+                            }
+
+
+                            }
+
+                            // InternalProblem.g:403:6: (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )*
+                            loop10:
+                            do {
+                                int alt10=2;
+                                int LA10_0 = input.LA(1);
+
+                                if ( (LA10_0==17) ) {
+                                    int LA10_1 = input.LA(2);
+
+                                    if ( (LA10_1==RULE_ID||LA10_1==RULE_QUOTED_ID||(LA10_1>=40 && LA10_1<=41)) ) {
+                                        alt10=1;
+                                    }
+
+
+                                }
+
+
+                                switch (alt10) {
+                                case 1 :
+                                    // InternalProblem.g:404:7: otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) )
+                                    {
+                                    otherlv_4=(Token)match(input,17,FOLLOW_8); 
+
+                                                                                        newLeafNode(otherlv_4, grammarAccess.getEnumDeclarationAccess().getCommaKeyword_2_0_1_1_0());
+                                                                                
+                                    // InternalProblem.g:408:7: ( (lv_literals_5_0= ruleEnumLiteral ) )
+                                    // InternalProblem.g:409:8: (lv_literals_5_0= ruleEnumLiteral )
+                                    {
+                                    // InternalProblem.g:409:8: (lv_literals_5_0= ruleEnumLiteral )
+                                    // InternalProblem.g:410:9: lv_literals_5_0= ruleEnumLiteral
+                                    {
+
+                                                                                                        newCompositeNode(grammarAccess.getEnumDeclarationAccess().getLiteralsEnumLiteralParserRuleCall_2_0_1_1_1_0());
+                                                                                                
+                                    pushFollow(FOLLOW_14);
+                                    lv_literals_5_0=ruleEnumLiteral();
+
+                                    state._fsp--;
+
+
+                                                                                                        if (current==null) {
+                                                                                                                current = createModelElementForParent(grammarAccess.getEnumDeclarationRule());
+                                                                                                        }
+                                                                                                        add(
+                                                                                                                current,
+                                                                                                                "literals",
+                                                                                                                lv_literals_5_0,
+                                                                                                                "org.eclipse.viatra.solver.language.Problem.EnumLiteral");
+                                                                                                        afterParserOrEnumRuleCall();
+                                                                                                
+
+                                    }
+
+
+                                    }
+
+
+                                    }
+                                    break;
+
+                                default :
+                                    break loop10;
+                                }
+                            } while (true);
+
+                            // InternalProblem.g:428:6: (otherlv_6= ',' | otherlv_7= ';' )?
+                            int alt11=3;
+                            int LA11_0 = input.LA(1);
+
+                            if ( (LA11_0==17) ) {
+                                alt11=1;
+                            }
+                            else if ( (LA11_0==19) ) {
+                                alt11=2;
+                            }
+                            switch (alt11) {
+                                case 1 :
+                                    // InternalProblem.g:429:7: otherlv_6= ','
+                                    {
+                                    otherlv_6=(Token)match(input,17,FOLLOW_15); 
+
+                                                                                        newLeafNode(otherlv_6, grammarAccess.getEnumDeclarationAccess().getCommaKeyword_2_0_1_2_0());
+                                                                                
+
+                                    }
+                                    break;
+                                case 2 :
+                                    // InternalProblem.g:434:7: otherlv_7= ';'
+                                    {
+                                    otherlv_7=(Token)match(input,19,FOLLOW_15); 
+
+                                                                                        newLeafNode(otherlv_7, grammarAccess.getEnumDeclarationAccess().getSemicolonKeyword_2_0_1_2_1());
+                                                                                
+
+                                    }
+                                    break;
+
+                            }
+
+
+                            }
+                            break;
+
+                    }
+
+                    otherlv_8=(Token)match(input,20,FOLLOW_2); 
+
+                                                        newLeafNode(otherlv_8, grammarAccess.getEnumDeclarationAccess().getRightCurlyBracketKeyword_2_0_2());
+                                                
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:446:4: otherlv_9= '.'
+                    {
+                    otherlv_9=(Token)match(input,13,FOLLOW_2); 
+
+                                                newLeafNode(otherlv_9, grammarAccess.getEnumDeclarationAccess().getFullStopKeyword_2_1());
+                                        
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleEnumDeclaration"
+
+
+    // $ANTLR start "entryRuleEnumLiteral"
+    // InternalProblem.g:455:1: entryRuleEnumLiteral returns [EObject current=null] : iv_ruleEnumLiteral= ruleEnumLiteral EOF ;
+    public final EObject entryRuleEnumLiteral() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleEnumLiteral = null;
+
+
+        try {
+            // InternalProblem.g:455:52: (iv_ruleEnumLiteral= ruleEnumLiteral EOF )
+            // InternalProblem.g:456:2: iv_ruleEnumLiteral= ruleEnumLiteral EOF
+            {
+             newCompositeNode(grammarAccess.getEnumLiteralRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleEnumLiteral=ruleEnumLiteral();
+
+            state._fsp--;
+
+             current =iv_ruleEnumLiteral; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleEnumLiteral"
+
+
+    // $ANTLR start "ruleEnumLiteral"
+    // InternalProblem.g:462:1: ruleEnumLiteral returns [EObject current=null] : ( (lv_name_0_0= ruleQuotedOrUnquotedId ) ) ;
+    public final EObject ruleEnumLiteral() throws RecognitionException {
+        EObject current = null;
+
+        AntlrDatatypeRuleToken lv_name_0_0 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:468:2: ( ( (lv_name_0_0= ruleQuotedOrUnquotedId ) ) )
+            // InternalProblem.g:469:2: ( (lv_name_0_0= ruleQuotedOrUnquotedId ) )
+            {
+            // InternalProblem.g:469:2: ( (lv_name_0_0= ruleQuotedOrUnquotedId ) )
+            // InternalProblem.g:470:3: (lv_name_0_0= ruleQuotedOrUnquotedId )
+            {
+            // InternalProblem.g:470:3: (lv_name_0_0= ruleQuotedOrUnquotedId )
+            // InternalProblem.g:471:4: lv_name_0_0= ruleQuotedOrUnquotedId
+            {
+
+                                        newCompositeNode(grammarAccess.getEnumLiteralAccess().getNameQuotedOrUnquotedIdParserRuleCall_0());
+                                
+            pushFollow(FOLLOW_2);
+            lv_name_0_0=ruleQuotedOrUnquotedId();
+
+            state._fsp--;
+
+
+                                        if (current==null) {
+                                                current = createModelElementForParent(grammarAccess.getEnumLiteralRule());
+                                        }
+                                        set(
+                                                current,
+                                                "name",
+                                                lv_name_0_0,
+                                                "org.eclipse.viatra.solver.language.Problem.QuotedOrUnquotedId");
+                                        afterParserOrEnumRuleCall();
+                                
+
+            }
+
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleEnumLiteral"
+
+
     // $ANTLR start "entryRuleReferenceDeclaration"
-    // InternalProblem.g:328:1: entryRuleReferenceDeclaration returns [EObject current=null] : iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF ;
+    // InternalProblem.g:491:1: entryRuleReferenceDeclaration returns [EObject current=null] : iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF ;
     public final EObject entryRuleReferenceDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -858,8 +1318,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:328:61: (iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF )
-            // InternalProblem.g:329:2: iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF
+            // InternalProblem.g:491:61: (iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF )
+            // InternalProblem.g:492:2: iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF
             {
              newCompositeNode(grammarAccess.getReferenceDeclarationRule()); 
             pushFollow(FOLLOW_1);
@@ -886,7 +1346,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleReferenceDeclaration"
-    // InternalProblem.g:335:1: ruleReferenceDeclaration returns [EObject current=null] : ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? ) ;
+    // InternalProblem.g:498:1: ruleReferenceDeclaration returns [EObject current=null] : ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' )? ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= ruleIdentifier ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? ) ;
     public final EObject ruleReferenceDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -894,48 +1354,43 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
         Token otherlv_1=null;
         Token otherlv_3=null;
         Token otherlv_5=null;
-        Token lv_name_6_0=null;
         Token otherlv_7=null;
         EObject lv_multiplicity_4_0 = null;
 
+        AntlrDatatypeRuleToken lv_name_6_0 = null;
+
 
 
                 enterRule();
 
         try {
-            // InternalProblem.g:341:2: ( ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? ) )
-            // InternalProblem.g:342:2: ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? )
+            // InternalProblem.g:504:2: ( ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' )? ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= ruleIdentifier ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? ) )
+            // InternalProblem.g:505:2: ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' )? ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= ruleIdentifier ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? )
             {
-            // InternalProblem.g:342:2: ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? )
-            // InternalProblem.g:343:3: ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )?
+            // InternalProblem.g:505:2: ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' )? ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= ruleIdentifier ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? )
+            // InternalProblem.g:506:3: ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' )? ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= ruleIdentifier ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )?
             {
-            // InternalProblem.g:343:3: ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' )
-            int alt10=2;
-            int LA10_0 = input.LA(1);
+            // InternalProblem.g:506:3: ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' )?
+            int alt14=3;
+            int LA14_0 = input.LA(1);
 
-            if ( (LA10_0==21) ) {
-                alt10=1;
-            }
-            else if ( (LA10_0==22) ) {
-                alt10=2;
+            if ( (LA14_0==22) ) {
+                alt14=1;
             }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("", 10, 0, input);
-
-                throw nvae;
+            else if ( (LA14_0==23) ) {
+                alt14=2;
             }
-            switch (alt10) {
+            switch (alt14) {
                 case 1 :
-                    // InternalProblem.g:344:4: ( (lv_containment_0_0= 'contains' ) )
+                    // InternalProblem.g:507:4: ( (lv_containment_0_0= 'contains' ) )
                     {
-                    // InternalProblem.g:344:4: ( (lv_containment_0_0= 'contains' ) )
-                    // InternalProblem.g:345:5: (lv_containment_0_0= 'contains' )
+                    // InternalProblem.g:507:4: ( (lv_containment_0_0= 'contains' ) )
+                    // InternalProblem.g:508:5: (lv_containment_0_0= 'contains' )
                     {
-                    // InternalProblem.g:345:5: (lv_containment_0_0= 'contains' )
-                    // InternalProblem.g:346:6: lv_containment_0_0= 'contains'
+                    // InternalProblem.g:508:5: (lv_containment_0_0= 'contains' )
+                    // InternalProblem.g:509:6: lv_containment_0_0= 'contains'
                     {
-                    lv_containment_0_0=(Token)match(input,21,FOLLOW_8); 
+                    lv_containment_0_0=(Token)match(input,22,FOLLOW_8); 
 
                                                                 newLeafNode(lv_containment_0_0, grammarAccess.getReferenceDeclarationAccess().getContainmentContainsKeyword_0_0_0());
                                                         
@@ -955,9 +1410,9 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:359:4: otherlv_1= 'refers'
+                    // InternalProblem.g:522:4: otherlv_1= 'refers'
                     {
-                    otherlv_1=(Token)match(input,22,FOLLOW_8); 
+                    otherlv_1=(Token)match(input,23,FOLLOW_8); 
 
                                                 newLeafNode(otherlv_1, grammarAccess.getReferenceDeclarationAccess().getRefersKeyword_0_1());
                                         
@@ -967,11 +1422,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:364:3: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:365:4: ( ruleQualifiedName )
+            // InternalProblem.g:527:3: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:528:4: ( ruleQualifiedName )
             {
-            // InternalProblem.g:365:4: ( ruleQualifiedName )
-            // InternalProblem.g:366:5: ruleQualifiedName
+            // InternalProblem.g:528:4: ( ruleQualifiedName )
+            // InternalProblem.g:529:5: ruleQualifiedName
             {
 
                                                 if (current==null) {
@@ -979,9 +1434,9 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                                 }
                                         
 
-                                                newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationCrossReference_1_0());
+                                                newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeRelationCrossReference_1_0());
                                         
-            pushFollow(FOLLOW_12);
+            pushFollow(FOLLOW_16);
             ruleQualifiedName();
 
             state._fsp--;
@@ -995,31 +1450,31 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:380:3: (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )?
-            int alt11=2;
-            int LA11_0 = input.LA(1);
+            // InternalProblem.g:543:3: (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )?
+            int alt15=2;
+            int LA15_0 = input.LA(1);
 
-            if ( (LA11_0==23) ) {
-                alt11=1;
+            if ( (LA15_0==24) ) {
+                alt15=1;
             }
-            switch (alt11) {
+            switch (alt15) {
                 case 1 :
-                    // InternalProblem.g:381:4: otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']'
+                    // InternalProblem.g:544:4: otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']'
                     {
-                    otherlv_3=(Token)match(input,23,FOLLOW_13); 
+                    otherlv_3=(Token)match(input,24,FOLLOW_17); 
 
                                                 newLeafNode(otherlv_3, grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2_0());
                                         
-                    // InternalProblem.g:385:4: ( (lv_multiplicity_4_0= ruleMultiplicity ) )
-                    // InternalProblem.g:386:5: (lv_multiplicity_4_0= ruleMultiplicity )
+                    // InternalProblem.g:548:4: ( (lv_multiplicity_4_0= ruleMultiplicity ) )
+                    // InternalProblem.g:549:5: (lv_multiplicity_4_0= ruleMultiplicity )
                     {
-                    // InternalProblem.g:386:5: (lv_multiplicity_4_0= ruleMultiplicity )
-                    // InternalProblem.g:387:6: lv_multiplicity_4_0= ruleMultiplicity
+                    // InternalProblem.g:549:5: (lv_multiplicity_4_0= ruleMultiplicity )
+                    // InternalProblem.g:550:6: lv_multiplicity_4_0= ruleMultiplicity
                     {
 
                                                                 newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getMultiplicityMultiplicityParserRuleCall_2_1_0());
                                                         
-                    pushFollow(FOLLOW_14);
+                    pushFollow(FOLLOW_18);
                     lv_multiplicity_4_0=ruleMultiplicity();
 
                     state._fsp--;
@@ -1041,7 +1496,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_5=(Token)match(input,24,FOLLOW_3); 
+                    otherlv_5=(Token)match(input,25,FOLLOW_3); 
 
                                                 newLeafNode(otherlv_5, grammarAccess.getReferenceDeclarationAccess().getRightSquareBracketKeyword_2_2());
                                         
@@ -1051,25 +1506,30 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:409:3: ( (lv_name_6_0= RULE_ID ) )
-            // InternalProblem.g:410:4: (lv_name_6_0= RULE_ID )
+            // InternalProblem.g:572:3: ( (lv_name_6_0= ruleIdentifier ) )
+            // InternalProblem.g:573:4: (lv_name_6_0= ruleIdentifier )
             {
-            // InternalProblem.g:410:4: (lv_name_6_0= RULE_ID )
-            // InternalProblem.g:411:5: lv_name_6_0= RULE_ID
+            // InternalProblem.g:573:4: (lv_name_6_0= ruleIdentifier )
+            // InternalProblem.g:574:5: lv_name_6_0= ruleIdentifier
             {
-            lv_name_6_0=(Token)match(input,RULE_ID,FOLLOW_15); 
 
-                                                newLeafNode(lv_name_6_0, grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_3_0());
+                                                newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getNameIdentifierParserRuleCall_3_0());
                                         
+            pushFollow(FOLLOW_19);
+            lv_name_6_0=ruleIdentifier();
+
+            state._fsp--;
+
 
                                                 if (current==null) {
-                                                        current = createModelElement(grammarAccess.getReferenceDeclarationRule());
+                                                        current = createModelElementForParent(grammarAccess.getReferenceDeclarationRule());
                                                 }
-                                                setWithLastConsumed(
+                                                set(
                                                         current,
                                                         "name",
                                                         lv_name_6_0,
-                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                        "org.eclipse.viatra.solver.language.Problem.Identifier");
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -1077,26 +1537,26 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:427:3: (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )?
-            int alt12=2;
-            int LA12_0 = input.LA(1);
+            // InternalProblem.g:591:3: (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )?
+            int alt16=2;
+            int LA16_0 = input.LA(1);
 
-            if ( (LA12_0==25) ) {
-                alt12=1;
+            if ( (LA16_0==26) ) {
+                alt16=1;
             }
-            switch (alt12) {
+            switch (alt16) {
                 case 1 :
-                    // InternalProblem.g:428:4: otherlv_7= 'opposite' ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:592:4: otherlv_7= 'opposite' ( ( ruleQualifiedName ) )
                     {
-                    otherlv_7=(Token)match(input,25,FOLLOW_8); 
+                    otherlv_7=(Token)match(input,26,FOLLOW_8); 
 
                                                 newLeafNode(otherlv_7, grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_4_0());
                                         
-                    // InternalProblem.g:432:4: ( ( ruleQualifiedName ) )
-                    // InternalProblem.g:433:5: ( ruleQualifiedName )
+                    // InternalProblem.g:596:4: ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:597:5: ( ruleQualifiedName )
                     {
-                    // InternalProblem.g:433:5: ( ruleQualifiedName )
-                    // InternalProblem.g:434:6: ruleQualifiedName
+                    // InternalProblem.g:597:5: ( ruleQualifiedName )
+                    // InternalProblem.g:598:6: ruleQualifiedName
                     {
 
                                                                 if (current==null) {
@@ -1149,7 +1609,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePredicateDefinition"
-    // InternalProblem.g:453:1: entryRulePredicateDefinition returns [EObject current=null] : iv_rulePredicateDefinition= rulePredicateDefinition EOF ;
+    // InternalProblem.g:617:1: entryRulePredicateDefinition returns [EObject current=null] : iv_rulePredicateDefinition= rulePredicateDefinition EOF ;
     public final EObject entryRulePredicateDefinition() throws RecognitionException {
         EObject current = null;
 
@@ -1157,8 +1617,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:453:60: (iv_rulePredicateDefinition= rulePredicateDefinition EOF )
-            // InternalProblem.g:454:2: iv_rulePredicateDefinition= rulePredicateDefinition EOF
+            // InternalProblem.g:617:60: (iv_rulePredicateDefinition= rulePredicateDefinition EOF )
+            // InternalProblem.g:618:2: iv_rulePredicateDefinition= rulePredicateDefinition EOF
             {
              newCompositeNode(grammarAccess.getPredicateDefinitionRule()); 
             pushFollow(FOLLOW_1);
@@ -1185,20 +1645,21 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePredicateDefinition"
-    // InternalProblem.g:460:1: rulePredicateDefinition returns [EObject current=null] : ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' ) ;
+    // InternalProblem.g:624:1: rulePredicateDefinition returns [EObject current=null] : ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' ) ;
     public final EObject rulePredicateDefinition() throws RecognitionException {
         EObject current = null;
 
         Token lv_error_0_0=null;
         Token otherlv_1=null;
         Token otherlv_2=null;
-        Token lv_name_3_0=null;
         Token otherlv_4=null;
         Token otherlv_6=null;
         Token otherlv_8=null;
         Token otherlv_9=null;
         Token otherlv_11=null;
         Token otherlv_13=null;
+        AntlrDatatypeRuleToken lv_name_3_0 = null;
+
         EObject lv_parameters_5_0 = null;
 
         EObject lv_parameters_7_0 = null;
@@ -1212,42 +1673,42 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:466:2: ( ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' ) )
-            // InternalProblem.g:467:2: ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' )
+            // InternalProblem.g:630:2: ( ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' ) )
+            // InternalProblem.g:631:2: ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' )
             {
-            // InternalProblem.g:467:2: ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' )
-            // InternalProblem.g:468:3: ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.'
+            // InternalProblem.g:631:2: ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' )
+            // InternalProblem.g:632:3: ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.'
             {
-            // InternalProblem.g:468:3: ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' )
-            int alt14=2;
-            int LA14_0 = input.LA(1);
+            // InternalProblem.g:632:3: ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' )
+            int alt18=2;
+            int LA18_0 = input.LA(1);
 
-            if ( (LA14_0==26) ) {
-                alt14=1;
+            if ( (LA18_0==27) ) {
+                alt18=1;
             }
-            else if ( (LA14_0==27) ) {
-                alt14=2;
+            else if ( (LA18_0==28) ) {
+                alt18=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 14, 0, input);
+                    new NoViableAltException("", 18, 0, input);
 
                 throw nvae;
             }
-            switch (alt14) {
+            switch (alt18) {
                 case 1 :
-                    // InternalProblem.g:469:4: ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? )
+                    // InternalProblem.g:633:4: ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? )
                     {
-                    // InternalProblem.g:469:4: ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? )
-                    // InternalProblem.g:470:5: ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )?
+                    // InternalProblem.g:633:4: ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? )
+                    // InternalProblem.g:634:5: ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )?
                     {
-                    // InternalProblem.g:470:5: ( (lv_error_0_0= 'error' ) )
-                    // InternalProblem.g:471:6: (lv_error_0_0= 'error' )
+                    // InternalProblem.g:634:5: ( (lv_error_0_0= 'error' ) )
+                    // InternalProblem.g:635:6: (lv_error_0_0= 'error' )
                     {
-                    // InternalProblem.g:471:6: (lv_error_0_0= 'error' )
-                    // InternalProblem.g:472:7: lv_error_0_0= 'error'
+                    // InternalProblem.g:635:6: (lv_error_0_0= 'error' )
+                    // InternalProblem.g:636:7: lv_error_0_0= 'error'
                     {
-                    lv_error_0_0=(Token)match(input,26,FOLLOW_16); 
+                    lv_error_0_0=(Token)match(input,27,FOLLOW_20); 
 
                                                                         newLeafNode(lv_error_0_0, grammarAccess.getPredicateDefinitionAccess().getErrorErrorKeyword_0_0_0_0());
                                                                 
@@ -1263,18 +1724,18 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:484:5: (otherlv_1= 'pred' )?
-                    int alt13=2;
-                    int LA13_0 = input.LA(1);
+                    // InternalProblem.g:648:5: (otherlv_1= 'pred' )?
+                    int alt17=2;
+                    int LA17_0 = input.LA(1);
 
-                    if ( (LA13_0==27) ) {
-                        alt13=1;
+                    if ( (LA17_0==28) ) {
+                        alt17=1;
                     }
-                    switch (alt13) {
+                    switch (alt17) {
                         case 1 :
-                            // InternalProblem.g:485:6: otherlv_1= 'pred'
+                            // InternalProblem.g:649:6: otherlv_1= 'pred'
                             {
-                            otherlv_1=(Token)match(input,27,FOLLOW_3); 
+                            otherlv_1=(Token)match(input,28,FOLLOW_3); 
 
                                                                         newLeafNode(otherlv_1, grammarAccess.getPredicateDefinitionAccess().getPredKeyword_0_0_1());
                                                                 
@@ -1291,9 +1752,9 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:492:4: otherlv_2= 'pred'
+                    // InternalProblem.g:656:4: otherlv_2= 'pred'
                     {
-                    otherlv_2=(Token)match(input,27,FOLLOW_3); 
+                    otherlv_2=(Token)match(input,28,FOLLOW_3); 
 
                                                 newLeafNode(otherlv_2, grammarAccess.getPredicateDefinitionAccess().getPredKeyword_0_1());
                                         
@@ -1303,25 +1764,30 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:497:3: ( (lv_name_3_0= RULE_ID ) )
-            // InternalProblem.g:498:4: (lv_name_3_0= RULE_ID )
+            // InternalProblem.g:661:3: ( (lv_name_3_0= ruleIdentifier ) )
+            // InternalProblem.g:662:4: (lv_name_3_0= ruleIdentifier )
             {
-            // InternalProblem.g:498:4: (lv_name_3_0= RULE_ID )
-            // InternalProblem.g:499:5: lv_name_3_0= RULE_ID
+            // InternalProblem.g:662:4: (lv_name_3_0= ruleIdentifier )
+            // InternalProblem.g:663:5: lv_name_3_0= ruleIdentifier
             {
-            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_17); 
 
-                                                newLeafNode(lv_name_3_0, grammarAccess.getPredicateDefinitionAccess().getNameIDTerminalRuleCall_1_0());
+                                                newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getNameIdentifierParserRuleCall_1_0());
                                         
+            pushFollow(FOLLOW_21);
+            lv_name_3_0=ruleIdentifier();
+
+            state._fsp--;
+
 
                                                 if (current==null) {
-                                                        current = createModelElement(grammarAccess.getPredicateDefinitionRule());
+                                                        current = createModelElementForParent(grammarAccess.getPredicateDefinitionRule());
                                                 }
-                                                setWithLastConsumed(
+                                                set(
                                                         current,
                                                         "name",
                                                         lv_name_3_0,
-                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                        "org.eclipse.viatra.solver.language.Problem.Identifier");
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -1329,31 +1795,31 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,28,FOLLOW_18); 
+            otherlv_4=(Token)match(input,29,FOLLOW_22); 
 
                                 newLeafNode(otherlv_4, grammarAccess.getPredicateDefinitionAccess().getLeftParenthesisKeyword_2());
                         
-            // InternalProblem.g:519:3: ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )?
-            int alt16=2;
-            int LA16_0 = input.LA(1);
+            // InternalProblem.g:684:3: ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )?
+            int alt20=2;
+            int LA20_0 = input.LA(1);
 
-            if ( (LA16_0==RULE_ID) ) {
-                alt16=1;
+            if ( (LA20_0==RULE_ID||LA20_0==RULE_QUOTED_ID||(LA20_0>=40 && LA20_0<=41)) ) {
+                alt20=1;
             }
-            switch (alt16) {
+            switch (alt20) {
                 case 1 :
-                    // InternalProblem.g:520:4: ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )*
+                    // InternalProblem.g:685:4: ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )*
                     {
-                    // InternalProblem.g:520:4: ( (lv_parameters_5_0= ruleParameter ) )
-                    // InternalProblem.g:521:5: (lv_parameters_5_0= ruleParameter )
+                    // InternalProblem.g:685:4: ( (lv_parameters_5_0= ruleParameter ) )
+                    // InternalProblem.g:686:5: (lv_parameters_5_0= ruleParameter )
                     {
-                    // InternalProblem.g:521:5: (lv_parameters_5_0= ruleParameter )
-                    // InternalProblem.g:522:6: lv_parameters_5_0= ruleParameter
+                    // InternalProblem.g:686:5: (lv_parameters_5_0= ruleParameter )
+                    // InternalProblem.g:687:6: lv_parameters_5_0= ruleParameter
                     {
 
                                                                 newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getParametersParameterParserRuleCall_3_0_0());
                                                         
-                    pushFollow(FOLLOW_19);
+                    pushFollow(FOLLOW_23);
                     lv_parameters_5_0=ruleParameter();
 
                     state._fsp--;
@@ -1375,35 +1841,35 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:539:4: (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )*
-                    loop15:
+                    // InternalProblem.g:704:4: (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )*
+                    loop19:
                     do {
-                        int alt15=2;
-                        int LA15_0 = input.LA(1);
+                        int alt19=2;
+                        int LA19_0 = input.LA(1);
 
-                        if ( (LA15_0==17) ) {
-                            alt15=1;
+                        if ( (LA19_0==17) ) {
+                            alt19=1;
                         }
 
 
-                        switch (alt15) {
+                        switch (alt19) {
                         case 1 :
-                            // InternalProblem.g:540:5: otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) )
+                            // InternalProblem.g:705:5: otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) )
                             {
-                            otherlv_6=(Token)match(input,17,FOLLOW_3); 
+                            otherlv_6=(Token)match(input,17,FOLLOW_8); 
 
                                                                 newLeafNode(otherlv_6, grammarAccess.getPredicateDefinitionAccess().getCommaKeyword_3_1_0());
                                                         
-                            // InternalProblem.g:544:5: ( (lv_parameters_7_0= ruleParameter ) )
-                            // InternalProblem.g:545:6: (lv_parameters_7_0= ruleParameter )
+                            // InternalProblem.g:709:5: ( (lv_parameters_7_0= ruleParameter ) )
+                            // InternalProblem.g:710:6: (lv_parameters_7_0= ruleParameter )
                             {
-                            // InternalProblem.g:545:6: (lv_parameters_7_0= ruleParameter )
-                            // InternalProblem.g:546:7: lv_parameters_7_0= ruleParameter
+                            // InternalProblem.g:710:6: (lv_parameters_7_0= ruleParameter )
+                            // InternalProblem.g:711:7: lv_parameters_7_0= ruleParameter
                             {
 
                                                                                 newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getParametersParameterParserRuleCall_3_1_1_0());
                                                                         
-                            pushFollow(FOLLOW_19);
+                            pushFollow(FOLLOW_23);
                             lv_parameters_7_0=ruleParameter();
 
                             state._fsp--;
@@ -1430,7 +1896,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                             break;
 
                         default :
-                            break loop15;
+                            break loop19;
                         }
                     } while (true);
 
@@ -1440,35 +1906,35 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_8=(Token)match(input,29,FOLLOW_20); 
+            otherlv_8=(Token)match(input,30,FOLLOW_24); 
 
                                 newLeafNode(otherlv_8, grammarAccess.getPredicateDefinitionAccess().getRightParenthesisKeyword_4());
                         
-            // InternalProblem.g:569:3: (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )?
-            int alt18=2;
-            int LA18_0 = input.LA(1);
+            // InternalProblem.g:734:3: (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )?
+            int alt22=2;
+            int LA22_0 = input.LA(1);
 
-            if ( (LA18_0==30) ) {
-                alt18=1;
+            if ( (LA22_0==31) ) {
+                alt22=1;
             }
-            switch (alt18) {
+            switch (alt22) {
                 case 1 :
-                    // InternalProblem.g:570:4: otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )*
+                    // InternalProblem.g:735:4: otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )*
                     {
-                    otherlv_9=(Token)match(input,30,FOLLOW_21); 
+                    otherlv_9=(Token)match(input,31,FOLLOW_25); 
 
                                                 newLeafNode(otherlv_9, grammarAccess.getPredicateDefinitionAccess().getColonHyphenMinusKeyword_5_0());
                                         
-                    // InternalProblem.g:574:4: ( (lv_bodies_10_0= ruleConjunction ) )
-                    // InternalProblem.g:575:5: (lv_bodies_10_0= ruleConjunction )
+                    // InternalProblem.g:739:4: ( (lv_bodies_10_0= ruleConjunction ) )
+                    // InternalProblem.g:740:5: (lv_bodies_10_0= ruleConjunction )
                     {
-                    // InternalProblem.g:575:5: (lv_bodies_10_0= ruleConjunction )
-                    // InternalProblem.g:576:6: lv_bodies_10_0= ruleConjunction
+                    // InternalProblem.g:740:5: (lv_bodies_10_0= ruleConjunction )
+                    // InternalProblem.g:741:6: lv_bodies_10_0= ruleConjunction
                     {
 
                                                                 newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getBodiesConjunctionParserRuleCall_5_1_0());
                                                         
-                    pushFollow(FOLLOW_22);
+                    pushFollow(FOLLOW_26);
                     lv_bodies_10_0=ruleConjunction();
 
                     state._fsp--;
@@ -1490,35 +1956,35 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:593:4: (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )*
-                    loop17:
+                    // InternalProblem.g:758:4: (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )*
+                    loop21:
                     do {
-                        int alt17=2;
-                        int LA17_0 = input.LA(1);
+                        int alt21=2;
+                        int LA21_0 = input.LA(1);
 
-                        if ( (LA17_0==19) ) {
-                            alt17=1;
+                        if ( (LA21_0==19) ) {
+                            alt21=1;
                         }
 
 
-                        switch (alt17) {
+                        switch (alt21) {
                         case 1 :
-                            // InternalProblem.g:594:5: otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) )
+                            // InternalProblem.g:759:5: otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) )
                             {
-                            otherlv_11=(Token)match(input,19,FOLLOW_21); 
+                            otherlv_11=(Token)match(input,19,FOLLOW_25); 
 
                                                                 newLeafNode(otherlv_11, grammarAccess.getPredicateDefinitionAccess().getSemicolonKeyword_5_2_0());
                                                         
-                            // InternalProblem.g:598:5: ( (lv_bodies_12_0= ruleConjunction ) )
-                            // InternalProblem.g:599:6: (lv_bodies_12_0= ruleConjunction )
+                            // InternalProblem.g:763:5: ( (lv_bodies_12_0= ruleConjunction ) )
+                            // InternalProblem.g:764:6: (lv_bodies_12_0= ruleConjunction )
                             {
-                            // InternalProblem.g:599:6: (lv_bodies_12_0= ruleConjunction )
-                            // InternalProblem.g:600:7: lv_bodies_12_0= ruleConjunction
+                            // InternalProblem.g:764:6: (lv_bodies_12_0= ruleConjunction )
+                            // InternalProblem.g:765:7: lv_bodies_12_0= ruleConjunction
                             {
 
                                                                                 newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getBodiesConjunctionParserRuleCall_5_2_1_0());
                                                                         
-                            pushFollow(FOLLOW_22);
+                            pushFollow(FOLLOW_26);
                             lv_bodies_12_0=ruleConjunction();
 
                             state._fsp--;
@@ -1545,7 +2011,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                             break;
 
                         default :
-                            break loop17;
+                            break loop21;
                         }
                     } while (true);
 
@@ -1582,7 +2048,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleParameter"
-    // InternalProblem.g:627:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ;
+    // InternalProblem.g:792:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ;
     public final EObject entryRuleParameter() throws RecognitionException {
         EObject current = null;
 
@@ -1590,8 +2056,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:627:50: (iv_ruleParameter= ruleParameter EOF )
-            // InternalProblem.g:628:2: iv_ruleParameter= ruleParameter EOF
+            // InternalProblem.g:792:50: (iv_ruleParameter= ruleParameter EOF )
+            // InternalProblem.g:793:2: iv_ruleParameter= ruleParameter EOF
             {
              newCompositeNode(grammarAccess.getParameterRule()); 
             pushFollow(FOLLOW_1);
@@ -1618,63 +2084,116 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleParameter"
-    // InternalProblem.g:634:1: ruleParameter returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) ) ;
+    // InternalProblem.g:799:1: ruleParameter returns [EObject current=null] : ( ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) ) ) ;
     public final EObject ruleParameter() throws RecognitionException {
         EObject current = null;
 
-        Token otherlv_0=null;
-        Token lv_name_1_0=null;
+        AntlrDatatypeRuleToken lv_name_1_0 = null;
+
 
 
                 enterRule();
 
         try {
-            // InternalProblem.g:640:2: ( ( ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) ) )
-            // InternalProblem.g:641:2: ( ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) )
-            {
-            // InternalProblem.g:641:2: ( ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) )
-            // InternalProblem.g:642:3: ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) )
-            {
-            // InternalProblem.g:642:3: ( (otherlv_0= RULE_ID ) )
-            // InternalProblem.g:643:4: (otherlv_0= RULE_ID )
+            // InternalProblem.g:805:2: ( ( ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) ) ) )
+            // InternalProblem.g:806:2: ( ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) ) )
             {
-            // InternalProblem.g:643:4: (otherlv_0= RULE_ID )
-            // InternalProblem.g:644:5: otherlv_0= RULE_ID
+            // InternalProblem.g:806:2: ( ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) ) )
+            // InternalProblem.g:807:3: ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) )
             {
+            // InternalProblem.g:807:3: ( ( ruleQualifiedName ) )?
+            int alt23=2;
+            switch ( input.LA(1) ) {
+                case RULE_QUOTED_ID:
+                    {
+                    alt23=1;
+                    }
+                    break;
+                case RULE_ID:
+                    {
+                    int LA23_2 = input.LA(2);
 
-                                                if (current==null) {
-                                                        current = createModelElement(grammarAccess.getParameterRule());
-                                                }
-                                        
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_3); 
+                    if ( (LA23_2==RULE_ID||LA23_2==34||(LA23_2>=40 && LA23_2<=41)) ) {
+                        alt23=1;
+                    }
+                    }
+                    break;
+                case 40:
+                    {
+                    int LA23_3 = input.LA(2);
 
-                                                newLeafNode(otherlv_0, grammarAccess.getParameterAccess().getParameterTypeClassDeclarationCrossReference_0_0());
-                                        
+                    if ( (LA23_3==RULE_ID||LA23_3==34||(LA23_3>=40 && LA23_3<=41)) ) {
+                        alt23=1;
+                    }
+                    }
+                    break;
+                case 41:
+                    {
+                    int LA23_4 = input.LA(2);
 
+                    if ( (LA23_4==RULE_ID||LA23_4==34||(LA23_4>=40 && LA23_4<=41)) ) {
+                        alt23=1;
+                    }
+                    }
+                    break;
             }
 
+            switch (alt23) {
+                case 1 :
+                    // InternalProblem.g:808:4: ( ruleQualifiedName )
+                    {
+                    // InternalProblem.g:808:4: ( ruleQualifiedName )
+                    // InternalProblem.g:809:5: ruleQualifiedName
+                    {
+
+                                                        if (current==null) {
+                                                                current = createModelElement(grammarAccess.getParameterRule());
+                                                        }
+                                                
+
+                                                        newCompositeNode(grammarAccess.getParameterAccess().getParameterTypeRelationCrossReference_0_0());
+                                                
+                    pushFollow(FOLLOW_3);
+                    ruleQualifiedName();
+
+                    state._fsp--;
+
+
+                                                        afterParserOrEnumRuleCall();
+                                                
+
+                    }
+
+
+                    }
+                    break;
 
             }
 
-            // InternalProblem.g:655:3: ( (lv_name_1_0= RULE_ID ) )
-            // InternalProblem.g:656:4: (lv_name_1_0= RULE_ID )
+            // InternalProblem.g:823:3: ( (lv_name_1_0= ruleIdentifier ) )
+            // InternalProblem.g:824:4: (lv_name_1_0= ruleIdentifier )
             {
-            // InternalProblem.g:656:4: (lv_name_1_0= RULE_ID )
-            // InternalProblem.g:657:5: lv_name_1_0= RULE_ID
+            // InternalProblem.g:824:4: (lv_name_1_0= ruleIdentifier )
+            // InternalProblem.g:825:5: lv_name_1_0= ruleIdentifier
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
-                                                newLeafNode(lv_name_1_0, grammarAccess.getParameterAccess().getNameIDTerminalRuleCall_1_0());
+                                                newCompositeNode(grammarAccess.getParameterAccess().getNameIdentifierParserRuleCall_1_0());
                                         
+            pushFollow(FOLLOW_2);
+            lv_name_1_0=ruleIdentifier();
+
+            state._fsp--;
+
 
                                                 if (current==null) {
-                                                        current = createModelElement(grammarAccess.getParameterRule());
+                                                        current = createModelElementForParent(grammarAccess.getParameterRule());
                                                 }
-                                                setWithLastConsumed(
+                                                set(
                                                         current,
                                                         "name",
                                                         lv_name_1_0,
-                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                        "org.eclipse.viatra.solver.language.Problem.Identifier");
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -1705,7 +2224,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleConjunction"
-    // InternalProblem.g:677:1: entryRuleConjunction returns [EObject current=null] : iv_ruleConjunction= ruleConjunction EOF ;
+    // InternalProblem.g:846:1: entryRuleConjunction returns [EObject current=null] : iv_ruleConjunction= ruleConjunction EOF ;
     public final EObject entryRuleConjunction() throws RecognitionException {
         EObject current = null;
 
@@ -1713,8 +2232,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:677:52: (iv_ruleConjunction= ruleConjunction EOF )
-            // InternalProblem.g:678:2: iv_ruleConjunction= ruleConjunction EOF
+            // InternalProblem.g:846:52: (iv_ruleConjunction= ruleConjunction EOF )
+            // InternalProblem.g:847:2: iv_ruleConjunction= ruleConjunction EOF
             {
              newCompositeNode(grammarAccess.getConjunctionRule()); 
             pushFollow(FOLLOW_1);
@@ -1741,7 +2260,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleConjunction"
-    // InternalProblem.g:684:1: ruleConjunction returns [EObject current=null] : ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* ) ;
+    // InternalProblem.g:853:1: ruleConjunction returns [EObject current=null] : ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* ) ;
     public final EObject ruleConjunction() throws RecognitionException {
         EObject current = null;
 
@@ -1755,22 +2274,22 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:690:2: ( ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* ) )
-            // InternalProblem.g:691:2: ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* )
+            // InternalProblem.g:859:2: ( ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* ) )
+            // InternalProblem.g:860:2: ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* )
             {
-            // InternalProblem.g:691:2: ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* )
-            // InternalProblem.g:692:3: ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )*
+            // InternalProblem.g:860:2: ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* )
+            // InternalProblem.g:861:3: ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )*
             {
-            // InternalProblem.g:692:3: ( (lv_literals_0_0= ruleLiteral ) )
-            // InternalProblem.g:693:4: (lv_literals_0_0= ruleLiteral )
+            // InternalProblem.g:861:3: ( (lv_literals_0_0= ruleLiteral ) )
+            // InternalProblem.g:862:4: (lv_literals_0_0= ruleLiteral )
             {
-            // InternalProblem.g:693:4: (lv_literals_0_0= ruleLiteral )
-            // InternalProblem.g:694:5: lv_literals_0_0= ruleLiteral
+            // InternalProblem.g:862:4: (lv_literals_0_0= ruleLiteral )
+            // InternalProblem.g:863:5: lv_literals_0_0= ruleLiteral
             {
 
                                                 newCompositeNode(grammarAccess.getConjunctionAccess().getLiteralsLiteralParserRuleCall_0_0());
                                         
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_27);
             lv_literals_0_0=ruleLiteral();
 
             state._fsp--;
@@ -1792,35 +2311,35 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:711:3: (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )*
-            loop19:
+            // InternalProblem.g:880:3: (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )*
+            loop24:
             do {
-                int alt19=2;
-                int LA19_0 = input.LA(1);
+                int alt24=2;
+                int LA24_0 = input.LA(1);
 
-                if ( (LA19_0==17) ) {
-                    alt19=1;
+                if ( (LA24_0==17) ) {
+                    alt24=1;
                 }
 
 
-                switch (alt19) {
+                switch (alt24) {
                 case 1 :
-                    // InternalProblem.g:712:4: otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) )
+                    // InternalProblem.g:881:4: otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) )
                     {
-                    otherlv_1=(Token)match(input,17,FOLLOW_21); 
+                    otherlv_1=(Token)match(input,17,FOLLOW_25); 
 
                                                 newLeafNode(otherlv_1, grammarAccess.getConjunctionAccess().getCommaKeyword_1_0());
                                         
-                    // InternalProblem.g:716:4: ( (lv_literals_2_0= ruleLiteral ) )
-                    // InternalProblem.g:717:5: (lv_literals_2_0= ruleLiteral )
+                    // InternalProblem.g:885:4: ( (lv_literals_2_0= ruleLiteral ) )
+                    // InternalProblem.g:886:5: (lv_literals_2_0= ruleLiteral )
                     {
-                    // InternalProblem.g:717:5: (lv_literals_2_0= ruleLiteral )
-                    // InternalProblem.g:718:6: lv_literals_2_0= ruleLiteral
+                    // InternalProblem.g:886:5: (lv_literals_2_0= ruleLiteral )
+                    // InternalProblem.g:887:6: lv_literals_2_0= ruleLiteral
                     {
 
                                                                 newCompositeNode(grammarAccess.getConjunctionAccess().getLiteralsLiteralParserRuleCall_1_1_0());
                                                         
-                    pushFollow(FOLLOW_23);
+                    pushFollow(FOLLOW_27);
                     lv_literals_2_0=ruleLiteral();
 
                     state._fsp--;
@@ -1847,7 +2366,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     break;
 
                 default :
-                    break loop19;
+                    break loop24;
                 }
             } while (true);
 
@@ -1874,7 +2393,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // InternalProblem.g:740:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
+    // InternalProblem.g:909:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
     public final EObject entryRuleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1882,8 +2401,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:740:48: (iv_ruleLiteral= ruleLiteral EOF )
-            // InternalProblem.g:741:2: iv_ruleLiteral= ruleLiteral EOF
+            // InternalProblem.g:909:48: (iv_ruleLiteral= ruleLiteral EOF )
+            // InternalProblem.g:910:2: iv_ruleLiteral= ruleLiteral EOF
             {
              newCompositeNode(grammarAccess.getLiteralRule()); 
             pushFollow(FOLLOW_1);
@@ -1910,7 +2429,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteral"
-    // InternalProblem.g:747:1: ruleLiteral returns [EObject current=null] : (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral ) ;
+    // InternalProblem.g:916:1: ruleLiteral returns [EObject current=null] : (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral ) ;
     public final EObject ruleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1923,28 +2442,28 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:753:2: ( (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral ) )
-            // InternalProblem.g:754:2: (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral )
+            // InternalProblem.g:922:2: ( (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral ) )
+            // InternalProblem.g:923:2: (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral )
             {
-            // InternalProblem.g:754:2: (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral )
-            int alt20=2;
-            int LA20_0 = input.LA(1);
+            // InternalProblem.g:923:2: (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral )
+            int alt25=2;
+            int LA25_0 = input.LA(1);
 
-            if ( (LA20_0==RULE_ID||LA20_0==RULE_QUOTED_ID) ) {
-                alt20=1;
+            if ( (LA25_0==RULE_ID||LA25_0==RULE_QUOTED_ID||(LA25_0>=40 && LA25_0<=41)) ) {
+                alt25=1;
             }
-            else if ( (LA20_0==31) ) {
-                alt20=2;
+            else if ( (LA25_0==32) ) {
+                alt25=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 20, 0, input);
+                    new NoViableAltException("", 25, 0, input);
 
                 throw nvae;
             }
-            switch (alt20) {
+            switch (alt25) {
                 case 1 :
-                    // InternalProblem.g:755:3: this_Atom_0= ruleAtom
+                    // InternalProblem.g:924:3: this_Atom_0= ruleAtom
                     {
 
                                         newCompositeNode(grammarAccess.getLiteralAccess().getAtomParserRuleCall_0());
@@ -1962,7 +2481,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:764:3: this_NegativeLiteral_1= ruleNegativeLiteral
+                    // InternalProblem.g:933:3: this_NegativeLiteral_1= ruleNegativeLiteral
                     {
 
                                         newCompositeNode(grammarAccess.getLiteralAccess().getNegativeLiteralParserRuleCall_1());
@@ -2002,7 +2521,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNegativeLiteral"
-    // InternalProblem.g:776:1: entryRuleNegativeLiteral returns [EObject current=null] : iv_ruleNegativeLiteral= ruleNegativeLiteral EOF ;
+    // InternalProblem.g:945:1: entryRuleNegativeLiteral returns [EObject current=null] : iv_ruleNegativeLiteral= ruleNegativeLiteral EOF ;
     public final EObject entryRuleNegativeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2010,8 +2529,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:776:56: (iv_ruleNegativeLiteral= ruleNegativeLiteral EOF )
-            // InternalProblem.g:777:2: iv_ruleNegativeLiteral= ruleNegativeLiteral EOF
+            // InternalProblem.g:945:56: (iv_ruleNegativeLiteral= ruleNegativeLiteral EOF )
+            // InternalProblem.g:946:2: iv_ruleNegativeLiteral= ruleNegativeLiteral EOF
             {
              newCompositeNode(grammarAccess.getNegativeLiteralRule()); 
             pushFollow(FOLLOW_1);
@@ -2038,7 +2557,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNegativeLiteral"
-    // InternalProblem.g:783:1: ruleNegativeLiteral returns [EObject current=null] : (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) ) ;
+    // InternalProblem.g:952:1: ruleNegativeLiteral returns [EObject current=null] : (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) ) ;
     public final EObject ruleNegativeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2050,21 +2569,21 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:789:2: ( (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) ) )
-            // InternalProblem.g:790:2: (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) )
+            // InternalProblem.g:958:2: ( (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) ) )
+            // InternalProblem.g:959:2: (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) )
             {
-            // InternalProblem.g:790:2: (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) )
-            // InternalProblem.g:791:3: otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) )
+            // InternalProblem.g:959:2: (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) )
+            // InternalProblem.g:960:3: otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) )
             {
-            otherlv_0=(Token)match(input,31,FOLLOW_8); 
+            otherlv_0=(Token)match(input,32,FOLLOW_8); 
 
                                 newLeafNode(otherlv_0, grammarAccess.getNegativeLiteralAccess().getExclamationMarkKeyword_0());
                         
-            // InternalProblem.g:795:3: ( (lv_atom_1_0= ruleAtom ) )
-            // InternalProblem.g:796:4: (lv_atom_1_0= ruleAtom )
+            // InternalProblem.g:964:3: ( (lv_atom_1_0= ruleAtom ) )
+            // InternalProblem.g:965:4: (lv_atom_1_0= ruleAtom )
             {
-            // InternalProblem.g:796:4: (lv_atom_1_0= ruleAtom )
-            // InternalProblem.g:797:5: lv_atom_1_0= ruleAtom
+            // InternalProblem.g:965:4: (lv_atom_1_0= ruleAtom )
+            // InternalProblem.g:966:5: lv_atom_1_0= ruleAtom
             {
 
                                                 newCompositeNode(grammarAccess.getNegativeLiteralAccess().getAtomAtomParserRuleCall_1_0());
@@ -2114,7 +2633,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAtom"
-    // InternalProblem.g:818:1: entryRuleAtom returns [EObject current=null] : iv_ruleAtom= ruleAtom EOF ;
+    // InternalProblem.g:987:1: entryRuleAtom returns [EObject current=null] : iv_ruleAtom= ruleAtom EOF ;
     public final EObject entryRuleAtom() throws RecognitionException {
         EObject current = null;
 
@@ -2122,8 +2641,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:818:45: (iv_ruleAtom= ruleAtom EOF )
-            // InternalProblem.g:819:2: iv_ruleAtom= ruleAtom EOF
+            // InternalProblem.g:987:45: (iv_ruleAtom= ruleAtom EOF )
+            // InternalProblem.g:988:2: iv_ruleAtom= ruleAtom EOF
             {
              newCompositeNode(grammarAccess.getAtomRule()); 
             pushFollow(FOLLOW_1);
@@ -2150,7 +2669,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAtom"
-    // InternalProblem.g:825:1: ruleAtom returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' ) ;
+    // InternalProblem.g:994:1: ruleAtom returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' ) ;
     public final EObject ruleAtom() throws RecognitionException {
         EObject current = null;
 
@@ -2167,17 +2686,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:831:2: ( ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' ) )
-            // InternalProblem.g:832:2: ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' )
+            // InternalProblem.g:1000:2: ( ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' ) )
+            // InternalProblem.g:1001:2: ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' )
             {
-            // InternalProblem.g:832:2: ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' )
-            // InternalProblem.g:833:3: ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')'
+            // InternalProblem.g:1001:2: ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' )
+            // InternalProblem.g:1002:3: ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')'
             {
-            // InternalProblem.g:833:3: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:834:4: ( ruleQualifiedName )
+            // InternalProblem.g:1002:3: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:1003:4: ( ruleQualifiedName )
             {
-            // InternalProblem.g:834:4: ( ruleQualifiedName )
-            // InternalProblem.g:835:5: ruleQualifiedName
+            // InternalProblem.g:1003:4: ( ruleQualifiedName )
+            // InternalProblem.g:1004:5: ruleQualifiedName
             {
 
                                                 if (current==null) {
@@ -2187,7 +2706,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                                 newCompositeNode(grammarAccess.getAtomAccess().getRelationRelationCrossReference_0_0());
                                         
-            pushFollow(FOLLOW_24);
+            pushFollow(FOLLOW_28);
             ruleQualifiedName();
 
             state._fsp--;
@@ -2201,21 +2720,21 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:849:3: ( (lv_transitiveClosure_1_0= '+' ) )?
-            int alt21=2;
-            int LA21_0 = input.LA(1);
+            // InternalProblem.g:1018:3: ( (lv_transitiveClosure_1_0= '+' ) )?
+            int alt26=2;
+            int LA26_0 = input.LA(1);
 
-            if ( (LA21_0==32) ) {
-                alt21=1;
+            if ( (LA26_0==33) ) {
+                alt26=1;
             }
-            switch (alt21) {
+            switch (alt26) {
                 case 1 :
-                    // InternalProblem.g:850:4: (lv_transitiveClosure_1_0= '+' )
+                    // InternalProblem.g:1019:4: (lv_transitiveClosure_1_0= '+' )
                     {
-                    // InternalProblem.g:850:4: (lv_transitiveClosure_1_0= '+' )
-                    // InternalProblem.g:851:5: lv_transitiveClosure_1_0= '+'
+                    // InternalProblem.g:1019:4: (lv_transitiveClosure_1_0= '+' )
+                    // InternalProblem.g:1020:5: lv_transitiveClosure_1_0= '+'
                     {
-                    lv_transitiveClosure_1_0=(Token)match(input,32,FOLLOW_17); 
+                    lv_transitiveClosure_1_0=(Token)match(input,33,FOLLOW_21); 
 
                                                         newLeafNode(lv_transitiveClosure_1_0, grammarAccess.getAtomAccess().getTransitiveClosurePlusSignKeyword_1_0());
                                                 
@@ -2234,31 +2753,31 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,28,FOLLOW_18); 
+            otherlv_2=(Token)match(input,29,FOLLOW_22); 
 
                                 newLeafNode(otherlv_2, grammarAccess.getAtomAccess().getLeftParenthesisKeyword_2());
                         
-            // InternalProblem.g:867:3: ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )?
-            int alt23=2;
-            int LA23_0 = input.LA(1);
+            // InternalProblem.g:1036:3: ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )?
+            int alt28=2;
+            int LA28_0 = input.LA(1);
 
-            if ( (LA23_0==RULE_ID) ) {
-                alt23=1;
+            if ( (LA28_0==RULE_ID||LA28_0==RULE_QUOTED_ID||(LA28_0>=40 && LA28_0<=41)) ) {
+                alt28=1;
             }
-            switch (alt23) {
+            switch (alt28) {
                 case 1 :
-                    // InternalProblem.g:868:4: ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )*
+                    // InternalProblem.g:1037:4: ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )*
                     {
-                    // InternalProblem.g:868:4: ( (lv_arguments_3_0= ruleArgument ) )
-                    // InternalProblem.g:869:5: (lv_arguments_3_0= ruleArgument )
+                    // InternalProblem.g:1037:4: ( (lv_arguments_3_0= ruleArgument ) )
+                    // InternalProblem.g:1038:5: (lv_arguments_3_0= ruleArgument )
                     {
-                    // InternalProblem.g:869:5: (lv_arguments_3_0= ruleArgument )
-                    // InternalProblem.g:870:6: lv_arguments_3_0= ruleArgument
+                    // InternalProblem.g:1038:5: (lv_arguments_3_0= ruleArgument )
+                    // InternalProblem.g:1039:6: lv_arguments_3_0= ruleArgument
                     {
 
                                                                 newCompositeNode(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_0_0());
                                                         
-                    pushFollow(FOLLOW_19);
+                    pushFollow(FOLLOW_23);
                     lv_arguments_3_0=ruleArgument();
 
                     state._fsp--;
@@ -2280,35 +2799,35 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:887:4: (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )*
-                    loop22:
+                    // InternalProblem.g:1056:4: (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )*
+                    loop27:
                     do {
-                        int alt22=2;
-                        int LA22_0 = input.LA(1);
+                        int alt27=2;
+                        int LA27_0 = input.LA(1);
 
-                        if ( (LA22_0==17) ) {
-                            alt22=1;
+                        if ( (LA27_0==17) ) {
+                            alt27=1;
                         }
 
 
-                        switch (alt22) {
+                        switch (alt27) {
                         case 1 :
-                            // InternalProblem.g:888:5: otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) )
+                            // InternalProblem.g:1057:5: otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) )
                             {
-                            otherlv_4=(Token)match(input,17,FOLLOW_3); 
+                            otherlv_4=(Token)match(input,17,FOLLOW_8); 
 
                                                                 newLeafNode(otherlv_4, grammarAccess.getAtomAccess().getCommaKeyword_3_1_0());
                                                         
-                            // InternalProblem.g:892:5: ( (lv_arguments_5_0= ruleArgument ) )
-                            // InternalProblem.g:893:6: (lv_arguments_5_0= ruleArgument )
+                            // InternalProblem.g:1061:5: ( (lv_arguments_5_0= ruleArgument ) )
+                            // InternalProblem.g:1062:6: (lv_arguments_5_0= ruleArgument )
                             {
-                            // InternalProblem.g:893:6: (lv_arguments_5_0= ruleArgument )
-                            // InternalProblem.g:894:7: lv_arguments_5_0= ruleArgument
+                            // InternalProblem.g:1062:6: (lv_arguments_5_0= ruleArgument )
+                            // InternalProblem.g:1063:7: lv_arguments_5_0= ruleArgument
                             {
 
                                                                                 newCompositeNode(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_1_1_0());
                                                                         
-                            pushFollow(FOLLOW_19);
+                            pushFollow(FOLLOW_23);
                             lv_arguments_5_0=ruleArgument();
 
                             state._fsp--;
@@ -2335,7 +2854,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                             break;
 
                         default :
-                            break loop22;
+                            break loop27;
                         }
                     } while (true);
 
@@ -2345,7 +2864,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_6=(Token)match(input,29,FOLLOW_2); 
+            otherlv_6=(Token)match(input,30,FOLLOW_2); 
 
                                 newLeafNode(otherlv_6, grammarAccess.getAtomAccess().getRightParenthesisKeyword_4());
                         
@@ -2372,7 +2891,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleArgument"
-    // InternalProblem.g:921:1: entryRuleArgument returns [EObject current=null] : iv_ruleArgument= ruleArgument EOF ;
+    // InternalProblem.g:1090:1: entryRuleArgument returns [EObject current=null] : iv_ruleArgument= ruleArgument EOF ;
     public final EObject entryRuleArgument() throws RecognitionException {
         EObject current = null;
 
@@ -2380,8 +2899,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:921:49: (iv_ruleArgument= ruleArgument EOF )
-            // InternalProblem.g:922:2: iv_ruleArgument= ruleArgument EOF
+            // InternalProblem.g:1090:49: (iv_ruleArgument= ruleArgument EOF )
+            // InternalProblem.g:1091:2: iv_ruleArgument= ruleArgument EOF
             {
              newCompositeNode(grammarAccess.getArgumentRule()); 
             pushFollow(FOLLOW_1);
@@ -2408,33 +2927,38 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleArgument"
-    // InternalProblem.g:928:1: ruleArgument returns [EObject current=null] : ( (otherlv_0= RULE_ID ) ) ;
+    // InternalProblem.g:1097:1: ruleArgument returns [EObject current=null] : ( ( ruleQualifiedName ) ) ;
     public final EObject ruleArgument() throws RecognitionException {
         EObject current = null;
 
-        Token otherlv_0=null;
-
 
                 enterRule();
 
         try {
-            // InternalProblem.g:934:2: ( ( (otherlv_0= RULE_ID ) ) )
-            // InternalProblem.g:935:2: ( (otherlv_0= RULE_ID ) )
+            // InternalProblem.g:1103:2: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:1104:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:935:2: ( (otherlv_0= RULE_ID ) )
-            // InternalProblem.g:936:3: (otherlv_0= RULE_ID )
+            // InternalProblem.g:1104:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:1105:3: ( ruleQualifiedName )
             {
-            // InternalProblem.g:936:3: (otherlv_0= RULE_ID )
-            // InternalProblem.g:937:4: otherlv_0= RULE_ID
+            // InternalProblem.g:1105:3: ( ruleQualifiedName )
+            // InternalProblem.g:1106:4: ruleQualifiedName
             {
 
                                         if (current==null) {
                                                 current = createModelElement(grammarAccess.getArgumentRule());
                                         }
                                 
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
-                                        newLeafNode(otherlv_0, grammarAccess.getArgumentAccess().getVariableVariableCrossReference_0());
+                                        newCompositeNode(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0());
+                                
+            pushFollow(FOLLOW_2);
+            ruleQualifiedName();
+
+            state._fsp--;
+
+
+                                        afterParserOrEnumRuleCall();
                                 
 
             }
@@ -2462,7 +2986,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAssertion"
-    // InternalProblem.g:951:1: entryRuleAssertion returns [EObject current=null] : iv_ruleAssertion= ruleAssertion EOF ;
+    // InternalProblem.g:1123:1: entryRuleAssertion returns [EObject current=null] : iv_ruleAssertion= ruleAssertion EOF ;
     public final EObject entryRuleAssertion() throws RecognitionException {
         EObject current = null;
 
@@ -2470,8 +2994,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:951:50: (iv_ruleAssertion= ruleAssertion EOF )
-            // InternalProblem.g:952:2: iv_ruleAssertion= ruleAssertion EOF
+            // InternalProblem.g:1123:50: (iv_ruleAssertion= ruleAssertion EOF )
+            // InternalProblem.g:1124:2: iv_ruleAssertion= ruleAssertion EOF
             {
              newCompositeNode(grammarAccess.getAssertionRule()); 
             pushFollow(FOLLOW_1);
@@ -2498,7 +3022,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAssertion"
-    // InternalProblem.g:958:1: ruleAssertion returns [EObject current=null] : ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' ) ;
+    // InternalProblem.g:1130:1: ruleAssertion returns [EObject current=null] : ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' ) ;
     public final EObject ruleAssertion() throws RecognitionException {
         EObject current = null;
 
@@ -2519,27 +3043,27 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:964:2: ( ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' ) )
-            // InternalProblem.g:965:2: ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' )
+            // InternalProblem.g:1136:2: ( ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' ) )
+            // InternalProblem.g:1137:2: ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' )
             {
-            // InternalProblem.g:965:2: ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' )
-            // InternalProblem.g:966:3: ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.'
+            // InternalProblem.g:1137:2: ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' )
+            // InternalProblem.g:1138:3: ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.'
             {
-            // InternalProblem.g:966:3: ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) )
-            int alt29=2;
-            alt29 = dfa29.predict(input);
-            switch (alt29) {
+            // InternalProblem.g:1138:3: ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) )
+            int alt34=2;
+            alt34 = dfa34.predict(input);
+            switch (alt34) {
                 case 1 :
-                    // InternalProblem.g:967:4: ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) )
+                    // InternalProblem.g:1139:4: ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) )
                     {
-                    // InternalProblem.g:967:4: ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) )
-                    // InternalProblem.g:968:5: ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) )
+                    // InternalProblem.g:1139:4: ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) )
+                    // InternalProblem.g:1140:5: ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) )
                     {
-                    // InternalProblem.g:968:5: ( ( ruleQualifiedName ) )
-                    // InternalProblem.g:969:6: ( ruleQualifiedName )
+                    // InternalProblem.g:1140:5: ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:1141:6: ( ruleQualifiedName )
                     {
-                    // InternalProblem.g:969:6: ( ruleQualifiedName )
-                    // InternalProblem.g:970:7: ruleQualifiedName
+                    // InternalProblem.g:1141:6: ( ruleQualifiedName )
+                    // InternalProblem.g:1142:7: ruleQualifiedName
                     {
 
                                                                         if (current==null) {
@@ -2549,7 +3073,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                                                         newCompositeNode(grammarAccess.getAssertionAccess().getRelationRelationCrossReference_0_0_0_0());
                                                                 
-                    pushFollow(FOLLOW_17);
+                    pushFollow(FOLLOW_21);
                     ruleQualifiedName();
 
                     state._fsp--;
@@ -2563,26 +3087,26 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_1=(Token)match(input,28,FOLLOW_25); 
+                    otherlv_1=(Token)match(input,29,FOLLOW_22); 
 
                                                         newLeafNode(otherlv_1, grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_0_1());
                                                 
-                    // InternalProblem.g:988:5: ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )?
-                    int alt25=2;
-                    int LA25_0 = input.LA(1);
+                    // InternalProblem.g:1160:5: ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )?
+                    int alt30=2;
+                    int LA30_0 = input.LA(1);
 
-                    if ( (LA25_0==RULE_ID||LA25_0==RULE_QUOTED_ID) ) {
-                        alt25=1;
+                    if ( (LA30_0==RULE_ID||LA30_0==RULE_QUOTED_ID||(LA30_0>=40 && LA30_0<=41)) ) {
+                        alt30=1;
                     }
-                    switch (alt25) {
+                    switch (alt30) {
                         case 1 :
-                            // InternalProblem.g:989:6: ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )*
+                            // InternalProblem.g:1161:6: ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )*
                             {
-                            // InternalProblem.g:989:6: ( ( ruleQualifiedName ) )
-                            // InternalProblem.g:990:7: ( ruleQualifiedName )
+                            // InternalProblem.g:1161:6: ( ( ruleQualifiedName ) )
+                            // InternalProblem.g:1162:7: ( ruleQualifiedName )
                             {
-                            // InternalProblem.g:990:7: ( ruleQualifiedName )
-                            // InternalProblem.g:991:8: ruleQualifiedName
+                            // InternalProblem.g:1162:7: ( ruleQualifiedName )
+                            // InternalProblem.g:1163:8: ruleQualifiedName
                             {
 
                                                                                         if (current==null) {
@@ -2592,7 +3116,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                                                                         newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_0_0());
                                                                                 
-                            pushFollow(FOLLOW_19);
+                            pushFollow(FOLLOW_23);
                             ruleQualifiedName();
 
                             state._fsp--;
@@ -2606,30 +3130,30 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalProblem.g:1005:6: (otherlv_3= ',' ( ( ruleQualifiedName ) ) )*
-                            loop24:
+                            // InternalProblem.g:1177:6: (otherlv_3= ',' ( ( ruleQualifiedName ) ) )*
+                            loop29:
                             do {
-                                int alt24=2;
-                                int LA24_0 = input.LA(1);
+                                int alt29=2;
+                                int LA29_0 = input.LA(1);
 
-                                if ( (LA24_0==17) ) {
-                                    alt24=1;
+                                if ( (LA29_0==17) ) {
+                                    alt29=1;
                                 }
 
 
-                                switch (alt24) {
+                                switch (alt29) {
                                 case 1 :
-                                    // InternalProblem.g:1006:7: otherlv_3= ',' ( ( ruleQualifiedName ) )
+                                    // InternalProblem.g:1178:7: otherlv_3= ',' ( ( ruleQualifiedName ) )
                                     {
                                     otherlv_3=(Token)match(input,17,FOLLOW_8); 
 
                                                                                         newLeafNode(otherlv_3, grammarAccess.getAssertionAccess().getCommaKeyword_0_0_2_1_0());
                                                                                 
-                                    // InternalProblem.g:1010:7: ( ( ruleQualifiedName ) )
-                                    // InternalProblem.g:1011:8: ( ruleQualifiedName )
+                                    // InternalProblem.g:1182:7: ( ( ruleQualifiedName ) )
+                                    // InternalProblem.g:1183:8: ( ruleQualifiedName )
                                     {
-                                    // InternalProblem.g:1011:8: ( ruleQualifiedName )
-                                    // InternalProblem.g:1012:9: ruleQualifiedName
+                                    // InternalProblem.g:1183:8: ( ruleQualifiedName )
+                                    // InternalProblem.g:1184:9: ruleQualifiedName
                                     {
 
                                                                                                         if (current==null) {
@@ -2639,7 +3163,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                                                                                         newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_1_1_0());
                                                                                                 
-                                    pushFollow(FOLLOW_19);
+                                    pushFollow(FOLLOW_23);
                                     ruleQualifiedName();
 
                                     state._fsp--;
@@ -2658,7 +3182,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                     break;
 
                                 default :
-                                    break loop24;
+                                    break loop29;
                                 }
                             } while (true);
 
@@ -2668,19 +3192,19 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_5=(Token)match(input,29,FOLLOW_26); 
+                    otherlv_5=(Token)match(input,30,FOLLOW_29); 
 
                                                         newLeafNode(otherlv_5, grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_0_3());
                                                 
-                    otherlv_6=(Token)match(input,33,FOLLOW_27); 
+                    otherlv_6=(Token)match(input,34,FOLLOW_30); 
 
                                                         newLeafNode(otherlv_6, grammarAccess.getAssertionAccess().getColonKeyword_0_0_4());
                                                 
-                    // InternalProblem.g:1036:5: ( (lv_value_7_0= ruleLogicValue ) )
-                    // InternalProblem.g:1037:6: (lv_value_7_0= ruleLogicValue )
+                    // InternalProblem.g:1208:5: ( (lv_value_7_0= ruleLogicValue ) )
+                    // InternalProblem.g:1209:6: (lv_value_7_0= ruleLogicValue )
                     {
-                    // InternalProblem.g:1037:6: (lv_value_7_0= ruleLogicValue )
-                    // InternalProblem.g:1038:7: lv_value_7_0= ruleLogicValue
+                    // InternalProblem.g:1209:6: (lv_value_7_0= ruleLogicValue )
+                    // InternalProblem.g:1210:7: lv_value_7_0= ruleLogicValue
                     {
 
                                                                         newCompositeNode(grammarAccess.getAssertionAccess().getValueLogicValueEnumRuleCall_0_0_5_0());
@@ -2714,24 +3238,24 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1057:4: ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' )
+                    // InternalProblem.g:1229:4: ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' )
                     {
-                    // InternalProblem.g:1057:4: ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' )
-                    // InternalProblem.g:1058:5: ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')'
+                    // InternalProblem.g:1229:4: ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' )
+                    // InternalProblem.g:1230:5: ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')'
                     {
-                    // InternalProblem.g:1058:5: ( (lv_value_8_0= ruleShortLogicValue ) )?
-                    int alt26=2;
-                    int LA26_0 = input.LA(1);
+                    // InternalProblem.g:1230:5: ( (lv_value_8_0= ruleShortLogicValue ) )?
+                    int alt31=2;
+                    int LA31_0 = input.LA(1);
 
-                    if ( (LA26_0==31||LA26_0==42) ) {
-                        alt26=1;
+                    if ( (LA31_0==32||LA31_0==43) ) {
+                        alt31=1;
                     }
-                    switch (alt26) {
+                    switch (alt31) {
                         case 1 :
-                            // InternalProblem.g:1059:6: (lv_value_8_0= ruleShortLogicValue )
+                            // InternalProblem.g:1231:6: (lv_value_8_0= ruleShortLogicValue )
                             {
-                            // InternalProblem.g:1059:6: (lv_value_8_0= ruleShortLogicValue )
-                            // InternalProblem.g:1060:7: lv_value_8_0= ruleShortLogicValue
+                            // InternalProblem.g:1231:6: (lv_value_8_0= ruleShortLogicValue )
+                            // InternalProblem.g:1232:7: lv_value_8_0= ruleShortLogicValue
                             {
 
                                                                                 newCompositeNode(grammarAccess.getAssertionAccess().getValueShortLogicValueEnumRuleCall_0_1_0_0());
@@ -2761,11 +3285,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:1077:5: ( ( ruleQualifiedName ) )
-                    // InternalProblem.g:1078:6: ( ruleQualifiedName )
+                    // InternalProblem.g:1249:5: ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:1250:6: ( ruleQualifiedName )
                     {
-                    // InternalProblem.g:1078:6: ( ruleQualifiedName )
-                    // InternalProblem.g:1079:7: ruleQualifiedName
+                    // InternalProblem.g:1250:6: ( ruleQualifiedName )
+                    // InternalProblem.g:1251:7: ruleQualifiedName
                     {
 
                                                                         if (current==null) {
@@ -2775,7 +3299,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                                                         newCompositeNode(grammarAccess.getAssertionAccess().getRelationRelationCrossReference_0_1_1_0());
                                                                 
-                    pushFollow(FOLLOW_17);
+                    pushFollow(FOLLOW_21);
                     ruleQualifiedName();
 
                     state._fsp--;
@@ -2789,26 +3313,26 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_10=(Token)match(input,28,FOLLOW_25); 
+                    otherlv_10=(Token)match(input,29,FOLLOW_22); 
 
                                                         newLeafNode(otherlv_10, grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_1_2());
                                                 
-                    // InternalProblem.g:1097:5: ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )?
-                    int alt28=2;
-                    int LA28_0 = input.LA(1);
+                    // InternalProblem.g:1269:5: ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )?
+                    int alt33=2;
+                    int LA33_0 = input.LA(1);
 
-                    if ( (LA28_0==RULE_ID||LA28_0==RULE_QUOTED_ID) ) {
-                        alt28=1;
+                    if ( (LA33_0==RULE_ID||LA33_0==RULE_QUOTED_ID||(LA33_0>=40 && LA33_0<=41)) ) {
+                        alt33=1;
                     }
-                    switch (alt28) {
+                    switch (alt33) {
                         case 1 :
-                            // InternalProblem.g:1098:6: ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )*
+                            // InternalProblem.g:1270:6: ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )*
                             {
-                            // InternalProblem.g:1098:6: ( ( ruleQualifiedName ) )
-                            // InternalProblem.g:1099:7: ( ruleQualifiedName )
+                            // InternalProblem.g:1270:6: ( ( ruleQualifiedName ) )
+                            // InternalProblem.g:1271:7: ( ruleQualifiedName )
                             {
-                            // InternalProblem.g:1099:7: ( ruleQualifiedName )
-                            // InternalProblem.g:1100:8: ruleQualifiedName
+                            // InternalProblem.g:1271:7: ( ruleQualifiedName )
+                            // InternalProblem.g:1272:8: ruleQualifiedName
                             {
 
                                                                                         if (current==null) {
@@ -2818,7 +3342,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                                                                         newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_0_0());
                                                                                 
-                            pushFollow(FOLLOW_19);
+                            pushFollow(FOLLOW_23);
                             ruleQualifiedName();
 
                             state._fsp--;
@@ -2832,30 +3356,30 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalProblem.g:1114:6: (otherlv_12= ',' ( ( ruleQualifiedName ) ) )*
-                            loop27:
+                            // InternalProblem.g:1286:6: (otherlv_12= ',' ( ( ruleQualifiedName ) ) )*
+                            loop32:
                             do {
-                                int alt27=2;
-                                int LA27_0 = input.LA(1);
+                                int alt32=2;
+                                int LA32_0 = input.LA(1);
 
-                                if ( (LA27_0==17) ) {
-                                    alt27=1;
+                                if ( (LA32_0==17) ) {
+                                    alt32=1;
                                 }
 
 
-                                switch (alt27) {
+                                switch (alt32) {
                                 case 1 :
-                                    // InternalProblem.g:1115:7: otherlv_12= ',' ( ( ruleQualifiedName ) )
+                                    // InternalProblem.g:1287:7: otherlv_12= ',' ( ( ruleQualifiedName ) )
                                     {
                                     otherlv_12=(Token)match(input,17,FOLLOW_8); 
 
                                                                                         newLeafNode(otherlv_12, grammarAccess.getAssertionAccess().getCommaKeyword_0_1_3_1_0());
                                                                                 
-                                    // InternalProblem.g:1119:7: ( ( ruleQualifiedName ) )
-                                    // InternalProblem.g:1120:8: ( ruleQualifiedName )
+                                    // InternalProblem.g:1291:7: ( ( ruleQualifiedName ) )
+                                    // InternalProblem.g:1292:8: ( ruleQualifiedName )
                                     {
-                                    // InternalProblem.g:1120:8: ( ruleQualifiedName )
-                                    // InternalProblem.g:1121:9: ruleQualifiedName
+                                    // InternalProblem.g:1292:8: ( ruleQualifiedName )
+                                    // InternalProblem.g:1293:9: ruleQualifiedName
                                     {
 
                                                                                                         if (current==null) {
@@ -2865,7 +3389,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                                                                                         newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_1_1_0());
                                                                                                 
-                                    pushFollow(FOLLOW_19);
+                                    pushFollow(FOLLOW_23);
                                     ruleQualifiedName();
 
                                     state._fsp--;
@@ -2884,7 +3408,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                     break;
 
                                 default :
-                                    break loop27;
+                                    break loop32;
                                 }
                             } while (true);
 
@@ -2894,7 +3418,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_14=(Token)match(input,29,FOLLOW_4); 
+                    otherlv_14=(Token)match(input,30,FOLLOW_4); 
 
                                                         newLeafNode(otherlv_14, grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_1_4());
                                                 
@@ -2934,7 +3458,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleScopeDeclaration"
-    // InternalProblem.g:1151:1: entryRuleScopeDeclaration returns [EObject current=null] : iv_ruleScopeDeclaration= ruleScopeDeclaration EOF ;
+    // InternalProblem.g:1323:1: entryRuleScopeDeclaration returns [EObject current=null] : iv_ruleScopeDeclaration= ruleScopeDeclaration EOF ;
     public final EObject entryRuleScopeDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -2942,8 +3466,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1151:57: (iv_ruleScopeDeclaration= ruleScopeDeclaration EOF )
-            // InternalProblem.g:1152:2: iv_ruleScopeDeclaration= ruleScopeDeclaration EOF
+            // InternalProblem.g:1323:57: (iv_ruleScopeDeclaration= ruleScopeDeclaration EOF )
+            // InternalProblem.g:1324:2: iv_ruleScopeDeclaration= ruleScopeDeclaration EOF
             {
              newCompositeNode(grammarAccess.getScopeDeclarationRule()); 
             pushFollow(FOLLOW_1);
@@ -2970,7 +3494,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleScopeDeclaration"
-    // InternalProblem.g:1158:1: ruleScopeDeclaration returns [EObject current=null] : (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' ) ;
+    // InternalProblem.g:1330:1: ruleScopeDeclaration returns [EObject current=null] : (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' ) ;
     public final EObject ruleScopeDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -2986,26 +3510,26 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1164:2: ( (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' ) )
-            // InternalProblem.g:1165:2: (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' )
+            // InternalProblem.g:1336:2: ( (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' ) )
+            // InternalProblem.g:1337:2: (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' )
             {
-            // InternalProblem.g:1165:2: (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' )
-            // InternalProblem.g:1166:3: otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.'
+            // InternalProblem.g:1337:2: (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' )
+            // InternalProblem.g:1338:3: otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.'
             {
-            otherlv_0=(Token)match(input,34,FOLLOW_3); 
+            otherlv_0=(Token)match(input,35,FOLLOW_31); 
 
                                 newLeafNode(otherlv_0, grammarAccess.getScopeDeclarationAccess().getScopeKeyword_0());
                         
-            // InternalProblem.g:1170:3: ( (lv_typeScopes_1_0= ruleTypeScope ) )
-            // InternalProblem.g:1171:4: (lv_typeScopes_1_0= ruleTypeScope )
+            // InternalProblem.g:1342:3: ( (lv_typeScopes_1_0= ruleTypeScope ) )
+            // InternalProblem.g:1343:4: (lv_typeScopes_1_0= ruleTypeScope )
             {
-            // InternalProblem.g:1171:4: (lv_typeScopes_1_0= ruleTypeScope )
-            // InternalProblem.g:1172:5: lv_typeScopes_1_0= ruleTypeScope
+            // InternalProblem.g:1343:4: (lv_typeScopes_1_0= ruleTypeScope )
+            // InternalProblem.g:1344:5: lv_typeScopes_1_0= ruleTypeScope
             {
 
                                                 newCompositeNode(grammarAccess.getScopeDeclarationAccess().getTypeScopesTypeScopeParserRuleCall_1_0());
                                         
-            pushFollow(FOLLOW_28);
+            pushFollow(FOLLOW_32);
             lv_typeScopes_1_0=ruleTypeScope();
 
             state._fsp--;
@@ -3027,35 +3551,35 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:1189:3: (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )*
-            loop30:
+            // InternalProblem.g:1361:3: (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )*
+            loop35:
             do {
-                int alt30=2;
-                int LA30_0 = input.LA(1);
+                int alt35=2;
+                int LA35_0 = input.LA(1);
 
-                if ( (LA30_0==17) ) {
-                    alt30=1;
+                if ( (LA35_0==17) ) {
+                    alt35=1;
                 }
 
 
-                switch (alt30) {
+                switch (alt35) {
                 case 1 :
-                    // InternalProblem.g:1190:4: otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) )
+                    // InternalProblem.g:1362:4: otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) )
                     {
-                    otherlv_2=(Token)match(input,17,FOLLOW_3); 
+                    otherlv_2=(Token)match(input,17,FOLLOW_31); 
 
                                                 newLeafNode(otherlv_2, grammarAccess.getScopeDeclarationAccess().getCommaKeyword_2_0());
                                         
-                    // InternalProblem.g:1194:4: ( (lv_typeScopes_3_0= ruleTypeScope ) )
-                    // InternalProblem.g:1195:5: (lv_typeScopes_3_0= ruleTypeScope )
+                    // InternalProblem.g:1366:4: ( (lv_typeScopes_3_0= ruleTypeScope ) )
+                    // InternalProblem.g:1367:5: (lv_typeScopes_3_0= ruleTypeScope )
                     {
-                    // InternalProblem.g:1195:5: (lv_typeScopes_3_0= ruleTypeScope )
-                    // InternalProblem.g:1196:6: lv_typeScopes_3_0= ruleTypeScope
+                    // InternalProblem.g:1367:5: (lv_typeScopes_3_0= ruleTypeScope )
+                    // InternalProblem.g:1368:6: lv_typeScopes_3_0= ruleTypeScope
                     {
 
                                                                 newCompositeNode(grammarAccess.getScopeDeclarationAccess().getTypeScopesTypeScopeParserRuleCall_2_1_0());
                                                         
-                    pushFollow(FOLLOW_28);
+                    pushFollow(FOLLOW_32);
                     lv_typeScopes_3_0=ruleTypeScope();
 
                     state._fsp--;
@@ -3082,7 +3606,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     break;
 
                 default :
-                    break loop30;
+                    break loop35;
                 }
             } while (true);
 
@@ -3113,7 +3637,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTypeScope"
-    // InternalProblem.g:1222:1: entryRuleTypeScope returns [EObject current=null] : iv_ruleTypeScope= ruleTypeScope EOF ;
+    // InternalProblem.g:1394:1: entryRuleTypeScope returns [EObject current=null] : iv_ruleTypeScope= ruleTypeScope EOF ;
     public final EObject entryRuleTypeScope() throws RecognitionException {
         EObject current = null;
 
@@ -3121,8 +3645,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1222:50: (iv_ruleTypeScope= ruleTypeScope EOF )
-            // InternalProblem.g:1223:2: iv_ruleTypeScope= ruleTypeScope EOF
+            // InternalProblem.g:1394:50: (iv_ruleTypeScope= ruleTypeScope EOF )
+            // InternalProblem.g:1395:2: iv_ruleTypeScope= ruleTypeScope EOF
             {
              newCompositeNode(grammarAccess.getTypeScopeRule()); 
             pushFollow(FOLLOW_1);
@@ -3149,7 +3673,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTypeScope"
-    // InternalProblem.g:1229:1: ruleTypeScope returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) ) ;
+    // InternalProblem.g:1401:1: ruleTypeScope returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) ) ;
     public final EObject ruleTypeScope() throws RecognitionException {
         EObject current = null;
 
@@ -3163,24 +3687,24 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1235:2: ( ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) ) )
-            // InternalProblem.g:1236:2: ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) )
+            // InternalProblem.g:1407:2: ( ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) ) )
+            // InternalProblem.g:1408:2: ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) )
             {
-            // InternalProblem.g:1236:2: ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) )
-            // InternalProblem.g:1237:3: ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) )
+            // InternalProblem.g:1408:2: ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) )
+            // InternalProblem.g:1409:3: ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) )
             {
-            // InternalProblem.g:1237:3: ( (otherlv_0= RULE_ID ) )
-            // InternalProblem.g:1238:4: (otherlv_0= RULE_ID )
+            // InternalProblem.g:1409:3: ( (otherlv_0= RULE_ID ) )
+            // InternalProblem.g:1410:4: (otherlv_0= RULE_ID )
             {
-            // InternalProblem.g:1238:4: (otherlv_0= RULE_ID )
-            // InternalProblem.g:1239:5: otherlv_0= RULE_ID
+            // InternalProblem.g:1410:4: (otherlv_0= RULE_ID )
+            // InternalProblem.g:1411:5: otherlv_0= RULE_ID
             {
 
                                                 if (current==null) {
                                                         current = createModelElement(grammarAccess.getTypeScopeRule());
                                                 }
                                         
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_29); 
+            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_33); 
 
                                                 newLeafNode(otherlv_0, grammarAccess.getTypeScopeAccess().getTargetTypeClassDeclarationCrossReference_0_0());
                                         
@@ -3190,33 +3714,33 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:1250:3: ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' )
-            int alt31=2;
-            int LA31_0 = input.LA(1);
+            // InternalProblem.g:1422:3: ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' )
+            int alt36=2;
+            int LA36_0 = input.LA(1);
 
-            if ( (LA31_0==35) ) {
-                alt31=1;
+            if ( (LA36_0==36) ) {
+                alt36=1;
             }
-            else if ( (LA31_0==36) ) {
-                alt31=2;
+            else if ( (LA36_0==37) ) {
+                alt36=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 31, 0, input);
+                    new NoViableAltException("", 36, 0, input);
 
                 throw nvae;
             }
-            switch (alt31) {
+            switch (alt36) {
                 case 1 :
-                    // InternalProblem.g:1251:4: ( (lv_increment_1_0= '+=' ) )
+                    // InternalProblem.g:1423:4: ( (lv_increment_1_0= '+=' ) )
                     {
-                    // InternalProblem.g:1251:4: ( (lv_increment_1_0= '+=' ) )
-                    // InternalProblem.g:1252:5: (lv_increment_1_0= '+=' )
+                    // InternalProblem.g:1423:4: ( (lv_increment_1_0= '+=' ) )
+                    // InternalProblem.g:1424:5: (lv_increment_1_0= '+=' )
                     {
-                    // InternalProblem.g:1252:5: (lv_increment_1_0= '+=' )
-                    // InternalProblem.g:1253:6: lv_increment_1_0= '+='
+                    // InternalProblem.g:1424:5: (lv_increment_1_0= '+=' )
+                    // InternalProblem.g:1425:6: lv_increment_1_0= '+='
                     {
-                    lv_increment_1_0=(Token)match(input,35,FOLLOW_13); 
+                    lv_increment_1_0=(Token)match(input,36,FOLLOW_17); 
 
                                                                 newLeafNode(lv_increment_1_0, grammarAccess.getTypeScopeAccess().getIncrementPlusSignEqualsSignKeyword_1_0_0());
                                                         
@@ -3236,9 +3760,9 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1266:4: otherlv_2= '='
+                    // InternalProblem.g:1438:4: otherlv_2= '='
                     {
-                    otherlv_2=(Token)match(input,36,FOLLOW_13); 
+                    otherlv_2=(Token)match(input,37,FOLLOW_17); 
 
                                                 newLeafNode(otherlv_2, grammarAccess.getTypeScopeAccess().getEqualsSignKeyword_1_1());
                                         
@@ -3248,11 +3772,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:1271:3: ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) )
-            // InternalProblem.g:1272:4: (lv_multiplicity_3_0= ruleDefiniteMultiplicity )
+            // InternalProblem.g:1443:3: ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) )
+            // InternalProblem.g:1444:4: (lv_multiplicity_3_0= ruleDefiniteMultiplicity )
             {
-            // InternalProblem.g:1272:4: (lv_multiplicity_3_0= ruleDefiniteMultiplicity )
-            // InternalProblem.g:1273:5: lv_multiplicity_3_0= ruleDefiniteMultiplicity
+            // InternalProblem.g:1444:4: (lv_multiplicity_3_0= ruleDefiniteMultiplicity )
+            // InternalProblem.g:1445:5: lv_multiplicity_3_0= ruleDefiniteMultiplicity
             {
 
                                                 newCompositeNode(grammarAccess.getTypeScopeAccess().getMultiplicityDefiniteMultiplicityParserRuleCall_2_0());
@@ -3302,7 +3826,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleMultiplicity"
-    // InternalProblem.g:1294:1: entryRuleMultiplicity returns [EObject current=null] : iv_ruleMultiplicity= ruleMultiplicity EOF ;
+    // InternalProblem.g:1466:1: entryRuleMultiplicity returns [EObject current=null] : iv_ruleMultiplicity= ruleMultiplicity EOF ;
     public final EObject entryRuleMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3310,8 +3834,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1294:53: (iv_ruleMultiplicity= ruleMultiplicity EOF )
-            // InternalProblem.g:1295:2: iv_ruleMultiplicity= ruleMultiplicity EOF
+            // InternalProblem.g:1466:53: (iv_ruleMultiplicity= ruleMultiplicity EOF )
+            // InternalProblem.g:1467:2: iv_ruleMultiplicity= ruleMultiplicity EOF
             {
              newCompositeNode(grammarAccess.getMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -3338,7 +3862,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleMultiplicity"
-    // InternalProblem.g:1301:1: ruleMultiplicity returns [EObject current=null] : (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity ) ;
+    // InternalProblem.g:1473:1: ruleMultiplicity returns [EObject current=null] : (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity ) ;
     public final EObject ruleMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3351,28 +3875,28 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1307:2: ( (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity ) )
-            // InternalProblem.g:1308:2: (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity )
+            // InternalProblem.g:1479:2: ( (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity ) )
+            // InternalProblem.g:1480:2: (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity )
             {
-            // InternalProblem.g:1308:2: (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity )
-            int alt32=2;
-            int LA32_0 = input.LA(1);
+            // InternalProblem.g:1480:2: (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity )
+            int alt37=2;
+            int LA37_0 = input.LA(1);
 
-            if ( (LA32_0==EOF||LA32_0==24) ) {
-                alt32=1;
+            if ( (LA37_0==EOF||LA37_0==25) ) {
+                alt37=1;
             }
-            else if ( (LA32_0==RULE_INT) ) {
-                alt32=2;
+            else if ( (LA37_0==RULE_INT) ) {
+                alt37=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 32, 0, input);
+                    new NoViableAltException("", 37, 0, input);
 
                 throw nvae;
             }
-            switch (alt32) {
+            switch (alt37) {
                 case 1 :
-                    // InternalProblem.g:1309:3: this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity
+                    // InternalProblem.g:1481:3: this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity
                     {
 
                                         newCompositeNode(grammarAccess.getMultiplicityAccess().getUnboundedMultiplicityParserRuleCall_0());
@@ -3390,7 +3914,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1318:3: this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity
+                    // InternalProblem.g:1490:3: this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity
                     {
 
                                         newCompositeNode(grammarAccess.getMultiplicityAccess().getDefiniteMultiplicityParserRuleCall_1());
@@ -3430,7 +3954,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDefiniteMultiplicity"
-    // InternalProblem.g:1330:1: entryRuleDefiniteMultiplicity returns [EObject current=null] : iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF ;
+    // InternalProblem.g:1502:1: entryRuleDefiniteMultiplicity returns [EObject current=null] : iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF ;
     public final EObject entryRuleDefiniteMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3438,8 +3962,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1330:61: (iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF )
-            // InternalProblem.g:1331:2: iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF
+            // InternalProblem.g:1502:61: (iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF )
+            // InternalProblem.g:1503:2: iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF
             {
              newCompositeNode(grammarAccess.getDefiniteMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -3466,7 +3990,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDefiniteMultiplicity"
-    // InternalProblem.g:1337:1: ruleDefiniteMultiplicity returns [EObject current=null] : (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity ) ;
+    // InternalProblem.g:1509:1: ruleDefiniteMultiplicity returns [EObject current=null] : (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity ) ;
     public final EObject ruleDefiniteMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3479,38 +4003,38 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1343:2: ( (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity ) )
-            // InternalProblem.g:1344:2: (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity )
+            // InternalProblem.g:1515:2: ( (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity ) )
+            // InternalProblem.g:1516:2: (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity )
             {
-            // InternalProblem.g:1344:2: (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity )
-            int alt33=2;
-            int LA33_0 = input.LA(1);
+            // InternalProblem.g:1516:2: (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity )
+            int alt38=2;
+            int LA38_0 = input.LA(1);
 
-            if ( (LA33_0==RULE_INT) ) {
-                int LA33_1 = input.LA(2);
+            if ( (LA38_0==RULE_INT) ) {
+                int LA38_1 = input.LA(2);
 
-                if ( (LA33_1==37) ) {
-                    alt33=1;
+                if ( (LA38_1==38) ) {
+                    alt38=1;
                 }
-                else if ( (LA33_1==EOF||LA33_1==13||LA33_1==17||LA33_1==24) ) {
-                    alt33=2;
+                else if ( (LA38_1==EOF||LA38_1==13||LA38_1==17||LA38_1==25) ) {
+                    alt38=2;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("", 33, 1, input);
+                        new NoViableAltException("", 38, 1, input);
 
                     throw nvae;
                 }
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 33, 0, input);
+                    new NoViableAltException("", 38, 0, input);
 
                 throw nvae;
             }
-            switch (alt33) {
+            switch (alt38) {
                 case 1 :
-                    // InternalProblem.g:1345:3: this_RangeMultiplicity_0= ruleRangeMultiplicity
+                    // InternalProblem.g:1517:3: this_RangeMultiplicity_0= ruleRangeMultiplicity
                     {
 
                                         newCompositeNode(grammarAccess.getDefiniteMultiplicityAccess().getRangeMultiplicityParserRuleCall_0());
@@ -3528,7 +4052,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1354:3: this_ExactMultiplicity_1= ruleExactMultiplicity
+                    // InternalProblem.g:1526:3: this_ExactMultiplicity_1= ruleExactMultiplicity
                     {
 
                                         newCompositeNode(grammarAccess.getDefiniteMultiplicityAccess().getExactMultiplicityParserRuleCall_1());
@@ -3568,7 +4092,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleUnboundedMultiplicity"
-    // InternalProblem.g:1366:1: entryRuleUnboundedMultiplicity returns [EObject current=null] : iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF ;
+    // InternalProblem.g:1538:1: entryRuleUnboundedMultiplicity returns [EObject current=null] : iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF ;
     public final EObject entryRuleUnboundedMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3576,8 +4100,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1366:62: (iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF )
-            // InternalProblem.g:1367:2: iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF
+            // InternalProblem.g:1538:62: (iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF )
+            // InternalProblem.g:1539:2: iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF
             {
              newCompositeNode(grammarAccess.getUnboundedMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -3604,7 +4128,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleUnboundedMultiplicity"
-    // InternalProblem.g:1373:1: ruleUnboundedMultiplicity returns [EObject current=null] : () ;
+    // InternalProblem.g:1545:1: ruleUnboundedMultiplicity returns [EObject current=null] : () ;
     public final EObject ruleUnboundedMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3612,11 +4136,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1379:2: ( () )
-            // InternalProblem.g:1380:2: ()
+            // InternalProblem.g:1551:2: ( () )
+            // InternalProblem.g:1552:2: ()
             {
-            // InternalProblem.g:1380:2: ()
-            // InternalProblem.g:1381:3: 
+            // InternalProblem.g:1552:2: ()
+            // InternalProblem.g:1553:3: 
             {
 
                                 current = forceCreateModelElement(
@@ -3641,7 +4165,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRangeMultiplicity"
-    // InternalProblem.g:1390:1: entryRuleRangeMultiplicity returns [EObject current=null] : iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF ;
+    // InternalProblem.g:1562:1: entryRuleRangeMultiplicity returns [EObject current=null] : iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF ;
     public final EObject entryRuleRangeMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3649,8 +4173,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1390:58: (iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF )
-            // InternalProblem.g:1391:2: iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF
+            // InternalProblem.g:1562:58: (iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF )
+            // InternalProblem.g:1563:2: iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF
             {
              newCompositeNode(grammarAccess.getRangeMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -3677,7 +4201,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRangeMultiplicity"
-    // InternalProblem.g:1397:1: ruleRangeMultiplicity returns [EObject current=null] : ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) ) ;
+    // InternalProblem.g:1569:1: ruleRangeMultiplicity returns [EObject current=null] : ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) ) ;
     public final EObject ruleRangeMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3690,19 +4214,19 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1403:2: ( ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) ) )
-            // InternalProblem.g:1404:2: ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) )
+            // InternalProblem.g:1575:2: ( ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) ) )
+            // InternalProblem.g:1576:2: ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) )
             {
-            // InternalProblem.g:1404:2: ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) )
-            // InternalProblem.g:1405:3: ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) )
+            // InternalProblem.g:1576:2: ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) )
+            // InternalProblem.g:1577:3: ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) )
             {
-            // InternalProblem.g:1405:3: ( (lv_lowerBound_0_0= RULE_INT ) )
-            // InternalProblem.g:1406:4: (lv_lowerBound_0_0= RULE_INT )
+            // InternalProblem.g:1577:3: ( (lv_lowerBound_0_0= RULE_INT ) )
+            // InternalProblem.g:1578:4: (lv_lowerBound_0_0= RULE_INT )
             {
-            // InternalProblem.g:1406:4: (lv_lowerBound_0_0= RULE_INT )
-            // InternalProblem.g:1407:5: lv_lowerBound_0_0= RULE_INT
+            // InternalProblem.g:1578:4: (lv_lowerBound_0_0= RULE_INT )
+            // InternalProblem.g:1579:5: lv_lowerBound_0_0= RULE_INT
             {
-            lv_lowerBound_0_0=(Token)match(input,RULE_INT,FOLLOW_30); 
+            lv_lowerBound_0_0=(Token)match(input,RULE_INT,FOLLOW_34); 
 
                                                 newLeafNode(lv_lowerBound_0_0, grammarAccess.getRangeMultiplicityAccess().getLowerBoundINTTerminalRuleCall_0_0());
                                         
@@ -3722,15 +4246,15 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,37,FOLLOW_31); 
+            otherlv_1=(Token)match(input,38,FOLLOW_35); 
 
                                 newLeafNode(otherlv_1, grammarAccess.getRangeMultiplicityAccess().getFullStopFullStopKeyword_1());
                         
-            // InternalProblem.g:1427:3: ( (lv_upperBound_2_0= ruleUpperBound ) )
-            // InternalProblem.g:1428:4: (lv_upperBound_2_0= ruleUpperBound )
+            // InternalProblem.g:1599:3: ( (lv_upperBound_2_0= ruleUpperBound ) )
+            // InternalProblem.g:1600:4: (lv_upperBound_2_0= ruleUpperBound )
             {
-            // InternalProblem.g:1428:4: (lv_upperBound_2_0= ruleUpperBound )
-            // InternalProblem.g:1429:5: lv_upperBound_2_0= ruleUpperBound
+            // InternalProblem.g:1600:4: (lv_upperBound_2_0= ruleUpperBound )
+            // InternalProblem.g:1601:5: lv_upperBound_2_0= ruleUpperBound
             {
 
                                                 newCompositeNode(grammarAccess.getRangeMultiplicityAccess().getUpperBoundUpperBoundParserRuleCall_2_0());
@@ -3780,7 +4304,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleExactMultiplicity"
-    // InternalProblem.g:1450:1: entryRuleExactMultiplicity returns [EObject current=null] : iv_ruleExactMultiplicity= ruleExactMultiplicity EOF ;
+    // InternalProblem.g:1622:1: entryRuleExactMultiplicity returns [EObject current=null] : iv_ruleExactMultiplicity= ruleExactMultiplicity EOF ;
     public final EObject entryRuleExactMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3788,8 +4312,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1450:58: (iv_ruleExactMultiplicity= ruleExactMultiplicity EOF )
-            // InternalProblem.g:1451:2: iv_ruleExactMultiplicity= ruleExactMultiplicity EOF
+            // InternalProblem.g:1622:58: (iv_ruleExactMultiplicity= ruleExactMultiplicity EOF )
+            // InternalProblem.g:1623:2: iv_ruleExactMultiplicity= ruleExactMultiplicity EOF
             {
              newCompositeNode(grammarAccess.getExactMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -3816,7 +4340,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleExactMultiplicity"
-    // InternalProblem.g:1457:1: ruleExactMultiplicity returns [EObject current=null] : ( (lv_exactValue_0_0= RULE_INT ) ) ;
+    // InternalProblem.g:1629:1: ruleExactMultiplicity returns [EObject current=null] : ( (lv_exactValue_0_0= RULE_INT ) ) ;
     public final EObject ruleExactMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3826,14 +4350,14 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1463:2: ( ( (lv_exactValue_0_0= RULE_INT ) ) )
-            // InternalProblem.g:1464:2: ( (lv_exactValue_0_0= RULE_INT ) )
+            // InternalProblem.g:1635:2: ( ( (lv_exactValue_0_0= RULE_INT ) ) )
+            // InternalProblem.g:1636:2: ( (lv_exactValue_0_0= RULE_INT ) )
             {
-            // InternalProblem.g:1464:2: ( (lv_exactValue_0_0= RULE_INT ) )
-            // InternalProblem.g:1465:3: (lv_exactValue_0_0= RULE_INT )
+            // InternalProblem.g:1636:2: ( (lv_exactValue_0_0= RULE_INT ) )
+            // InternalProblem.g:1637:3: (lv_exactValue_0_0= RULE_INT )
             {
-            // InternalProblem.g:1465:3: (lv_exactValue_0_0= RULE_INT )
-            // InternalProblem.g:1466:4: lv_exactValue_0_0= RULE_INT
+            // InternalProblem.g:1637:3: (lv_exactValue_0_0= RULE_INT )
+            // InternalProblem.g:1638:4: lv_exactValue_0_0= RULE_INT
             {
             lv_exactValue_0_0=(Token)match(input,RULE_INT,FOLLOW_2); 
 
@@ -3875,7 +4399,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleUpperBound"
-    // InternalProblem.g:1485:1: entryRuleUpperBound returns [String current=null] : iv_ruleUpperBound= ruleUpperBound EOF ;
+    // InternalProblem.g:1657:1: entryRuleUpperBound returns [String current=null] : iv_ruleUpperBound= ruleUpperBound EOF ;
     public final String entryRuleUpperBound() throws RecognitionException {
         String current = null;
 
@@ -3883,8 +4407,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1485:50: (iv_ruleUpperBound= ruleUpperBound EOF )
-            // InternalProblem.g:1486:2: iv_ruleUpperBound= ruleUpperBound EOF
+            // InternalProblem.g:1657:50: (iv_ruleUpperBound= ruleUpperBound EOF )
+            // InternalProblem.g:1658:2: iv_ruleUpperBound= ruleUpperBound EOF
             {
              newCompositeNode(grammarAccess.getUpperBoundRule()); 
             pushFollow(FOLLOW_1);
@@ -3911,7 +4435,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleUpperBound"
-    // InternalProblem.g:1492:1: ruleUpperBound returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_INT_0= RULE_INT | kw= '*' ) ;
+    // InternalProblem.g:1664:1: ruleUpperBound returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_INT_0= RULE_INT | kw= '*' ) ;
     public final AntlrDatatypeRuleToken ruleUpperBound() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -3922,28 +4446,28 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1498:2: ( (this_INT_0= RULE_INT | kw= '*' ) )
-            // InternalProblem.g:1499:2: (this_INT_0= RULE_INT | kw= '*' )
+            // InternalProblem.g:1670:2: ( (this_INT_0= RULE_INT | kw= '*' ) )
+            // InternalProblem.g:1671:2: (this_INT_0= RULE_INT | kw= '*' )
             {
-            // InternalProblem.g:1499:2: (this_INT_0= RULE_INT | kw= '*' )
-            int alt34=2;
-            int LA34_0 = input.LA(1);
+            // InternalProblem.g:1671:2: (this_INT_0= RULE_INT | kw= '*' )
+            int alt39=2;
+            int LA39_0 = input.LA(1);
 
-            if ( (LA34_0==RULE_INT) ) {
-                alt34=1;
+            if ( (LA39_0==RULE_INT) ) {
+                alt39=1;
             }
-            else if ( (LA34_0==38) ) {
-                alt34=2;
+            else if ( (LA39_0==39) ) {
+                alt39=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 34, 0, input);
+                    new NoViableAltException("", 39, 0, input);
 
                 throw nvae;
             }
-            switch (alt34) {
+            switch (alt39) {
                 case 1 :
-                    // InternalProblem.g:1500:3: this_INT_0= RULE_INT
+                    // InternalProblem.g:1672:3: this_INT_0= RULE_INT
                     {
                     this_INT_0=(Token)match(input,RULE_INT,FOLLOW_2); 
 
@@ -3956,9 +4480,9 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1508:3: kw= '*'
+                    // InternalProblem.g:1680:3: kw= '*'
                     {
-                    kw=(Token)match(input,38,FOLLOW_2); 
+                    kw=(Token)match(input,39,FOLLOW_2); 
 
                                         current.merge(kw);
                                         newLeafNode(kw, grammarAccess.getUpperBoundAccess().getAsteriskKeyword_1());
@@ -3988,8 +4512,132 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     // $ANTLR end "ruleUpperBound"
 
 
+    // $ANTLR start "entryRuleQuotedOrUnquotedId"
+    // InternalProblem.g:1689:1: entryRuleQuotedOrUnquotedId returns [String current=null] : iv_ruleQuotedOrUnquotedId= ruleQuotedOrUnquotedId EOF ;
+    public final String entryRuleQuotedOrUnquotedId() throws RecognitionException {
+        String current = null;
+
+        AntlrDatatypeRuleToken iv_ruleQuotedOrUnquotedId = null;
+
+
+        try {
+            // InternalProblem.g:1689:58: (iv_ruleQuotedOrUnquotedId= ruleQuotedOrUnquotedId EOF )
+            // InternalProblem.g:1690:2: iv_ruleQuotedOrUnquotedId= ruleQuotedOrUnquotedId EOF
+            {
+             newCompositeNode(grammarAccess.getQuotedOrUnquotedIdRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleQuotedOrUnquotedId=ruleQuotedOrUnquotedId();
+
+            state._fsp--;
+
+             current =iv_ruleQuotedOrUnquotedId.getText(); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleQuotedOrUnquotedId"
+
+
+    // $ANTLR start "ruleQuotedOrUnquotedId"
+    // InternalProblem.g:1696:1: ruleQuotedOrUnquotedId returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QUOTED_ID_0= RULE_QUOTED_ID | this_Identifier_1= ruleIdentifier ) ;
+    public final AntlrDatatypeRuleToken ruleQuotedOrUnquotedId() throws RecognitionException {
+        AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+        Token this_QUOTED_ID_0=null;
+        AntlrDatatypeRuleToken this_Identifier_1 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:1702:2: ( (this_QUOTED_ID_0= RULE_QUOTED_ID | this_Identifier_1= ruleIdentifier ) )
+            // InternalProblem.g:1703:2: (this_QUOTED_ID_0= RULE_QUOTED_ID | this_Identifier_1= ruleIdentifier )
+            {
+            // InternalProblem.g:1703:2: (this_QUOTED_ID_0= RULE_QUOTED_ID | this_Identifier_1= ruleIdentifier )
+            int alt40=2;
+            int LA40_0 = input.LA(1);
+
+            if ( (LA40_0==RULE_QUOTED_ID) ) {
+                alt40=1;
+            }
+            else if ( (LA40_0==RULE_ID||(LA40_0>=40 && LA40_0<=41)) ) {
+                alt40=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 40, 0, input);
+
+                throw nvae;
+            }
+            switch (alt40) {
+                case 1 :
+                    // InternalProblem.g:1704:3: this_QUOTED_ID_0= RULE_QUOTED_ID
+                    {
+                    this_QUOTED_ID_0=(Token)match(input,RULE_QUOTED_ID,FOLLOW_2); 
+
+                                        current.merge(this_QUOTED_ID_0);
+                                
+
+                                        newLeafNode(this_QUOTED_ID_0, grammarAccess.getQuotedOrUnquotedIdAccess().getQUOTED_IDTerminalRuleCall_0());
+                                
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:1712:3: this_Identifier_1= ruleIdentifier
+                    {
+
+                                        newCompositeNode(grammarAccess.getQuotedOrUnquotedIdAccess().getIdentifierParserRuleCall_1());
+                                
+                    pushFollow(FOLLOW_2);
+                    this_Identifier_1=ruleIdentifier();
+
+                    state._fsp--;
+
+
+                                        current.merge(this_Identifier_1);
+                                
+
+                                        afterParserOrEnumRuleCall();
+                                
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleQuotedOrUnquotedId"
+
+
     // $ANTLR start "entryRuleQualifiedName"
-    // InternalProblem.g:1517:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
+    // InternalProblem.g:1726:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
     public final String entryRuleQualifiedName() throws RecognitionException {
         String current = null;
 
@@ -3997,8 +4645,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1517:53: (iv_ruleQualifiedName= ruleQualifiedName EOF )
-            // InternalProblem.g:1518:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+            // InternalProblem.g:1726:53: (iv_ruleQualifiedName= ruleQualifiedName EOF )
+            // InternalProblem.g:1727:2: iv_ruleQualifiedName= ruleQualifiedName EOF
             {
              newCompositeNode(grammarAccess.getQualifiedNameRule()); 
             pushFollow(FOLLOW_1);
@@ -4025,42 +4673,44 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // InternalProblem.g:1524:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) ) ;
+    // InternalProblem.g:1733:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_Identifier_1= ruleIdentifier (kw= ':' this_Identifier_3= ruleIdentifier )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
         Token this_QUOTED_ID_0=null;
-        Token this_ID_1=null;
         Token kw=null;
-        Token this_ID_3=null;
         Token this_QUOTED_ID_5=null;
+        AntlrDatatypeRuleToken this_Identifier_1 = null;
+
+        AntlrDatatypeRuleToken this_Identifier_3 = null;
+
 
 
                 enterRule();
 
         try {
-            // InternalProblem.g:1530:2: ( (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) ) )
-            // InternalProblem.g:1531:2: (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) )
+            // InternalProblem.g:1739:2: ( (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_Identifier_1= ruleIdentifier (kw= ':' this_Identifier_3= ruleIdentifier )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) ) )
+            // InternalProblem.g:1740:2: (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_Identifier_1= ruleIdentifier (kw= ':' this_Identifier_3= ruleIdentifier )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) )
             {
-            // InternalProblem.g:1531:2: (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) )
-            int alt37=2;
-            int LA37_0 = input.LA(1);
+            // InternalProblem.g:1740:2: (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_Identifier_1= ruleIdentifier (kw= ':' this_Identifier_3= ruleIdentifier )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) )
+            int alt43=2;
+            int LA43_0 = input.LA(1);
 
-            if ( (LA37_0==RULE_QUOTED_ID) ) {
-                alt37=1;
+            if ( (LA43_0==RULE_QUOTED_ID) ) {
+                alt43=1;
             }
-            else if ( (LA37_0==RULE_ID) ) {
-                alt37=2;
+            else if ( (LA43_0==RULE_ID||(LA43_0>=40 && LA43_0<=41)) ) {
+                alt43=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 37, 0, input);
+                    new NoViableAltException("", 43, 0, input);
 
                 throw nvae;
             }
-            switch (alt37) {
+            switch (alt43) {
                 case 1 :
-                    // InternalProblem.g:1532:3: this_QUOTED_ID_0= RULE_QUOTED_ID
+                    // InternalProblem.g:1741:3: this_QUOTED_ID_0= RULE_QUOTED_ID
                     {
                     this_QUOTED_ID_0=(Token)match(input,RULE_QUOTED_ID,FOLLOW_2); 
 
@@ -4073,72 +4723,86 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1540:3: (this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? )
+                    // InternalProblem.g:1749:3: (this_Identifier_1= ruleIdentifier (kw= ':' this_Identifier_3= ruleIdentifier )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? )
                     {
-                    // InternalProblem.g:1540:3: (this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? )
-                    // InternalProblem.g:1541:4: this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )?
+                    // InternalProblem.g:1749:3: (this_Identifier_1= ruleIdentifier (kw= ':' this_Identifier_3= ruleIdentifier )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? )
+                    // InternalProblem.g:1750:4: this_Identifier_1= ruleIdentifier (kw= ':' this_Identifier_3= ruleIdentifier )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )?
                     {
-                    this_ID_1=(Token)match(input,RULE_ID,FOLLOW_32); 
 
-                                                current.merge(this_ID_1);
+                                                newCompositeNode(grammarAccess.getQualifiedNameAccess().getIdentifierParserRuleCall_1_0());
+                                        
+                    pushFollow(FOLLOW_36);
+                    this_Identifier_1=ruleIdentifier();
+
+                    state._fsp--;
+
+
+                                                current.merge(this_Identifier_1);
                                         
 
-                                                newLeafNode(this_ID_1, grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_0());
+                                                afterParserOrEnumRuleCall();
                                         
-                    // InternalProblem.g:1548:4: (kw= ':' this_ID_3= RULE_ID )*
-                    loop35:
+                    // InternalProblem.g:1760:4: (kw= ':' this_Identifier_3= ruleIdentifier )*
+                    loop41:
                     do {
-                        int alt35=2;
-                        int LA35_0 = input.LA(1);
+                        int alt41=2;
+                        int LA41_0 = input.LA(1);
 
-                        if ( (LA35_0==33) ) {
-                            int LA35_1 = input.LA(2);
+                        if ( (LA41_0==34) ) {
+                            int LA41_1 = input.LA(2);
 
-                            if ( (LA35_1==RULE_ID) ) {
-                                alt35=1;
+                            if ( (LA41_1==RULE_ID||(LA41_1>=40 && LA41_1<=41)) ) {
+                                alt41=1;
                             }
 
 
                         }
 
 
-                        switch (alt35) {
+                        switch (alt41) {
                         case 1 :
-                            // InternalProblem.g:1549:5: kw= ':' this_ID_3= RULE_ID
+                            // InternalProblem.g:1761:5: kw= ':' this_Identifier_3= ruleIdentifier
                             {
-                            kw=(Token)match(input,33,FOLLOW_3); 
+                            kw=(Token)match(input,34,FOLLOW_3); 
 
                                                                 current.merge(kw);
                                                                 newLeafNode(kw, grammarAccess.getQualifiedNameAccess().getColonKeyword_1_1_0());
                                                         
-                            this_ID_3=(Token)match(input,RULE_ID,FOLLOW_32); 
 
-                                                                current.merge(this_ID_3);
+                                                                newCompositeNode(grammarAccess.getQualifiedNameAccess().getIdentifierParserRuleCall_1_1_1());
                                                         
+                            pushFollow(FOLLOW_36);
+                            this_Identifier_3=ruleIdentifier();
+
+                            state._fsp--;
+
 
-                                                                newLeafNode(this_ID_3, grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1_1());
+                                                                current.merge(this_Identifier_3);
+                                                        
+
+                                                                afterParserOrEnumRuleCall();
                                                         
 
                             }
                             break;
 
                         default :
-                            break loop35;
+                            break loop41;
                         }
                     } while (true);
 
-                    // InternalProblem.g:1562:4: (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )?
-                    int alt36=2;
-                    int LA36_0 = input.LA(1);
+                    // InternalProblem.g:1777:4: (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )?
+                    int alt42=2;
+                    int LA42_0 = input.LA(1);
 
-                    if ( (LA36_0==33) ) {
-                        alt36=1;
+                    if ( (LA42_0==34) ) {
+                        alt42=1;
                     }
-                    switch (alt36) {
+                    switch (alt42) {
                         case 1 :
-                            // InternalProblem.g:1563:5: kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID
+                            // InternalProblem.g:1778:5: kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID
                             {
-                            kw=(Token)match(input,33,FOLLOW_33); 
+                            kw=(Token)match(input,34,FOLLOW_37); 
 
                                                                 current.merge(kw);
                                                                 newLeafNode(kw, grammarAccess.getQualifiedNameAccess().getColonKeyword_1_2_0());
@@ -4184,8 +4848,142 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     // $ANTLR end "ruleQualifiedName"
 
 
+    // $ANTLR start "entryRuleIdentifier"
+    // InternalProblem.g:1796:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ;
+    public final String entryRuleIdentifier() throws RecognitionException {
+        String current = null;
+
+        AntlrDatatypeRuleToken iv_ruleIdentifier = null;
+
+
+        try {
+            // InternalProblem.g:1796:50: (iv_ruleIdentifier= ruleIdentifier EOF )
+            // InternalProblem.g:1797:2: iv_ruleIdentifier= ruleIdentifier EOF
+            {
+             newCompositeNode(grammarAccess.getIdentifierRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleIdentifier=ruleIdentifier();
+
+            state._fsp--;
+
+             current =iv_ruleIdentifier.getText(); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleIdentifier"
+
+
+    // $ANTLR start "ruleIdentifier"
+    // InternalProblem.g:1803:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID | kw= 'true' | kw= 'false' ) ;
+    public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException {
+        AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+        Token this_ID_0=null;
+        Token kw=null;
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:1809:2: ( (this_ID_0= RULE_ID | kw= 'true' | kw= 'false' ) )
+            // InternalProblem.g:1810:2: (this_ID_0= RULE_ID | kw= 'true' | kw= 'false' )
+            {
+            // InternalProblem.g:1810:2: (this_ID_0= RULE_ID | kw= 'true' | kw= 'false' )
+            int alt44=3;
+            switch ( input.LA(1) ) {
+            case RULE_ID:
+                {
+                alt44=1;
+                }
+                break;
+            case 40:
+                {
+                alt44=2;
+                }
+                break;
+            case 41:
+                {
+                alt44=3;
+                }
+                break;
+            default:
+                NoViableAltException nvae =
+                    new NoViableAltException("", 44, 0, input);
+
+                throw nvae;
+            }
+
+            switch (alt44) {
+                case 1 :
+                    // InternalProblem.g:1811:3: this_ID_0= RULE_ID
+                    {
+                    this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); 
+
+                                        current.merge(this_ID_0);
+                                
+
+                                        newLeafNode(this_ID_0, grammarAccess.getIdentifierAccess().getIDTerminalRuleCall_0());
+                                
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:1819:3: kw= 'true'
+                    {
+                    kw=(Token)match(input,40,FOLLOW_2); 
+
+                                        current.merge(kw);
+                                        newLeafNode(kw, grammarAccess.getIdentifierAccess().getTrueKeyword_1());
+                                
+
+                    }
+                    break;
+                case 3 :
+                    // InternalProblem.g:1825:3: kw= 'false'
+                    {
+                    kw=(Token)match(input,41,FOLLOW_2); 
+
+                                        current.merge(kw);
+                                        newLeafNode(kw, grammarAccess.getIdentifierAccess().getFalseKeyword_2());
+                                
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleIdentifier"
+
+
     // $ANTLR start "ruleLogicValue"
-    // InternalProblem.g:1581:1: ruleLogicValue returns [Enumerator current=null] : ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) ) ;
+    // InternalProblem.g:1834:1: ruleLogicValue returns [Enumerator current=null] : ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) ) ;
     public final Enumerator ruleLogicValue() throws RecognitionException {
         Enumerator current = null;
 
@@ -4197,42 +4995,42 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1587:2: ( ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) ) )
-            // InternalProblem.g:1588:2: ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) )
+            // InternalProblem.g:1840:2: ( ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) ) )
+            // InternalProblem.g:1841:2: ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) )
             {
-            // InternalProblem.g:1588:2: ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) )
-            int alt38=3;
+            // InternalProblem.g:1841:2: ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) )
+            int alt45=3;
             switch ( input.LA(1) ) {
-            case 39:
+            case 40:
                 {
-                alt38=1;
+                alt45=1;
                 }
                 break;
-            case 40:
+            case 41:
                 {
-                alt38=2;
+                alt45=2;
                 }
                 break;
-            case 41:
+            case 42:
                 {
-                alt38=3;
+                alt45=3;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("", 38, 0, input);
+                    new NoViableAltException("", 45, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt38) {
+            switch (alt45) {
                 case 1 :
-                    // InternalProblem.g:1589:3: (enumLiteral_0= 'true' )
+                    // InternalProblem.g:1842:3: (enumLiteral_0= 'true' )
                     {
-                    // InternalProblem.g:1589:3: (enumLiteral_0= 'true' )
-                    // InternalProblem.g:1590:4: enumLiteral_0= 'true'
+                    // InternalProblem.g:1842:3: (enumLiteral_0= 'true' )
+                    // InternalProblem.g:1843:4: enumLiteral_0= 'true'
                     {
-                    enumLiteral_0=(Token)match(input,39,FOLLOW_2); 
+                    enumLiteral_0=(Token)match(input,40,FOLLOW_2); 
 
                                                 current = grammarAccess.getLogicValueAccess().getTRUEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                                                 newLeafNode(enumLiteral_0, grammarAccess.getLogicValueAccess().getTRUEEnumLiteralDeclaration_0());
@@ -4244,12 +5042,12 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1597:3: (enumLiteral_1= 'false' )
+                    // InternalProblem.g:1850:3: (enumLiteral_1= 'false' )
                     {
-                    // InternalProblem.g:1597:3: (enumLiteral_1= 'false' )
-                    // InternalProblem.g:1598:4: enumLiteral_1= 'false'
+                    // InternalProblem.g:1850:3: (enumLiteral_1= 'false' )
+                    // InternalProblem.g:1851:4: enumLiteral_1= 'false'
                     {
-                    enumLiteral_1=(Token)match(input,40,FOLLOW_2); 
+                    enumLiteral_1=(Token)match(input,41,FOLLOW_2); 
 
                                                 current = grammarAccess.getLogicValueAccess().getFALSEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                                                 newLeafNode(enumLiteral_1, grammarAccess.getLogicValueAccess().getFALSEEnumLiteralDeclaration_1());
@@ -4261,12 +5059,12 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalProblem.g:1605:3: (enumLiteral_2= 'unknown' )
+                    // InternalProblem.g:1858:3: (enumLiteral_2= 'unknown' )
                     {
-                    // InternalProblem.g:1605:3: (enumLiteral_2= 'unknown' )
-                    // InternalProblem.g:1606:4: enumLiteral_2= 'unknown'
+                    // InternalProblem.g:1858:3: (enumLiteral_2= 'unknown' )
+                    // InternalProblem.g:1859:4: enumLiteral_2= 'unknown'
                     {
-                    enumLiteral_2=(Token)match(input,41,FOLLOW_2); 
+                    enumLiteral_2=(Token)match(input,42,FOLLOW_2); 
 
                                                 current = grammarAccess.getLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
                                                 newLeafNode(enumLiteral_2, grammarAccess.getLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_2());
@@ -4300,7 +5098,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleShortLogicValue"
-    // InternalProblem.g:1616:1: ruleShortLogicValue returns [Enumerator current=null] : ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) ) ;
+    // InternalProblem.g:1869:1: ruleShortLogicValue returns [Enumerator current=null] : ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) ) ;
     public final Enumerator ruleShortLogicValue() throws RecognitionException {
         Enumerator current = null;
 
@@ -4311,33 +5109,33 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1622:2: ( ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) ) )
-            // InternalProblem.g:1623:2: ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) )
+            // InternalProblem.g:1875:2: ( ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) ) )
+            // InternalProblem.g:1876:2: ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) )
             {
-            // InternalProblem.g:1623:2: ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) )
-            int alt39=2;
-            int LA39_0 = input.LA(1);
+            // InternalProblem.g:1876:2: ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) )
+            int alt46=2;
+            int LA46_0 = input.LA(1);
 
-            if ( (LA39_0==31) ) {
-                alt39=1;
+            if ( (LA46_0==32) ) {
+                alt46=1;
             }
-            else if ( (LA39_0==42) ) {
-                alt39=2;
+            else if ( (LA46_0==43) ) {
+                alt46=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 39, 0, input);
+                    new NoViableAltException("", 46, 0, input);
 
                 throw nvae;
             }
-            switch (alt39) {
+            switch (alt46) {
                 case 1 :
-                    // InternalProblem.g:1624:3: (enumLiteral_0= '!' )
+                    // InternalProblem.g:1877:3: (enumLiteral_0= '!' )
                     {
-                    // InternalProblem.g:1624:3: (enumLiteral_0= '!' )
-                    // InternalProblem.g:1625:4: enumLiteral_0= '!'
+                    // InternalProblem.g:1877:3: (enumLiteral_0= '!' )
+                    // InternalProblem.g:1878:4: enumLiteral_0= '!'
                     {
-                    enumLiteral_0=(Token)match(input,31,FOLLOW_2); 
+                    enumLiteral_0=(Token)match(input,32,FOLLOW_2); 
 
                                                 current = grammarAccess.getShortLogicValueAccess().getFALSEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                                                 newLeafNode(enumLiteral_0, grammarAccess.getShortLogicValueAccess().getFALSEEnumLiteralDeclaration_0());
@@ -4349,12 +5147,12 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1632:3: (enumLiteral_1= '?' )
+                    // InternalProblem.g:1885:3: (enumLiteral_1= '?' )
                     {
-                    // InternalProblem.g:1632:3: (enumLiteral_1= '?' )
-                    // InternalProblem.g:1633:4: enumLiteral_1= '?'
+                    // InternalProblem.g:1885:3: (enumLiteral_1= '?' )
+                    // InternalProblem.g:1886:4: enumLiteral_1= '?'
                     {
-                    enumLiteral_1=(Token)match(input,42,FOLLOW_2); 
+                    enumLiteral_1=(Token)match(input,43,FOLLOW_2); 
 
                                                 current = grammarAccess.getShortLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                                                 newLeafNode(enumLiteral_1, grammarAccess.getShortLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_1());
@@ -4389,34 +5187,46 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     // Delegated rules
 
 
-    protected DFA29 dfa29 = new DFA29(this);
-    static final String dfa_1s = "\25\uffff";
-    static final String dfa_2s = "\1\4\2\34\1\uffff\2\4\2\21\1\15\2\34\2\4\1\uffff\4\21\1\4\2\21";
-    static final String dfa_3s = "\1\52\1\34\1\41\1\uffff\1\35\1\6\1\35\2\41\1\34\1\41\2\6\1\uffff\1\35\1\41\1\35\1\41\1\6\1\35\1\41";
-    static final String dfa_4s = "\3\uffff\1\2\11\uffff\1\1\7\uffff";
-    static final String dfa_5s = "\25\uffff}>";
+    protected DFA34 dfa34 = new DFA34(this);
+    static final String dfa_1s = "\41\uffff";
+    static final String dfa_2s = "\1\4\4\35\1\uffff\2\4\4\21\1\15\4\35\2\4\1\uffff\10\21\1\4\4\21";
+    static final String dfa_3s = "\1\53\1\35\3\42\1\uffff\2\51\1\36\7\42\1\35\2\51\1\uffff\1\36\6\42\1\36\1\51\3\42\1\36";
+    static final String dfa_4s = "\5\uffff\1\2\15\uffff\1\1\15\uffff";
+    static final String dfa_5s = "\41\uffff}>";
     static final String[] dfa_6s = {
-            "\1\2\1\uffff\1\1\30\uffff\1\3\12\uffff\1\3",
-            "\1\4",
-            "\1\4\4\uffff\1\5",
+            "\1\2\1\uffff\1\1\31\uffff\1\5\7\uffff\1\3\1\4\1\uffff\1\5",
+            "\1\6",
+            "\1\6\4\uffff\1\7",
+            "\1\6\4\uffff\1\7",
+            "\1\6\4\uffff\1\7",
             "",
-            "\1\7\1\uffff\1\6\26\uffff\1\10",
-            "\1\12\1\uffff\1\11",
-            "\1\13\13\uffff\1\10",
-            "\1\13\13\uffff\1\10\3\uffff\1\14",
-            "\1\3\23\uffff\1\15",
-            "\1\4",
-            "\1\4\4\uffff\1\5",
-            "\1\17\1\uffff\1\16",
-            "\1\21\1\uffff\1\20",
+            "\1\11\1\uffff\1\10\27\uffff\1\14\11\uffff\1\12\1\13",
+            "\1\15\1\uffff\1\20\41\uffff\1\16\1\17",
+            "\1\21\14\uffff\1\14",
+            "\1\21\14\uffff\1\14\3\uffff\1\22",
+            "\1\21\14\uffff\1\14\3\uffff\1\22",
+            "\1\21\14\uffff\1\14\3\uffff\1\22",
+            "\1\5\24\uffff\1\23",
+            "\1\6\4\uffff\1\7",
+            "\1\6\4\uffff\1\7",
+            "\1\6\4\uffff\1\7",
+            "\1\6",
+            "\1\25\1\uffff\1\24\41\uffff\1\26\1\27",
+            "\1\30\1\uffff\1\33\41\uffff\1\31\1\32",
             "",
-            "\1\13\13\uffff\1\10",
-            "\1\13\13\uffff\1\10\3\uffff\1\22",
-            "\1\13\13\uffff\1\10",
-            "\1\13\13\uffff\1\10\3\uffff\1\14",
-            "\1\24\1\uffff\1\23",
-            "\1\13\13\uffff\1\10",
-            "\1\13\13\uffff\1\10\3\uffff\1\22"
+            "\1\21\14\uffff\1\14",
+            "\1\21\14\uffff\1\14\3\uffff\1\34",
+            "\1\21\14\uffff\1\14\3\uffff\1\34",
+            "\1\21\14\uffff\1\14\3\uffff\1\34",
+            "\1\21\14\uffff\1\14\3\uffff\1\22",
+            "\1\21\14\uffff\1\14\3\uffff\1\22",
+            "\1\21\14\uffff\1\14\3\uffff\1\22",
+            "\1\21\14\uffff\1\14",
+            "\1\35\1\uffff\1\40\41\uffff\1\36\1\37",
+            "\1\21\14\uffff\1\14\3\uffff\1\34",
+            "\1\21\14\uffff\1\14\3\uffff\1\34",
+            "\1\21\14\uffff\1\14\3\uffff\1\34",
+            "\1\21\14\uffff\1\14"
     };
 
     static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
@@ -4426,11 +5236,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
     static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
 
-    class DFA29 extends DFA {
+    class DFA34 extends DFA {
 
-        public DFA29(BaseRecognizer recognizer) {
+        public DFA34(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 29;
+            this.decisionNumber = 34;
             this.eot = dfa_1;
             this.eof = dfa_1;
             this.min = dfa_2;
@@ -4440,43 +5250,47 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             this.transition = dfa_6;
         }
         public String getDescription() {
-            return "966:3: ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) )";
+            return "1138:3: ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) )";
         }
     }
  
 
     public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
     public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000030000000010L});
     public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x000004048C00C052L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x00000B091820C052L});
     public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000008000L});
     public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000052000L});
-    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000000050L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000030000000050L});
     public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000062000L});
-    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000700000L});
-    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000780000L});
-    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000800010L});
-    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000002000002L});
-    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000008000010L});
-    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000020000010L});
-    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000020020000L});
-    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000040002000L});
-    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000080000050L});
-    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000000082000L});
-    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000000020002L});
-    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000110000000L});
-    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000020000050L});
-    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000038000000000L});
-    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000000022000L});
-    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000001800000000L});
-    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000004000000020L});
-    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000030000D00050L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000030000D80050L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000042000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000030000100050L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x00000000001A0000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000030001000010L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000004000002L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000030010000010L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000020000000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000030040000050L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000040020000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000080002000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000030100000050L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000000082000L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000000020002L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000220000000L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000070000000000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000000022000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000003000000000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000004000000000L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000008000000020L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000400000002L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000000000040L});
 
 }
\ No newline at end of file
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSemanticSequencer.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSemanticSequencer.java
index 336d0867..cb44c31f 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSemanticSequencer.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSemanticSequencer.java
@@ -12,8 +12,10 @@ import org.eclipse.viatra.solver.language.model.problem.Assertion;
 import org.eclipse.viatra.solver.language.model.problem.Atom;
 import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration;
 import org.eclipse.viatra.solver.language.model.problem.Conjunction;
+import org.eclipse.viatra.solver.language.model.problem.EnumDeclaration;
 import org.eclipse.viatra.solver.language.model.problem.ExactMultiplicity;
 import org.eclipse.viatra.solver.language.model.problem.NegativeLiteral;
+import org.eclipse.viatra.solver.language.model.problem.Node;
 import org.eclipse.viatra.solver.language.model.problem.PredicateDefinition;
 import org.eclipse.viatra.solver.language.model.problem.Problem;
 import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
@@ -60,12 +62,18 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
                         case ProblemPackage.CONJUNCTION:
                                 sequence_Conjunction(context, (Conjunction) semanticObject); 
                                 return; 
+                        case ProblemPackage.ENUM_DECLARATION:
+                                sequence_EnumDeclaration(context, (EnumDeclaration) semanticObject); 
+                                return; 
                         case ProblemPackage.EXACT_MULTIPLICITY:
                                 sequence_ExactMultiplicity(context, (ExactMultiplicity) semanticObject); 
                                 return; 
                         case ProblemPackage.NEGATIVE_LITERAL:
                                 sequence_NegativeLiteral(context, (NegativeLiteral) semanticObject); 
                                 return; 
+                        case ProblemPackage.NODE:
+                                sequence_EnumLiteral(context, (Node) semanticObject); 
+                                return; 
                         case ProblemPackage.PARAMETER:
                                 sequence_Parameter(context, (org.eclipse.viatra.solver.language.model.problem.Parameter) semanticObject); 
                                 return; 
@@ -100,15 +108,15 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
          *     Argument returns Argument
          *
          * Constraint:
-         *     variable=[Variable|ID]
+         *     variableOrNode=[VariableOrNode|QualifiedName]
          */
         protected void sequence_Argument(ISerializationContext context, Argument semanticObject) {
                 if (errorAcceptor != null) {
-                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.ARGUMENT__VARIABLE) == ValueTransient.YES)
-                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.ARGUMENT__VARIABLE));
+                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.ARGUMENT__VARIABLE_OR_NODE) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.ARGUMENT__VARIABLE_OR_NODE));
                 }
                 SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
-                feeder.accept(grammarAccess.getArgumentAccess().getVariableVariableIDTerminalRuleCall_0_1(), semanticObject.eGet(ProblemPackage.Literals.ARGUMENT__VARIABLE, false));
+                feeder.accept(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1(), semanticObject.eGet(ProblemPackage.Literals.ARGUMENT__VARIABLE_OR_NODE, false));
                 feeder.finish();
         }
         
@@ -150,8 +158,8 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
          * Constraint:
          *     (
          *         abstract?='abstract'? 
-         *         name=ID 
-         *         (superTypes+=[ClassDeclaration|QualifiedName] superTypes+=[ClassDeclaration|QualifiedName]*)? 
+         *         name=Identifier 
+         *         (superTypes+=[Relation|QualifiedName] superTypes+=[Relation|QualifiedName]*)? 
          *         referenceDeclarations+=ReferenceDeclaration*
          *     )
          */
@@ -174,6 +182,37 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
         
         /**
          * Contexts:
+         *     Statement returns EnumDeclaration
+         *     EnumDeclaration returns EnumDeclaration
+         *
+         * Constraint:
+         *     (name=Identifier (literals+=EnumLiteral literals+=EnumLiteral*)?)
+         */
+        protected void sequence_EnumDeclaration(ISerializationContext context, EnumDeclaration semanticObject) {
+                genericSequencer.createSequence(context, semanticObject);
+        }
+        
+        
+        /**
+         * Contexts:
+         *     EnumLiteral returns Node
+         *
+         * Constraint:
+         *     name=QuotedOrUnquotedId
+         */
+        protected void sequence_EnumLiteral(ISerializationContext context, Node semanticObject) {
+                if (errorAcceptor != null) {
+                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.NAMED_ELEMENT__NAME) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.NAMED_ELEMENT__NAME));
+                }
+                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+                feeder.accept(grammarAccess.getEnumLiteralAccess().getNameQuotedOrUnquotedIdParserRuleCall_0(), semanticObject.getName());
+                feeder.finish();
+        }
+        
+        
+        /**
+         * Contexts:
          *     Multiplicity returns ExactMultiplicity
          *     DefiniteMultiplicity returns ExactMultiplicity
          *     ExactMultiplicity returns ExactMultiplicity
@@ -216,19 +255,10 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
          *     Parameter returns Parameter
          *
          * Constraint:
-         *     (parameterType=[ClassDeclaration|ID] name=ID)
+         *     (parameterType=[Relation|QualifiedName]? name=Identifier)
          */
         protected void sequence_Parameter(ISerializationContext context, org.eclipse.viatra.solver.language.model.problem.Parameter semanticObject) {
-                if (errorAcceptor != null) {
-                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.PARAMETER__PARAMETER_TYPE) == ValueTransient.YES)
-                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.PARAMETER__PARAMETER_TYPE));
-                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.NAMED_ELEMENT__NAME) == ValueTransient.YES)
-                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.NAMED_ELEMENT__NAME));
-                }
-                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
-                feeder.accept(grammarAccess.getParameterAccess().getParameterTypeClassDeclarationIDTerminalRuleCall_0_0_1(), semanticObject.eGet(ProblemPackage.Literals.PARAMETER__PARAMETER_TYPE, false));
-                feeder.accept(grammarAccess.getParameterAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());
-                feeder.finish();
+                genericSequencer.createSequence(context, semanticObject);
         }
         
         
@@ -238,7 +268,7 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
          *     PredicateDefinition returns PredicateDefinition
          *
          * Constraint:
-         *     (error?='error'? name=ID (parameters+=Parameter parameters+=Parameter*)? (bodies+=Conjunction bodies+=Conjunction*)?)
+         *     (error?='error'? name=Identifier (parameters+=Parameter parameters+=Parameter*)? (bodies+=Conjunction bodies+=Conjunction*)?)
          */
         protected void sequence_PredicateDefinition(ISerializationContext context, PredicateDefinition semanticObject) {
                 genericSequencer.createSequence(context, semanticObject);
@@ -250,7 +280,7 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
          *     Problem returns Problem
          *
          * Constraint:
-         *     ((name=ID statements+=Statement+) | statements+=Statement+)?
+         *     ((name=Identifier statements+=Statement+) | statements+=Statement+)?
          */
         protected void sequence_Problem(ISerializationContext context, Problem semanticObject) {
                 genericSequencer.createSequence(context, semanticObject);
@@ -287,9 +317,9 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
          * Constraint:
          *     (
          *         containment?='contains'? 
-         *         referenceType=[ClassDeclaration|QualifiedName] 
+         *         referenceType=[Relation|QualifiedName] 
          *         multiplicity=Multiplicity? 
-         *         name=ID 
+         *         name=Identifier 
          *         opposite=[ReferenceDeclaration|QualifiedName]?
          *     )
          */
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSyntacticSequencer.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSyntacticSequencer.java
index 80ac73d6..3f0a3f05 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSyntacticSequencer.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSyntacticSequencer.java
@@ -24,14 +24,20 @@ public class ProblemSyntacticSequencer extends AbstractSyntacticSequencer {
         protected ProblemGrammarAccess grammarAccess;
         protected AbstractElementAlias match_ClassDeclaration_FullStopKeyword_4_1_or___LeftCurlyBracketKeyword_4_0_0_RightCurlyBracketKeyword_4_0_2__;
         protected AbstractElementAlias match_ClassDeclaration_SemicolonKeyword_4_0_1_1_q;
+        protected AbstractElementAlias match_EnumDeclaration_FullStopKeyword_2_1_or___LeftCurlyBracketKeyword_2_0_0_RightCurlyBracketKeyword_2_0_2__;
+        protected AbstractElementAlias match_EnumDeclaration___CommaKeyword_2_0_1_2_0_or_SemicolonKeyword_2_0_1_2_1__q;
         protected AbstractElementAlias match_PredicateDefinition_PredKeyword_0_0_1_q;
+        protected AbstractElementAlias match_ReferenceDeclaration_RefersKeyword_0_1_q;
         
         @Inject
         protected void init(IGrammarAccess access) {
                 grammarAccess = (ProblemGrammarAccess) access;
                 match_ClassDeclaration_FullStopKeyword_4_1_or___LeftCurlyBracketKeyword_4_0_0_RightCurlyBracketKeyword_4_0_2__ = new AlternativeAlias(false, false, new GroupAlias(false, false, new TokenAlias(false, false, grammarAccess.getClassDeclarationAccess().getLeftCurlyBracketKeyword_4_0_0()), new TokenAlias(false, false, grammarAccess.getClassDeclarationAccess().getRightCurlyBracketKeyword_4_0_2())), new TokenAlias(false, false, grammarAccess.getClassDeclarationAccess().getFullStopKeyword_4_1()));
                 match_ClassDeclaration_SemicolonKeyword_4_0_1_1_q = new TokenAlias(false, true, grammarAccess.getClassDeclarationAccess().getSemicolonKeyword_4_0_1_1());
+                match_EnumDeclaration_FullStopKeyword_2_1_or___LeftCurlyBracketKeyword_2_0_0_RightCurlyBracketKeyword_2_0_2__ = new AlternativeAlias(false, false, new GroupAlias(false, false, new TokenAlias(false, false, grammarAccess.getEnumDeclarationAccess().getLeftCurlyBracketKeyword_2_0_0()), new TokenAlias(false, false, grammarAccess.getEnumDeclarationAccess().getRightCurlyBracketKeyword_2_0_2())), new TokenAlias(false, false, grammarAccess.getEnumDeclarationAccess().getFullStopKeyword_2_1()));
+                match_EnumDeclaration___CommaKeyword_2_0_1_2_0_or_SemicolonKeyword_2_0_1_2_1__q = new AlternativeAlias(false, true, new TokenAlias(false, false, grammarAccess.getEnumDeclarationAccess().getCommaKeyword_2_0_1_2_0()), new TokenAlias(false, false, grammarAccess.getEnumDeclarationAccess().getSemicolonKeyword_2_0_1_2_1()));
                 match_PredicateDefinition_PredKeyword_0_0_1_q = new TokenAlias(false, true, grammarAccess.getPredicateDefinitionAccess().getPredKeyword_0_0_1());
+                match_ReferenceDeclaration_RefersKeyword_0_1_q = new TokenAlias(false, true, grammarAccess.getReferenceDeclarationAccess().getRefersKeyword_0_1());
         }
         
         @Override
@@ -50,8 +56,14 @@ public class ProblemSyntacticSequencer extends AbstractSyntacticSequencer {
                                 emit_ClassDeclaration_FullStopKeyword_4_1_or___LeftCurlyBracketKeyword_4_0_0_RightCurlyBracketKeyword_4_0_2__(semanticObject, getLastNavigableState(), syntaxNodes);
                         else if (match_ClassDeclaration_SemicolonKeyword_4_0_1_1_q.equals(syntax))
                                 emit_ClassDeclaration_SemicolonKeyword_4_0_1_1_q(semanticObject, getLastNavigableState(), syntaxNodes);
+                        else if (match_EnumDeclaration_FullStopKeyword_2_1_or___LeftCurlyBracketKeyword_2_0_0_RightCurlyBracketKeyword_2_0_2__.equals(syntax))
+                                emit_EnumDeclaration_FullStopKeyword_2_1_or___LeftCurlyBracketKeyword_2_0_0_RightCurlyBracketKeyword_2_0_2__(semanticObject, getLastNavigableState(), syntaxNodes);
+                        else if (match_EnumDeclaration___CommaKeyword_2_0_1_2_0_or_SemicolonKeyword_2_0_1_2_1__q.equals(syntax))
+                                emit_EnumDeclaration___CommaKeyword_2_0_1_2_0_or_SemicolonKeyword_2_0_1_2_1__q(semanticObject, getLastNavigableState(), syntaxNodes);
                         else if (match_PredicateDefinition_PredKeyword_0_0_1_q.equals(syntax))
                                 emit_PredicateDefinition_PredKeyword_0_0_1_q(semanticObject, getLastNavigableState(), syntaxNodes);
+                        else if (match_ReferenceDeclaration_RefersKeyword_0_1_q.equals(syntax))
+                                emit_ReferenceDeclaration_RefersKeyword_0_1_q(semanticObject, getLastNavigableState(), syntaxNodes);
                         else acceptNodes(getLastNavigableState(), syntaxNodes);
                 }
         }
@@ -61,8 +73,8 @@ public class ProblemSyntacticSequencer extends AbstractSyntacticSequencer {
          *     ('{' '}') | '.'
          *
          * This ambiguous syntax occurs at:
-         *     name=ID (ambiguity) (rule end)
-         *     superTypes+=[ClassDeclaration|QualifiedName] (ambiguity) (rule end)
+         *     name=Identifier (ambiguity) (rule end)
+         *     superTypes+=[Relation|QualifiedName] (ambiguity) (rule end)
          */
         protected void emit_ClassDeclaration_FullStopKeyword_4_1_or___LeftCurlyBracketKeyword_4_0_0_RightCurlyBracketKeyword_4_0_2__(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
                 acceptNodes(transition, nodes);
@@ -82,13 +94,46 @@ public class ProblemSyntacticSequencer extends AbstractSyntacticSequencer {
         
         /**
          * Ambiguous syntax:
+         *     ('{' '}') | '.'
+         *
+         * This ambiguous syntax occurs at:
+         *     name=Identifier (ambiguity) (rule end)
+         */
+        protected void emit_EnumDeclaration_FullStopKeyword_2_1_or___LeftCurlyBracketKeyword_2_0_0_RightCurlyBracketKeyword_2_0_2__(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+                acceptNodes(transition, nodes);
+        }
+        
+        /**
+         * Ambiguous syntax:
+         *     (',' | ';')?
+         *
+         * This ambiguous syntax occurs at:
+         *     literals+=EnumLiteral (ambiguity) '}' (rule end)
+         */
+        protected void emit_EnumDeclaration___CommaKeyword_2_0_1_2_0_or_SemicolonKeyword_2_0_1_2_1__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+                acceptNodes(transition, nodes);
+        }
+        
+        /**
+         * Ambiguous syntax:
          *     'pred'?
          *
          * This ambiguous syntax occurs at:
-         *     error?='error' (ambiguity) name=ID
+         *     error?='error' (ambiguity) name=Identifier
          */
         protected void emit_PredicateDefinition_PredKeyword_0_0_1_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
                 acceptNodes(transition, nodes);
         }
         
+        /**
+         * Ambiguous syntax:
+         *     'refers'?
+         *
+         * This ambiguous syntax occurs at:
+         *     (rule start) (ambiguity) referenceType=[Relation|QualifiedName]
+         */
+        protected void emit_ReferenceDeclaration_RefersKeyword_0_1_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+                acceptNodes(transition, nodes);
+        }
+        
 }
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/services/ProblemGrammarAccess.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/services/ProblemGrammarAccess.java
index 5b3781a2..4368036b 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/services/ProblemGrammarAccess.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/services/ProblemGrammarAccess.java
@@ -32,31 +32,31 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 private final Group cGroup_0 = (Group)cGroup.eContents().get(0);
                 private final Keyword cProblemKeyword_0_0 = (Keyword)cGroup_0.eContents().get(0);
                 private final Assignment cNameAssignment_0_1 = (Assignment)cGroup_0.eContents().get(1);
-                private final RuleCall cNameIDTerminalRuleCall_0_1_0 = (RuleCall)cNameAssignment_0_1.eContents().get(0);
+                private final RuleCall cNameIdentifierParserRuleCall_0_1_0 = (RuleCall)cNameAssignment_0_1.eContents().get(0);
                 private final Keyword cFullStopKeyword_0_2 = (Keyword)cGroup_0.eContents().get(2);
                 private final Assignment cStatementsAssignment_1 = (Assignment)cGroup.eContents().get(1);
                 private final RuleCall cStatementsStatementParserRuleCall_1_0 = (RuleCall)cStatementsAssignment_1.eContents().get(0);
                 
                 //Problem:
-                //    ("problem" name=ID ".")?
+                //    ("problem" name=Identifier ".")?
                 //    statements+=Statement*;
                 @Override public ParserRule getRule() { return rule; }
                 
-                //("problem" name=ID ".")?
+                //("problem" name=Identifier ".")?
                 //statements+=Statement*
                 public Group getGroup() { return cGroup; }
                 
-                //("problem" name=ID ".")?
+                //("problem" name=Identifier ".")?
                 public Group getGroup_0() { return cGroup_0; }
                 
                 //"problem"
                 public Keyword getProblemKeyword_0_0() { return cProblemKeyword_0_0; }
                 
-                //name=ID
+                //name=Identifier
                 public Assignment getNameAssignment_0_1() { return cNameAssignment_0_1; }
                 
-                //ID
-                public RuleCall getNameIDTerminalRuleCall_0_1_0() { return cNameIDTerminalRuleCall_0_1_0; }
+                //Identifier
+                public RuleCall getNameIdentifierParserRuleCall_0_1_0() { return cNameIdentifierParserRuleCall_0_1_0; }
                 
                 //"."
                 public Keyword getFullStopKeyword_0_2() { return cFullStopKeyword_0_2; }
@@ -71,28 +71,32 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.Statement");
                 private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
                 private final RuleCall cClassDeclarationParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
-                private final RuleCall cPredicateDefinitionParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
-                private final RuleCall cAssertionParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
-                private final RuleCall cScopeDeclarationParserRuleCall_3 = (RuleCall)cAlternatives.eContents().get(3);
+                private final RuleCall cEnumDeclarationParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                private final RuleCall cPredicateDefinitionParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
+                private final RuleCall cAssertionParserRuleCall_3 = (RuleCall)cAlternatives.eContents().get(3);
+                private final RuleCall cScopeDeclarationParserRuleCall_4 = (RuleCall)cAlternatives.eContents().get(4);
                 
                 //Statement:
-                //    ClassDeclaration | PredicateDefinition | Assertion | ScopeDeclaration;
+                //    ClassDeclaration | EnumDeclaration | PredicateDefinition | Assertion | ScopeDeclaration;
                 @Override public ParserRule getRule() { return rule; }
                 
-                //ClassDeclaration | PredicateDefinition | Assertion | ScopeDeclaration
+                //ClassDeclaration | EnumDeclaration | PredicateDefinition | Assertion | ScopeDeclaration
                 public Alternatives getAlternatives() { return cAlternatives; }
                 
                 //ClassDeclaration
                 public RuleCall getClassDeclarationParserRuleCall_0() { return cClassDeclarationParserRuleCall_0; }
                 
+                //EnumDeclaration
+                public RuleCall getEnumDeclarationParserRuleCall_1() { return cEnumDeclarationParserRuleCall_1; }
+                
                 //PredicateDefinition
-                public RuleCall getPredicateDefinitionParserRuleCall_1() { return cPredicateDefinitionParserRuleCall_1; }
+                public RuleCall getPredicateDefinitionParserRuleCall_2() { return cPredicateDefinitionParserRuleCall_2; }
                 
                 //Assertion
-                public RuleCall getAssertionParserRuleCall_2() { return cAssertionParserRuleCall_2; }
+                public RuleCall getAssertionParserRuleCall_3() { return cAssertionParserRuleCall_3; }
                 
                 //ScopeDeclaration
-                public RuleCall getScopeDeclarationParserRuleCall_3() { return cScopeDeclarationParserRuleCall_3; }
+                public RuleCall getScopeDeclarationParserRuleCall_4() { return cScopeDeclarationParserRuleCall_4; }
         }
         public class ClassDeclarationElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.ClassDeclaration");
@@ -101,17 +105,17 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 private final Keyword cAbstractAbstractKeyword_0_0 = (Keyword)cAbstractAssignment_0.eContents().get(0);
                 private final Keyword cClassKeyword_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 RuleCall cNameIdentifierParserRuleCall_2_0 = (RuleCall)cNameAssignment_2.eContents().get(0);
                 private final Group cGroup_3 = (Group)cGroup.eContents().get(3);
                 private final Keyword cExtendsKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);
                 private final Assignment cSuperTypesAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);
-                private final CrossReference cSuperTypesClassDeclarationCrossReference_3_1_0 = (CrossReference)cSuperTypesAssignment_3_1.eContents().get(0);
-                private final RuleCall cSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_1_0_1 = (RuleCall)cSuperTypesClassDeclarationCrossReference_3_1_0.eContents().get(1);
+                private final CrossReference cSuperTypesRelationCrossReference_3_1_0 = (CrossReference)cSuperTypesAssignment_3_1.eContents().get(0);
+                private final RuleCall cSuperTypesRelationQualifiedNameParserRuleCall_3_1_0_1 = (RuleCall)cSuperTypesRelationCrossReference_3_1_0.eContents().get(1);
                 private final Group cGroup_3_2 = (Group)cGroup_3.eContents().get(2);
                 private final Keyword cCommaKeyword_3_2_0 = (Keyword)cGroup_3_2.eContents().get(0);
                 private final Assignment cSuperTypesAssignment_3_2_1 = (Assignment)cGroup_3_2.eContents().get(1);
-                private final CrossReference cSuperTypesClassDeclarationCrossReference_3_2_1_0 = (CrossReference)cSuperTypesAssignment_3_2_1.eContents().get(0);
-                private final RuleCall cSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_2_1_0_1 = (RuleCall)cSuperTypesClassDeclarationCrossReference_3_2_1_0.eContents().get(1);
+                private final CrossReference cSuperTypesRelationCrossReference_3_2_1_0 = (CrossReference)cSuperTypesAssignment_3_2_1.eContents().get(0);
+                private final RuleCall cSuperTypesRelationQualifiedNameParserRuleCall_3_2_1_0_1 = (RuleCall)cSuperTypesRelationCrossReference_3_2_1_0.eContents().get(1);
                 private final Alternatives cAlternatives_4 = (Alternatives)cGroup.eContents().get(4);
                 private final Group cGroup_4_0 = (Group)cAlternatives_4.eContents().get(0);
                 private final Keyword cLeftCurlyBracketKeyword_4_0_0 = (Keyword)cGroup_4_0.eContents().get(0);
@@ -124,14 +128,14 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 
                 //ClassDeclaration:
                 //    abstract?="abstract"? "class"
-                //    name=ID
-                //    ("extends" superTypes+=[ClassDeclaration|QualifiedName] ("," superTypes+=[ClassDeclaration|QualifiedName])*)?
+                //    name=Identifier
+                //    ("extends" superTypes+=[Relation|QualifiedName] ("," superTypes+=[Relation|QualifiedName])*)?
                 //    ("{" (referenceDeclarations+=ReferenceDeclaration ";"?)* "}" | ".");
                 @Override public ParserRule getRule() { return rule; }
                 
                 //abstract?="abstract"? "class"
-                //name=ID
-                //("extends" superTypes+=[ClassDeclaration|QualifiedName] ("," superTypes+=[ClassDeclaration|QualifiedName])*)?
+                //name=Identifier
+                //("extends" superTypes+=[Relation|QualifiedName] ("," superTypes+=[Relation|QualifiedName])*)?
                 //("{" (referenceDeclarations+=ReferenceDeclaration ";"?)* "}" | ".")
                 public Group getGroup() { return cGroup; }
                 
@@ -144,41 +148,41 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //"class"
                 public Keyword getClassKeyword_1() { return cClassKeyword_1; }
                 
-                //name=ID
+                //name=Identifier
                 public Assignment getNameAssignment_2() { return cNameAssignment_2; }
                 
-                //ID
-                public RuleCall getNameIDTerminalRuleCall_2_0() { return cNameIDTerminalRuleCall_2_0; }
+                //Identifier
+                public RuleCall getNameIdentifierParserRuleCall_2_0() { return cNameIdentifierParserRuleCall_2_0; }
                 
-                //("extends" superTypes+=[ClassDeclaration|QualifiedName] ("," superTypes+=[ClassDeclaration|QualifiedName])*)?
+                //("extends" superTypes+=[Relation|QualifiedName] ("," superTypes+=[Relation|QualifiedName])*)?
                 public Group getGroup_3() { return cGroup_3; }
                 
                 //"extends"
                 public Keyword getExtendsKeyword_3_0() { return cExtendsKeyword_3_0; }
                 
-                //superTypes+=[ClassDeclaration|QualifiedName]
+                //superTypes+=[Relation|QualifiedName]
                 public Assignment getSuperTypesAssignment_3_1() { return cSuperTypesAssignment_3_1; }
                 
-                //[ClassDeclaration|QualifiedName]
-                public CrossReference getSuperTypesClassDeclarationCrossReference_3_1_0() { return cSuperTypesClassDeclarationCrossReference_3_1_0; }
+                //[Relation|QualifiedName]
+                public CrossReference getSuperTypesRelationCrossReference_3_1_0() { return cSuperTypesRelationCrossReference_3_1_0; }
                 
                 //QualifiedName
-                public RuleCall getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_1_0_1() { return cSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_1_0_1; }
+                public RuleCall getSuperTypesRelationQualifiedNameParserRuleCall_3_1_0_1() { return cSuperTypesRelationQualifiedNameParserRuleCall_3_1_0_1; }
                 
-                //("," superTypes+=[ClassDeclaration|QualifiedName])*
+                //("," superTypes+=[Relation|QualifiedName])*
                 public Group getGroup_3_2() { return cGroup_3_2; }
                 
                 //","
                 public Keyword getCommaKeyword_3_2_0() { return cCommaKeyword_3_2_0; }
                 
-                //superTypes+=[ClassDeclaration|QualifiedName]
+                //superTypes+=[Relation|QualifiedName]
                 public Assignment getSuperTypesAssignment_3_2_1() { return cSuperTypesAssignment_3_2_1; }
                 
-                //[ClassDeclaration|QualifiedName]
-                public CrossReference getSuperTypesClassDeclarationCrossReference_3_2_1_0() { return cSuperTypesClassDeclarationCrossReference_3_2_1_0; }
+                //[Relation|QualifiedName]
+                public CrossReference getSuperTypesRelationCrossReference_3_2_1_0() { return cSuperTypesRelationCrossReference_3_2_1_0; }
                 
                 //QualifiedName
-                public RuleCall getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_2_1_0_1() { return cSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_2_1_0_1; }
+                public RuleCall getSuperTypesRelationQualifiedNameParserRuleCall_3_2_1_0_1() { return cSuperTypesRelationQualifiedNameParserRuleCall_3_2_1_0_1; }
                 
                 //("{" (referenceDeclarations+=ReferenceDeclaration ";"?)* "}" | ".")
                 public Alternatives getAlternatives_4() { return cAlternatives_4; }
@@ -207,6 +211,108 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //"."
                 public Keyword getFullStopKeyword_4_1() { return cFullStopKeyword_4_1; }
         }
+        public class EnumDeclarationElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.EnumDeclaration");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Keyword cEnumKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final RuleCall cNameIdentifierParserRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
+                private final Alternatives cAlternatives_2 = (Alternatives)cGroup.eContents().get(2);
+                private final Group cGroup_2_0 = (Group)cAlternatives_2.eContents().get(0);
+                private final Keyword cLeftCurlyBracketKeyword_2_0_0 = (Keyword)cGroup_2_0.eContents().get(0);
+                private final Group cGroup_2_0_1 = (Group)cGroup_2_0.eContents().get(1);
+                private final Assignment cLiteralsAssignment_2_0_1_0 = (Assignment)cGroup_2_0_1.eContents().get(0);
+                private final RuleCall cLiteralsEnumLiteralParserRuleCall_2_0_1_0_0 = (RuleCall)cLiteralsAssignment_2_0_1_0.eContents().get(0);
+                private final Group cGroup_2_0_1_1 = (Group)cGroup_2_0_1.eContents().get(1);
+                private final Keyword cCommaKeyword_2_0_1_1_0 = (Keyword)cGroup_2_0_1_1.eContents().get(0);
+                private final Assignment cLiteralsAssignment_2_0_1_1_1 = (Assignment)cGroup_2_0_1_1.eContents().get(1);
+                private final RuleCall cLiteralsEnumLiteralParserRuleCall_2_0_1_1_1_0 = (RuleCall)cLiteralsAssignment_2_0_1_1_1.eContents().get(0);
+                private final Alternatives cAlternatives_2_0_1_2 = (Alternatives)cGroup_2_0_1.eContents().get(2);
+                private final Keyword cCommaKeyword_2_0_1_2_0 = (Keyword)cAlternatives_2_0_1_2.eContents().get(0);
+                private final Keyword cSemicolonKeyword_2_0_1_2_1 = (Keyword)cAlternatives_2_0_1_2.eContents().get(1);
+                private final Keyword cRightCurlyBracketKeyword_2_0_2 = (Keyword)cGroup_2_0.eContents().get(2);
+                private final Keyword cFullStopKeyword_2_1 = (Keyword)cAlternatives_2.eContents().get(1);
+                
+                //EnumDeclaration:
+                //    "enum"
+                //    name=Identifier
+                //    ("{" (literals+=EnumLiteral ("," literals+=EnumLiteral)* ("," | ";")?)? "}" | ".");
+                @Override public ParserRule getRule() { return rule; }
+                
+                //"enum"
+                //name=Identifier
+                //("{" (literals+=EnumLiteral ("," literals+=EnumLiteral)* ("," | ";")?)? "}" | ".")
+                public Group getGroup() { return cGroup; }
+                
+                //"enum"
+                public Keyword getEnumKeyword_0() { return cEnumKeyword_0; }
+                
+                //name=Identifier
+                public Assignment getNameAssignment_1() { return cNameAssignment_1; }
+                
+                //Identifier
+                public RuleCall getNameIdentifierParserRuleCall_1_0() { return cNameIdentifierParserRuleCall_1_0; }
+                
+                //("{" (literals+=EnumLiteral ("," literals+=EnumLiteral)* ("," | ";")?)? "}" | ".")
+                public Alternatives getAlternatives_2() { return cAlternatives_2; }
+                
+                //"{" (literals+=EnumLiteral ("," literals+=EnumLiteral)* ("," | ";")?)? "}"
+                public Group getGroup_2_0() { return cGroup_2_0; }
+                
+                //"{"
+                public Keyword getLeftCurlyBracketKeyword_2_0_0() { return cLeftCurlyBracketKeyword_2_0_0; }
+                
+                //(literals+=EnumLiteral ("," literals+=EnumLiteral)* ("," | ";")?)?
+                public Group getGroup_2_0_1() { return cGroup_2_0_1; }
+                
+                //literals+=EnumLiteral
+                public Assignment getLiteralsAssignment_2_0_1_0() { return cLiteralsAssignment_2_0_1_0; }
+                
+                //EnumLiteral
+                public RuleCall getLiteralsEnumLiteralParserRuleCall_2_0_1_0_0() { return cLiteralsEnumLiteralParserRuleCall_2_0_1_0_0; }
+                
+                //("," literals+=EnumLiteral)*
+                public Group getGroup_2_0_1_1() { return cGroup_2_0_1_1; }
+                
+                //","
+                public Keyword getCommaKeyword_2_0_1_1_0() { return cCommaKeyword_2_0_1_1_0; }
+                
+                //literals+=EnumLiteral
+                public Assignment getLiteralsAssignment_2_0_1_1_1() { return cLiteralsAssignment_2_0_1_1_1; }
+                
+                //EnumLiteral
+                public RuleCall getLiteralsEnumLiteralParserRuleCall_2_0_1_1_1_0() { return cLiteralsEnumLiteralParserRuleCall_2_0_1_1_1_0; }
+                
+                //("," | ";")?
+                public Alternatives getAlternatives_2_0_1_2() { return cAlternatives_2_0_1_2; }
+                
+                //","
+                public Keyword getCommaKeyword_2_0_1_2_0() { return cCommaKeyword_2_0_1_2_0; }
+                
+                //";"
+                public Keyword getSemicolonKeyword_2_0_1_2_1() { return cSemicolonKeyword_2_0_1_2_1; }
+                
+                //"}"
+                public Keyword getRightCurlyBracketKeyword_2_0_2() { return cRightCurlyBracketKeyword_2_0_2; }
+                
+                //"."
+                public Keyword getFullStopKeyword_2_1() { return cFullStopKeyword_2_1; }
+        }
+        public class EnumLiteralElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.EnumLiteral");
+                private final Assignment cNameAssignment = (Assignment)rule.eContents().get(1);
+                private final RuleCall cNameQuotedOrUnquotedIdParserRuleCall_0 = (RuleCall)cNameAssignment.eContents().get(0);
+                
+                //EnumLiteral returns Node:
+                //    name=QuotedOrUnquotedId;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //name=QuotedOrUnquotedId
+                public Assignment getNameAssignment() { return cNameAssignment; }
+                
+                //QuotedOrUnquotedId
+                public RuleCall getNameQuotedOrUnquotedIdParserRuleCall_0() { return cNameQuotedOrUnquotedIdParserRuleCall_0; }
+        }
         public class ReferenceDeclarationElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.ReferenceDeclaration");
                 private final Group cGroup = (Group)rule.eContents().get(1);
@@ -215,15 +321,15 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 private final Keyword cContainmentContainsKeyword_0_0_0 = (Keyword)cContainmentAssignment_0_0.eContents().get(0);
                 private final Keyword cRefersKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);
                 private final Assignment cReferenceTypeAssignment_1 = (Assignment)cGroup.eContents().get(1);
-                private final CrossReference cReferenceTypeClassDeclarationCrossReference_1_0 = (CrossReference)cReferenceTypeAssignment_1.eContents().get(0);
-                private final RuleCall cReferenceTypeClassDeclarationQualifiedNameParserRuleCall_1_0_1 = (RuleCall)cReferenceTypeClassDeclarationCrossReference_1_0.eContents().get(1);
+                private final CrossReference cReferenceTypeRelationCrossReference_1_0 = (CrossReference)cReferenceTypeAssignment_1.eContents().get(0);
+                private final RuleCall cReferenceTypeRelationQualifiedNameParserRuleCall_1_0_1 = (RuleCall)cReferenceTypeRelationCrossReference_1_0.eContents().get(1);
                 private final Group cGroup_2 = (Group)cGroup.eContents().get(2);
                 private final Keyword cLeftSquareBracketKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);
                 private final Assignment cMultiplicityAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);
                 private final RuleCall cMultiplicityMultiplicityParserRuleCall_2_1_0 = (RuleCall)cMultiplicityAssignment_2_1.eContents().get(0);
                 private final Keyword cRightSquareBracketKeyword_2_2 = (Keyword)cGroup_2.eContents().get(2);
                 private final Assignment cNameAssignment_3 = (Assignment)cGroup.eContents().get(3);
-                private final RuleCall cNameIDTerminalRuleCall_3_0 = (RuleCall)cNameAssignment_3.eContents().get(0);
+                private final RuleCall cNameIdentifierParserRuleCall_3_0 = (RuleCall)cNameAssignment_3.eContents().get(0);
                 private final Group cGroup_4 = (Group)cGroup.eContents().get(4);
                 private final Keyword cOppositeKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);
                 private final Assignment cOppositeAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);
@@ -231,21 +337,21 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 private final RuleCall cOppositeReferenceDeclarationQualifiedNameParserRuleCall_4_1_0_1 = (RuleCall)cOppositeReferenceDeclarationCrossReference_4_1_0.eContents().get(1);
                 
                 //ReferenceDeclaration:
-                //    (containment?="contains" | "refers")
-                //    referenceType=[ClassDeclaration|QualifiedName]
+                //    (containment?="contains" | "refers")?
+                //    referenceType=[Relation|QualifiedName]
                 //    ("[" multiplicity=Multiplicity "]")?
-                //    name=ID
+                //    name=Identifier
                 //    ("opposite" opposite=[ReferenceDeclaration|QualifiedName])?;
                 @Override public ParserRule getRule() { return rule; }
                 
-                //(containment?="contains" | "refers")
-                //referenceType=[ClassDeclaration|QualifiedName]
+                //(containment?="contains" | "refers")?
+                //referenceType=[Relation|QualifiedName]
                 //("[" multiplicity=Multiplicity "]")?
-                //name=ID
+                //name=Identifier
                 //("opposite" opposite=[ReferenceDeclaration|QualifiedName])?
                 public Group getGroup() { return cGroup; }
                 
-                //(containment?="contains" | "refers")
+                //(containment?="contains" | "refers")?
                 public Alternatives getAlternatives_0() { return cAlternatives_0; }
                 
                 //containment?="contains"
@@ -257,14 +363,14 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //"refers"
                 public Keyword getRefersKeyword_0_1() { return cRefersKeyword_0_1; }
                 
-                //referenceType=[ClassDeclaration|QualifiedName]
+                //referenceType=[Relation|QualifiedName]
                 public Assignment getReferenceTypeAssignment_1() { return cReferenceTypeAssignment_1; }
                 
-                //[ClassDeclaration|QualifiedName]
-                public CrossReference getReferenceTypeClassDeclarationCrossReference_1_0() { return cReferenceTypeClassDeclarationCrossReference_1_0; }
+                //[Relation|QualifiedName]
+                public CrossReference getReferenceTypeRelationCrossReference_1_0() { return cReferenceTypeRelationCrossReference_1_0; }
                 
                 //QualifiedName
-                public RuleCall getReferenceTypeClassDeclarationQualifiedNameParserRuleCall_1_0_1() { return cReferenceTypeClassDeclarationQualifiedNameParserRuleCall_1_0_1; }
+                public RuleCall getReferenceTypeRelationQualifiedNameParserRuleCall_1_0_1() { return cReferenceTypeRelationQualifiedNameParserRuleCall_1_0_1; }
                 
                 //("[" multiplicity=Multiplicity "]")?
                 public Group getGroup_2() { return cGroup_2; }
@@ -281,11 +387,11 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //"]"
                 public Keyword getRightSquareBracketKeyword_2_2() { return cRightSquareBracketKeyword_2_2; }
                 
-                //name=ID
+                //name=Identifier
                 public Assignment getNameAssignment_3() { return cNameAssignment_3; }
                 
-                //ID
-                public RuleCall getNameIDTerminalRuleCall_3_0() { return cNameIDTerminalRuleCall_3_0; }
+                //Identifier
+                public RuleCall getNameIdentifierParserRuleCall_3_0() { return cNameIdentifierParserRuleCall_3_0; }
                 
                 //("opposite" opposite=[ReferenceDeclaration|QualifiedName])?
                 public Group getGroup_4() { return cGroup_4; }
@@ -312,7 +418,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 private final Keyword cPredKeyword_0_0_1 = (Keyword)cGroup_0_0.eContents().get(1);
                 private final Keyword cPredKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);
                 private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
-                private final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
+                private final RuleCall cNameIdentifierParserRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
                 private final Keyword cLeftParenthesisKeyword_2 = (Keyword)cGroup.eContents().get(2);
                 private final Group cGroup_3 = (Group)cGroup.eContents().get(3);
                 private final Assignment cParametersAssignment_3_0 = (Assignment)cGroup_3.eContents().get(0);
@@ -334,14 +440,14 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 
                 //PredicateDefinition:
                 //    (error?="error" "pred"? | "pred")
-                //    name=ID
+                //    name=Identifier
                 //    "(" (parameters+=Parameter ("," parameters+=Parameter)*)? ")"
                 //    (":-" bodies+=Conjunction (";" bodies+=Conjunction)*)?
                 //    ".";
                 @Override public ParserRule getRule() { return rule; }
                 
                 //(error?="error" "pred"? | "pred")
-                //name=ID
+                //name=Identifier
                 //"(" (parameters+=Parameter ("," parameters+=Parameter)*)? ")"
                 //(":-" bodies+=Conjunction (";" bodies+=Conjunction)*)?
                 //"."
@@ -365,11 +471,11 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //"pred"
                 public Keyword getPredKeyword_0_1() { return cPredKeyword_0_1; }
                 
-                //name=ID
+                //name=Identifier
                 public Assignment getNameAssignment_1() { return cNameAssignment_1; }
                 
-                //ID
-                public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
+                //Identifier
+                public RuleCall getNameIdentifierParserRuleCall_1_0() { return cNameIdentifierParserRuleCall_1_0; }
                 
                 //"("
                 public Keyword getLeftParenthesisKeyword_2() { return cLeftParenthesisKeyword_2; }
@@ -429,32 +535,32 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.Parameter");
                 private final Group cGroup = (Group)rule.eContents().get(1);
                 private final Assignment cParameterTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);
-                private final CrossReference cParameterTypeClassDeclarationCrossReference_0_0 = (CrossReference)cParameterTypeAssignment_0.eContents().get(0);
-                private final RuleCall cParameterTypeClassDeclarationIDTerminalRuleCall_0_0_1 = (RuleCall)cParameterTypeClassDeclarationCrossReference_0_0.eContents().get(1);
+                private final CrossReference cParameterTypeRelationCrossReference_0_0 = (CrossReference)cParameterTypeAssignment_0.eContents().get(0);
+                private final RuleCall cParameterTypeRelationQualifiedNameParserRuleCall_0_0_1 = (RuleCall)cParameterTypeRelationCrossReference_0_0.eContents().get(1);
                 private final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);
-                private final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
+                private final RuleCall cNameIdentifierParserRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);
                 
                 //Parameter:
-                //    parameterType=[ClassDeclaration] name=ID;
+                //    parameterType=[Relation|QualifiedName]? name=Identifier;
                 @Override public ParserRule getRule() { return rule; }
                 
-                //parameterType=[ClassDeclaration] name=ID
+                //parameterType=[Relation|QualifiedName]? name=Identifier
                 public Group getGroup() { return cGroup; }
                 
-                //parameterType=[ClassDeclaration]
+                //parameterType=[Relation|QualifiedName]?
                 public Assignment getParameterTypeAssignment_0() { return cParameterTypeAssignment_0; }
                 
-                //[ClassDeclaration]
-                public CrossReference getParameterTypeClassDeclarationCrossReference_0_0() { return cParameterTypeClassDeclarationCrossReference_0_0; }
+                //[Relation|QualifiedName]
+                public CrossReference getParameterTypeRelationCrossReference_0_0() { return cParameterTypeRelationCrossReference_0_0; }
                 
-                //ID
-                public RuleCall getParameterTypeClassDeclarationIDTerminalRuleCall_0_0_1() { return cParameterTypeClassDeclarationIDTerminalRuleCall_0_0_1; }
+                //QualifiedName
+                public RuleCall getParameterTypeRelationQualifiedNameParserRuleCall_0_0_1() { return cParameterTypeRelationQualifiedNameParserRuleCall_0_0_1; }
                 
-                //name=ID
+                //name=Identifier
                 public Assignment getNameAssignment_1() { return cNameAssignment_1; }
                 
-                //ID
-                public RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }
+                //Identifier
+                public RuleCall getNameIdentifierParserRuleCall_1_0() { return cNameIdentifierParserRuleCall_1_0; }
         }
         public class ConjunctionElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.Conjunction");
@@ -606,22 +712,22 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         }
         public class ArgumentElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.Argument");
-                private final Assignment cVariableAssignment = (Assignment)rule.eContents().get(1);
-                private final CrossReference cVariableVariableCrossReference_0 = (CrossReference)cVariableAssignment.eContents().get(0);
-                private final RuleCall cVariableVariableIDTerminalRuleCall_0_1 = (RuleCall)cVariableVariableCrossReference_0.eContents().get(1);
+                private final Assignment cVariableOrNodeAssignment = (Assignment)rule.eContents().get(1);
+                private final CrossReference cVariableOrNodeVariableOrNodeCrossReference_0 = (CrossReference)cVariableOrNodeAssignment.eContents().get(0);
+                private final RuleCall cVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1 = (RuleCall)cVariableOrNodeVariableOrNodeCrossReference_0.eContents().get(1);
                 
                 //Argument:
-                //    variable=[Variable];
+                //    variableOrNode=[VariableOrNode|QualifiedName];
                 @Override public ParserRule getRule() { return rule; }
                 
-                //variable=[Variable]
-                public Assignment getVariableAssignment() { return cVariableAssignment; }
+                //variableOrNode=[VariableOrNode|QualifiedName]
+                public Assignment getVariableOrNodeAssignment() { return cVariableOrNodeAssignment; }
                 
-                //[Variable]
-                public CrossReference getVariableVariableCrossReference_0() { return cVariableVariableCrossReference_0; }
+                //[VariableOrNode|QualifiedName]
+                public CrossReference getVariableOrNodeVariableOrNodeCrossReference_0() { return cVariableOrNodeVariableOrNodeCrossReference_0; }
                 
-                //ID
-                public RuleCall getVariableVariableIDTerminalRuleCall_0_1() { return cVariableVariableIDTerminalRuleCall_0_1; }
+                //QualifiedName
+                public RuleCall getVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1() { return cVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1; }
         }
         public class AssertionElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.Assertion");
@@ -1011,43 +1117,62 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //"*"
                 public Keyword getAsteriskKeyword_1() { return cAsteriskKeyword_1; }
         }
+        public class QuotedOrUnquotedIdElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.QuotedOrUnquotedId");
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final RuleCall cQUOTED_IDTerminalRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final RuleCall cIdentifierParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                
+                //QuotedOrUnquotedId:
+                //    QUOTED_ID | Identifier;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //QUOTED_ID | Identifier
+                public Alternatives getAlternatives() { return cAlternatives; }
+                
+                //QUOTED_ID
+                public RuleCall getQUOTED_IDTerminalRuleCall_0() { return cQUOTED_IDTerminalRuleCall_0; }
+                
+                //Identifier
+                public RuleCall getIdentifierParserRuleCall_1() { return cIdentifierParserRuleCall_1; }
+        }
         public class QualifiedNameElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.QualifiedName");
                 private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
                 private final RuleCall cQUOTED_IDTerminalRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
                 private final Group cGroup_1 = (Group)cAlternatives.eContents().get(1);
-                private final RuleCall cIDTerminalRuleCall_1_0 = (RuleCall)cGroup_1.eContents().get(0);
+                private final RuleCall cIdentifierParserRuleCall_1_0 = (RuleCall)cGroup_1.eContents().get(0);
                 private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1);
                 private final Keyword cColonKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0);
-                private final RuleCall cIDTerminalRuleCall_1_1_1 = (RuleCall)cGroup_1_1.eContents().get(1);
+                private final RuleCall cIdentifierParserRuleCall_1_1_1 = (RuleCall)cGroup_1_1.eContents().get(1);
                 private final Group cGroup_1_2 = (Group)cGroup_1.eContents().get(2);
                 private final Keyword cColonKeyword_1_2_0 = (Keyword)cGroup_1_2.eContents().get(0);
                 private final RuleCall cQUOTED_IDTerminalRuleCall_1_2_1 = (RuleCall)cGroup_1_2.eContents().get(1);
                 
                 //QualifiedName:
-                //    QUOTED_ID | ID (":" ID)* (":" QUOTED_ID)?;
+                //    QUOTED_ID | Identifier (":" Identifier)* (":" QUOTED_ID)?;
                 @Override public ParserRule getRule() { return rule; }
                 
-                //QUOTED_ID | ID (":" ID)* (":" QUOTED_ID)?
+                //QUOTED_ID | Identifier (":" Identifier)* (":" QUOTED_ID)?
                 public Alternatives getAlternatives() { return cAlternatives; }
                 
                 //QUOTED_ID
                 public RuleCall getQUOTED_IDTerminalRuleCall_0() { return cQUOTED_IDTerminalRuleCall_0; }
                 
-                //ID (":" ID)* (":" QUOTED_ID)?
+                //Identifier (":" Identifier)* (":" QUOTED_ID)?
                 public Group getGroup_1() { return cGroup_1; }
                 
-                //ID
-                public RuleCall getIDTerminalRuleCall_1_0() { return cIDTerminalRuleCall_1_0; }
+                //Identifier
+                public RuleCall getIdentifierParserRuleCall_1_0() { return cIdentifierParserRuleCall_1_0; }
                 
-                //(":" ID)*
+                //(":" Identifier)*
                 public Group getGroup_1_1() { return cGroup_1_1; }
                 
                 //":"
                 public Keyword getColonKeyword_1_1_0() { return cColonKeyword_1_1_0; }
                 
-                //ID
-                public RuleCall getIDTerminalRuleCall_1_1_1() { return cIDTerminalRuleCall_1_1_1; }
+                //Identifier
+                public RuleCall getIdentifierParserRuleCall_1_1_1() { return cIdentifierParserRuleCall_1_1_1; }
                 
                 //(":" QUOTED_ID)?
                 public Group getGroup_1_2() { return cGroup_1_2; }
@@ -1058,6 +1183,29 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //QUOTED_ID
                 public RuleCall getQUOTED_IDTerminalRuleCall_1_2_1() { return cQUOTED_IDTerminalRuleCall_1_2_1; }
         }
+        public class IdentifierElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.Identifier");
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final RuleCall cIDTerminalRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final Keyword cTrueKeyword_1 = (Keyword)cAlternatives.eContents().get(1);
+                private final Keyword cFalseKeyword_2 = (Keyword)cAlternatives.eContents().get(2);
+                
+                //Identifier:
+                //    ID | "true" | "false";
+                @Override public ParserRule getRule() { return rule; }
+                
+                //ID | "true" | "false"
+                public Alternatives getAlternatives() { return cAlternatives; }
+                
+                //ID
+                public RuleCall getIDTerminalRuleCall_0() { return cIDTerminalRuleCall_0; }
+                
+                //"true"
+                public Keyword getTrueKeyword_1() { return cTrueKeyword_1; }
+                
+                //"false"
+                public Keyword getFalseKeyword_2() { return cFalseKeyword_2; }
+        }
         
         public class LogicValueElements extends AbstractElementFinder.AbstractEnumRuleElementFinder {
                 private final EnumRule rule = (EnumRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.LogicValue");
@@ -1125,6 +1273,8 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         private final ProblemElements pProblem;
         private final StatementElements pStatement;
         private final ClassDeclarationElements pClassDeclaration;
+        private final EnumDeclarationElements pEnumDeclaration;
+        private final EnumLiteralElements pEnumLiteral;
         private final ReferenceDeclarationElements pReferenceDeclaration;
         private final PredicateDefinitionElements pPredicateDefinition;
         private final ParameterElements pParameter;
@@ -1144,7 +1294,9 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         private final RangeMultiplicityElements pRangeMultiplicity;
         private final ExactMultiplicityElements pExactMultiplicity;
         private final UpperBoundElements pUpperBound;
+        private final QuotedOrUnquotedIdElements pQuotedOrUnquotedId;
         private final QualifiedNameElements pQualifiedName;
+        private final IdentifierElements pIdentifier;
         private final TerminalRule tSTRING;
         private final TerminalRule tQUOTED_ID;
         
@@ -1160,6 +1312,8 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 this.pProblem = new ProblemElements();
                 this.pStatement = new StatementElements();
                 this.pClassDeclaration = new ClassDeclarationElements();
+                this.pEnumDeclaration = new EnumDeclarationElements();
+                this.pEnumLiteral = new EnumLiteralElements();
                 this.pReferenceDeclaration = new ReferenceDeclarationElements();
                 this.pPredicateDefinition = new PredicateDefinitionElements();
                 this.pParameter = new ParameterElements();
@@ -1179,7 +1333,9 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 this.pRangeMultiplicity = new RangeMultiplicityElements();
                 this.pExactMultiplicity = new ExactMultiplicityElements();
                 this.pUpperBound = new UpperBoundElements();
+                this.pQuotedOrUnquotedId = new QuotedOrUnquotedIdElements();
                 this.pQualifiedName = new QualifiedNameElements();
+                this.pIdentifier = new IdentifierElements();
                 this.tSTRING = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.STRING");
                 this.tQUOTED_ID = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.QUOTED_ID");
         }
@@ -1212,7 +1368,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
 
         
         //Problem:
-        //    ("problem" name=ID ".")?
+        //    ("problem" name=Identifier ".")?
         //    statements+=Statement*;
         public ProblemElements getProblemAccess() {
                 return pProblem;
@@ -1223,7 +1379,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         }
         
         //Statement:
-        //    ClassDeclaration | PredicateDefinition | Assertion | ScopeDeclaration;
+        //    ClassDeclaration | EnumDeclaration | PredicateDefinition | Assertion | ScopeDeclaration;
         public StatementElements getStatementAccess() {
                 return pStatement;
         }
@@ -1234,8 +1390,8 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         
         //ClassDeclaration:
         //    abstract?="abstract"? "class"
-        //    name=ID
-        //    ("extends" superTypes+=[ClassDeclaration|QualifiedName] ("," superTypes+=[ClassDeclaration|QualifiedName])*)?
+        //    name=Identifier
+        //    ("extends" superTypes+=[Relation|QualifiedName] ("," superTypes+=[Relation|QualifiedName])*)?
         //    ("{" (referenceDeclarations+=ReferenceDeclaration ";"?)* "}" | ".");
         public ClassDeclarationElements getClassDeclarationAccess() {
                 return pClassDeclaration;
@@ -1245,11 +1401,33 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 return getClassDeclarationAccess().getRule();
         }
         
+        //EnumDeclaration:
+        //    "enum"
+        //    name=Identifier
+        //    ("{" (literals+=EnumLiteral ("," literals+=EnumLiteral)* ("," | ";")?)? "}" | ".");
+        public EnumDeclarationElements getEnumDeclarationAccess() {
+                return pEnumDeclaration;
+        }
+        
+        public ParserRule getEnumDeclarationRule() {
+                return getEnumDeclarationAccess().getRule();
+        }
+        
+        //EnumLiteral returns Node:
+        //    name=QuotedOrUnquotedId;
+        public EnumLiteralElements getEnumLiteralAccess() {
+                return pEnumLiteral;
+        }
+        
+        public ParserRule getEnumLiteralRule() {
+                return getEnumLiteralAccess().getRule();
+        }
+        
         //ReferenceDeclaration:
-        //    (containment?="contains" | "refers")
-        //    referenceType=[ClassDeclaration|QualifiedName]
+        //    (containment?="contains" | "refers")?
+        //    referenceType=[Relation|QualifiedName]
         //    ("[" multiplicity=Multiplicity "]")?
-        //    name=ID
+        //    name=Identifier
         //    ("opposite" opposite=[ReferenceDeclaration|QualifiedName])?;
         public ReferenceDeclarationElements getReferenceDeclarationAccess() {
                 return pReferenceDeclaration;
@@ -1261,7 +1439,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         
         //PredicateDefinition:
         //    (error?="error" "pred"? | "pred")
-        //    name=ID
+        //    name=Identifier
         //    "(" (parameters+=Parameter ("," parameters+=Parameter)*)? ")"
         //    (":-" bodies+=Conjunction (";" bodies+=Conjunction)*)?
         //    ".";
@@ -1274,7 +1452,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         }
         
         //Parameter:
-        //    parameterType=[ClassDeclaration] name=ID;
+        //    parameterType=[Relation|QualifiedName]? name=Identifier;
         public ParameterElements getParameterAccess() {
                 return pParameter;
         }
@@ -1326,7 +1504,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         }
         
         //Argument:
-        //    variable=[Variable];
+        //    variableOrNode=[VariableOrNode|QualifiedName];
         public ArgumentElements getArgumentAccess() {
                 return pArgument;
         }
@@ -1453,8 +1631,18 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 return getUpperBoundAccess().getRule();
         }
         
+        //QuotedOrUnquotedId:
+        //    QUOTED_ID | Identifier;
+        public QuotedOrUnquotedIdElements getQuotedOrUnquotedIdAccess() {
+                return pQuotedOrUnquotedId;
+        }
+        
+        public ParserRule getQuotedOrUnquotedIdRule() {
+                return getQuotedOrUnquotedIdAccess().getRule();
+        }
+        
         //QualifiedName:
-        //    QUOTED_ID | ID (":" ID)* (":" QUOTED_ID)?;
+        //    QUOTED_ID | Identifier (":" Identifier)* (":" QUOTED_ID)?;
         public QualifiedNameElements getQualifiedNameAccess() {
                 return pQualifiedName;
         }
@@ -1463,13 +1651,25 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 return getQualifiedNameAccess().getRule();
         }
         
+        //Identifier:
+        //    ID | "true" | "false";
+        public IdentifierElements getIdentifierAccess() {
+                return pIdentifier;
+        }
+        
+        public ParserRule getIdentifierRule() {
+                return getIdentifierAccess().getRule();
+        }
+        
         //@Override
-        //terminal STRING: '"' ( '\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\'|'"') )* '"';
+        //terminal STRING:
+        //    '"' ('\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\' | '"'))* '"';
         public TerminalRule getSTRINGRule() {
                 return tSTRING;
         }
         
-        //terminal QUOTED_ID: "'" ( '\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\'|"'") )* "'";
+        //terminal QUOTED_ID:
+        //    "'" ('\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\' | "'"))* "'";
         public TerminalRule getQUOTED_IDRule() {
                 return tQUOTED_ID;
         }