53 files changed, 16118 insertions, 4408 deletions

diff --git a/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/ProblemParser.java b/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/ProblemParser.java
index e4142d9f..093342ad 100644
--- a/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/ProblemParser.java
+++ b/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/ProblemParser.java
@@ -38,7 +38,10 @@ public class ProblemParser extends AbstractContentAssistParser {
                         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");
+                        builder.put(grammarAccess.getArgumentAccess().getAlternatives(), "rule__Argument__Alternatives");
                         builder.put(grammarAccess.getAssertionAccess().getAlternatives_0(), "rule__Assertion__Alternatives_0");
+                        builder.put(grammarAccess.getAssertionArgumentAccess().getAlternatives(), "rule__AssertionArgument__Alternatives");
+                        builder.put(grammarAccess.getConstantAccess().getAlternatives(), "rule__Constant__Alternatives");
                         builder.put(grammarAccess.getTypeScopeAccess().getAlternatives_1(), "rule__TypeScope__Alternatives_1");
                         builder.put(grammarAccess.getMultiplicityAccess().getAlternatives(), "rule__Multiplicity__Alternatives");
                         builder.put(grammarAccess.getDefiniteMultiplicityAccess().getAlternatives(), "rule__DefiniteMultiplicity__Alternatives");
@@ -46,6 +49,9 @@ public class ProblemParser extends AbstractContentAssistParser {
                         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.getRealAccess().getAlternatives_2(), "rule__Real__Alternatives_2");
+                        builder.put(grammarAccess.getRealAccess().getAlternatives_2_1_1(), "rule__Real__Alternatives_2_1_1");
+                        builder.put(grammarAccess.getRealAccess().getAlternatives_2_1_2(), "rule__Real__Alternatives_2_1_2");
                         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");
@@ -82,6 +88,7 @@ public class ProblemParser extends AbstractContentAssistParser {
                         builder.put(grammarAccess.getAssertionAccess().getGroup_0_1(), "rule__Assertion__Group_0_1__0");
                         builder.put(grammarAccess.getAssertionAccess().getGroup_0_1_3(), "rule__Assertion__Group_0_1_3__0");
                         builder.put(grammarAccess.getAssertionAccess().getGroup_0_1_3_1(), "rule__Assertion__Group_0_1_3_1__0");
+                        builder.put(grammarAccess.getNodeValueAssertionAccess().getGroup(), "rule__NodeValueAssertion__Group__0");
                         builder.put(grammarAccess.getScopeDeclarationAccess().getGroup(), "rule__ScopeDeclaration__Group__0");
                         builder.put(grammarAccess.getScopeDeclarationAccess().getGroup_2(), "rule__ScopeDeclaration__Group_2__0");
                         builder.put(grammarAccess.getTypeScopeAccess().getGroup(), "rule__TypeScope__Group__0");
@@ -89,6 +96,11 @@ public class ProblemParser extends AbstractContentAssistParser {
                         builder.put(grammarAccess.getQualifiedNameAccess().getGroup_1(), "rule__QualifiedName__Group_1__0");
                         builder.put(grammarAccess.getQualifiedNameAccess().getGroup_1_1(), "rule__QualifiedName__Group_1_1__0");
                         builder.put(grammarAccess.getQualifiedNameAccess().getGroup_1_2(), "rule__QualifiedName__Group_1_2__0");
+                        builder.put(grammarAccess.getIntegerAccess().getGroup(), "rule__Integer__Group__0");
+                        builder.put(grammarAccess.getRealAccess().getGroup(), "rule__Real__Group__0");
+                        builder.put(grammarAccess.getRealAccess().getGroup_2_0(), "rule__Real__Group_2_0__0");
+                        builder.put(grammarAccess.getRealAccess().getGroup_2_1(), "rule__Real__Group_2_1__0");
+                        builder.put(grammarAccess.getRealAccess().getGroup_2_1_0(), "rule__Real__Group_2_1_0__0");
                         builder.put(grammarAccess.getProblemAccess().getNameAssignment_0_1(), "rule__Problem__NameAssignment_0_1");
                         builder.put(grammarAccess.getProblemAccess().getStatementsAssignment_1(), "rule__Problem__StatementsAssignment_1");
                         builder.put(grammarAccess.getClassDeclarationAccess().getAbstractAssignment_0(), "rule__ClassDeclaration__AbstractAssignment_0");
@@ -120,7 +132,8 @@ 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().getVariableOrNodeAssignment(), "rule__Argument__VariableOrNodeAssignment");
+                        builder.put(grammarAccess.getVariableOrNodeArgumentAccess().getVariableOrNodeAssignment(), "rule__VariableOrNodeArgument__VariableOrNodeAssignment");
+                        builder.put(grammarAccess.getConstantArgumentAccess().getConstantAssignment(), "rule__ConstantArgument__ConstantAssignment");
                         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");
@@ -129,6 +142,13 @@ public class ProblemParser extends AbstractContentAssistParser {
                         builder.put(grammarAccess.getAssertionAccess().getRelationAssignment_0_1_1(), "rule__Assertion__RelationAssignment_0_1_1");
                         builder.put(grammarAccess.getAssertionAccess().getArgumentsAssignment_0_1_3_0(), "rule__Assertion__ArgumentsAssignment_0_1_3_0");
                         builder.put(grammarAccess.getAssertionAccess().getArgumentsAssignment_0_1_3_1_1(), "rule__Assertion__ArgumentsAssignment_0_1_3_1_1");
+                        builder.put(grammarAccess.getNodeAssertionArgumentAccess().getNodeAssignment(), "rule__NodeAssertionArgument__NodeAssignment");
+                        builder.put(grammarAccess.getConstantAssertionArgumentAccess().getConstantAssignment(), "rule__ConstantAssertionArgument__ConstantAssignment");
+                        builder.put(grammarAccess.getNodeValueAssertionAccess().getNodeAssignment_0(), "rule__NodeValueAssertion__NodeAssignment_0");
+                        builder.put(grammarAccess.getNodeValueAssertionAccess().getValueAssignment_2(), "rule__NodeValueAssertion__ValueAssignment_2");
+                        builder.put(grammarAccess.getIntConstantAccess().getIntValueAssignment(), "rule__IntConstant__IntValueAssignment");
+                        builder.put(grammarAccess.getRealConstantAccess().getRealValueAssignment(), "rule__RealConstant__RealValueAssignment");
+                        builder.put(grammarAccess.getStringConstantAccess().getStringValueAssignment(), "rule__StringConstant__StringValueAssignment");
                         builder.put(grammarAccess.getScopeDeclarationAccess().getTypeScopesAssignment_1(), "rule__ScopeDeclaration__TypeScopesAssignment_1");
                         builder.put(grammarAccess.getScopeDeclarationAccess().getTypeScopesAssignment_2_1(), "rule__ScopeDeclaration__TypeScopesAssignment_2_1");
                         builder.put(grammarAccess.getTypeScopeAccess().getTargetTypeAssignment_0(), "rule__TypeScope__TargetTypeAssignment_0");
diff --git a/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.g b/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.g
index c53ed3c4..a1504042 100644
--- a/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.g
+++ b/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.g
@@ -365,9 +365,59 @@ ruleArgument
         }
         :
         (
-                { before(grammarAccess.getArgumentAccess().getVariableOrNodeAssignment()); }
-                (rule__Argument__VariableOrNodeAssignment)
-                { after(grammarAccess.getArgumentAccess().getVariableOrNodeAssignment()); }
+                { before(grammarAccess.getArgumentAccess().getAlternatives()); }
+                (rule__Argument__Alternatives)
+                { after(grammarAccess.getArgumentAccess().getAlternatives()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+// Entry rule entryRuleVariableOrNodeArgument
+entryRuleVariableOrNodeArgument
+:
+{ before(grammarAccess.getVariableOrNodeArgumentRule()); }
+         ruleVariableOrNodeArgument
+{ after(grammarAccess.getVariableOrNodeArgumentRule()); } 
+         EOF 
+;
+
+// Rule VariableOrNodeArgument
+ruleVariableOrNodeArgument 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getVariableOrNodeArgumentAccess().getVariableOrNodeAssignment()); }
+                (rule__VariableOrNodeArgument__VariableOrNodeAssignment)
+                { after(grammarAccess.getVariableOrNodeArgumentAccess().getVariableOrNodeAssignment()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+// Entry rule entryRuleConstantArgument
+entryRuleConstantArgument
+:
+{ before(grammarAccess.getConstantArgumentRule()); }
+         ruleConstantArgument
+{ after(grammarAccess.getConstantArgumentRule()); } 
+         EOF 
+;
+
+// Rule ConstantArgument
+ruleConstantArgument 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getConstantArgumentAccess().getConstantAssignment()); }
+                (rule__ConstantArgument__ConstantAssignment)
+                { after(grammarAccess.getConstantArgumentAccess().getConstantAssignment()); }
         )
 ;
 finally {
@@ -399,6 +449,206 @@ finally {
         restoreStackSize(stackSize);
 }
 
+// Entry rule entryRuleAssertionArgument
+entryRuleAssertionArgument
+:
+{ before(grammarAccess.getAssertionArgumentRule()); }
+         ruleAssertionArgument
+{ after(grammarAccess.getAssertionArgumentRule()); } 
+         EOF 
+;
+
+// Rule AssertionArgument
+ruleAssertionArgument 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getAssertionArgumentAccess().getAlternatives()); }
+                (rule__AssertionArgument__Alternatives)
+                { after(grammarAccess.getAssertionArgumentAccess().getAlternatives()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+// Entry rule entryRuleNodeAssertionArgument
+entryRuleNodeAssertionArgument
+:
+{ before(grammarAccess.getNodeAssertionArgumentRule()); }
+         ruleNodeAssertionArgument
+{ after(grammarAccess.getNodeAssertionArgumentRule()); } 
+         EOF 
+;
+
+// Rule NodeAssertionArgument
+ruleNodeAssertionArgument 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getNodeAssertionArgumentAccess().getNodeAssignment()); }
+                (rule__NodeAssertionArgument__NodeAssignment)
+                { after(grammarAccess.getNodeAssertionArgumentAccess().getNodeAssignment()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+// Entry rule entryRuleConstantAssertionArgument
+entryRuleConstantAssertionArgument
+:
+{ before(grammarAccess.getConstantAssertionArgumentRule()); }
+         ruleConstantAssertionArgument
+{ after(grammarAccess.getConstantAssertionArgumentRule()); } 
+         EOF 
+;
+
+// Rule ConstantAssertionArgument
+ruleConstantAssertionArgument 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getConstantAssertionArgumentAccess().getConstantAssignment()); }
+                (rule__ConstantAssertionArgument__ConstantAssignment)
+                { after(grammarAccess.getConstantAssertionArgumentAccess().getConstantAssignment()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+// Entry rule entryRuleNodeValueAssertion
+entryRuleNodeValueAssertion
+:
+{ before(grammarAccess.getNodeValueAssertionRule()); }
+         ruleNodeValueAssertion
+{ after(grammarAccess.getNodeValueAssertionRule()); } 
+         EOF 
+;
+
+// Rule NodeValueAssertion
+ruleNodeValueAssertion 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getNodeValueAssertionAccess().getGroup()); }
+                (rule__NodeValueAssertion__Group__0)
+                { after(grammarAccess.getNodeValueAssertionAccess().getGroup()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+// Entry rule entryRuleConstant
+entryRuleConstant
+:
+{ before(grammarAccess.getConstantRule()); }
+         ruleConstant
+{ after(grammarAccess.getConstantRule()); } 
+         EOF 
+;
+
+// Rule Constant
+ruleConstant 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getConstantAccess().getAlternatives()); }
+                (rule__Constant__Alternatives)
+                { after(grammarAccess.getConstantAccess().getAlternatives()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+// Entry rule entryRuleIntConstant
+entryRuleIntConstant
+:
+{ before(grammarAccess.getIntConstantRule()); }
+         ruleIntConstant
+{ after(grammarAccess.getIntConstantRule()); } 
+         EOF 
+;
+
+// Rule IntConstant
+ruleIntConstant 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getIntConstantAccess().getIntValueAssignment()); }
+                (rule__IntConstant__IntValueAssignment)
+                { after(grammarAccess.getIntConstantAccess().getIntValueAssignment()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+// Entry rule entryRuleRealConstant
+entryRuleRealConstant
+:
+{ before(grammarAccess.getRealConstantRule()); }
+         ruleRealConstant
+{ after(grammarAccess.getRealConstantRule()); } 
+         EOF 
+;
+
+// Rule RealConstant
+ruleRealConstant 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getRealConstantAccess().getRealValueAssignment()); }
+                (rule__RealConstant__RealValueAssignment)
+                { after(grammarAccess.getRealConstantAccess().getRealValueAssignment()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+// Entry rule entryRuleStringConstant
+entryRuleStringConstant
+:
+{ before(grammarAccess.getStringConstantRule()); }
+         ruleStringConstant
+{ after(grammarAccess.getStringConstantRule()); } 
+         EOF 
+;
+
+// Rule StringConstant
+ruleStringConstant 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getStringConstantAccess().getStringValueAssignment()); }
+                (rule__StringConstant__StringValueAssignment)
+                { after(grammarAccess.getStringConstantAccess().getStringValueAssignment()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
 // Entry rule entryRuleScopeDeclaration
 entryRuleScopeDeclaration
 :
@@ -626,16 +876,23 @@ finally {
 
 // Entry rule entryRuleQualifiedName
 entryRuleQualifiedName
+@init { 
+        HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+}
 :
 { before(grammarAccess.getQualifiedNameRule()); }
          ruleQualifiedName
 { after(grammarAccess.getQualifiedNameRule()); } 
          EOF 
 ;
+finally {
+        myHiddenTokenState.restore();
+}
 
 // Rule QualifiedName
 ruleQualifiedName 
         @init {
+                HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
                 int stackSize = keepStackSize();
         }
         :
@@ -647,6 +904,7 @@ ruleQualifiedName
 ;
 finally {
         restoreStackSize(stackSize);
+        myHiddenTokenState.restore();
 }
 
 // Entry rule entryRuleIdentifier
@@ -674,6 +932,72 @@ finally {
         restoreStackSize(stackSize);
 }
 
+// Entry rule entryRuleInteger
+entryRuleInteger
+@init { 
+        HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+}
+:
+{ before(grammarAccess.getIntegerRule()); }
+         ruleInteger
+{ after(grammarAccess.getIntegerRule()); } 
+         EOF 
+;
+finally {
+        myHiddenTokenState.restore();
+}
+
+// Rule Integer
+ruleInteger 
+        @init {
+                HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getIntegerAccess().getGroup()); }
+                (rule__Integer__Group__0)
+                { after(grammarAccess.getIntegerAccess().getGroup()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+        myHiddenTokenState.restore();
+}
+
+// Entry rule entryRuleReal
+entryRuleReal
+@init { 
+        HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+}
+:
+{ before(grammarAccess.getRealRule()); }
+         ruleReal
+{ after(grammarAccess.getRealRule()); } 
+         EOF 
+;
+finally {
+        myHiddenTokenState.restore();
+}
+
+// Rule Real
+ruleReal 
+        @init {
+                HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getRealAccess().getGroup()); }
+                (rule__Real__Group__0)
+                { after(grammarAccess.getRealAccess().getGroup()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+        myHiddenTokenState.restore();
+}
+
 // Rule LogicValue
 ruleLogicValue
         @init {
@@ -736,9 +1060,15 @@ rule__Statement__Alternatives
         )
         |
         (
-                { before(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_4()); }
+                { before(grammarAccess.getStatementAccess().getNodeValueAssertionParserRuleCall_4()); }
+                ruleNodeValueAssertion
+                { after(grammarAccess.getStatementAccess().getNodeValueAssertionParserRuleCall_4()); }
+        )
+        |
+        (
+                { before(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_5()); }
                 ruleScopeDeclaration
-                { after(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_4()); }
+                { after(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_5()); }
         )
 ;
 finally {
@@ -871,6 +1201,27 @@ finally {
         restoreStackSize(stackSize);
 }
 
+rule__Argument__Alternatives
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getArgumentAccess().getVariableOrNodeArgumentParserRuleCall_0()); }
+                ruleVariableOrNodeArgument
+                { after(grammarAccess.getArgumentAccess().getVariableOrNodeArgumentParserRuleCall_0()); }
+        )
+        |
+        (
+                { before(grammarAccess.getArgumentAccess().getConstantArgumentParserRuleCall_1()); }
+                ruleConstantArgument
+                { after(grammarAccess.getArgumentAccess().getConstantArgumentParserRuleCall_1()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
 rule__Assertion__Alternatives_0
         @init {
                 int stackSize = keepStackSize();
@@ -892,6 +1243,54 @@ finally {
         restoreStackSize(stackSize);
 }
 
+rule__AssertionArgument__Alternatives
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getAssertionArgumentAccess().getNodeAssertionArgumentParserRuleCall_0()); }
+                ruleNodeAssertionArgument
+                { after(grammarAccess.getAssertionArgumentAccess().getNodeAssertionArgumentParserRuleCall_0()); }
+        )
+        |
+        (
+                { before(grammarAccess.getAssertionArgumentAccess().getConstantAssertionArgumentParserRuleCall_1()); }
+                ruleConstantAssertionArgument
+                { after(grammarAccess.getAssertionArgumentAccess().getConstantAssertionArgumentParserRuleCall_1()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Constant__Alternatives
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getConstantAccess().getIntConstantParserRuleCall_0()); }
+                ruleIntConstant
+                { after(grammarAccess.getConstantAccess().getIntConstantParserRuleCall_0()); }
+        )
+        |
+        (
+                { before(grammarAccess.getConstantAccess().getRealConstantParserRuleCall_1()); }
+                ruleRealConstant
+                { after(grammarAccess.getConstantAccess().getRealConstantParserRuleCall_1()); }
+        )
+        |
+        (
+                { before(grammarAccess.getConstantAccess().getStringConstantParserRuleCall_2()); }
+                ruleStringConstant
+                { after(grammarAccess.getConstantAccess().getStringConstantParserRuleCall_2()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
 rule__TypeScope__Alternatives_1
         @init {
                 int stackSize = keepStackSize();
@@ -1040,6 +1439,81 @@ rule__Identifier__Alternatives
                 'false'
                 { after(grammarAccess.getIdentifierAccess().getFalseKeyword_2()); }
         )
+        |
+        (
+                { before(grammarAccess.getIdentifierAccess().getEKeyword_3()); }
+                'e'
+                { after(grammarAccess.getIdentifierAccess().getEKeyword_3()); }
+        )
+        |
+        (
+                { before(grammarAccess.getIdentifierAccess().getEKeyword_4()); }
+                'E'
+                { after(grammarAccess.getIdentifierAccess().getEKeyword_4()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Alternatives_2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getRealAccess().getGroup_2_0()); }
+                (rule__Real__Group_2_0__0)
+                { after(grammarAccess.getRealAccess().getGroup_2_0()); }
+        )
+        |
+        (
+                { before(grammarAccess.getRealAccess().getGroup_2_1()); }
+                (rule__Real__Group_2_1__0)
+                { after(grammarAccess.getRealAccess().getGroup_2_1()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Alternatives_2_1_1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getRealAccess().getEKeyword_2_1_1_0()); }
+                'e'
+                { after(grammarAccess.getRealAccess().getEKeyword_2_1_1_0()); }
+        )
+        |
+        (
+                { before(grammarAccess.getRealAccess().getEKeyword_2_1_1_1()); }
+                'E'
+                { after(grammarAccess.getRealAccess().getEKeyword_2_1_1_1()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Alternatives_2_1_2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getRealAccess().getHyphenMinusKeyword_2_1_2_0()); }
+                '-'
+                { after(grammarAccess.getRealAccess().getHyphenMinusKeyword_2_1_2_0()); }
+        )
+        |
+        (
+                { before(grammarAccess.getRealAccess().getPlusSignKeyword_2_1_2_1()); }
+                '+'
+                { after(grammarAccess.getRealAccess().getPlusSignKeyword_2_1_2_1()); }
+        )
 ;
 finally {
         restoreStackSize(stackSize);
@@ -3712,6 +4186,114 @@ finally {
 }
 
 
+rule__NodeValueAssertion__Group__0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__NodeValueAssertion__Group__0__Impl
+        rule__NodeValueAssertion__Group__1
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__NodeValueAssertion__Group__0__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getNodeValueAssertionAccess().getNodeAssignment_0()); }
+        (rule__NodeValueAssertion__NodeAssignment_0)
+        { after(grammarAccess.getNodeValueAssertionAccess().getNodeAssignment_0()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__NodeValueAssertion__Group__1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__NodeValueAssertion__Group__1__Impl
+        rule__NodeValueAssertion__Group__2
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__NodeValueAssertion__Group__1__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getNodeValueAssertionAccess().getColonKeyword_1()); }
+        ':'
+        { after(grammarAccess.getNodeValueAssertionAccess().getColonKeyword_1()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__NodeValueAssertion__Group__2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__NodeValueAssertion__Group__2__Impl
+        rule__NodeValueAssertion__Group__3
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__NodeValueAssertion__Group__2__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getNodeValueAssertionAccess().getValueAssignment_2()); }
+        (rule__NodeValueAssertion__ValueAssignment_2)
+        { after(grammarAccess.getNodeValueAssertionAccess().getValueAssignment_2()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__NodeValueAssertion__Group__3
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__NodeValueAssertion__Group__3__Impl
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__NodeValueAssertion__Group__3__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getNodeValueAssertionAccess().getFullStopKeyword_3()); }
+        '.'
+        { after(grammarAccess.getNodeValueAssertionAccess().getFullStopKeyword_3()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+
 rule__ScopeDeclaration__Group__0
         @init {
                 int stackSize = keepStackSize();
@@ -4225,6 +4807,357 @@ finally {
 }
 
 
+rule__Integer__Group__0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__Integer__Group__0__Impl
+        rule__Integer__Group__1
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Integer__Group__0__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0()); }
+        ('-')?
+        { after(grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Integer__Group__1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__Integer__Group__1__Impl
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Integer__Group__1__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getIntegerAccess().getINTTerminalRuleCall_1()); }
+        RULE_INT
+        { after(grammarAccess.getIntegerAccess().getINTTerminalRuleCall_1()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+
+rule__Real__Group__0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__Real__Group__0__Impl
+        rule__Real__Group__1
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Group__0__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getRealAccess().getHyphenMinusKeyword_0()); }
+        ('-')?
+        { after(grammarAccess.getRealAccess().getHyphenMinusKeyword_0()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Group__1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__Real__Group__1__Impl
+        rule__Real__Group__2
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Group__1__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getRealAccess().getINTTerminalRuleCall_1()); }
+        RULE_INT
+        { after(grammarAccess.getRealAccess().getINTTerminalRuleCall_1()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Group__2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__Real__Group__2__Impl
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Group__2__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getRealAccess().getAlternatives_2()); }
+        (rule__Real__Alternatives_2)
+        { after(grammarAccess.getRealAccess().getAlternatives_2()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+
+rule__Real__Group_2_0__0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__Real__Group_2_0__0__Impl
+        rule__Real__Group_2_0__1
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Group_2_0__0__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getRealAccess().getFullStopKeyword_2_0_0()); }
+        '.'
+        { after(grammarAccess.getRealAccess().getFullStopKeyword_2_0_0()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Group_2_0__1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__Real__Group_2_0__1__Impl
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Group_2_0__1__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getRealAccess().getINTTerminalRuleCall_2_0_1()); }
+        RULE_INT
+        { after(grammarAccess.getRealAccess().getINTTerminalRuleCall_2_0_1()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+
+rule__Real__Group_2_1__0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__Real__Group_2_1__0__Impl
+        rule__Real__Group_2_1__1
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Group_2_1__0__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getRealAccess().getGroup_2_1_0()); }
+        (rule__Real__Group_2_1_0__0)?
+        { after(grammarAccess.getRealAccess().getGroup_2_1_0()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Group_2_1__1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__Real__Group_2_1__1__Impl
+        rule__Real__Group_2_1__2
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Group_2_1__1__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getRealAccess().getAlternatives_2_1_1()); }
+        (rule__Real__Alternatives_2_1_1)
+        { after(grammarAccess.getRealAccess().getAlternatives_2_1_1()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Group_2_1__2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__Real__Group_2_1__2__Impl
+        rule__Real__Group_2_1__3
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Group_2_1__2__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getRealAccess().getAlternatives_2_1_2()); }
+        (rule__Real__Alternatives_2_1_2)?
+        { after(grammarAccess.getRealAccess().getAlternatives_2_1_2()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Group_2_1__3
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__Real__Group_2_1__3__Impl
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Group_2_1__3__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getRealAccess().getINTTerminalRuleCall_2_1_3()); }
+        RULE_INT
+        { after(grammarAccess.getRealAccess().getINTTerminalRuleCall_2_1_3()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+
+rule__Real__Group_2_1_0__0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__Real__Group_2_1_0__0__Impl
+        rule__Real__Group_2_1_0__1
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Group_2_1_0__0__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getRealAccess().getFullStopKeyword_2_1_0_0()); }
+        '.'
+        { after(grammarAccess.getRealAccess().getFullStopKeyword_2_1_0_0()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Group_2_1_0__1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__Real__Group_2_1_0__1__Impl
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Real__Group_2_1_0__1__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getRealAccess().getINTTerminalRuleCall_2_1_0_1()); }
+        RULE_INT
+        { after(grammarAccess.getRealAccess().getINTTerminalRuleCall_2_1_0_1()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+
 rule__Problem__NameAssignment_0_1
         @init {
                 int stackSize = keepStackSize();
@@ -4730,19 +5663,34 @@ finally {
         restoreStackSize(stackSize);
 }
 
-rule__Argument__VariableOrNodeAssignment
+rule__VariableOrNodeArgument__VariableOrNodeAssignment
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0()); }
+                { before(grammarAccess.getVariableOrNodeArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0()); }
                 (
-                        { before(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1()); }
+                        { before(grammarAccess.getVariableOrNodeArgumentAccess().getVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1()); }
                         ruleQualifiedName
-                        { after(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1()); }
+                        { after(grammarAccess.getVariableOrNodeArgumentAccess().getVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1()); }
                 )
-                { after(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0()); }
+                { after(grammarAccess.getVariableOrNodeArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__ConstantArgument__ConstantAssignment
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getConstantArgumentAccess().getConstantConstantParserRuleCall_0()); }
+                ruleConstant
+                { after(grammarAccess.getConstantArgumentAccess().getConstantConstantParserRuleCall_0()); }
         )
 ;
 finally {
@@ -4774,13 +5722,9 @@ rule__Assertion__ArgumentsAssignment_0_0_2_0
         }
 :
         (
-                { before(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_0_0()); }
-                (
-                        { before(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_0_2_0_0_1()); }
-                        ruleQualifiedName
-                        { after(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_0_2_0_0_1()); }
-                )
-                { after(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_0_0()); }
+                { before(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_0_2_0_0()); }
+                ruleAssertionArgument
+                { after(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_0_2_0_0()); }
         )
 ;
 finally {
@@ -4793,13 +5737,9 @@ rule__Assertion__ArgumentsAssignment_0_0_2_1_1
         }
 :
         (
-                { before(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_1_1_0()); }
-                (
-                        { before(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_0_2_1_1_0_1()); }
-                        ruleQualifiedName
-                        { after(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_0_2_1_1_0_1()); }
-                )
-                { after(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_1_1_0()); }
+                { before(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_0_2_1_1_0()); }
+                ruleAssertionArgument
+                { after(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_0_2_1_1_0()); }
         )
 ;
 finally {
@@ -4861,32 +5801,137 @@ rule__Assertion__ArgumentsAssignment_0_1_3_0
         }
 :
         (
-                { before(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_0_0()); }
+                { before(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_1_3_0_0()); }
+                ruleAssertionArgument
+                { after(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_1_3_0_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Assertion__ArgumentsAssignment_0_1_3_1_1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_1_3_1_1_0()); }
+                ruleAssertionArgument
+                { after(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_1_3_1_1_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__NodeAssertionArgument__NodeAssignment
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getNodeAssertionArgumentAccess().getNodeNodeCrossReference_0()); }
                 (
-                        { before(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_1_3_0_0_1()); }
+                        { before(grammarAccess.getNodeAssertionArgumentAccess().getNodeNodeQualifiedNameParserRuleCall_0_1()); }
                         ruleQualifiedName
-                        { after(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_1_3_0_0_1()); }
+                        { after(grammarAccess.getNodeAssertionArgumentAccess().getNodeNodeQualifiedNameParserRuleCall_0_1()); }
                 )
-                { after(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_0_0()); }
+                { after(grammarAccess.getNodeAssertionArgumentAccess().getNodeNodeCrossReference_0()); }
         )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__Assertion__ArgumentsAssignment_0_1_3_1_1
+rule__ConstantAssertionArgument__ConstantAssignment
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_1_1_0()); }
+                { before(grammarAccess.getConstantAssertionArgumentAccess().getConstantConstantParserRuleCall_0()); }
+                ruleConstant
+                { after(grammarAccess.getConstantAssertionArgumentAccess().getConstantConstantParserRuleCall_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__NodeValueAssertion__NodeAssignment_0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getNodeValueAssertionAccess().getNodeNodeCrossReference_0_0()); }
                 (
-                        { before(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_1_3_1_1_0_1()); }
+                        { before(grammarAccess.getNodeValueAssertionAccess().getNodeNodeQualifiedNameParserRuleCall_0_0_1()); }
                         ruleQualifiedName
-                        { after(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_1_3_1_1_0_1()); }
+                        { after(grammarAccess.getNodeValueAssertionAccess().getNodeNodeQualifiedNameParserRuleCall_0_0_1()); }
                 )
-                { after(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_1_1_0()); }
+                { after(grammarAccess.getNodeValueAssertionAccess().getNodeNodeCrossReference_0_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__NodeValueAssertion__ValueAssignment_2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getNodeValueAssertionAccess().getValueConstantParserRuleCall_2_0()); }
+                ruleConstant
+                { after(grammarAccess.getNodeValueAssertionAccess().getValueConstantParserRuleCall_2_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__IntConstant__IntValueAssignment
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getIntConstantAccess().getIntValueIntegerParserRuleCall_0()); }
+                ruleInteger
+                { after(grammarAccess.getIntConstantAccess().getIntValueIntegerParserRuleCall_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__RealConstant__RealValueAssignment
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getRealConstantAccess().getRealValueRealParserRuleCall_0()); }
+                ruleReal
+                { after(grammarAccess.getRealConstantAccess().getRealValueRealParserRuleCall_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__StringConstant__StringValueAssignment
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getStringConstantAccess().getStringValueSTRINGTerminalRuleCall_0()); }
+                RULE_STRING
+                { after(grammarAccess.getStringConstantAccess().getStringValueSTRINGTerminalRuleCall_0()); }
         )
 ;
 finally {
@@ -5021,14 +6066,14 @@ finally {
         restoreStackSize(stackSize);
 }
 
+RULE_ID : ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
+
 RULE_STRING : '"' ('\\' .|~(('\\'|'"')))* '"';
 
 RULE_QUOTED_ID : '\'' ('\\' .|~(('\\'|'\'')))* '\'';
 
 RULE_SL_COMMENT : ('%'|'//') ~(('\n'|'\r'))* ('\r'? '\n')?;
 
-RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
-
 RULE_INT : ('0'..'9')+;
 
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
diff --git a/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.tokens b/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.tokens
index 49838545..a9f3d8e2 100644
--- a/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.tokens
+++ b/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.tokens
@@ -1,36 +1,39 @@
-'!'=22
-'('=33
-')'=34
+'!'=26
+'('=37
+')'=38
 '*'=18
-'+'=43
-'+='=44
+'+'=24
+'+='=47
 ','=13
+'-'=23
 '.'=12
-'..'=38
-':'=36
-':-'=35
-'::'=39
+'..'=42
+':'=40
+':-'=39
+'::'=43
 ';'=14
 '='=17
-'?'=23
-'['=30
-']'=31
-'abstract'=40
-'class'=25
-'contains'=41
-'enum'=29
-'error'=42
-'extends'=26
+'?'=27
+'E'=22
+'['=34
+']'=35
+'abstract'=44
+'class'=29
+'contains'=45
+'e'=21
+'enum'=33
+'error'=46
+'extends'=30
 'false'=20
-'opposite'=32
+'opposite'=36
 'pred'=16
-'problem'=24
+'problem'=28
 'refers'=15
-'scope'=37
+'scope'=41
 'true'=19
-'unknown'=21
-'{'=27
-'}'=28
+'unknown'=25
+'{'=31
+'}'=32
 RULE_ANY_OTHER=11
 RULE_ID=6
 RULE_INT=4
@@ -72,3 +75,6 @@ T__41=41
 T__42=42
 T__43=43
 T__44=44
+T__45=45
+T__46=46
+T__47=47
diff --git a/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java b/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java
index 36b14a55..8e000971 100644
--- a/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java
+++ b/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java
@@ -50,6 +50,9 @@ public class InternalProblemLexer extends Lexer {
     public static final int RULE_WS=10;
     public static final int RULE_ANY_OTHER=11;
     public static final int T__44=44;
+    public static final int T__45=45;
+    public static final int T__46=46;
+    public static final int T__47=47;
     public static final int T__40=40;
     public static final int T__41=41;
     public static final int T__42=42;
@@ -257,11 +260,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:20:7: ( 'unknown' )
-            // InternalProblem.g:20:9: 'unknown'
+            // InternalProblem.g:20:7: ( 'e' )
+            // InternalProblem.g:20:9: 'e'
             {
-            match("unknown"); 
-
+            match('e'); 
 
             }
 
@@ -278,10 +280,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:21:7: ( '!' )
-            // InternalProblem.g:21:9: '!'
+            // InternalProblem.g:21:7: ( 'E' )
+            // InternalProblem.g:21:9: 'E'
             {
-            match('!'); 
+            match('E'); 
 
             }
 
@@ -298,10 +300,10 @@ 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: ( '-' )
+            // InternalProblem.g:22:9: '-'
             {
-            match('?'); 
+            match('-'); 
 
             }
 
@@ -318,11 +320,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:23:7: ( 'problem' )
-            // InternalProblem.g:23:9: 'problem'
+            // InternalProblem.g:23:7: ( '+' )
+            // InternalProblem.g:23:9: '+'
             {
-            match("problem"); 
-
+            match('+'); 
 
             }
 
@@ -339,10 +340,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:24:7: ( 'class' )
-            // InternalProblem.g:24:9: 'class'
+            // InternalProblem.g:24:7: ( 'unknown' )
+            // InternalProblem.g:24:9: 'unknown'
             {
-            match("class"); 
+            match("unknown"); 
 
 
             }
@@ -360,11 +361,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:25:7: ( 'extends' )
-            // InternalProblem.g:25:9: 'extends'
+            // InternalProblem.g:25:7: ( '!' )
+            // InternalProblem.g:25:9: '!'
             {
-            match("extends"); 
-
+            match('!'); 
 
             }
 
@@ -381,10 +381,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('?'); 
 
             }
 
@@ -401,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: ( 'problem' )
+            // InternalProblem.g:27:9: 'problem'
             {
-            match('}'); 
+            match("problem"); 
+
 
             }
 
@@ -421,10 +422,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:28:7: ( 'enum' )
-            // InternalProblem.g:28:9: 'enum'
+            // InternalProblem.g:28:7: ( 'class' )
+            // InternalProblem.g:28:9: 'class'
             {
-            match("enum"); 
+            match("class"); 
 
 
             }
@@ -442,10 +443,11 @@ 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: ( 'extends' )
+            // InternalProblem.g:29:9: 'extends'
             {
-            match('['); 
+            match("extends"); 
+
 
             }
 
@@ -462,10 +464,10 @@ 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('{'); 
 
             }
 
@@ -482,11 +484,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:31:7: ( 'opposite' )
-            // InternalProblem.g:31:9: 'opposite'
+            // InternalProblem.g:31:7: ( '}' )
+            // InternalProblem.g:31:9: '}'
             {
-            match("opposite"); 
-
+            match('}'); 
 
             }
 
@@ -503,10 +504,11 @@ 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: ( 'enum' )
+            // InternalProblem.g:32:9: 'enum'
             {
-            match('('); 
+            match("enum"); 
+
 
             }
 
@@ -523,10 +525,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('['); 
 
             }
 
@@ -543,11 +545,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: ( ']' )
+            // InternalProblem.g:34:9: ']'
             {
-            match(":-"); 
-
+            match(']'); 
 
             }
 
@@ -564,10 +565,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: ( 'opposite' )
+            // InternalProblem.g:35:9: 'opposite'
             {
-            match(':'); 
+            match("opposite"); 
+
 
             }
 
@@ -584,11 +586,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:36:7: ( 'scope' )
-            // InternalProblem.g:36:9: 'scope'
+            // InternalProblem.g:36:7: ( '(' )
+            // InternalProblem.g:36:9: '('
             {
-            match("scope"); 
-
+            match('('); 
 
             }
 
@@ -605,11 +606,10 @@ 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(')'); 
 
             }
 
@@ -626,10 +626,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:38:7: ( '::' )
-            // InternalProblem.g:38:9: '::'
+            // InternalProblem.g:38:7: ( ':-' )
+            // InternalProblem.g:38:9: ':-'
             {
-            match("::"); 
+            match(":-"); 
 
 
             }
@@ -647,11 +647,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:39:7: ( 'abstract' )
-            // InternalProblem.g:39:9: 'abstract'
+            // InternalProblem.g:39:7: ( ':' )
+            // InternalProblem.g:39:9: ':'
             {
-            match("abstract"); 
-
+            match(':'); 
 
             }
 
@@ -668,10 +667,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__41;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:40:7: ( 'contains' )
-            // InternalProblem.g:40:9: 'contains'
+            // InternalProblem.g:40:7: ( 'scope' )
+            // InternalProblem.g:40:9: 'scope'
             {
-            match("contains"); 
+            match("scope"); 
 
 
             }
@@ -689,10 +688,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__42;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:41:7: ( 'error' )
-            // InternalProblem.g:41:9: 'error'
+            // InternalProblem.g:41:7: ( '..' )
+            // InternalProblem.g:41:9: '..'
             {
-            match("error"); 
+            match(".."); 
 
 
             }
@@ -710,10 +709,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:42:7: ( '+' )
-            // InternalProblem.g:42:9: '+'
+            // InternalProblem.g:42:7: ( '::' )
+            // InternalProblem.g:42:9: '::'
             {
-            match('+'); 
+            match("::"); 
+
 
             }
 
@@ -730,10 +730,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:43:7: ( '+=' )
-            // InternalProblem.g:43:9: '+='
+            // InternalProblem.g:43:7: ( 'abstract' )
+            // InternalProblem.g:43:9: 'abstract'
             {
-            match("+="); 
+            match("abstract"); 
 
 
             }
@@ -746,32 +746,156 @@ public class InternalProblemLexer extends Lexer {
     }
     // $ANTLR end "T__44"
 
+    // $ANTLR start "T__45"
+    public final void mT__45() throws RecognitionException {
+        try {
+            int _type = T__45;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:44:7: ( 'contains' )
+            // InternalProblem.g:44:9: 'contains'
+            {
+            match("contains"); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__45"
+
+    // $ANTLR start "T__46"
+    public final void mT__46() throws RecognitionException {
+        try {
+            int _type = T__46;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:45:7: ( 'error' )
+            // InternalProblem.g:45:9: 'error'
+            {
+            match("error"); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__46"
+
+    // $ANTLR start "T__47"
+    public final void mT__47() throws RecognitionException {
+        try {
+            int _type = T__47;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:46:7: ( '+=' )
+            // InternalProblem.g:46:9: '+='
+            {
+            match("+="); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__47"
+
+    // $ANTLR start "RULE_ID"
+    public final void mRULE_ID() throws RecognitionException {
+        try {
+            int _type = RULE_ID;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:6069:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalProblem.g:6069:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            {
+            if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
+                input.consume();
+
+            }
+            else {
+                MismatchedSetException mse = new MismatchedSetException(null,input);
+                recover(mse);
+                throw mse;}
+
+            // InternalProblem.g:6069:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            loop1:
+            do {
+                int alt1=2;
+                int LA1_0 = input.LA(1);
+
+                if ( ((LA1_0>='0' && LA1_0<='9')||(LA1_0>='A' && LA1_0<='Z')||LA1_0=='_'||(LA1_0>='a' && LA1_0<='z')) ) {
+                    alt1=1;
+                }
+
+
+                switch (alt1) {
+                case 1 :
+                    // InternalProblem.g:
+                    {
+                    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
+                        input.consume();
+
+                    }
+                    else {
+                        MismatchedSetException mse = new MismatchedSetException(null,input);
+                        recover(mse);
+                        throw mse;}
+
+
+                    }
+                    break;
+
+                default :
+                    break loop1;
+                }
+            } while (true);
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "RULE_ID"
+
     // $ANTLR start "RULE_STRING"
     public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:5024:13: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
-            // InternalProblem.g:5024:15: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+            // InternalProblem.g:6071:13: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
+            // InternalProblem.g:6071:15: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
             {
             match('\"'); 
-            // InternalProblem.g:5024:19: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
-            loop1:
+            // InternalProblem.g:6071:19: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+            loop2:
             do {
-                int alt1=3;
-                int LA1_0 = input.LA(1);
+                int alt2=3;
+                int LA2_0 = input.LA(1);
 
-                if ( (LA1_0=='\\') ) {
-                    alt1=1;
+                if ( (LA2_0=='\\') ) {
+                    alt2=1;
                 }
-                else if ( ((LA1_0>='\u0000' && LA1_0<='!')||(LA1_0>='#' && LA1_0<='[')||(LA1_0>=']' && LA1_0<='\uFFFF')) ) {
-                    alt1=2;
+                else if ( ((LA2_0>='\u0000' && LA2_0<='!')||(LA2_0>='#' && LA2_0<='[')||(LA2_0>=']' && LA2_0<='\uFFFF')) ) {
+                    alt2=2;
                 }
 
 
-                switch (alt1) {
+                switch (alt2) {
                 case 1 :
-                    // InternalProblem.g:5024:20: '\\\\' .
+                    // InternalProblem.g:6071:20: '\\\\' .
                     {
                     match('\\'); 
                     matchAny(); 
@@ -779,7 +903,7 @@ public class InternalProblemLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:5024:27: ~ ( ( '\\\\' | '\"' ) )
+                    // InternalProblem.g:6071:27: ~ ( ( '\\\\' | '\"' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -795,7 +919,7 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    break loop1;
+                    break loop2;
                 }
             } while (true);
 
@@ -816,27 +940,27 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_QUOTED_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:5026:16: ( '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
-            // InternalProblem.g:5026:18: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+            // InternalProblem.g:6073:16: ( '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalProblem.g:6073:18: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
             {
             match('\''); 
-            // InternalProblem.g:5026:23: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
-            loop2:
+            // InternalProblem.g:6073:23: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+            loop3:
             do {
-                int alt2=3;
-                int LA2_0 = input.LA(1);
+                int alt3=3;
+                int LA3_0 = input.LA(1);
 
-                if ( (LA2_0=='\\') ) {
-                    alt2=1;
+                if ( (LA3_0=='\\') ) {
+                    alt3=1;
                 }
-                else if ( ((LA2_0>='\u0000' && LA2_0<='&')||(LA2_0>='(' && LA2_0<='[')||(LA2_0>=']' && LA2_0<='\uFFFF')) ) {
-                    alt2=2;
+                else if ( ((LA3_0>='\u0000' && LA3_0<='&')||(LA3_0>='(' && LA3_0<='[')||(LA3_0>=']' && LA3_0<='\uFFFF')) ) {
+                    alt3=2;
                 }
 
 
-                switch (alt2) {
+                switch (alt3) {
                 case 1 :
-                    // InternalProblem.g:5026:24: '\\\\' .
+                    // InternalProblem.g:6073:24: '\\\\' .
                     {
                     match('\\'); 
                     matchAny(); 
@@ -844,7 +968,7 @@ public class InternalProblemLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:5026:31: ~ ( ( '\\\\' | '\\'' ) )
+                    // InternalProblem.g:6073:31: ~ ( ( '\\\\' | '\\'' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -860,7 +984,7 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    break loop2;
+                    break loop3;
                 }
             } while (true);
 
@@ -881,35 +1005,35 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:5028:17: ( ( '%' | '//' ) (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // InternalProblem.g:5028:19: ( '%' | '//' ) (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalProblem.g:6075:17: ( ( '%' | '//' ) (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalProblem.g:6075:19: ( '%' | '//' ) (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
-            // InternalProblem.g:5028:19: ( '%' | '//' )
-            int alt3=2;
-            int LA3_0 = input.LA(1);
+            // InternalProblem.g:6075:19: ( '%' | '//' )
+            int alt4=2;
+            int LA4_0 = input.LA(1);
 
-            if ( (LA3_0=='%') ) {
-                alt3=1;
+            if ( (LA4_0=='%') ) {
+                alt4=1;
             }
-            else if ( (LA3_0=='/') ) {
-                alt3=2;
+            else if ( (LA4_0=='/') ) {
+                alt4=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 3, 0, input);
+                    new NoViableAltException("", 4, 0, input);
 
                 throw nvae;
             }
-            switch (alt3) {
+            switch (alt4) {
                 case 1 :
-                    // InternalProblem.g:5028:20: '%'
+                    // InternalProblem.g:6075:20: '%'
                     {
                     match('%'); 
 
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:5028:24: '//'
+                    // InternalProblem.g:6075:24: '//'
                     {
                     match("//"); 
 
@@ -919,20 +1043,20 @@ public class InternalProblemLexer extends Lexer {
 
             }
 
-            // InternalProblem.g:5028:30: (~ ( ( '\\n' | '\\r' ) ) )*
-            loop4:
+            // InternalProblem.g:6075:30: (~ ( ( '\\n' | '\\r' ) ) )*
+            loop5:
             do {
-                int alt4=2;
-                int LA4_0 = input.LA(1);
+                int alt5=2;
+                int LA5_0 = input.LA(1);
 
-                if ( ((LA4_0>='\u0000' && LA4_0<='\t')||(LA4_0>='\u000B' && LA4_0<='\f')||(LA4_0>='\u000E' && LA4_0<='\uFFFF')) ) {
-                    alt4=1;
+                if ( ((LA5_0>='\u0000' && LA5_0<='\t')||(LA5_0>='\u000B' && LA5_0<='\f')||(LA5_0>='\u000E' && LA5_0<='\uFFFF')) ) {
+                    alt5=1;
                 }
 
 
-                switch (alt4) {
+                switch (alt5) {
                 case 1 :
-                    // InternalProblem.g:5028:30: ~ ( ( '\\n' | '\\r' ) )
+                    // InternalProblem.g:6075:30: ~ ( ( '\\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();
@@ -948,31 +1072,31 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    break loop4;
+                    break loop5;
                 }
             } while (true);
 
-            // InternalProblem.g:5028:46: ( ( '\\r' )? '\\n' )?
-            int alt6=2;
-            int LA6_0 = input.LA(1);
+            // InternalProblem.g:6075:46: ( ( '\\r' )? '\\n' )?
+            int alt7=2;
+            int LA7_0 = input.LA(1);
 
-            if ( (LA6_0=='\n'||LA6_0=='\r') ) {
-                alt6=1;
+            if ( (LA7_0=='\n'||LA7_0=='\r') ) {
+                alt7=1;
             }
-            switch (alt6) {
+            switch (alt7) {
                 case 1 :
-                    // InternalProblem.g:5028:47: ( '\\r' )? '\\n'
+                    // InternalProblem.g:6075:47: ( '\\r' )? '\\n'
                     {
-                    // InternalProblem.g:5028:47: ( '\\r' )?
-                    int alt5=2;
-                    int LA5_0 = input.LA(1);
+                    // InternalProblem.g:6075:47: ( '\\r' )?
+                    int alt6=2;
+                    int LA6_0 = input.LA(1);
 
-                    if ( (LA5_0=='\r') ) {
-                        alt5=1;
+                    if ( (LA6_0=='\r') ) {
+                        alt6=1;
                     }
-                    switch (alt5) {
+                    switch (alt6) {
                         case 1 :
-                            // InternalProblem.g:5028:47: '\\r'
+                            // InternalProblem.g:6075:47: '\\r'
                             {
                             match('\r'); 
 
@@ -999,108 +1123,29 @@ public class InternalProblemLexer extends Lexer {
     }
     // $ANTLR end "RULE_SL_COMMENT"
 
-    // $ANTLR start "RULE_ID"
-    public final void mRULE_ID() throws RecognitionException {
+    // $ANTLR start "RULE_INT"
+    public final void mRULE_INT() throws RecognitionException {
         try {
-            int _type = RULE_ID;
+            int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:5030:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // InternalProblem.g:5030:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalProblem.g:6077:10: ( ( '0' .. '9' )+ )
+            // InternalProblem.g:6077:12: ( '0' .. '9' )+
             {
-            // InternalProblem.g:5030:11: ( '^' )?
-            int alt7=2;
-            int LA7_0 = input.LA(1);
-
-            if ( (LA7_0=='^') ) {
-                alt7=1;
-            }
-            switch (alt7) {
-                case 1 :
-                    // InternalProblem.g:5030:11: '^'
-                    {
-                    match('^'); 
-
-                    }
-                    break;
-
-            }
-
-            if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            // InternalProblem.g:5030:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalProblem.g:6077:12: ( '0' .. '9' )+
+            int cnt8=0;
             loop8:
             do {
                 int alt8=2;
                 int LA8_0 = input.LA(1);
 
-                if ( ((LA8_0>='0' && LA8_0<='9')||(LA8_0>='A' && LA8_0<='Z')||LA8_0=='_'||(LA8_0>='a' && LA8_0<='z')) ) {
+                if ( ((LA8_0>='0' && LA8_0<='9')) ) {
                     alt8=1;
                 }
 
 
                 switch (alt8) {
                 case 1 :
-                    // InternalProblem.g:
-                    {
-                    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
-                        input.consume();
-
-                    }
-                    else {
-                        MismatchedSetException mse = new MismatchedSetException(null,input);
-                        recover(mse);
-                        throw mse;}
-
-
-                    }
-                    break;
-
-                default :
-                    break loop8;
-                }
-            } while (true);
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_ID"
-
-    // $ANTLR start "RULE_INT"
-    public final void mRULE_INT() throws RecognitionException {
-        try {
-            int _type = RULE_INT;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:5032:10: ( ( '0' .. '9' )+ )
-            // InternalProblem.g:5032:12: ( '0' .. '9' )+
-            {
-            // InternalProblem.g:5032:12: ( '0' .. '9' )+
-            int cnt9=0;
-            loop9:
-            do {
-                int alt9=2;
-                int LA9_0 = input.LA(1);
-
-                if ( ((LA9_0>='0' && LA9_0<='9')) ) {
-                    alt9=1;
-                }
-
-
-                switch (alt9) {
-                case 1 :
-                    // InternalProblem.g:5032:13: '0' .. '9'
+                    // InternalProblem.g:6077:13: '0' .. '9'
                     {
                     matchRange('0','9'); 
 
@@ -1108,12 +1153,12 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    if ( cnt9 >= 1 ) break loop9;
+                    if ( cnt8 >= 1 ) break loop8;
                         EarlyExitException eee =
-                            new EarlyExitException(9, input);
+                            new EarlyExitException(8, input);
                         throw eee;
                 }
-                cnt9++;
+                cnt8++;
             } while (true);
 
 
@@ -1132,37 +1177,37 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:5034:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // InternalProblem.g:5034:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalProblem.g:6079:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalProblem.g:6079:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // InternalProblem.g:5034:24: ( options {greedy=false; } : . )*
-            loop10:
+            // InternalProblem.g:6079:24: ( options {greedy=false; } : . )*
+            loop9:
             do {
-                int alt10=2;
-                int LA10_0 = input.LA(1);
+                int alt9=2;
+                int LA9_0 = input.LA(1);
 
-                if ( (LA10_0=='*') ) {
-                    int LA10_1 = input.LA(2);
+                if ( (LA9_0=='*') ) {
+                    int LA9_1 = input.LA(2);
 
-                    if ( (LA10_1=='/') ) {
-                        alt10=2;
+                    if ( (LA9_1=='/') ) {
+                        alt9=2;
                     }
-                    else if ( ((LA10_1>='\u0000' && LA10_1<='.')||(LA10_1>='0' && LA10_1<='\uFFFF')) ) {
-                        alt10=1;
+                    else if ( ((LA9_1>='\u0000' && LA9_1<='.')||(LA9_1>='0' && LA9_1<='\uFFFF')) ) {
+                        alt9=1;
                     }
 
 
                 }
-                else if ( ((LA10_0>='\u0000' && LA10_0<=')')||(LA10_0>='+' && LA10_0<='\uFFFF')) ) {
-                    alt10=1;
+                else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) {
+                    alt9=1;
                 }
 
 
-                switch (alt10) {
+                switch (alt9) {
                 case 1 :
-                    // InternalProblem.g:5034:52: .
+                    // InternalProblem.g:6079:52: .
                     {
                     matchAny(); 
 
@@ -1170,7 +1215,7 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    break loop10;
+                    break loop9;
                 }
             } while (true);
 
@@ -1192,22 +1237,22 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:5036:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // InternalProblem.g:5036:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalProblem.g:6081:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalProblem.g:6081:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // InternalProblem.g:5036:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
-            int cnt11=0;
-            loop11:
+            // InternalProblem.g:6081:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            int cnt10=0;
+            loop10:
             do {
-                int alt11=2;
-                int LA11_0 = input.LA(1);
+                int alt10=2;
+                int LA10_0 = input.LA(1);
 
-                if ( ((LA11_0>='\t' && LA11_0<='\n')||LA11_0=='\r'||LA11_0==' ') ) {
-                    alt11=1;
+                if ( ((LA10_0>='\t' && LA10_0<='\n')||LA10_0=='\r'||LA10_0==' ') ) {
+                    alt10=1;
                 }
 
 
-                switch (alt11) {
+                switch (alt10) {
                 case 1 :
                     // InternalProblem.g:
                     {
@@ -1225,12 +1270,12 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    if ( cnt11 >= 1 ) break loop11;
+                    if ( cnt10 >= 1 ) break loop10;
                         EarlyExitException eee =
-                            new EarlyExitException(11, input);
+                            new EarlyExitException(10, input);
                         throw eee;
                 }
-                cnt11++;
+                cnt10++;
             } while (true);
 
 
@@ -1249,8 +1294,8 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:5038:16: ( . )
-            // InternalProblem.g:5038:18: .
+            // InternalProblem.g:6083:16: ( . )
+            // InternalProblem.g:6083:18: .
             {
             matchAny(); 
 
@@ -1265,10 +1310,10 @@ 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 | T__43 | T__44 | RULE_STRING | RULE_QUOTED_ID | RULE_SL_COMMENT | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt12=41;
-        alt12 = dfa12.predict(input);
-        switch (alt12) {
+        // 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 | T__44 | T__45 | T__46 | T__47 | RULE_ID | RULE_STRING | RULE_QUOTED_ID | RULE_SL_COMMENT | RULE_INT | RULE_ML_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt11=44;
+        alt11 = dfa11.predict(input);
+        switch (alt11) {
             case 1 :
                 // InternalProblem.g:1:10: T__12
                 {
@@ -1501,56 +1546,77 @@ public class InternalProblemLexer extends Lexer {
                 }
                 break;
             case 34 :
-                // InternalProblem.g:1:208: RULE_STRING
+                // InternalProblem.g:1:208: T__45
                 {
-                mRULE_STRING(); 
+                mT__45(); 
 
                 }
                 break;
             case 35 :
-                // InternalProblem.g:1:220: RULE_QUOTED_ID
+                // InternalProblem.g:1:214: T__46
                 {
-                mRULE_QUOTED_ID(); 
+                mT__46(); 
 
                 }
                 break;
             case 36 :
-                // InternalProblem.g:1:235: RULE_SL_COMMENT
+                // InternalProblem.g:1:220: T__47
                 {
-                mRULE_SL_COMMENT(); 
+                mT__47(); 
 
                 }
                 break;
             case 37 :
-                // InternalProblem.g:1:251: RULE_ID
+                // InternalProblem.g:1:226: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 38 :
-                // InternalProblem.g:1:259: RULE_INT
+                // InternalProblem.g:1:234: RULE_STRING
                 {
-                mRULE_INT(); 
+                mRULE_STRING(); 
 
                 }
                 break;
             case 39 :
-                // InternalProblem.g:1:268: RULE_ML_COMMENT
+                // InternalProblem.g:1:246: RULE_QUOTED_ID
                 {
-                mRULE_ML_COMMENT(); 
+                mRULE_QUOTED_ID(); 
 
                 }
                 break;
             case 40 :
-                // InternalProblem.g:1:284: RULE_WS
+                // InternalProblem.g:1:261: RULE_SL_COMMENT
                 {
-                mRULE_WS(); 
+                mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 41 :
-                // InternalProblem.g:1:292: RULE_ANY_OTHER
+                // InternalProblem.g:1:277: RULE_INT
+                {
+                mRULE_INT(); 
+
+                }
+                break;
+            case 42 :
+                // InternalProblem.g:1:286: RULE_ML_COMMENT
+                {
+                mRULE_ML_COMMENT(); 
+
+                }
+                break;
+            case 43 :
+                // InternalProblem.g:1:302: RULE_WS
+                {
+                mRULE_WS(); 
+
+                }
+                break;
+            case 44 :
+                // InternalProblem.g:1:310: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1562,78 +1628,69 @@ public class InternalProblemLexer extends Lexer {
     }
 
 
-    protected DFA12 dfa12 = new DFA12(this);
-    static final String DFA12_eotS =
-        "\1\uffff\1\44\2\uffff\2\50\2\uffff\3\50\2\uffff\2\50\4\uffff\1\50\2\uffff\1\77\2\50\1\103\2\42\1\uffff\2\42\10\uffff\1\50\1\uffff\1\50\2\uffff\3\50\2\uffff\5\50\4\uffff\1\50\5\uffff\2\50\10\uffff\17\50\1\147\1\50\1\151\5\50\1\157\5\50\1\uffff\1\50\1\uffff\1\166\1\50\1\170\2\50\1\uffff\1\173\1\50\1\175\1\50\1\177\1\50\1\uffff\1\50\1\uffff\2\50\1\uffff\1\50\1\uffff\1\50\1\uffff\1\u0086\1\u0087\1\50\1\u0089\2\50\2\uffff\1\u008c\1\uffff\1\u008d\1\u008e\3\uffff";
-    static final String DFA12_eofS =
-        "\u008f\uffff";
-    static final String DFA12_minS =
-        "\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\uffff\1\52\1\101\10\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\5\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 DFA12_maxS =
-        "\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\72\1\143\1\142\1\75\2\uffff\1\uffff\1\57\1\172\10\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\5\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 DFA12_acceptS =
-        "\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\6\uffff\1\44\2\uffff\1\45\1\46\1\50\1\51\1\33\1\1\1\2\1\3\1\uffff\1\45\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\34\1\31\2\uffff\1\41\1\40\1\42\1\43\1\44\1\47\1\46\1\50\35\uffff\1\5\1\uffff\1\10\5\uffff\1\22\6\uffff\1\11\1\uffff\1\16\2\uffff\1\37\1\uffff\1\32\1\uffff\1\4\6\uffff\1\15\1\12\1\uffff\1\17\2\uffff\1\36\1\25\1\35";
-    static final String DFA12_specialS =
-        "\1\0\31\uffff\1\2\1\1\163\uffff}>";
-    static final String[] DFA12_transitionS = {
-            "\11\42\2\41\2\42\1\41\22\42\1\41\1\13\1\32\2\42\1\34\1\42\1\33\1\24\1\25\1\7\1\31\1\2\1\42\1\1\1\35\12\40\1\26\1\3\1\42\1\6\1\42\1\14\1\42\32\37\1\21\1\42\1\22\1\36\1\37\1\42\1\30\1\37\1\15\1\37\1\16\1\11\10\37\1\23\1\5\1\37\1\4\1\27\1\10\1\12\5\37\1\17\1\42\1\20\uff82\42",
-            "\1\43",
+    protected DFA11 dfa11 = new DFA11(this);
+    static final String DFA11_eotS =
+        "\1\uffff\1\45\2\uffff\2\51\2\uffff\2\51\1\62\1\63\1\uffff\1\66\1\51\2\uffff\1\51\4\uffff\1\51\2\uffff\1\105\2\51\1\uffff\2\43\1\uffff\1\43\7\uffff\1\51\1\uffff\1\51\2\uffff\5\51\5\uffff\1\51\2\uffff\2\51\4\uffff\1\51\5\uffff\2\51\6\uffff\17\51\1\153\1\51\1\155\2\51\1\160\10\51\1\uffff\1\51\1\uffff\1\172\1\51\1\uffff\1\174\1\51\1\176\2\51\1\u0081\1\51\1\u0083\1\51\1\uffff\1\51\1\uffff\1\51\1\uffff\2\51\1\uffff\1\51\1\uffff\1\u008a\1\u008b\1\u008c\3\51\3\uffff\1\u0090\1\u0091\1\u0092\3\uffff";
+    static final String DFA11_eofS =
+        "\u0093\uffff";
+    static final String DFA11_minS =
+        "\1\0\1\56\2\uffff\1\145\1\162\2\uffff\1\162\1\141\2\60\1\uffff\1\75\1\156\2\uffff\1\154\4\uffff\1\160\2\uffff\1\55\1\143\1\142\1\uffff\2\0\1\uffff\1\52\7\uffff\1\146\1\uffff\1\145\2\uffff\1\165\1\154\1\164\1\165\1\162\5\uffff\1\153\2\uffff\1\141\1\156\4\uffff\1\160\5\uffff\1\157\1\163\6\uffff\1\145\1\144\1\142\1\145\1\163\1\145\1\155\1\157\1\156\1\163\1\164\1\157\1\160\1\164\1\162\1\60\1\154\1\60\1\145\1\156\1\60\1\162\1\157\1\163\1\141\1\163\1\145\1\162\1\163\1\uffff\1\145\1\uffff\1\60\1\144\1\uffff\1\60\1\167\1\60\2\151\1\60\1\141\1\60\1\155\1\uffff\1\163\1\uffff\1\156\1\uffff\1\156\1\164\1\uffff\1\143\1\uffff\3\60\1\163\1\145\1\164\3\uffff\3\60\3\uffff";
+    static final String DFA11_maxS =
+        "\1\uffff\1\56\2\uffff\1\145\1\162\2\uffff\1\162\1\141\2\172\1\uffff\1\75\1\156\2\uffff\1\157\4\uffff\1\160\2\uffff\1\72\1\143\1\142\1\uffff\2\uffff\1\uffff\1\57\7\uffff\1\146\1\uffff\1\157\2\uffff\1\165\1\154\1\164\1\165\1\162\5\uffff\1\153\2\uffff\1\141\1\156\4\uffff\1\160\5\uffff\1\157\1\163\6\uffff\1\145\1\144\1\142\1\145\1\163\1\145\1\155\1\157\1\156\1\163\1\164\1\157\1\160\1\164\1\162\1\172\1\154\1\172\1\145\1\156\1\172\1\162\1\157\1\163\1\141\1\163\1\145\1\162\1\163\1\uffff\1\145\1\uffff\1\172\1\144\1\uffff\1\172\1\167\1\172\2\151\1\172\1\141\1\172\1\155\1\uffff\1\163\1\uffff\1\156\1\uffff\1\156\1\164\1\uffff\1\143\1\uffff\3\172\1\163\1\145\1\164\3\uffff\3\172\3\uffff";
+    static final String DFA11_acceptS =
+        "\2\uffff\1\2\1\3\2\uffff\1\6\1\7\4\uffff\1\14\2\uffff\1\17\1\20\1\uffff\1\24\1\25\1\27\1\30\1\uffff\1\32\1\33\3\uffff\1\45\2\uffff\1\50\1\uffff\1\51\1\53\1\54\1\37\1\1\1\2\1\3\1\uffff\1\45\1\uffff\1\6\1\7\5\uffff\1\12\1\13\1\14\1\44\1\15\1\uffff\1\17\1\20\2\uffff\1\24\1\25\1\27\1\30\1\uffff\1\32\1\33\1\34\1\40\1\35\2\uffff\1\46\1\47\1\50\1\52\1\51\1\53\35\uffff\1\5\1\uffff\1\10\2\uffff\1\26\11\uffff\1\11\1\uffff\1\43\1\uffff\1\22\2\uffff\1\36\1\uffff\1\4\6\uffff\1\21\1\23\1\16\3\uffff\1\42\1\31\1\41";
+    static final String DFA11_specialS =
+        "\1\1\34\uffff\1\2\1\0\164\uffff}>";
+    static final String[] DFA11_transitionS = {
+            "\11\43\2\42\2\43\1\42\22\43\1\42\1\17\1\35\2\43\1\37\1\43\1\36\1\27\1\30\1\7\1\15\1\2\1\14\1\1\1\40\12\41\1\31\1\3\1\43\1\6\1\43\1\20\1\43\4\34\1\13\25\34\1\24\1\43\1\25\1\43\1\34\1\43\1\33\1\34\1\21\1\34\1\12\1\11\10\34\1\26\1\5\1\34\1\4\1\32\1\10\1\16\5\34\1\22\1\43\1\23\uff82\43",
+            "\1\44",
             "",
             "",
-            "\1\47",
-            "\1\51",
+            "\1\50",
+            "\1\52",
             "",
             "",
-            "\1\54",
             "\1\55",
             "\1\56",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\15\51\1\60\3\51\1\61\5\51\1\57\2\51",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
             "",
+            "\1\65",
+            "\1\67",
             "",
-            "\1\61\2\uffff\1\62",
-            "\1\64\3\uffff\1\65\5\uffff\1\63",
             "",
+            "\1\72\2\uffff\1\73",
             "",
             "",
             "",
-            "\1\72",
             "",
-            "",
-            "\1\75\14\uffff\1\76",
             "\1\100",
-            "\1\101",
-            "\1\102",
-            "\0\104",
-            "\0\105",
-            "",
-            "\1\107\4\uffff\1\106",
-            "\32\50\4\uffff\1\50\1\uffff\32\50",
             "",
             "",
+            "\1\103\14\uffff\1\104",
+            "\1\106",
+            "\1\107",
             "",
+            "\0\110",
+            "\0\111",
             "",
+            "\1\113\4\uffff\1\112",
             "",
             "",
             "",
             "",
-            "\1\112",
             "",
-            "\1\113\11\uffff\1\114",
             "",
             "",
-            "\1\115",
             "\1\116",
-            "\1\117",
+            "",
+            "\1\117\11\uffff\1\120",
             "",
             "",
-            "\1\120",
             "\1\121",
             "\1\122",
             "\1\123",
             "\1\124",
-            "",
-            "",
-            "",
-            "",
             "\1\125",
             "",
             "",
@@ -1641,19 +1698,28 @@ public class InternalProblemLexer extends Lexer {
             "",
             "",
             "\1\126",
+            "",
+            "",
             "\1\127",
+            "\1\130",
             "",
             "",
             "",
             "",
+            "\1\131",
+            "",
             "",
             "",
             "",
             "",
-            "\1\130",
-            "\1\131",
             "\1\132",
             "\1\133",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
             "\1\134",
             "\1\135",
             "\1\136",
@@ -1665,195 +1731,201 @@ public class InternalProblemLexer extends Lexer {
             "\1\144",
             "\1\145",
             "\1\146",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+            "\1\147",
             "\1\150",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+            "\1\151",
             "\1\152",
-            "\1\153",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
             "\1\154",
-            "\1\155",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
             "\1\156",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
-            "\1\160",
+            "\1\157",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
             "\1\161",
             "\1\162",
             "\1\163",
             "\1\164",
-            "",
             "\1\165",
-            "",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+            "\1\166",
             "\1\167",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
-            "\1\171",
-            "\1\172",
+            "\1\170",
             "",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
-            "\1\174",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
-            "\1\176",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
-            "\1\u0080",
+            "\1\171",
             "",
-            "\1\u0081",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\1\173",
             "",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\1\175",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\1\177",
+            "\1\u0080",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
             "\1\u0082",
-            "\1\u0083",
-            "",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
             "\1\u0084",
             "",
             "\1\u0085",
             "",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+            "\1\u0086",
+            "",
+            "\1\u0087",
             "\1\u0088",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
-            "\1\u008a",
-            "\1\u008b",
             "",
+            "\1\u0089",
+            "",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\1\u008d",
+            "\1\u008e",
+            "\1\u008f",
             "",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
             "",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
-            "\12\50\7\uffff\32\50\4\uffff\1\50\1\uffff\32\50",
+            "",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
+            "\12\51\7\uffff\32\51\4\uffff\1\51\1\uffff\32\51",
             "",
             "",
             ""
     };
 
-    static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
-    static final short[] DFA12_eof = DFA.unpackEncodedString(DFA12_eofS);
-    static final char[] DFA12_min = DFA.unpackEncodedStringToUnsignedChars(DFA12_minS);
-    static final char[] DFA12_max = DFA.unpackEncodedStringToUnsignedChars(DFA12_maxS);
-    static final short[] DFA12_accept = DFA.unpackEncodedString(DFA12_acceptS);
-    static final short[] DFA12_special = DFA.unpackEncodedString(DFA12_specialS);
-    static final short[][] DFA12_transition;
+    static final short[] DFA11_eot = DFA.unpackEncodedString(DFA11_eotS);
+    static final short[] DFA11_eof = DFA.unpackEncodedString(DFA11_eofS);
+    static final char[] DFA11_min = DFA.unpackEncodedStringToUnsignedChars(DFA11_minS);
+    static final char[] DFA11_max = DFA.unpackEncodedStringToUnsignedChars(DFA11_maxS);
+    static final short[] DFA11_accept = DFA.unpackEncodedString(DFA11_acceptS);
+    static final short[] DFA11_special = DFA.unpackEncodedString(DFA11_specialS);
+    static final short[][] DFA11_transition;
 
     static {
-        int numStates = DFA12_transitionS.length;
-        DFA12_transition = new short[numStates][];
+        int numStates = DFA11_transitionS.length;
+        DFA11_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA12_transition[i] = DFA.unpackEncodedString(DFA12_transitionS[i]);
+            DFA11_transition[i] = DFA.unpackEncodedString(DFA11_transitionS[i]);
         }
     }
 
-    class DFA12 extends DFA {
+    class DFA11 extends DFA {
 
-        public DFA12(BaseRecognizer recognizer) {
+        public DFA11(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 12;
-            this.eot = DFA12_eot;
-            this.eof = DFA12_eof;
-            this.min = DFA12_min;
-            this.max = DFA12_max;
-            this.accept = DFA12_accept;
-            this.special = DFA12_special;
-            this.transition = DFA12_transition;
+            this.decisionNumber = 11;
+            this.eot = DFA11_eot;
+            this.eof = DFA11_eof;
+            this.min = DFA11_min;
+            this.max = DFA11_max;
+            this.accept = DFA11_accept;
+            this.special = DFA11_special;
+            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 | T__43 | T__44 | RULE_STRING | RULE_QUOTED_ID | RULE_SL_COMMENT | RULE_ID | RULE_INT | RULE_ML_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 | T__44 | T__45 | T__46 | T__47 | RULE_ID | RULE_STRING | RULE_QUOTED_ID | RULE_SL_COMMENT | RULE_INT | RULE_ML_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 LA12_0 = input.LA(1);
+                        int LA11_30 = input.LA(1);
 
                         s = -1;
-                        if ( (LA12_0=='.') ) {s = 1;}
+                        if ( ((LA11_30>='\u0000' && LA11_30<='\uFFFF')) ) {s = 73;}
+
+                        else s = 35;
 
-                        else if ( (LA12_0==',') ) {s = 2;}
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA11_0 = input.LA(1);
 
-                        else if ( (LA12_0==';') ) {s = 3;}
+                        s = -1;
+                        if ( (LA11_0=='.') ) {s = 1;}
 
-                        else if ( (LA12_0=='r') ) {s = 4;}
+                        else if ( (LA11_0==',') ) {s = 2;}
 
-                        else if ( (LA12_0=='p') ) {s = 5;}
+                        else if ( (LA11_0==';') ) {s = 3;}
 
-                        else if ( (LA12_0=='=') ) {s = 6;}
+                        else if ( (LA11_0=='r') ) {s = 4;}
 
-                        else if ( (LA12_0=='*') ) {s = 7;}
+                        else if ( (LA11_0=='p') ) {s = 5;}
 
-                        else if ( (LA12_0=='t') ) {s = 8;}
+                        else if ( (LA11_0=='=') ) {s = 6;}
 
-                        else if ( (LA12_0=='f') ) {s = 9;}
+                        else if ( (LA11_0=='*') ) {s = 7;}
 
-                        else if ( (LA12_0=='u') ) {s = 10;}
+                        else if ( (LA11_0=='t') ) {s = 8;}
 
-                        else if ( (LA12_0=='!') ) {s = 11;}
+                        else if ( (LA11_0=='f') ) {s = 9;}
 
-                        else if ( (LA12_0=='?') ) {s = 12;}
+                        else if ( (LA11_0=='e') ) {s = 10;}
 
-                        else if ( (LA12_0=='c') ) {s = 13;}
+                        else if ( (LA11_0=='E') ) {s = 11;}
 
-                        else if ( (LA12_0=='e') ) {s = 14;}
+                        else if ( (LA11_0=='-') ) {s = 12;}
 
-                        else if ( (LA12_0=='{') ) {s = 15;}
+                        else if ( (LA11_0=='+') ) {s = 13;}
 
-                        else if ( (LA12_0=='}') ) {s = 16;}
+                        else if ( (LA11_0=='u') ) {s = 14;}
 
-                        else if ( (LA12_0=='[') ) {s = 17;}
+                        else if ( (LA11_0=='!') ) {s = 15;}
 
-                        else if ( (LA12_0==']') ) {s = 18;}
+                        else if ( (LA11_0=='?') ) {s = 16;}
 
-                        else if ( (LA12_0=='o') ) {s = 19;}
+                        else if ( (LA11_0=='c') ) {s = 17;}
 
-                        else if ( (LA12_0=='(') ) {s = 20;}
+                        else if ( (LA11_0=='{') ) {s = 18;}
 
-                        else if ( (LA12_0==')') ) {s = 21;}
+                        else if ( (LA11_0=='}') ) {s = 19;}
 
-                        else if ( (LA12_0==':') ) {s = 22;}
+                        else if ( (LA11_0=='[') ) {s = 20;}
 
-                        else if ( (LA12_0=='s') ) {s = 23;}
+                        else if ( (LA11_0==']') ) {s = 21;}
 
-                        else if ( (LA12_0=='a') ) {s = 24;}
+                        else if ( (LA11_0=='o') ) {s = 22;}
 
-                        else if ( (LA12_0=='+') ) {s = 25;}
+                        else if ( (LA11_0=='(') ) {s = 23;}
 
-                        else if ( (LA12_0=='\"') ) {s = 26;}
+                        else if ( (LA11_0==')') ) {s = 24;}
 
-                        else if ( (LA12_0=='\'') ) {s = 27;}
+                        else if ( (LA11_0==':') ) {s = 25;}
 
-                        else if ( (LA12_0=='%') ) {s = 28;}
+                        else if ( (LA11_0=='s') ) {s = 26;}
 
-                        else if ( (LA12_0=='/') ) {s = 29;}
+                        else if ( (LA11_0=='a') ) {s = 27;}
 
-                        else if ( (LA12_0=='^') ) {s = 30;}
+                        else if ( ((LA11_0>='A' && LA11_0<='D')||(LA11_0>='F' && LA11_0<='Z')||LA11_0=='_'||LA11_0=='b'||LA11_0=='d'||(LA11_0>='g' && LA11_0<='n')||LA11_0=='q'||(LA11_0>='v' && LA11_0<='z')) ) {s = 28;}
 
-                        else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||LA12_0=='b'||LA12_0=='d'||(LA12_0>='g' && LA12_0<='n')||LA12_0=='q'||(LA12_0>='v' && LA12_0<='z')) ) {s = 31;}
+                        else if ( (LA11_0=='\"') ) {s = 29;}
 
-                        else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 32;}
+                        else if ( (LA11_0=='\'') ) {s = 30;}
 
-                        else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 33;}
+                        else if ( (LA11_0=='%') ) {s = 31;}
 
-                        else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||(LA12_0>='#' && LA12_0<='$')||LA12_0=='&'||LA12_0=='-'||LA12_0=='<'||LA12_0=='>'||LA12_0=='@'||LA12_0=='\\'||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\uFFFF')) ) {s = 34;}
+                        else if ( (LA11_0=='/') ) {s = 32;}
 
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA12_27 = input.LA(1);
+                        else if ( ((LA11_0>='0' && LA11_0<='9')) ) {s = 33;}
 
-                        s = -1;
-                        if ( ((LA12_27>='\u0000' && LA12_27<='\uFFFF')) ) {s = 69;}
+                        else if ( ((LA11_0>='\t' && LA11_0<='\n')||LA11_0=='\r'||LA11_0==' ') ) {s = 34;}
 
-                        else s = 34;
+                        else if ( ((LA11_0>='\u0000' && LA11_0<='\b')||(LA11_0>='\u000B' && LA11_0<='\f')||(LA11_0>='\u000E' && LA11_0<='\u001F')||(LA11_0>='#' && LA11_0<='$')||LA11_0=='&'||LA11_0=='<'||LA11_0=='>'||LA11_0=='@'||LA11_0=='\\'||LA11_0=='^'||LA11_0=='`'||LA11_0=='|'||(LA11_0>='~' && LA11_0<='\uFFFF')) ) {s = 35;}
 
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA12_26 = input.LA(1);
+                        int LA11_29 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA12_26>='\u0000' && LA12_26<='\uFFFF')) ) {s = 68;}
+                        if ( ((LA11_29>='\u0000' && LA11_29<='\uFFFF')) ) {s = 72;}
 
-                        else s = 34;
+                        else s = 35;
 
                         if ( s>=0 ) return s;
                         break;
             }
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 12, _s, input);
+                new NoViableAltException(getDescription(), 11, _s, input);
             error(nvae);
             throw nvae;
         }
diff --git a/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemParser.java b/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemParser.java
index c93cb758..76a70bff 100644
--- a/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemParser.java
+++ b/language-ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemParser.java
@@ -22,7 +22,7 @@ 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_SL_COMMENT", "RULE_ML_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'.'", "','", "';'", "'refers'", "'pred'", "'='", "'*'", "'true'", "'false'", "'unknown'", "'!'", "'?'", "'problem'", "'class'", "'extends'", "'{'", "'}'", "'enum'", "'['", "']'", "'opposite'", "'('", "')'", "':-'", "':'", "'scope'", "'..'", "'::'", "'abstract'", "'contains'", "'error'", "'+'", "'+='"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_QUOTED_ID", "RULE_ID", "RULE_STRING", "RULE_SL_COMMENT", "RULE_ML_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'.'", "','", "';'", "'refers'", "'pred'", "'='", "'*'", "'true'", "'false'", "'e'", "'E'", "'-'", "'+'", "'unknown'", "'!'", "'?'", "'problem'", "'class'", "'extends'", "'{'", "'}'", "'enum'", "'['", "']'", "'opposite'", "'('", "')'", "':-'", "':'", "'scope'", "'..'", "'::'", "'abstract'", "'contains'", "'error'", "'+='"
     };
     public static final int T__19=19;
     public static final int T__15=15;
@@ -62,6 +62,9 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     public static final int RULE_WS=10;
     public static final int RULE_ANY_OTHER=11;
     public static final int T__44=44;
+    public static final int T__45=45;
+    public static final int T__46=46;
+    public static final int T__47=47;
     public static final int T__40=40;
     public static final int T__41=41;
     public static final int T__42=42;
@@ -1057,31 +1060,31 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleArgument"
-    // InternalProblem.g:362:1: ruleArgument : ( ( rule__Argument__VariableOrNodeAssignment ) ) ;
+    // InternalProblem.g:362:1: ruleArgument : ( ( rule__Argument__Alternatives ) ) ;
     public final void ruleArgument() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:366:2: ( ( ( rule__Argument__VariableOrNodeAssignment ) ) )
-            // InternalProblem.g:367:2: ( ( rule__Argument__VariableOrNodeAssignment ) )
+            // InternalProblem.g:366:2: ( ( ( rule__Argument__Alternatives ) ) )
+            // InternalProblem.g:367:2: ( ( rule__Argument__Alternatives ) )
             {
-            // InternalProblem.g:367:2: ( ( rule__Argument__VariableOrNodeAssignment ) )
-            // InternalProblem.g:368:3: ( rule__Argument__VariableOrNodeAssignment )
+            // InternalProblem.g:367:2: ( ( rule__Argument__Alternatives ) )
+            // InternalProblem.g:368:3: ( rule__Argument__Alternatives )
             {
-             before(grammarAccess.getArgumentAccess().getVariableOrNodeAssignment()); 
-            // InternalProblem.g:369:3: ( rule__Argument__VariableOrNodeAssignment )
-            // InternalProblem.g:369:4: rule__Argument__VariableOrNodeAssignment
+             before(grammarAccess.getArgumentAccess().getAlternatives()); 
+            // InternalProblem.g:369:3: ( rule__Argument__Alternatives )
+            // InternalProblem.g:369:4: rule__Argument__Alternatives
             {
             pushFollow(FOLLOW_2);
-            rule__Argument__VariableOrNodeAssignment();
+            rule__Argument__Alternatives();
 
             state._fsp--;
 
 
             }
 
-             after(grammarAccess.getArgumentAccess().getVariableOrNodeAssignment()); 
+             after(grammarAccess.getArgumentAccess().getAlternatives()); 
 
             }
 
@@ -1103,12 +1106,166 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "ruleArgument"
 
 
+    // $ANTLR start "entryRuleVariableOrNodeArgument"
+    // InternalProblem.g:378:1: entryRuleVariableOrNodeArgument : ruleVariableOrNodeArgument EOF ;
+    public final void entryRuleVariableOrNodeArgument() throws RecognitionException {
+        try {
+            // InternalProblem.g:379:1: ( ruleVariableOrNodeArgument EOF )
+            // InternalProblem.g:380:1: ruleVariableOrNodeArgument EOF
+            {
+             before(grammarAccess.getVariableOrNodeArgumentRule()); 
+            pushFollow(FOLLOW_1);
+            ruleVariableOrNodeArgument();
+
+            state._fsp--;
+
+             after(grammarAccess.getVariableOrNodeArgumentRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleVariableOrNodeArgument"
+
+
+    // $ANTLR start "ruleVariableOrNodeArgument"
+    // InternalProblem.g:387:1: ruleVariableOrNodeArgument : ( ( rule__VariableOrNodeArgument__VariableOrNodeAssignment ) ) ;
+    public final void ruleVariableOrNodeArgument() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:391:2: ( ( ( rule__VariableOrNodeArgument__VariableOrNodeAssignment ) ) )
+            // InternalProblem.g:392:2: ( ( rule__VariableOrNodeArgument__VariableOrNodeAssignment ) )
+            {
+            // InternalProblem.g:392:2: ( ( rule__VariableOrNodeArgument__VariableOrNodeAssignment ) )
+            // InternalProblem.g:393:3: ( rule__VariableOrNodeArgument__VariableOrNodeAssignment )
+            {
+             before(grammarAccess.getVariableOrNodeArgumentAccess().getVariableOrNodeAssignment()); 
+            // InternalProblem.g:394:3: ( rule__VariableOrNodeArgument__VariableOrNodeAssignment )
+            // InternalProblem.g:394:4: rule__VariableOrNodeArgument__VariableOrNodeAssignment
+            {
+            pushFollow(FOLLOW_2);
+            rule__VariableOrNodeArgument__VariableOrNodeAssignment();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getVariableOrNodeArgumentAccess().getVariableOrNodeAssignment()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleVariableOrNodeArgument"
+
+
+    // $ANTLR start "entryRuleConstantArgument"
+    // InternalProblem.g:403:1: entryRuleConstantArgument : ruleConstantArgument EOF ;
+    public final void entryRuleConstantArgument() throws RecognitionException {
+        try {
+            // InternalProblem.g:404:1: ( ruleConstantArgument EOF )
+            // InternalProblem.g:405:1: ruleConstantArgument EOF
+            {
+             before(grammarAccess.getConstantArgumentRule()); 
+            pushFollow(FOLLOW_1);
+            ruleConstantArgument();
+
+            state._fsp--;
+
+             after(grammarAccess.getConstantArgumentRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleConstantArgument"
+
+
+    // $ANTLR start "ruleConstantArgument"
+    // InternalProblem.g:412:1: ruleConstantArgument : ( ( rule__ConstantArgument__ConstantAssignment ) ) ;
+    public final void ruleConstantArgument() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:416:2: ( ( ( rule__ConstantArgument__ConstantAssignment ) ) )
+            // InternalProblem.g:417:2: ( ( rule__ConstantArgument__ConstantAssignment ) )
+            {
+            // InternalProblem.g:417:2: ( ( rule__ConstantArgument__ConstantAssignment ) )
+            // InternalProblem.g:418:3: ( rule__ConstantArgument__ConstantAssignment )
+            {
+             before(grammarAccess.getConstantArgumentAccess().getConstantAssignment()); 
+            // InternalProblem.g:419:3: ( rule__ConstantArgument__ConstantAssignment )
+            // InternalProblem.g:419:4: rule__ConstantArgument__ConstantAssignment
+            {
+            pushFollow(FOLLOW_2);
+            rule__ConstantArgument__ConstantAssignment();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getConstantArgumentAccess().getConstantAssignment()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleConstantArgument"
+
+
     // $ANTLR start "entryRuleAssertion"
-    // InternalProblem.g:378:1: entryRuleAssertion : ruleAssertion EOF ;
+    // InternalProblem.g:428:1: entryRuleAssertion : ruleAssertion EOF ;
     public final void entryRuleAssertion() throws RecognitionException {
         try {
-            // InternalProblem.g:379:1: ( ruleAssertion EOF )
-            // InternalProblem.g:380:1: ruleAssertion EOF
+            // InternalProblem.g:429:1: ( ruleAssertion EOF )
+            // InternalProblem.g:430:1: ruleAssertion EOF
             {
              before(grammarAccess.getAssertionRule()); 
             pushFollow(FOLLOW_1);
@@ -1134,21 +1291,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAssertion"
-    // InternalProblem.g:387:1: ruleAssertion : ( ( rule__Assertion__Group__0 ) ) ;
+    // InternalProblem.g:437:1: ruleAssertion : ( ( rule__Assertion__Group__0 ) ) ;
     public final void ruleAssertion() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:391:2: ( ( ( rule__Assertion__Group__0 ) ) )
-            // InternalProblem.g:392:2: ( ( rule__Assertion__Group__0 ) )
+            // InternalProblem.g:441:2: ( ( ( rule__Assertion__Group__0 ) ) )
+            // InternalProblem.g:442:2: ( ( rule__Assertion__Group__0 ) )
             {
-            // InternalProblem.g:392:2: ( ( rule__Assertion__Group__0 ) )
-            // InternalProblem.g:393:3: ( rule__Assertion__Group__0 )
+            // InternalProblem.g:442:2: ( ( rule__Assertion__Group__0 ) )
+            // InternalProblem.g:443:3: ( rule__Assertion__Group__0 )
             {
              before(grammarAccess.getAssertionAccess().getGroup()); 
-            // InternalProblem.g:394:3: ( rule__Assertion__Group__0 )
-            // InternalProblem.g:394:4: rule__Assertion__Group__0
+            // InternalProblem.g:444:3: ( rule__Assertion__Group__0 )
+            // InternalProblem.g:444:4: rule__Assertion__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group__0();
@@ -1180,12 +1337,628 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "ruleAssertion"
 
 
+    // $ANTLR start "entryRuleAssertionArgument"
+    // InternalProblem.g:453:1: entryRuleAssertionArgument : ruleAssertionArgument EOF ;
+    public final void entryRuleAssertionArgument() throws RecognitionException {
+        try {
+            // InternalProblem.g:454:1: ( ruleAssertionArgument EOF )
+            // InternalProblem.g:455:1: ruleAssertionArgument EOF
+            {
+             before(grammarAccess.getAssertionArgumentRule()); 
+            pushFollow(FOLLOW_1);
+            ruleAssertionArgument();
+
+            state._fsp--;
+
+             after(grammarAccess.getAssertionArgumentRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleAssertionArgument"
+
+
+    // $ANTLR start "ruleAssertionArgument"
+    // InternalProblem.g:462:1: ruleAssertionArgument : ( ( rule__AssertionArgument__Alternatives ) ) ;
+    public final void ruleAssertionArgument() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:466:2: ( ( ( rule__AssertionArgument__Alternatives ) ) )
+            // InternalProblem.g:467:2: ( ( rule__AssertionArgument__Alternatives ) )
+            {
+            // InternalProblem.g:467:2: ( ( rule__AssertionArgument__Alternatives ) )
+            // InternalProblem.g:468:3: ( rule__AssertionArgument__Alternatives )
+            {
+             before(grammarAccess.getAssertionArgumentAccess().getAlternatives()); 
+            // InternalProblem.g:469:3: ( rule__AssertionArgument__Alternatives )
+            // InternalProblem.g:469:4: rule__AssertionArgument__Alternatives
+            {
+            pushFollow(FOLLOW_2);
+            rule__AssertionArgument__Alternatives();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getAssertionArgumentAccess().getAlternatives()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleAssertionArgument"
+
+
+    // $ANTLR start "entryRuleNodeAssertionArgument"
+    // InternalProblem.g:478:1: entryRuleNodeAssertionArgument : ruleNodeAssertionArgument EOF ;
+    public final void entryRuleNodeAssertionArgument() throws RecognitionException {
+        try {
+            // InternalProblem.g:479:1: ( ruleNodeAssertionArgument EOF )
+            // InternalProblem.g:480:1: ruleNodeAssertionArgument EOF
+            {
+             before(grammarAccess.getNodeAssertionArgumentRule()); 
+            pushFollow(FOLLOW_1);
+            ruleNodeAssertionArgument();
+
+            state._fsp--;
+
+             after(grammarAccess.getNodeAssertionArgumentRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleNodeAssertionArgument"
+
+
+    // $ANTLR start "ruleNodeAssertionArgument"
+    // InternalProblem.g:487:1: ruleNodeAssertionArgument : ( ( rule__NodeAssertionArgument__NodeAssignment ) ) ;
+    public final void ruleNodeAssertionArgument() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:491:2: ( ( ( rule__NodeAssertionArgument__NodeAssignment ) ) )
+            // InternalProblem.g:492:2: ( ( rule__NodeAssertionArgument__NodeAssignment ) )
+            {
+            // InternalProblem.g:492:2: ( ( rule__NodeAssertionArgument__NodeAssignment ) )
+            // InternalProblem.g:493:3: ( rule__NodeAssertionArgument__NodeAssignment )
+            {
+             before(grammarAccess.getNodeAssertionArgumentAccess().getNodeAssignment()); 
+            // InternalProblem.g:494:3: ( rule__NodeAssertionArgument__NodeAssignment )
+            // InternalProblem.g:494:4: rule__NodeAssertionArgument__NodeAssignment
+            {
+            pushFollow(FOLLOW_2);
+            rule__NodeAssertionArgument__NodeAssignment();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getNodeAssertionArgumentAccess().getNodeAssignment()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleNodeAssertionArgument"
+
+
+    // $ANTLR start "entryRuleConstantAssertionArgument"
+    // InternalProblem.g:503:1: entryRuleConstantAssertionArgument : ruleConstantAssertionArgument EOF ;
+    public final void entryRuleConstantAssertionArgument() throws RecognitionException {
+        try {
+            // InternalProblem.g:504:1: ( ruleConstantAssertionArgument EOF )
+            // InternalProblem.g:505:1: ruleConstantAssertionArgument EOF
+            {
+             before(grammarAccess.getConstantAssertionArgumentRule()); 
+            pushFollow(FOLLOW_1);
+            ruleConstantAssertionArgument();
+
+            state._fsp--;
+
+             after(grammarAccess.getConstantAssertionArgumentRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleConstantAssertionArgument"
+
+
+    // $ANTLR start "ruleConstantAssertionArgument"
+    // InternalProblem.g:512:1: ruleConstantAssertionArgument : ( ( rule__ConstantAssertionArgument__ConstantAssignment ) ) ;
+    public final void ruleConstantAssertionArgument() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:516:2: ( ( ( rule__ConstantAssertionArgument__ConstantAssignment ) ) )
+            // InternalProblem.g:517:2: ( ( rule__ConstantAssertionArgument__ConstantAssignment ) )
+            {
+            // InternalProblem.g:517:2: ( ( rule__ConstantAssertionArgument__ConstantAssignment ) )
+            // InternalProblem.g:518:3: ( rule__ConstantAssertionArgument__ConstantAssignment )
+            {
+             before(grammarAccess.getConstantAssertionArgumentAccess().getConstantAssignment()); 
+            // InternalProblem.g:519:3: ( rule__ConstantAssertionArgument__ConstantAssignment )
+            // InternalProblem.g:519:4: rule__ConstantAssertionArgument__ConstantAssignment
+            {
+            pushFollow(FOLLOW_2);
+            rule__ConstantAssertionArgument__ConstantAssignment();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getConstantAssertionArgumentAccess().getConstantAssignment()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleConstantAssertionArgument"
+
+
+    // $ANTLR start "entryRuleNodeValueAssertion"
+    // InternalProblem.g:528:1: entryRuleNodeValueAssertion : ruleNodeValueAssertion EOF ;
+    public final void entryRuleNodeValueAssertion() throws RecognitionException {
+        try {
+            // InternalProblem.g:529:1: ( ruleNodeValueAssertion EOF )
+            // InternalProblem.g:530:1: ruleNodeValueAssertion EOF
+            {
+             before(grammarAccess.getNodeValueAssertionRule()); 
+            pushFollow(FOLLOW_1);
+            ruleNodeValueAssertion();
+
+            state._fsp--;
+
+             after(grammarAccess.getNodeValueAssertionRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleNodeValueAssertion"
+
+
+    // $ANTLR start "ruleNodeValueAssertion"
+    // InternalProblem.g:537:1: ruleNodeValueAssertion : ( ( rule__NodeValueAssertion__Group__0 ) ) ;
+    public final void ruleNodeValueAssertion() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:541:2: ( ( ( rule__NodeValueAssertion__Group__0 ) ) )
+            // InternalProblem.g:542:2: ( ( rule__NodeValueAssertion__Group__0 ) )
+            {
+            // InternalProblem.g:542:2: ( ( rule__NodeValueAssertion__Group__0 ) )
+            // InternalProblem.g:543:3: ( rule__NodeValueAssertion__Group__0 )
+            {
+             before(grammarAccess.getNodeValueAssertionAccess().getGroup()); 
+            // InternalProblem.g:544:3: ( rule__NodeValueAssertion__Group__0 )
+            // InternalProblem.g:544:4: rule__NodeValueAssertion__Group__0
+            {
+            pushFollow(FOLLOW_2);
+            rule__NodeValueAssertion__Group__0();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getNodeValueAssertionAccess().getGroup()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleNodeValueAssertion"
+
+
+    // $ANTLR start "entryRuleConstant"
+    // InternalProblem.g:553:1: entryRuleConstant : ruleConstant EOF ;
+    public final void entryRuleConstant() throws RecognitionException {
+        try {
+            // InternalProblem.g:554:1: ( ruleConstant EOF )
+            // InternalProblem.g:555:1: ruleConstant EOF
+            {
+             before(grammarAccess.getConstantRule()); 
+            pushFollow(FOLLOW_1);
+            ruleConstant();
+
+            state._fsp--;
+
+             after(grammarAccess.getConstantRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleConstant"
+
+
+    // $ANTLR start "ruleConstant"
+    // InternalProblem.g:562:1: ruleConstant : ( ( rule__Constant__Alternatives ) ) ;
+    public final void ruleConstant() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:566:2: ( ( ( rule__Constant__Alternatives ) ) )
+            // InternalProblem.g:567:2: ( ( rule__Constant__Alternatives ) )
+            {
+            // InternalProblem.g:567:2: ( ( rule__Constant__Alternatives ) )
+            // InternalProblem.g:568:3: ( rule__Constant__Alternatives )
+            {
+             before(grammarAccess.getConstantAccess().getAlternatives()); 
+            // InternalProblem.g:569:3: ( rule__Constant__Alternatives )
+            // InternalProblem.g:569:4: rule__Constant__Alternatives
+            {
+            pushFollow(FOLLOW_2);
+            rule__Constant__Alternatives();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getConstantAccess().getAlternatives()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleConstant"
+
+
+    // $ANTLR start "entryRuleIntConstant"
+    // InternalProblem.g:578:1: entryRuleIntConstant : ruleIntConstant EOF ;
+    public final void entryRuleIntConstant() throws RecognitionException {
+        try {
+            // InternalProblem.g:579:1: ( ruleIntConstant EOF )
+            // InternalProblem.g:580:1: ruleIntConstant EOF
+            {
+             before(grammarAccess.getIntConstantRule()); 
+            pushFollow(FOLLOW_1);
+            ruleIntConstant();
+
+            state._fsp--;
+
+             after(grammarAccess.getIntConstantRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleIntConstant"
+
+
+    // $ANTLR start "ruleIntConstant"
+    // InternalProblem.g:587:1: ruleIntConstant : ( ( rule__IntConstant__IntValueAssignment ) ) ;
+    public final void ruleIntConstant() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:591:2: ( ( ( rule__IntConstant__IntValueAssignment ) ) )
+            // InternalProblem.g:592:2: ( ( rule__IntConstant__IntValueAssignment ) )
+            {
+            // InternalProblem.g:592:2: ( ( rule__IntConstant__IntValueAssignment ) )
+            // InternalProblem.g:593:3: ( rule__IntConstant__IntValueAssignment )
+            {
+             before(grammarAccess.getIntConstantAccess().getIntValueAssignment()); 
+            // InternalProblem.g:594:3: ( rule__IntConstant__IntValueAssignment )
+            // InternalProblem.g:594:4: rule__IntConstant__IntValueAssignment
+            {
+            pushFollow(FOLLOW_2);
+            rule__IntConstant__IntValueAssignment();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getIntConstantAccess().getIntValueAssignment()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleIntConstant"
+
+
+    // $ANTLR start "entryRuleRealConstant"
+    // InternalProblem.g:603:1: entryRuleRealConstant : ruleRealConstant EOF ;
+    public final void entryRuleRealConstant() throws RecognitionException {
+        try {
+            // InternalProblem.g:604:1: ( ruleRealConstant EOF )
+            // InternalProblem.g:605:1: ruleRealConstant EOF
+            {
+             before(grammarAccess.getRealConstantRule()); 
+            pushFollow(FOLLOW_1);
+            ruleRealConstant();
+
+            state._fsp--;
+
+             after(grammarAccess.getRealConstantRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleRealConstant"
+
+
+    // $ANTLR start "ruleRealConstant"
+    // InternalProblem.g:612:1: ruleRealConstant : ( ( rule__RealConstant__RealValueAssignment ) ) ;
+    public final void ruleRealConstant() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:616:2: ( ( ( rule__RealConstant__RealValueAssignment ) ) )
+            // InternalProblem.g:617:2: ( ( rule__RealConstant__RealValueAssignment ) )
+            {
+            // InternalProblem.g:617:2: ( ( rule__RealConstant__RealValueAssignment ) )
+            // InternalProblem.g:618:3: ( rule__RealConstant__RealValueAssignment )
+            {
+             before(grammarAccess.getRealConstantAccess().getRealValueAssignment()); 
+            // InternalProblem.g:619:3: ( rule__RealConstant__RealValueAssignment )
+            // InternalProblem.g:619:4: rule__RealConstant__RealValueAssignment
+            {
+            pushFollow(FOLLOW_2);
+            rule__RealConstant__RealValueAssignment();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getRealConstantAccess().getRealValueAssignment()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleRealConstant"
+
+
+    // $ANTLR start "entryRuleStringConstant"
+    // InternalProblem.g:628:1: entryRuleStringConstant : ruleStringConstant EOF ;
+    public final void entryRuleStringConstant() throws RecognitionException {
+        try {
+            // InternalProblem.g:629:1: ( ruleStringConstant EOF )
+            // InternalProblem.g:630:1: ruleStringConstant EOF
+            {
+             before(grammarAccess.getStringConstantRule()); 
+            pushFollow(FOLLOW_1);
+            ruleStringConstant();
+
+            state._fsp--;
+
+             after(grammarAccess.getStringConstantRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleStringConstant"
+
+
+    // $ANTLR start "ruleStringConstant"
+    // InternalProblem.g:637:1: ruleStringConstant : ( ( rule__StringConstant__StringValueAssignment ) ) ;
+    public final void ruleStringConstant() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:641:2: ( ( ( rule__StringConstant__StringValueAssignment ) ) )
+            // InternalProblem.g:642:2: ( ( rule__StringConstant__StringValueAssignment ) )
+            {
+            // InternalProblem.g:642:2: ( ( rule__StringConstant__StringValueAssignment ) )
+            // InternalProblem.g:643:3: ( rule__StringConstant__StringValueAssignment )
+            {
+             before(grammarAccess.getStringConstantAccess().getStringValueAssignment()); 
+            // InternalProblem.g:644:3: ( rule__StringConstant__StringValueAssignment )
+            // InternalProblem.g:644:4: rule__StringConstant__StringValueAssignment
+            {
+            pushFollow(FOLLOW_2);
+            rule__StringConstant__StringValueAssignment();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getStringConstantAccess().getStringValueAssignment()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleStringConstant"
+
+
     // $ANTLR start "entryRuleScopeDeclaration"
-    // InternalProblem.g:403:1: entryRuleScopeDeclaration : ruleScopeDeclaration EOF ;
+    // InternalProblem.g:653:1: entryRuleScopeDeclaration : ruleScopeDeclaration EOF ;
     public final void entryRuleScopeDeclaration() throws RecognitionException {
         try {
-            // InternalProblem.g:404:1: ( ruleScopeDeclaration EOF )
-            // InternalProblem.g:405:1: ruleScopeDeclaration EOF
+            // InternalProblem.g:654:1: ( ruleScopeDeclaration EOF )
+            // InternalProblem.g:655:1: ruleScopeDeclaration EOF
             {
              before(grammarAccess.getScopeDeclarationRule()); 
             pushFollow(FOLLOW_1);
@@ -1211,21 +1984,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleScopeDeclaration"
-    // InternalProblem.g:412:1: ruleScopeDeclaration : ( ( rule__ScopeDeclaration__Group__0 ) ) ;
+    // InternalProblem.g:662:1: ruleScopeDeclaration : ( ( rule__ScopeDeclaration__Group__0 ) ) ;
     public final void ruleScopeDeclaration() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:416:2: ( ( ( rule__ScopeDeclaration__Group__0 ) ) )
-            // InternalProblem.g:417:2: ( ( rule__ScopeDeclaration__Group__0 ) )
+            // InternalProblem.g:666:2: ( ( ( rule__ScopeDeclaration__Group__0 ) ) )
+            // InternalProblem.g:667:2: ( ( rule__ScopeDeclaration__Group__0 ) )
             {
-            // InternalProblem.g:417:2: ( ( rule__ScopeDeclaration__Group__0 ) )
-            // InternalProblem.g:418:3: ( rule__ScopeDeclaration__Group__0 )
+            // InternalProblem.g:667:2: ( ( rule__ScopeDeclaration__Group__0 ) )
+            // InternalProblem.g:668:3: ( rule__ScopeDeclaration__Group__0 )
             {
              before(grammarAccess.getScopeDeclarationAccess().getGroup()); 
-            // InternalProblem.g:419:3: ( rule__ScopeDeclaration__Group__0 )
-            // InternalProblem.g:419:4: rule__ScopeDeclaration__Group__0
+            // InternalProblem.g:669:3: ( rule__ScopeDeclaration__Group__0 )
+            // InternalProblem.g:669:4: rule__ScopeDeclaration__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__ScopeDeclaration__Group__0();
@@ -1258,11 +2031,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTypeScope"
-    // InternalProblem.g:428:1: entryRuleTypeScope : ruleTypeScope EOF ;
+    // InternalProblem.g:678:1: entryRuleTypeScope : ruleTypeScope EOF ;
     public final void entryRuleTypeScope() throws RecognitionException {
         try {
-            // InternalProblem.g:429:1: ( ruleTypeScope EOF )
-            // InternalProblem.g:430:1: ruleTypeScope EOF
+            // InternalProblem.g:679:1: ( ruleTypeScope EOF )
+            // InternalProblem.g:680:1: ruleTypeScope EOF
             {
              before(grammarAccess.getTypeScopeRule()); 
             pushFollow(FOLLOW_1);
@@ -1288,21 +2061,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTypeScope"
-    // InternalProblem.g:437:1: ruleTypeScope : ( ( rule__TypeScope__Group__0 ) ) ;
+    // InternalProblem.g:687:1: ruleTypeScope : ( ( rule__TypeScope__Group__0 ) ) ;
     public final void ruleTypeScope() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:441:2: ( ( ( rule__TypeScope__Group__0 ) ) )
-            // InternalProblem.g:442:2: ( ( rule__TypeScope__Group__0 ) )
+            // InternalProblem.g:691:2: ( ( ( rule__TypeScope__Group__0 ) ) )
+            // InternalProblem.g:692:2: ( ( rule__TypeScope__Group__0 ) )
             {
-            // InternalProblem.g:442:2: ( ( rule__TypeScope__Group__0 ) )
-            // InternalProblem.g:443:3: ( rule__TypeScope__Group__0 )
+            // InternalProblem.g:692:2: ( ( rule__TypeScope__Group__0 ) )
+            // InternalProblem.g:693:3: ( rule__TypeScope__Group__0 )
             {
              before(grammarAccess.getTypeScopeAccess().getGroup()); 
-            // InternalProblem.g:444:3: ( rule__TypeScope__Group__0 )
-            // InternalProblem.g:444:4: rule__TypeScope__Group__0
+            // InternalProblem.g:694:3: ( rule__TypeScope__Group__0 )
+            // InternalProblem.g:694:4: rule__TypeScope__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TypeScope__Group__0();
@@ -1335,11 +2108,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleMultiplicity"
-    // InternalProblem.g:453:1: entryRuleMultiplicity : ruleMultiplicity EOF ;
+    // InternalProblem.g:703:1: entryRuleMultiplicity : ruleMultiplicity EOF ;
     public final void entryRuleMultiplicity() throws RecognitionException {
         try {
-            // InternalProblem.g:454:1: ( ruleMultiplicity EOF )
-            // InternalProblem.g:455:1: ruleMultiplicity EOF
+            // InternalProblem.g:704:1: ( ruleMultiplicity EOF )
+            // InternalProblem.g:705:1: ruleMultiplicity EOF
             {
              before(grammarAccess.getMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -1365,21 +2138,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleMultiplicity"
-    // InternalProblem.g:462:1: ruleMultiplicity : ( ( rule__Multiplicity__Alternatives ) ) ;
+    // InternalProblem.g:712:1: ruleMultiplicity : ( ( rule__Multiplicity__Alternatives ) ) ;
     public final void ruleMultiplicity() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:466:2: ( ( ( rule__Multiplicity__Alternatives ) ) )
-            // InternalProblem.g:467:2: ( ( rule__Multiplicity__Alternatives ) )
+            // InternalProblem.g:716:2: ( ( ( rule__Multiplicity__Alternatives ) ) )
+            // InternalProblem.g:717:2: ( ( rule__Multiplicity__Alternatives ) )
             {
-            // InternalProblem.g:467:2: ( ( rule__Multiplicity__Alternatives ) )
-            // InternalProblem.g:468:3: ( rule__Multiplicity__Alternatives )
+            // InternalProblem.g:717:2: ( ( rule__Multiplicity__Alternatives ) )
+            // InternalProblem.g:718:3: ( rule__Multiplicity__Alternatives )
             {
              before(grammarAccess.getMultiplicityAccess().getAlternatives()); 
-            // InternalProblem.g:469:3: ( rule__Multiplicity__Alternatives )
-            // InternalProblem.g:469:4: rule__Multiplicity__Alternatives
+            // InternalProblem.g:719:3: ( rule__Multiplicity__Alternatives )
+            // InternalProblem.g:719:4: rule__Multiplicity__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__Multiplicity__Alternatives();
@@ -1412,11 +2185,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleDefiniteMultiplicity"
-    // InternalProblem.g:478:1: entryRuleDefiniteMultiplicity : ruleDefiniteMultiplicity EOF ;
+    // InternalProblem.g:728:1: entryRuleDefiniteMultiplicity : ruleDefiniteMultiplicity EOF ;
     public final void entryRuleDefiniteMultiplicity() throws RecognitionException {
         try {
-            // InternalProblem.g:479:1: ( ruleDefiniteMultiplicity EOF )
-            // InternalProblem.g:480:1: ruleDefiniteMultiplicity EOF
+            // InternalProblem.g:729:1: ( ruleDefiniteMultiplicity EOF )
+            // InternalProblem.g:730:1: ruleDefiniteMultiplicity EOF
             {
              before(grammarAccess.getDefiniteMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -1442,21 +2215,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleDefiniteMultiplicity"
-    // InternalProblem.g:487:1: ruleDefiniteMultiplicity : ( ( rule__DefiniteMultiplicity__Alternatives ) ) ;
+    // InternalProblem.g:737:1: ruleDefiniteMultiplicity : ( ( rule__DefiniteMultiplicity__Alternatives ) ) ;
     public final void ruleDefiniteMultiplicity() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:491:2: ( ( ( rule__DefiniteMultiplicity__Alternatives ) ) )
-            // InternalProblem.g:492:2: ( ( rule__DefiniteMultiplicity__Alternatives ) )
+            // InternalProblem.g:741:2: ( ( ( rule__DefiniteMultiplicity__Alternatives ) ) )
+            // InternalProblem.g:742:2: ( ( rule__DefiniteMultiplicity__Alternatives ) )
             {
-            // InternalProblem.g:492:2: ( ( rule__DefiniteMultiplicity__Alternatives ) )
-            // InternalProblem.g:493:3: ( rule__DefiniteMultiplicity__Alternatives )
+            // InternalProblem.g:742:2: ( ( rule__DefiniteMultiplicity__Alternatives ) )
+            // InternalProblem.g:743:3: ( rule__DefiniteMultiplicity__Alternatives )
             {
              before(grammarAccess.getDefiniteMultiplicityAccess().getAlternatives()); 
-            // InternalProblem.g:494:3: ( rule__DefiniteMultiplicity__Alternatives )
-            // InternalProblem.g:494:4: rule__DefiniteMultiplicity__Alternatives
+            // InternalProblem.g:744:3: ( rule__DefiniteMultiplicity__Alternatives )
+            // InternalProblem.g:744:4: rule__DefiniteMultiplicity__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__DefiniteMultiplicity__Alternatives();
@@ -1489,11 +2262,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleUnboundedMultiplicity"
-    // InternalProblem.g:503:1: entryRuleUnboundedMultiplicity : ruleUnboundedMultiplicity EOF ;
+    // InternalProblem.g:753:1: entryRuleUnboundedMultiplicity : ruleUnboundedMultiplicity EOF ;
     public final void entryRuleUnboundedMultiplicity() throws RecognitionException {
         try {
-            // InternalProblem.g:504:1: ( ruleUnboundedMultiplicity EOF )
-            // InternalProblem.g:505:1: ruleUnboundedMultiplicity EOF
+            // InternalProblem.g:754:1: ( ruleUnboundedMultiplicity EOF )
+            // InternalProblem.g:755:1: ruleUnboundedMultiplicity EOF
             {
              before(grammarAccess.getUnboundedMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -1519,21 +2292,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleUnboundedMultiplicity"
-    // InternalProblem.g:512:1: ruleUnboundedMultiplicity : ( () ) ;
+    // InternalProblem.g:762:1: ruleUnboundedMultiplicity : ( () ) ;
     public final void ruleUnboundedMultiplicity() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:516:2: ( ( () ) )
-            // InternalProblem.g:517:2: ( () )
+            // InternalProblem.g:766:2: ( ( () ) )
+            // InternalProblem.g:767:2: ( () )
             {
-            // InternalProblem.g:517:2: ( () )
-            // InternalProblem.g:518:3: ()
+            // InternalProblem.g:767:2: ( () )
+            // InternalProblem.g:768:3: ()
             {
              before(grammarAccess.getUnboundedMultiplicityAccess().getUnboundedMultiplicityAction()); 
-            // InternalProblem.g:519:3: ()
-            // InternalProblem.g:519:4: 
+            // InternalProblem.g:769:3: ()
+            // InternalProblem.g:769:4: 
             {
             }
 
@@ -1556,11 +2329,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleRangeMultiplicity"
-    // InternalProblem.g:528:1: entryRuleRangeMultiplicity : ruleRangeMultiplicity EOF ;
+    // InternalProblem.g:778:1: entryRuleRangeMultiplicity : ruleRangeMultiplicity EOF ;
     public final void entryRuleRangeMultiplicity() throws RecognitionException {
         try {
-            // InternalProblem.g:529:1: ( ruleRangeMultiplicity EOF )
-            // InternalProblem.g:530:1: ruleRangeMultiplicity EOF
+            // InternalProblem.g:779:1: ( ruleRangeMultiplicity EOF )
+            // InternalProblem.g:780:1: ruleRangeMultiplicity EOF
             {
              before(grammarAccess.getRangeMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -1586,21 +2359,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRangeMultiplicity"
-    // InternalProblem.g:537:1: ruleRangeMultiplicity : ( ( rule__RangeMultiplicity__Group__0 ) ) ;
+    // InternalProblem.g:787:1: ruleRangeMultiplicity : ( ( rule__RangeMultiplicity__Group__0 ) ) ;
     public final void ruleRangeMultiplicity() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:541:2: ( ( ( rule__RangeMultiplicity__Group__0 ) ) )
-            // InternalProblem.g:542:2: ( ( rule__RangeMultiplicity__Group__0 ) )
+            // InternalProblem.g:791:2: ( ( ( rule__RangeMultiplicity__Group__0 ) ) )
+            // InternalProblem.g:792:2: ( ( rule__RangeMultiplicity__Group__0 ) )
             {
-            // InternalProblem.g:542:2: ( ( rule__RangeMultiplicity__Group__0 ) )
-            // InternalProblem.g:543:3: ( rule__RangeMultiplicity__Group__0 )
+            // InternalProblem.g:792:2: ( ( rule__RangeMultiplicity__Group__0 ) )
+            // InternalProblem.g:793:3: ( rule__RangeMultiplicity__Group__0 )
             {
              before(grammarAccess.getRangeMultiplicityAccess().getGroup()); 
-            // InternalProblem.g:544:3: ( rule__RangeMultiplicity__Group__0 )
-            // InternalProblem.g:544:4: rule__RangeMultiplicity__Group__0
+            // InternalProblem.g:794:3: ( rule__RangeMultiplicity__Group__0 )
+            // InternalProblem.g:794:4: rule__RangeMultiplicity__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__RangeMultiplicity__Group__0();
@@ -1633,11 +2406,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleExactMultiplicity"
-    // InternalProblem.g:553:1: entryRuleExactMultiplicity : ruleExactMultiplicity EOF ;
+    // InternalProblem.g:803:1: entryRuleExactMultiplicity : ruleExactMultiplicity EOF ;
     public final void entryRuleExactMultiplicity() throws RecognitionException {
         try {
-            // InternalProblem.g:554:1: ( ruleExactMultiplicity EOF )
-            // InternalProblem.g:555:1: ruleExactMultiplicity EOF
+            // InternalProblem.g:804:1: ( ruleExactMultiplicity EOF )
+            // InternalProblem.g:805:1: ruleExactMultiplicity EOF
             {
              before(grammarAccess.getExactMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -1663,21 +2436,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleExactMultiplicity"
-    // InternalProblem.g:562:1: ruleExactMultiplicity : ( ( rule__ExactMultiplicity__ExactValueAssignment ) ) ;
+    // InternalProblem.g:812:1: ruleExactMultiplicity : ( ( rule__ExactMultiplicity__ExactValueAssignment ) ) ;
     public final void ruleExactMultiplicity() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:566:2: ( ( ( rule__ExactMultiplicity__ExactValueAssignment ) ) )
-            // InternalProblem.g:567:2: ( ( rule__ExactMultiplicity__ExactValueAssignment ) )
+            // InternalProblem.g:816:2: ( ( ( rule__ExactMultiplicity__ExactValueAssignment ) ) )
+            // InternalProblem.g:817:2: ( ( rule__ExactMultiplicity__ExactValueAssignment ) )
             {
-            // InternalProblem.g:567:2: ( ( rule__ExactMultiplicity__ExactValueAssignment ) )
-            // InternalProblem.g:568:3: ( rule__ExactMultiplicity__ExactValueAssignment )
+            // InternalProblem.g:817:2: ( ( rule__ExactMultiplicity__ExactValueAssignment ) )
+            // InternalProblem.g:818:3: ( rule__ExactMultiplicity__ExactValueAssignment )
             {
              before(grammarAccess.getExactMultiplicityAccess().getExactValueAssignment()); 
-            // InternalProblem.g:569:3: ( rule__ExactMultiplicity__ExactValueAssignment )
-            // InternalProblem.g:569:4: rule__ExactMultiplicity__ExactValueAssignment
+            // InternalProblem.g:819:3: ( rule__ExactMultiplicity__ExactValueAssignment )
+            // InternalProblem.g:819:4: rule__ExactMultiplicity__ExactValueAssignment
             {
             pushFollow(FOLLOW_2);
             rule__ExactMultiplicity__ExactValueAssignment();
@@ -1710,11 +2483,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleUpperBound"
-    // InternalProblem.g:578:1: entryRuleUpperBound : ruleUpperBound EOF ;
+    // InternalProblem.g:828:1: entryRuleUpperBound : ruleUpperBound EOF ;
     public final void entryRuleUpperBound() throws RecognitionException {
         try {
-            // InternalProblem.g:579:1: ( ruleUpperBound EOF )
-            // InternalProblem.g:580:1: ruleUpperBound EOF
+            // InternalProblem.g:829:1: ( ruleUpperBound EOF )
+            // InternalProblem.g:830:1: ruleUpperBound EOF
             {
              before(grammarAccess.getUpperBoundRule()); 
             pushFollow(FOLLOW_1);
@@ -1740,21 +2513,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleUpperBound"
-    // InternalProblem.g:587:1: ruleUpperBound : ( ( rule__UpperBound__Alternatives ) ) ;
+    // InternalProblem.g:837:1: ruleUpperBound : ( ( rule__UpperBound__Alternatives ) ) ;
     public final void ruleUpperBound() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:591:2: ( ( ( rule__UpperBound__Alternatives ) ) )
-            // InternalProblem.g:592:2: ( ( rule__UpperBound__Alternatives ) )
+            // InternalProblem.g:841:2: ( ( ( rule__UpperBound__Alternatives ) ) )
+            // InternalProblem.g:842:2: ( ( rule__UpperBound__Alternatives ) )
             {
-            // InternalProblem.g:592:2: ( ( rule__UpperBound__Alternatives ) )
-            // InternalProblem.g:593:3: ( rule__UpperBound__Alternatives )
+            // InternalProblem.g:842:2: ( ( rule__UpperBound__Alternatives ) )
+            // InternalProblem.g:843:3: ( rule__UpperBound__Alternatives )
             {
              before(grammarAccess.getUpperBoundAccess().getAlternatives()); 
-            // InternalProblem.g:594:3: ( rule__UpperBound__Alternatives )
-            // InternalProblem.g:594:4: rule__UpperBound__Alternatives
+            // InternalProblem.g:844:3: ( rule__UpperBound__Alternatives )
+            // InternalProblem.g:844:4: rule__UpperBound__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__UpperBound__Alternatives();
@@ -1787,11 +2560,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleQuotedOrUnquotedId"
-    // InternalProblem.g:603:1: entryRuleQuotedOrUnquotedId : ruleQuotedOrUnquotedId EOF ;
+    // InternalProblem.g:853:1: entryRuleQuotedOrUnquotedId : ruleQuotedOrUnquotedId EOF ;
     public final void entryRuleQuotedOrUnquotedId() throws RecognitionException {
         try {
-            // InternalProblem.g:604:1: ( ruleQuotedOrUnquotedId EOF )
-            // InternalProblem.g:605:1: ruleQuotedOrUnquotedId EOF
+            // InternalProblem.g:854:1: ( ruleQuotedOrUnquotedId EOF )
+            // InternalProblem.g:855:1: ruleQuotedOrUnquotedId EOF
             {
              before(grammarAccess.getQuotedOrUnquotedIdRule()); 
             pushFollow(FOLLOW_1);
@@ -1817,21 +2590,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleQuotedOrUnquotedId"
-    // InternalProblem.g:612:1: ruleQuotedOrUnquotedId : ( ( rule__QuotedOrUnquotedId__Alternatives ) ) ;
+    // InternalProblem.g:862: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:866:2: ( ( ( rule__QuotedOrUnquotedId__Alternatives ) ) )
+            // InternalProblem.g:867:2: ( ( rule__QuotedOrUnquotedId__Alternatives ) )
             {
-            // InternalProblem.g:617:2: ( ( rule__QuotedOrUnquotedId__Alternatives ) )
-            // InternalProblem.g:618:3: ( rule__QuotedOrUnquotedId__Alternatives )
+            // InternalProblem.g:867:2: ( ( rule__QuotedOrUnquotedId__Alternatives ) )
+            // InternalProblem.g:868:3: ( rule__QuotedOrUnquotedId__Alternatives )
             {
              before(grammarAccess.getQuotedOrUnquotedIdAccess().getAlternatives()); 
-            // InternalProblem.g:619:3: ( rule__QuotedOrUnquotedId__Alternatives )
-            // InternalProblem.g:619:4: rule__QuotedOrUnquotedId__Alternatives
+            // InternalProblem.g:869:3: ( rule__QuotedOrUnquotedId__Alternatives )
+            // InternalProblem.g:869:4: rule__QuotedOrUnquotedId__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__QuotedOrUnquotedId__Alternatives();
@@ -1864,11 +2637,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleQualifiedName"
-    // InternalProblem.g:628:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
+    // InternalProblem.g:878:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
     public final void entryRuleQualifiedName() throws RecognitionException {
+         
+                HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+
         try {
-            // InternalProblem.g:629:1: ( ruleQualifiedName EOF )
-            // InternalProblem.g:630:1: ruleQualifiedName EOF
+            // InternalProblem.g:882:1: ( ruleQualifiedName EOF )
+            // InternalProblem.g:883:1: ruleQualifiedName EOF
             {
              before(grammarAccess.getQualifiedNameRule()); 
             pushFollow(FOLLOW_1);
@@ -1887,6 +2663,9 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
             recover(input,re);
         }
         finally {
+
+                myHiddenTokenState.restore();
+
         }
         return ;
     }
@@ -1894,21 +2673,22 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // InternalProblem.g:637:1: ruleQualifiedName : ( ( rule__QualifiedName__Alternatives ) ) ;
+    // InternalProblem.g:893:1: ruleQualifiedName : ( ( rule__QualifiedName__Alternatives ) ) ;
     public final void ruleQualifiedName() throws RecognitionException {
 
+                        HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:641:2: ( ( ( rule__QualifiedName__Alternatives ) ) )
-            // InternalProblem.g:642:2: ( ( rule__QualifiedName__Alternatives ) )
+            // InternalProblem.g:898:2: ( ( ( rule__QualifiedName__Alternatives ) ) )
+            // InternalProblem.g:899:2: ( ( rule__QualifiedName__Alternatives ) )
             {
-            // InternalProblem.g:642:2: ( ( rule__QualifiedName__Alternatives ) )
-            // InternalProblem.g:643:3: ( rule__QualifiedName__Alternatives )
+            // InternalProblem.g:899:2: ( ( rule__QualifiedName__Alternatives ) )
+            // InternalProblem.g:900:3: ( rule__QualifiedName__Alternatives )
             {
              before(grammarAccess.getQualifiedNameAccess().getAlternatives()); 
-            // InternalProblem.g:644:3: ( rule__QualifiedName__Alternatives )
-            // InternalProblem.g:644:4: rule__QualifiedName__Alternatives
+            // InternalProblem.g:901:3: ( rule__QualifiedName__Alternatives )
+            // InternalProblem.g:901:4: rule__QualifiedName__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedName__Alternatives();
@@ -1933,6 +2713,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         finally {
 
                 restoreStackSize(stackSize);
+                myHiddenTokenState.restore();
 
         }
         return ;
@@ -1941,11 +2722,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleIdentifier"
-    // InternalProblem.g:653:1: entryRuleIdentifier : ruleIdentifier EOF ;
+    // InternalProblem.g:911:1: entryRuleIdentifier : ruleIdentifier EOF ;
     public final void entryRuleIdentifier() throws RecognitionException {
         try {
-            // InternalProblem.g:654:1: ( ruleIdentifier EOF )
-            // InternalProblem.g:655:1: ruleIdentifier EOF
+            // InternalProblem.g:912:1: ( ruleIdentifier EOF )
+            // InternalProblem.g:913:1: ruleIdentifier EOF
             {
              before(grammarAccess.getIdentifierRule()); 
             pushFollow(FOLLOW_1);
@@ -1971,21 +2752,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleIdentifier"
-    // InternalProblem.g:662:1: ruleIdentifier : ( ( rule__Identifier__Alternatives ) ) ;
+    // InternalProblem.g:920: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:924:2: ( ( ( rule__Identifier__Alternatives ) ) )
+            // InternalProblem.g:925:2: ( ( rule__Identifier__Alternatives ) )
             {
-            // InternalProblem.g:667:2: ( ( rule__Identifier__Alternatives ) )
-            // InternalProblem.g:668:3: ( rule__Identifier__Alternatives )
+            // InternalProblem.g:925:2: ( ( rule__Identifier__Alternatives ) )
+            // InternalProblem.g:926:3: ( rule__Identifier__Alternatives )
             {
              before(grammarAccess.getIdentifierAccess().getAlternatives()); 
-            // InternalProblem.g:669:3: ( rule__Identifier__Alternatives )
-            // InternalProblem.g:669:4: rule__Identifier__Alternatives
+            // InternalProblem.g:927:3: ( rule__Identifier__Alternatives )
+            // InternalProblem.g:927:4: rule__Identifier__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__Identifier__Alternatives();
@@ -2017,22 +2798,192 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "ruleIdentifier"
 
 
+    // $ANTLR start "entryRuleInteger"
+    // InternalProblem.g:936:1: entryRuleInteger : ruleInteger EOF ;
+    public final void entryRuleInteger() throws RecognitionException {
+         
+                HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+
+        try {
+            // InternalProblem.g:940:1: ( ruleInteger EOF )
+            // InternalProblem.g:941:1: ruleInteger EOF
+            {
+             before(grammarAccess.getIntegerRule()); 
+            pushFollow(FOLLOW_1);
+            ruleInteger();
+
+            state._fsp--;
+
+             after(grammarAccess.getIntegerRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                myHiddenTokenState.restore();
+
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleInteger"
+
+
+    // $ANTLR start "ruleInteger"
+    // InternalProblem.g:951:1: ruleInteger : ( ( rule__Integer__Group__0 ) ) ;
+    public final void ruleInteger() throws RecognitionException {
+
+                        HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:956:2: ( ( ( rule__Integer__Group__0 ) ) )
+            // InternalProblem.g:957:2: ( ( rule__Integer__Group__0 ) )
+            {
+            // InternalProblem.g:957:2: ( ( rule__Integer__Group__0 ) )
+            // InternalProblem.g:958:3: ( rule__Integer__Group__0 )
+            {
+             before(grammarAccess.getIntegerAccess().getGroup()); 
+            // InternalProblem.g:959:3: ( rule__Integer__Group__0 )
+            // InternalProblem.g:959:4: rule__Integer__Group__0
+            {
+            pushFollow(FOLLOW_2);
+            rule__Integer__Group__0();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getIntegerAccess().getGroup()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+                myHiddenTokenState.restore();
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleInteger"
+
+
+    // $ANTLR start "entryRuleReal"
+    // InternalProblem.g:969:1: entryRuleReal : ruleReal EOF ;
+    public final void entryRuleReal() throws RecognitionException {
+         
+                HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+
+        try {
+            // InternalProblem.g:973:1: ( ruleReal EOF )
+            // InternalProblem.g:974:1: ruleReal EOF
+            {
+             before(grammarAccess.getRealRule()); 
+            pushFollow(FOLLOW_1);
+            ruleReal();
+
+            state._fsp--;
+
+             after(grammarAccess.getRealRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                myHiddenTokenState.restore();
+
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleReal"
+
+
+    // $ANTLR start "ruleReal"
+    // InternalProblem.g:984:1: ruleReal : ( ( rule__Real__Group__0 ) ) ;
+    public final void ruleReal() throws RecognitionException {
+
+                        HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:989:2: ( ( ( rule__Real__Group__0 ) ) )
+            // InternalProblem.g:990:2: ( ( rule__Real__Group__0 ) )
+            {
+            // InternalProblem.g:990:2: ( ( rule__Real__Group__0 ) )
+            // InternalProblem.g:991:3: ( rule__Real__Group__0 )
+            {
+             before(grammarAccess.getRealAccess().getGroup()); 
+            // InternalProblem.g:992:3: ( rule__Real__Group__0 )
+            // InternalProblem.g:992:4: rule__Real__Group__0
+            {
+            pushFollow(FOLLOW_2);
+            rule__Real__Group__0();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getRealAccess().getGroup()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+                myHiddenTokenState.restore();
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleReal"
+
+
     // $ANTLR start "ruleLogicValue"
-    // InternalProblem.g:678:1: ruleLogicValue : ( ( rule__LogicValue__Alternatives ) ) ;
+    // InternalProblem.g:1002:1: ruleLogicValue : ( ( rule__LogicValue__Alternatives ) ) ;
     public final void ruleLogicValue() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:682:1: ( ( ( rule__LogicValue__Alternatives ) ) )
-            // InternalProblem.g:683:2: ( ( rule__LogicValue__Alternatives ) )
+            // InternalProblem.g:1006:1: ( ( ( rule__LogicValue__Alternatives ) ) )
+            // InternalProblem.g:1007:2: ( ( rule__LogicValue__Alternatives ) )
             {
-            // InternalProblem.g:683:2: ( ( rule__LogicValue__Alternatives ) )
-            // InternalProblem.g:684:3: ( rule__LogicValue__Alternatives )
+            // InternalProblem.g:1007:2: ( ( rule__LogicValue__Alternatives ) )
+            // InternalProblem.g:1008:3: ( rule__LogicValue__Alternatives )
             {
              before(grammarAccess.getLogicValueAccess().getAlternatives()); 
-            // InternalProblem.g:685:3: ( rule__LogicValue__Alternatives )
-            // InternalProblem.g:685:4: rule__LogicValue__Alternatives
+            // InternalProblem.g:1009:3: ( rule__LogicValue__Alternatives )
+            // InternalProblem.g:1009:4: rule__LogicValue__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__LogicValue__Alternatives();
@@ -2065,21 +3016,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleShortLogicValue"
-    // InternalProblem.g:694:1: ruleShortLogicValue : ( ( rule__ShortLogicValue__Alternatives ) ) ;
+    // InternalProblem.g:1018:1: ruleShortLogicValue : ( ( rule__ShortLogicValue__Alternatives ) ) ;
     public final void ruleShortLogicValue() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:698:1: ( ( ( rule__ShortLogicValue__Alternatives ) ) )
-            // InternalProblem.g:699:2: ( ( rule__ShortLogicValue__Alternatives ) )
+            // InternalProblem.g:1022:1: ( ( ( rule__ShortLogicValue__Alternatives ) ) )
+            // InternalProblem.g:1023:2: ( ( rule__ShortLogicValue__Alternatives ) )
             {
-            // InternalProblem.g:699:2: ( ( rule__ShortLogicValue__Alternatives ) )
-            // InternalProblem.g:700:3: ( rule__ShortLogicValue__Alternatives )
+            // InternalProblem.g:1023:2: ( ( rule__ShortLogicValue__Alternatives ) )
+            // InternalProblem.g:1024:3: ( rule__ShortLogicValue__Alternatives )
             {
              before(grammarAccess.getShortLogicValueAccess().getAlternatives()); 
-            // InternalProblem.g:701:3: ( rule__ShortLogicValue__Alternatives )
-            // InternalProblem.g:701:4: rule__ShortLogicValue__Alternatives
+            // InternalProblem.g:1025:3: ( rule__ShortLogicValue__Alternatives )
+            // InternalProblem.g:1025:4: rule__ShortLogicValue__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__ShortLogicValue__Alternatives();
@@ -2112,60 +3063,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Statement__Alternatives"
-    // InternalProblem.g:709:1: rule__Statement__Alternatives : ( ( ruleClassDeclaration ) | ( ruleEnumDeclaration ) | ( rulePredicateDefinition ) | ( ruleAssertion ) | ( ruleScopeDeclaration ) );
+    // InternalProblem.g:1033:1: rule__Statement__Alternatives : ( ( ruleClassDeclaration ) | ( ruleEnumDeclaration ) | ( rulePredicateDefinition ) | ( ruleAssertion ) | ( ruleNodeValueAssertion ) | ( ruleScopeDeclaration ) );
     public final void rule__Statement__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:713:1: ( ( ruleClassDeclaration ) | ( ruleEnumDeclaration ) | ( rulePredicateDefinition ) | ( ruleAssertion ) | ( ruleScopeDeclaration ) )
-            int alt1=5;
-            switch ( input.LA(1) ) {
-            case 25:
-            case 40:
-                {
-                alt1=1;
-                }
-                break;
-            case 29:
-                {
-                alt1=2;
-                }
-                break;
-            case 16:
-            case 42:
-                {
-                alt1=3;
-                }
-                break;
-            case RULE_QUOTED_ID:
-            case RULE_ID:
-            case 19:
-            case 20:
-            case 22:
-            case 23:
-                {
-                alt1=4;
-                }
-                break;
-            case 37:
-                {
-                alt1=5;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 1, 0, input);
-
-                throw nvae;
-            }
-
+            // InternalProblem.g:1037:1: ( ( ruleClassDeclaration ) | ( ruleEnumDeclaration ) | ( rulePredicateDefinition ) | ( ruleAssertion ) | ( ruleNodeValueAssertion ) | ( ruleScopeDeclaration ) )
+            int alt1=6;
+            alt1 = dfa1.predict(input);
             switch (alt1) {
                 case 1 :
-                    // InternalProblem.g:714:2: ( ruleClassDeclaration )
+                    // InternalProblem.g:1038:2: ( ruleClassDeclaration )
                     {
-                    // InternalProblem.g:714:2: ( ruleClassDeclaration )
-                    // InternalProblem.g:715:3: ruleClassDeclaration
+                    // InternalProblem.g:1038:2: ( ruleClassDeclaration )
+                    // InternalProblem.g:1039:3: ruleClassDeclaration
                     {
                      before(grammarAccess.getStatementAccess().getClassDeclarationParserRuleCall_0()); 
                     pushFollow(FOLLOW_2);
@@ -2181,10 +3093,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:720:2: ( ruleEnumDeclaration )
+                    // InternalProblem.g:1044:2: ( ruleEnumDeclaration )
                     {
-                    // InternalProblem.g:720:2: ( ruleEnumDeclaration )
-                    // InternalProblem.g:721:3: ruleEnumDeclaration
+                    // InternalProblem.g:1044:2: ( ruleEnumDeclaration )
+                    // InternalProblem.g:1045:3: ruleEnumDeclaration
                     {
                      before(grammarAccess.getStatementAccess().getEnumDeclarationParserRuleCall_1()); 
                     pushFollow(FOLLOW_2);
@@ -2200,10 +3112,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalProblem.g:726:2: ( rulePredicateDefinition )
+                    // InternalProblem.g:1050:2: ( rulePredicateDefinition )
                     {
-                    // InternalProblem.g:726:2: ( rulePredicateDefinition )
-                    // InternalProblem.g:727:3: rulePredicateDefinition
+                    // InternalProblem.g:1050:2: ( rulePredicateDefinition )
+                    // InternalProblem.g:1051:3: rulePredicateDefinition
                     {
                      before(grammarAccess.getStatementAccess().getPredicateDefinitionParserRuleCall_2()); 
                     pushFollow(FOLLOW_2);
@@ -2219,10 +3131,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // InternalProblem.g:732:2: ( ruleAssertion )
+                    // InternalProblem.g:1056:2: ( ruleAssertion )
                     {
-                    // InternalProblem.g:732:2: ( ruleAssertion )
-                    // InternalProblem.g:733:3: ruleAssertion
+                    // InternalProblem.g:1056:2: ( ruleAssertion )
+                    // InternalProblem.g:1057:3: ruleAssertion
                     {
                      before(grammarAccess.getStatementAccess().getAssertionParserRuleCall_3()); 
                     pushFollow(FOLLOW_2);
@@ -2238,18 +3150,37 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 5 :
-                    // InternalProblem.g:738:2: ( ruleScopeDeclaration )
+                    // InternalProblem.g:1062:2: ( ruleNodeValueAssertion )
                     {
-                    // InternalProblem.g:738:2: ( ruleScopeDeclaration )
-                    // InternalProblem.g:739:3: ruleScopeDeclaration
+                    // InternalProblem.g:1062:2: ( ruleNodeValueAssertion )
+                    // InternalProblem.g:1063:3: ruleNodeValueAssertion
                     {
-                     before(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_4()); 
+                     before(grammarAccess.getStatementAccess().getNodeValueAssertionParserRuleCall_4()); 
+                    pushFollow(FOLLOW_2);
+                    ruleNodeValueAssertion();
+
+                    state._fsp--;
+
+                     after(grammarAccess.getStatementAccess().getNodeValueAssertionParserRuleCall_4()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 6 :
+                    // InternalProblem.g:1068:2: ( ruleScopeDeclaration )
+                    {
+                    // InternalProblem.g:1068:2: ( ruleScopeDeclaration )
+                    // InternalProblem.g:1069:3: ruleScopeDeclaration
+                    {
+                     before(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_5()); 
                     pushFollow(FOLLOW_2);
                     ruleScopeDeclaration();
 
                     state._fsp--;
 
-                     after(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_4()); 
+                     after(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_5()); 
 
                     }
 
@@ -2274,17 +3205,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Alternatives_4"
-    // InternalProblem.g:748:1: rule__ClassDeclaration__Alternatives_4 : ( ( ( rule__ClassDeclaration__Group_4_0__0 ) ) | ( '.' ) );
+    // InternalProblem.g:1078: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:752:1: ( ( ( rule__ClassDeclaration__Group_4_0__0 ) ) | ( '.' ) )
+            // InternalProblem.g:1082:1: ( ( ( rule__ClassDeclaration__Group_4_0__0 ) ) | ( '.' ) )
             int alt2=2;
             int LA2_0 = input.LA(1);
 
-            if ( (LA2_0==27) ) {
+            if ( (LA2_0==31) ) {
                 alt2=1;
             }
             else if ( (LA2_0==12) ) {
@@ -2298,14 +3229,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
             }
             switch (alt2) {
                 case 1 :
-                    // InternalProblem.g:753:2: ( ( rule__ClassDeclaration__Group_4_0__0 ) )
+                    // InternalProblem.g:1083:2: ( ( 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 )
+                    // InternalProblem.g:1083:2: ( ( rule__ClassDeclaration__Group_4_0__0 ) )
+                    // InternalProblem.g:1084:3: ( rule__ClassDeclaration__Group_4_0__0 )
                     {
                      before(grammarAccess.getClassDeclarationAccess().getGroup_4_0()); 
-                    // InternalProblem.g:755:3: ( rule__ClassDeclaration__Group_4_0__0 )
-                    // InternalProblem.g:755:4: rule__ClassDeclaration__Group_4_0__0
+                    // InternalProblem.g:1085:3: ( rule__ClassDeclaration__Group_4_0__0 )
+                    // InternalProblem.g:1085:4: rule__ClassDeclaration__Group_4_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__ClassDeclaration__Group_4_0__0();
@@ -2323,10 +3254,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:759:2: ( '.' )
+                    // InternalProblem.g:1089:2: ( '.' )
                     {
-                    // InternalProblem.g:759:2: ( '.' )
-                    // InternalProblem.g:760:3: '.'
+                    // InternalProblem.g:1089:2: ( '.' )
+                    // InternalProblem.g:1090:3: '.'
                     {
                      before(grammarAccess.getClassDeclarationAccess().getFullStopKeyword_4_1()); 
                     match(input,12,FOLLOW_2); 
@@ -2355,17 +3286,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumDeclaration__Alternatives_2"
-    // InternalProblem.g:769:1: rule__EnumDeclaration__Alternatives_2 : ( ( ( rule__EnumDeclaration__Group_2_0__0 ) ) | ( '.' ) );
+    // InternalProblem.g:1099: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:773:1: ( ( ( rule__EnumDeclaration__Group_2_0__0 ) ) | ( '.' ) )
+            // InternalProblem.g:1103:1: ( ( ( rule__EnumDeclaration__Group_2_0__0 ) ) | ( '.' ) )
             int alt3=2;
             int LA3_0 = input.LA(1);
 
-            if ( (LA3_0==27) ) {
+            if ( (LA3_0==31) ) {
                 alt3=1;
             }
             else if ( (LA3_0==12) ) {
@@ -2379,14 +3310,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
             }
             switch (alt3) {
                 case 1 :
-                    // InternalProblem.g:774:2: ( ( rule__EnumDeclaration__Group_2_0__0 ) )
+                    // InternalProblem.g:1104: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 )
+                    // InternalProblem.g:1104:2: ( ( rule__EnumDeclaration__Group_2_0__0 ) )
+                    // InternalProblem.g:1105: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
+                    // InternalProblem.g:1106:3: ( rule__EnumDeclaration__Group_2_0__0 )
+                    // InternalProblem.g:1106:4: rule__EnumDeclaration__Group_2_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__EnumDeclaration__Group_2_0__0();
@@ -2404,10 +3335,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:780:2: ( '.' )
+                    // InternalProblem.g:1110:2: ( '.' )
                     {
-                    // InternalProblem.g:780:2: ( '.' )
-                    // InternalProblem.g:781:3: '.'
+                    // InternalProblem.g:1110:2: ( '.' )
+                    // InternalProblem.g:1111:3: '.'
                     {
                      before(grammarAccess.getEnumDeclarationAccess().getFullStopKeyword_2_1()); 
                     match(input,12,FOLLOW_2); 
@@ -2436,13 +3367,13 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumDeclaration__Alternatives_2_0_1_2"
-    // InternalProblem.g:790:1: rule__EnumDeclaration__Alternatives_2_0_1_2 : ( ( ',' ) | ( ';' ) );
+    // InternalProblem.g:1120: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: ( ( ',' ) | ( ';' ) )
+            // InternalProblem.g:1124:1: ( ( ',' ) | ( ';' ) )
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -2460,10 +3391,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
             }
             switch (alt4) {
                 case 1 :
-                    // InternalProblem.g:795:2: ( ',' )
+                    // InternalProblem.g:1125:2: ( ',' )
                     {
-                    // InternalProblem.g:795:2: ( ',' )
-                    // InternalProblem.g:796:3: ','
+                    // InternalProblem.g:1125:2: ( ',' )
+                    // InternalProblem.g:1126:3: ','
                     {
                      before(grammarAccess.getEnumDeclarationAccess().getCommaKeyword_2_0_1_2_0()); 
                     match(input,13,FOLLOW_2); 
@@ -2475,10 +3406,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:801:2: ( ';' )
+                    // InternalProblem.g:1131:2: ( ';' )
                     {
-                    // InternalProblem.g:801:2: ( ';' )
-                    // InternalProblem.g:802:3: ';'
+                    // InternalProblem.g:1131:2: ( ';' )
+                    // InternalProblem.g:1132:3: ';'
                     {
                      before(grammarAccess.getEnumDeclarationAccess().getSemicolonKeyword_2_0_1_2_1()); 
                     match(input,14,FOLLOW_2); 
@@ -2507,17 +3438,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Alternatives_0"
-    // InternalProblem.g:811:1: rule__ReferenceDeclaration__Alternatives_0 : ( ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) ) | ( 'refers' ) );
+    // InternalProblem.g:1141: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' ) )
+            // InternalProblem.g:1145:1: ( ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) ) | ( 'refers' ) )
             int alt5=2;
             int LA5_0 = input.LA(1);
 
-            if ( (LA5_0==41) ) {
+            if ( (LA5_0==45) ) {
                 alt5=1;
             }
             else if ( (LA5_0==15) ) {
@@ -2531,14 +3462,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
             }
             switch (alt5) {
                 case 1 :
-                    // InternalProblem.g:816:2: ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) )
+                    // InternalProblem.g:1146:2: ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) )
                     {
-                    // InternalProblem.g:816:2: ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) )
-                    // InternalProblem.g:817:3: ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 )
+                    // InternalProblem.g:1146:2: ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) )
+                    // InternalProblem.g:1147:3: ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 )
                     {
                      before(grammarAccess.getReferenceDeclarationAccess().getContainmentAssignment_0_0()); 
-                    // InternalProblem.g:818:3: ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 )
-                    // InternalProblem.g:818:4: rule__ReferenceDeclaration__ContainmentAssignment_0_0
+                    // InternalProblem.g:1148:3: ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 )
+                    // InternalProblem.g:1148:4: rule__ReferenceDeclaration__ContainmentAssignment_0_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__ReferenceDeclaration__ContainmentAssignment_0_0();
@@ -2556,10 +3487,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:822:2: ( 'refers' )
+                    // InternalProblem.g:1152:2: ( 'refers' )
                     {
-                    // InternalProblem.g:822:2: ( 'refers' )
-                    // InternalProblem.g:823:3: 'refers'
+                    // InternalProblem.g:1152:2: ( 'refers' )
+                    // InternalProblem.g:1153:3: 'refers'
                     {
                      before(grammarAccess.getReferenceDeclarationAccess().getRefersKeyword_0_1()); 
                     match(input,15,FOLLOW_2); 
@@ -2588,17 +3519,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Alternatives_0"
-    // InternalProblem.g:832:1: rule__PredicateDefinition__Alternatives_0 : ( ( ( rule__PredicateDefinition__Group_0_0__0 ) ) | ( 'pred' ) );
+    // InternalProblem.g:1162: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:836:1: ( ( ( rule__PredicateDefinition__Group_0_0__0 ) ) | ( 'pred' ) )
+            // InternalProblem.g:1166:1: ( ( ( rule__PredicateDefinition__Group_0_0__0 ) ) | ( 'pred' ) )
             int alt6=2;
             int LA6_0 = input.LA(1);
 
-            if ( (LA6_0==42) ) {
+            if ( (LA6_0==46) ) {
                 alt6=1;
             }
             else if ( (LA6_0==16) ) {
@@ -2612,14 +3543,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
             }
             switch (alt6) {
                 case 1 :
-                    // InternalProblem.g:837:2: ( ( rule__PredicateDefinition__Group_0_0__0 ) )
+                    // InternalProblem.g:1167:2: ( ( 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 )
+                    // InternalProblem.g:1167:2: ( ( rule__PredicateDefinition__Group_0_0__0 ) )
+                    // InternalProblem.g:1168:3: ( rule__PredicateDefinition__Group_0_0__0 )
                     {
                      before(grammarAccess.getPredicateDefinitionAccess().getGroup_0_0()); 
-                    // InternalProblem.g:839:3: ( rule__PredicateDefinition__Group_0_0__0 )
-                    // InternalProblem.g:839:4: rule__PredicateDefinition__Group_0_0__0
+                    // InternalProblem.g:1169:3: ( rule__PredicateDefinition__Group_0_0__0 )
+                    // InternalProblem.g:1169:4: rule__PredicateDefinition__Group_0_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__PredicateDefinition__Group_0_0__0();
@@ -2637,10 +3568,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:843:2: ( 'pred' )
+                    // InternalProblem.g:1173:2: ( 'pred' )
                     {
-                    // InternalProblem.g:843:2: ( 'pred' )
-                    // InternalProblem.g:844:3: 'pred'
+                    // InternalProblem.g:1173:2: ( 'pred' )
+                    // InternalProblem.g:1174:3: 'pred'
                     {
                      before(grammarAccess.getPredicateDefinitionAccess().getPredKeyword_0_1()); 
                     match(input,16,FOLLOW_2); 
@@ -2669,20 +3600,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Literal__Alternatives"
-    // InternalProblem.g:853:1: rule__Literal__Alternatives : ( ( ruleAtom ) | ( ruleNegativeLiteral ) );
+    // InternalProblem.g:1183:1: rule__Literal__Alternatives : ( ( ruleAtom ) | ( ruleNegativeLiteral ) );
     public final void rule__Literal__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:857:1: ( ( ruleAtom ) | ( ruleNegativeLiteral ) )
+            // InternalProblem.g:1187:1: ( ( ruleAtom ) | ( ruleNegativeLiteral ) )
             int alt7=2;
             int LA7_0 = input.LA(1);
 
-            if ( ((LA7_0>=RULE_QUOTED_ID && LA7_0<=RULE_ID)||(LA7_0>=19 && LA7_0<=20)) ) {
+            if ( ((LA7_0>=RULE_QUOTED_ID && LA7_0<=RULE_ID)||(LA7_0>=19 && LA7_0<=22)) ) {
                 alt7=1;
             }
-            else if ( (LA7_0==22) ) {
+            else if ( (LA7_0==26) ) {
                 alt7=2;
             }
             else {
@@ -2693,10 +3624,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
             }
             switch (alt7) {
                 case 1 :
-                    // InternalProblem.g:858:2: ( ruleAtom )
+                    // InternalProblem.g:1188:2: ( ruleAtom )
                     {
-                    // InternalProblem.g:858:2: ( ruleAtom )
-                    // InternalProblem.g:859:3: ruleAtom
+                    // InternalProblem.g:1188:2: ( ruleAtom )
+                    // InternalProblem.g:1189:3: ruleAtom
                     {
                      before(grammarAccess.getLiteralAccess().getAtomParserRuleCall_0()); 
                     pushFollow(FOLLOW_2);
@@ -2712,10 +3643,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:864:2: ( ruleNegativeLiteral )
+                    // InternalProblem.g:1194:2: ( ruleNegativeLiteral )
                     {
-                    // InternalProblem.g:864:2: ( ruleNegativeLiteral )
-                    // InternalProblem.g:865:3: ruleNegativeLiteral
+                    // InternalProblem.g:1194:2: ( ruleNegativeLiteral )
+                    // InternalProblem.g:1195:3: ruleNegativeLiteral
                     {
                      before(grammarAccess.getLiteralAccess().getNegativeLiteralParserRuleCall_1()); 
                     pushFollow(FOLLOW_2);
@@ -2747,26 +3678,105 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__Literal__Alternatives"
 
 
-    // $ANTLR start "rule__Assertion__Alternatives_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 {
+    // $ANTLR start "rule__Argument__Alternatives"
+    // InternalProblem.g:1204:1: rule__Argument__Alternatives : ( ( ruleVariableOrNodeArgument ) | ( ruleConstantArgument ) );
+    public final void rule__Argument__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:878:1: ( ( ( rule__Assertion__Group_0_0__0 ) ) | ( ( rule__Assertion__Group_0_1__0 ) ) )
+            // InternalProblem.g:1208:1: ( ( ruleVariableOrNodeArgument ) | ( ruleConstantArgument ) )
             int alt8=2;
-            alt8 = dfa8.predict(input);
+            int LA8_0 = input.LA(1);
+
+            if ( ((LA8_0>=RULE_QUOTED_ID && LA8_0<=RULE_ID)||(LA8_0>=19 && LA8_0<=22)) ) {
+                alt8=1;
+            }
+            else if ( (LA8_0==RULE_INT||LA8_0==RULE_STRING||LA8_0==23) ) {
+                alt8=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 8, 0, input);
+
+                throw nvae;
+            }
             switch (alt8) {
                 case 1 :
-                    // InternalProblem.g:879:2: ( ( rule__Assertion__Group_0_0__0 ) )
+                    // InternalProblem.g:1209:2: ( ruleVariableOrNodeArgument )
+                    {
+                    // InternalProblem.g:1209:2: ( ruleVariableOrNodeArgument )
+                    // InternalProblem.g:1210:3: ruleVariableOrNodeArgument
+                    {
+                     before(grammarAccess.getArgumentAccess().getVariableOrNodeArgumentParserRuleCall_0()); 
+                    pushFollow(FOLLOW_2);
+                    ruleVariableOrNodeArgument();
+
+                    state._fsp--;
+
+                     after(grammarAccess.getArgumentAccess().getVariableOrNodeArgumentParserRuleCall_0()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:1215:2: ( ruleConstantArgument )
+                    {
+                    // InternalProblem.g:1215:2: ( ruleConstantArgument )
+                    // InternalProblem.g:1216:3: ruleConstantArgument
+                    {
+                     before(grammarAccess.getArgumentAccess().getConstantArgumentParserRuleCall_1()); 
+                    pushFollow(FOLLOW_2);
+                    ruleConstantArgument();
+
+                    state._fsp--;
+
+                     after(grammarAccess.getArgumentAccess().getConstantArgumentParserRuleCall_1()); 
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Argument__Alternatives"
+
+
+    // $ANTLR start "rule__Assertion__Alternatives_0"
+    // InternalProblem.g:1225: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:1229:1: ( ( ( rule__Assertion__Group_0_0__0 ) ) | ( ( rule__Assertion__Group_0_1__0 ) ) )
+            int alt9=2;
+            alt9 = dfa9.predict(input);
+            switch (alt9) {
+                case 1 :
+                    // InternalProblem.g:1230:2: ( ( 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 )
+                    // InternalProblem.g:1230:2: ( ( rule__Assertion__Group_0_0__0 ) )
+                    // InternalProblem.g:1231:3: ( rule__Assertion__Group_0_0__0 )
                     {
                      before(grammarAccess.getAssertionAccess().getGroup_0_0()); 
-                    // InternalProblem.g:881:3: ( rule__Assertion__Group_0_0__0 )
-                    // InternalProblem.g:881:4: rule__Assertion__Group_0_0__0
+                    // InternalProblem.g:1232:3: ( rule__Assertion__Group_0_0__0 )
+                    // InternalProblem.g:1232:4: rule__Assertion__Group_0_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Assertion__Group_0_0__0();
@@ -2784,14 +3794,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:885:2: ( ( rule__Assertion__Group_0_1__0 ) )
+                    // InternalProblem.g:1236:2: ( ( 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 )
+                    // InternalProblem.g:1236:2: ( ( rule__Assertion__Group_0_1__0 ) )
+                    // InternalProblem.g:1237:3: ( rule__Assertion__Group_0_1__0 )
                     {
                      before(grammarAccess.getAssertionAccess().getGroup_0_1()); 
-                    // InternalProblem.g:887:3: ( rule__Assertion__Group_0_1__0 )
-                    // InternalProblem.g:887:4: rule__Assertion__Group_0_1__0
+                    // InternalProblem.g:1238:3: ( rule__Assertion__Group_0_1__0 )
+                    // InternalProblem.g:1238:4: rule__Assertion__Group_0_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Assertion__Group_0_1__0();
@@ -2825,39 +3835,311 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__Assertion__Alternatives_0"
 
 
+    // $ANTLR start "rule__AssertionArgument__Alternatives"
+    // InternalProblem.g:1246:1: rule__AssertionArgument__Alternatives : ( ( ruleNodeAssertionArgument ) | ( ruleConstantAssertionArgument ) );
+    public final void rule__AssertionArgument__Alternatives() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1250:1: ( ( ruleNodeAssertionArgument ) | ( ruleConstantAssertionArgument ) )
+            int alt10=2;
+            int LA10_0 = input.LA(1);
+
+            if ( ((LA10_0>=RULE_QUOTED_ID && LA10_0<=RULE_ID)||(LA10_0>=19 && LA10_0<=22)) ) {
+                alt10=1;
+            }
+            else if ( (LA10_0==RULE_INT||LA10_0==RULE_STRING||LA10_0==23) ) {
+                alt10=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 10, 0, input);
+
+                throw nvae;
+            }
+            switch (alt10) {
+                case 1 :
+                    // InternalProblem.g:1251:2: ( ruleNodeAssertionArgument )
+                    {
+                    // InternalProblem.g:1251:2: ( ruleNodeAssertionArgument )
+                    // InternalProblem.g:1252:3: ruleNodeAssertionArgument
+                    {
+                     before(grammarAccess.getAssertionArgumentAccess().getNodeAssertionArgumentParserRuleCall_0()); 
+                    pushFollow(FOLLOW_2);
+                    ruleNodeAssertionArgument();
+
+                    state._fsp--;
+
+                     after(grammarAccess.getAssertionArgumentAccess().getNodeAssertionArgumentParserRuleCall_0()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:1257:2: ( ruleConstantAssertionArgument )
+                    {
+                    // InternalProblem.g:1257:2: ( ruleConstantAssertionArgument )
+                    // InternalProblem.g:1258:3: ruleConstantAssertionArgument
+                    {
+                     before(grammarAccess.getAssertionArgumentAccess().getConstantAssertionArgumentParserRuleCall_1()); 
+                    pushFollow(FOLLOW_2);
+                    ruleConstantAssertionArgument();
+
+                    state._fsp--;
+
+                     after(grammarAccess.getAssertionArgumentAccess().getConstantAssertionArgumentParserRuleCall_1()); 
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__AssertionArgument__Alternatives"
+
+
+    // $ANTLR start "rule__Constant__Alternatives"
+    // InternalProblem.g:1267:1: rule__Constant__Alternatives : ( ( ruleIntConstant ) | ( ruleRealConstant ) | ( ruleStringConstant ) );
+    public final void rule__Constant__Alternatives() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1271:1: ( ( ruleIntConstant ) | ( ruleRealConstant ) | ( ruleStringConstant ) )
+            int alt11=3;
+            switch ( input.LA(1) ) {
+            case 23:
+                {
+                int LA11_1 = input.LA(2);
+
+                if ( (LA11_1==RULE_INT) ) {
+                    switch ( input.LA(3) ) {
+                    case 12:
+                        {
+                        int LA11_4 = input.LA(4);
+
+                        if ( (LA11_4==RULE_INT) ) {
+                            alt11=2;
+                        }
+                        else if ( (LA11_4==EOF||(LA11_4>=RULE_QUOTED_ID && LA11_4<=RULE_ID)||LA11_4==16||(LA11_4>=19 && LA11_4<=22)||(LA11_4>=26 && LA11_4<=27)||LA11_4==29||LA11_4==33||LA11_4==41||LA11_4==44||LA11_4==46) ) {
+                            alt11=1;
+                        }
+                        else {
+                            NoViableAltException nvae =
+                                new NoViableAltException("", 11, 4, input);
+
+                            throw nvae;
+                        }
+                        }
+                        break;
+                    case 21:
+                    case 22:
+                        {
+                        alt11=2;
+                        }
+                        break;
+                    case EOF:
+                    case 13:
+                    case 38:
+                        {
+                        alt11=1;
+                        }
+                        break;
+                    default:
+                        NoViableAltException nvae =
+                            new NoViableAltException("", 11, 2, input);
+
+                        throw nvae;
+                    }
+
+                }
+                else {
+                    NoViableAltException nvae =
+                        new NoViableAltException("", 11, 1, input);
+
+                    throw nvae;
+                }
+                }
+                break;
+            case RULE_INT:
+                {
+                switch ( input.LA(2) ) {
+                case 12:
+                    {
+                    int LA11_4 = input.LA(3);
+
+                    if ( (LA11_4==RULE_INT) ) {
+                        alt11=2;
+                    }
+                    else if ( (LA11_4==EOF||(LA11_4>=RULE_QUOTED_ID && LA11_4<=RULE_ID)||LA11_4==16||(LA11_4>=19 && LA11_4<=22)||(LA11_4>=26 && LA11_4<=27)||LA11_4==29||LA11_4==33||LA11_4==41||LA11_4==44||LA11_4==46) ) {
+                        alt11=1;
+                    }
+                    else {
+                        NoViableAltException nvae =
+                            new NoViableAltException("", 11, 4, input);
+
+                        throw nvae;
+                    }
+                    }
+                    break;
+                case 21:
+                case 22:
+                    {
+                    alt11=2;
+                    }
+                    break;
+                case EOF:
+                case 13:
+                case 38:
+                    {
+                    alt11=1;
+                    }
+                    break;
+                default:
+                    NoViableAltException nvae =
+                        new NoViableAltException("", 11, 2, input);
+
+                    throw nvae;
+                }
+
+                }
+                break;
+            case RULE_STRING:
+                {
+                alt11=3;
+                }
+                break;
+            default:
+                NoViableAltException nvae =
+                    new NoViableAltException("", 11, 0, input);
+
+                throw nvae;
+            }
+
+            switch (alt11) {
+                case 1 :
+                    // InternalProblem.g:1272:2: ( ruleIntConstant )
+                    {
+                    // InternalProblem.g:1272:2: ( ruleIntConstant )
+                    // InternalProblem.g:1273:3: ruleIntConstant
+                    {
+                     before(grammarAccess.getConstantAccess().getIntConstantParserRuleCall_0()); 
+                    pushFollow(FOLLOW_2);
+                    ruleIntConstant();
+
+                    state._fsp--;
+
+                     after(grammarAccess.getConstantAccess().getIntConstantParserRuleCall_0()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:1278:2: ( ruleRealConstant )
+                    {
+                    // InternalProblem.g:1278:2: ( ruleRealConstant )
+                    // InternalProblem.g:1279:3: ruleRealConstant
+                    {
+                     before(grammarAccess.getConstantAccess().getRealConstantParserRuleCall_1()); 
+                    pushFollow(FOLLOW_2);
+                    ruleRealConstant();
+
+                    state._fsp--;
+
+                     after(grammarAccess.getConstantAccess().getRealConstantParserRuleCall_1()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 3 :
+                    // InternalProblem.g:1284:2: ( ruleStringConstant )
+                    {
+                    // InternalProblem.g:1284:2: ( ruleStringConstant )
+                    // InternalProblem.g:1285:3: ruleStringConstant
+                    {
+                     before(grammarAccess.getConstantAccess().getStringConstantParserRuleCall_2()); 
+                    pushFollow(FOLLOW_2);
+                    ruleStringConstant();
+
+                    state._fsp--;
+
+                     after(grammarAccess.getConstantAccess().getStringConstantParserRuleCall_2()); 
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Constant__Alternatives"
+
+
     // $ANTLR start "rule__TypeScope__Alternatives_1"
-    // InternalProblem.g:895:1: rule__TypeScope__Alternatives_1 : ( ( ( rule__TypeScope__IncrementAssignment_1_0 ) ) | ( '=' ) );
+    // InternalProblem.g:1294: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:899:1: ( ( ( rule__TypeScope__IncrementAssignment_1_0 ) ) | ( '=' ) )
-            int alt9=2;
-            int LA9_0 = input.LA(1);
+            // InternalProblem.g:1298:1: ( ( ( rule__TypeScope__IncrementAssignment_1_0 ) ) | ( '=' ) )
+            int alt12=2;
+            int LA12_0 = input.LA(1);
 
-            if ( (LA9_0==44) ) {
-                alt9=1;
+            if ( (LA12_0==47) ) {
+                alt12=1;
             }
-            else if ( (LA9_0==17) ) {
-                alt9=2;
+            else if ( (LA12_0==17) ) {
+                alt12=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 9, 0, input);
+                    new NoViableAltException("", 12, 0, input);
 
                 throw nvae;
             }
-            switch (alt9) {
+            switch (alt12) {
                 case 1 :
-                    // InternalProblem.g:900:2: ( ( rule__TypeScope__IncrementAssignment_1_0 ) )
+                    // InternalProblem.g:1299:2: ( ( rule__TypeScope__IncrementAssignment_1_0 ) )
                     {
-                    // InternalProblem.g:900:2: ( ( rule__TypeScope__IncrementAssignment_1_0 ) )
-                    // InternalProblem.g:901:3: ( rule__TypeScope__IncrementAssignment_1_0 )
+                    // InternalProblem.g:1299:2: ( ( rule__TypeScope__IncrementAssignment_1_0 ) )
+                    // InternalProblem.g:1300:3: ( rule__TypeScope__IncrementAssignment_1_0 )
                     {
                      before(grammarAccess.getTypeScopeAccess().getIncrementAssignment_1_0()); 
-                    // InternalProblem.g:902:3: ( rule__TypeScope__IncrementAssignment_1_0 )
-                    // InternalProblem.g:902:4: rule__TypeScope__IncrementAssignment_1_0
+                    // InternalProblem.g:1301:3: ( rule__TypeScope__IncrementAssignment_1_0 )
+                    // InternalProblem.g:1301:4: rule__TypeScope__IncrementAssignment_1_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TypeScope__IncrementAssignment_1_0();
@@ -2875,10 +4157,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:906:2: ( '=' )
+                    // InternalProblem.g:1305:2: ( '=' )
                     {
-                    // InternalProblem.g:906:2: ( '=' )
-                    // InternalProblem.g:907:3: '='
+                    // InternalProblem.g:1305:2: ( '=' )
+                    // InternalProblem.g:1306:3: '='
                     {
                      before(grammarAccess.getTypeScopeAccess().getEqualsSignKeyword_1_1()); 
                     match(input,17,FOLLOW_2); 
@@ -2907,34 +4189,34 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Multiplicity__Alternatives"
-    // InternalProblem.g:916:1: rule__Multiplicity__Alternatives : ( ( ruleUnboundedMultiplicity ) | ( ruleDefiniteMultiplicity ) );
+    // InternalProblem.g:1315:1: rule__Multiplicity__Alternatives : ( ( ruleUnboundedMultiplicity ) | ( ruleDefiniteMultiplicity ) );
     public final void rule__Multiplicity__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:920:1: ( ( ruleUnboundedMultiplicity ) | ( ruleDefiniteMultiplicity ) )
-            int alt10=2;
-            int LA10_0 = input.LA(1);
+            // InternalProblem.g:1319:1: ( ( ruleUnboundedMultiplicity ) | ( ruleDefiniteMultiplicity ) )
+            int alt13=2;
+            int LA13_0 = input.LA(1);
 
-            if ( (LA10_0==EOF||LA10_0==31) ) {
-                alt10=1;
+            if ( (LA13_0==EOF||LA13_0==35) ) {
+                alt13=1;
             }
-            else if ( (LA10_0==RULE_INT) ) {
-                alt10=2;
+            else if ( (LA13_0==RULE_INT) ) {
+                alt13=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 10, 0, input);
+                    new NoViableAltException("", 13, 0, input);
 
                 throw nvae;
             }
-            switch (alt10) {
+            switch (alt13) {
                 case 1 :
-                    // InternalProblem.g:921:2: ( ruleUnboundedMultiplicity )
+                    // InternalProblem.g:1320:2: ( ruleUnboundedMultiplicity )
                     {
-                    // InternalProblem.g:921:2: ( ruleUnboundedMultiplicity )
-                    // InternalProblem.g:922:3: ruleUnboundedMultiplicity
+                    // InternalProblem.g:1320:2: ( ruleUnboundedMultiplicity )
+                    // InternalProblem.g:1321:3: ruleUnboundedMultiplicity
                     {
                      before(grammarAccess.getMultiplicityAccess().getUnboundedMultiplicityParserRuleCall_0()); 
                     pushFollow(FOLLOW_2);
@@ -2950,10 +4232,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:927:2: ( ruleDefiniteMultiplicity )
+                    // InternalProblem.g:1326:2: ( ruleDefiniteMultiplicity )
                     {
-                    // InternalProblem.g:927:2: ( ruleDefiniteMultiplicity )
-                    // InternalProblem.g:928:3: ruleDefiniteMultiplicity
+                    // InternalProblem.g:1326:2: ( ruleDefiniteMultiplicity )
+                    // InternalProblem.g:1327:3: ruleDefiniteMultiplicity
                     {
                      before(grammarAccess.getMultiplicityAccess().getDefiniteMultiplicityParserRuleCall_1()); 
                     pushFollow(FOLLOW_2);
@@ -2986,44 +4268,44 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__DefiniteMultiplicity__Alternatives"
-    // InternalProblem.g:937:1: rule__DefiniteMultiplicity__Alternatives : ( ( ruleRangeMultiplicity ) | ( ruleExactMultiplicity ) );
+    // InternalProblem.g:1336:1: rule__DefiniteMultiplicity__Alternatives : ( ( ruleRangeMultiplicity ) | ( ruleExactMultiplicity ) );
     public final void rule__DefiniteMultiplicity__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:941:1: ( ( ruleRangeMultiplicity ) | ( ruleExactMultiplicity ) )
-            int alt11=2;
-            int LA11_0 = input.LA(1);
+            // InternalProblem.g:1340:1: ( ( ruleRangeMultiplicity ) | ( ruleExactMultiplicity ) )
+            int alt14=2;
+            int LA14_0 = input.LA(1);
 
-            if ( (LA11_0==RULE_INT) ) {
-                int LA11_1 = input.LA(2);
+            if ( (LA14_0==RULE_INT) ) {
+                int LA14_1 = input.LA(2);
 
-                if ( (LA11_1==38) ) {
-                    alt11=1;
+                if ( (LA14_1==42) ) {
+                    alt14=1;
                 }
-                else if ( (LA11_1==EOF||(LA11_1>=12 && LA11_1<=13)||LA11_1==31) ) {
-                    alt11=2;
+                else if ( (LA14_1==EOF||(LA14_1>=12 && LA14_1<=13)||LA14_1==35) ) {
+                    alt14=2;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("", 11, 1, input);
+                        new NoViableAltException("", 14, 1, input);
 
                     throw nvae;
                 }
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 11, 0, input);
+                    new NoViableAltException("", 14, 0, input);
 
                 throw nvae;
             }
-            switch (alt11) {
+            switch (alt14) {
                 case 1 :
-                    // InternalProblem.g:942:2: ( ruleRangeMultiplicity )
+                    // InternalProblem.g:1341:2: ( ruleRangeMultiplicity )
                     {
-                    // InternalProblem.g:942:2: ( ruleRangeMultiplicity )
-                    // InternalProblem.g:943:3: ruleRangeMultiplicity
+                    // InternalProblem.g:1341:2: ( ruleRangeMultiplicity )
+                    // InternalProblem.g:1342:3: ruleRangeMultiplicity
                     {
                      before(grammarAccess.getDefiniteMultiplicityAccess().getRangeMultiplicityParserRuleCall_0()); 
                     pushFollow(FOLLOW_2);
@@ -3039,10 +4321,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:948:2: ( ruleExactMultiplicity )
+                    // InternalProblem.g:1347:2: ( ruleExactMultiplicity )
                     {
-                    // InternalProblem.g:948:2: ( ruleExactMultiplicity )
-                    // InternalProblem.g:949:3: ruleExactMultiplicity
+                    // InternalProblem.g:1347:2: ( ruleExactMultiplicity )
+                    // InternalProblem.g:1348:3: ruleExactMultiplicity
                     {
                      before(grammarAccess.getDefiniteMultiplicityAccess().getExactMultiplicityParserRuleCall_1()); 
                     pushFollow(FOLLOW_2);
@@ -3075,34 +4357,34 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__UpperBound__Alternatives"
-    // InternalProblem.g:958:1: rule__UpperBound__Alternatives : ( ( RULE_INT ) | ( '*' ) );
+    // InternalProblem.g:1357:1: rule__UpperBound__Alternatives : ( ( RULE_INT ) | ( '*' ) );
     public final void rule__UpperBound__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:962:1: ( ( RULE_INT ) | ( '*' ) )
-            int alt12=2;
-            int LA12_0 = input.LA(1);
+            // InternalProblem.g:1361:1: ( ( RULE_INT ) | ( '*' ) )
+            int alt15=2;
+            int LA15_0 = input.LA(1);
 
-            if ( (LA12_0==RULE_INT) ) {
-                alt12=1;
+            if ( (LA15_0==RULE_INT) ) {
+                alt15=1;
             }
-            else if ( (LA12_0==18) ) {
-                alt12=2;
+            else if ( (LA15_0==18) ) {
+                alt15=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 12, 0, input);
+                    new NoViableAltException("", 15, 0, input);
 
                 throw nvae;
             }
-            switch (alt12) {
+            switch (alt15) {
                 case 1 :
-                    // InternalProblem.g:963:2: ( RULE_INT )
+                    // InternalProblem.g:1362:2: ( RULE_INT )
                     {
-                    // InternalProblem.g:963:2: ( RULE_INT )
-                    // InternalProblem.g:964:3: RULE_INT
+                    // InternalProblem.g:1362:2: ( RULE_INT )
+                    // InternalProblem.g:1363:3: RULE_INT
                     {
                      before(grammarAccess.getUpperBoundAccess().getINTTerminalRuleCall_0()); 
                     match(input,RULE_INT,FOLLOW_2); 
@@ -3114,10 +4396,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:969:2: ( '*' )
+                    // InternalProblem.g:1368:2: ( '*' )
                     {
-                    // InternalProblem.g:969:2: ( '*' )
-                    // InternalProblem.g:970:3: '*'
+                    // InternalProblem.g:1368:2: ( '*' )
+                    // InternalProblem.g:1369:3: '*'
                     {
                      before(grammarAccess.getUpperBoundAccess().getAsteriskKeyword_1()); 
                     match(input,18,FOLLOW_2); 
@@ -3146,34 +4428,34 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QuotedOrUnquotedId__Alternatives"
-    // InternalProblem.g:979:1: rule__QuotedOrUnquotedId__Alternatives : ( ( RULE_QUOTED_ID ) | ( ruleIdentifier ) );
+    // InternalProblem.g:1378: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);
+            // InternalProblem.g:1382:1: ( ( RULE_QUOTED_ID ) | ( ruleIdentifier ) )
+            int alt16=2;
+            int LA16_0 = input.LA(1);
 
-            if ( (LA13_0==RULE_QUOTED_ID) ) {
-                alt13=1;
+            if ( (LA16_0==RULE_QUOTED_ID) ) {
+                alt16=1;
             }
-            else if ( (LA13_0==RULE_ID||(LA13_0>=19 && LA13_0<=20)) ) {
-                alt13=2;
+            else if ( (LA16_0==RULE_ID||(LA16_0>=19 && LA16_0<=22)) ) {
+                alt16=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 13, 0, input);
+                    new NoViableAltException("", 16, 0, input);
 
                 throw nvae;
             }
-            switch (alt13) {
+            switch (alt16) {
                 case 1 :
-                    // InternalProblem.g:984:2: ( RULE_QUOTED_ID )
+                    // InternalProblem.g:1383:2: ( RULE_QUOTED_ID )
                     {
-                    // InternalProblem.g:984:2: ( RULE_QUOTED_ID )
-                    // InternalProblem.g:985:3: RULE_QUOTED_ID
+                    // InternalProblem.g:1383:2: ( RULE_QUOTED_ID )
+                    // InternalProblem.g:1384:3: RULE_QUOTED_ID
                     {
                      before(grammarAccess.getQuotedOrUnquotedIdAccess().getQUOTED_IDTerminalRuleCall_0()); 
                     match(input,RULE_QUOTED_ID,FOLLOW_2); 
@@ -3185,10 +4467,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:990:2: ( ruleIdentifier )
+                    // InternalProblem.g:1389:2: ( ruleIdentifier )
                     {
-                    // InternalProblem.g:990:2: ( ruleIdentifier )
-                    // InternalProblem.g:991:3: ruleIdentifier
+                    // InternalProblem.g:1389:2: ( ruleIdentifier )
+                    // InternalProblem.g:1390:3: ruleIdentifier
                     {
                      before(grammarAccess.getQuotedOrUnquotedIdAccess().getIdentifierParserRuleCall_1()); 
                     pushFollow(FOLLOW_2);
@@ -3221,34 +4503,34 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Alternatives"
-    // InternalProblem.g:1000:1: rule__QualifiedName__Alternatives : ( ( RULE_QUOTED_ID ) | ( ( rule__QualifiedName__Group_1__0 ) ) );
+    // InternalProblem.g:1399: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:1004:1: ( ( RULE_QUOTED_ID ) | ( ( rule__QualifiedName__Group_1__0 ) ) )
-            int alt14=2;
-            int LA14_0 = input.LA(1);
+            // InternalProblem.g:1403:1: ( ( RULE_QUOTED_ID ) | ( ( rule__QualifiedName__Group_1__0 ) ) )
+            int alt17=2;
+            int LA17_0 = input.LA(1);
 
-            if ( (LA14_0==RULE_QUOTED_ID) ) {
-                alt14=1;
+            if ( (LA17_0==RULE_QUOTED_ID) ) {
+                alt17=1;
             }
-            else if ( (LA14_0==RULE_ID||(LA14_0>=19 && LA14_0<=20)) ) {
-                alt14=2;
+            else if ( (LA17_0==RULE_ID||(LA17_0>=19 && LA17_0<=22)) ) {
+                alt17=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 14, 0, input);
+                    new NoViableAltException("", 17, 0, input);
 
                 throw nvae;
             }
-            switch (alt14) {
+            switch (alt17) {
                 case 1 :
-                    // InternalProblem.g:1005:2: ( RULE_QUOTED_ID )
+                    // InternalProblem.g:1404:2: ( RULE_QUOTED_ID )
                     {
-                    // InternalProblem.g:1005:2: ( RULE_QUOTED_ID )
-                    // InternalProblem.g:1006:3: RULE_QUOTED_ID
+                    // InternalProblem.g:1404:2: ( RULE_QUOTED_ID )
+                    // InternalProblem.g:1405:3: RULE_QUOTED_ID
                     {
                      before(grammarAccess.getQualifiedNameAccess().getQUOTED_IDTerminalRuleCall_0()); 
                     match(input,RULE_QUOTED_ID,FOLLOW_2); 
@@ -3260,14 +4542,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1011:2: ( ( rule__QualifiedName__Group_1__0 ) )
+                    // InternalProblem.g:1410:2: ( ( rule__QualifiedName__Group_1__0 ) )
                     {
-                    // InternalProblem.g:1011:2: ( ( rule__QualifiedName__Group_1__0 ) )
-                    // InternalProblem.g:1012:3: ( rule__QualifiedName__Group_1__0 )
+                    // InternalProblem.g:1410:2: ( ( rule__QualifiedName__Group_1__0 ) )
+                    // InternalProblem.g:1411:3: ( rule__QualifiedName__Group_1__0 )
                     {
                      before(grammarAccess.getQualifiedNameAccess().getGroup_1()); 
-                    // InternalProblem.g:1013:3: ( rule__QualifiedName__Group_1__0 )
-                    // InternalProblem.g:1013:4: rule__QualifiedName__Group_1__0
+                    // InternalProblem.g:1412:3: ( rule__QualifiedName__Group_1__0 )
+                    // InternalProblem.g:1412:4: rule__QualifiedName__Group_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__QualifiedName__Group_1__0();
@@ -3302,43 +4584,53 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Identifier__Alternatives"
-    // InternalProblem.g:1021:1: rule__Identifier__Alternatives : ( ( RULE_ID ) | ( 'true' ) | ( 'false' ) );
+    // InternalProblem.g:1420:1: rule__Identifier__Alternatives : ( ( RULE_ID ) | ( 'true' ) | ( 'false' ) | ( 'e' ) | ( 'E' ) );
     public final void rule__Identifier__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1025:1: ( ( RULE_ID ) | ( 'true' ) | ( 'false' ) )
-            int alt15=3;
+            // InternalProblem.g:1424:1: ( ( RULE_ID ) | ( 'true' ) | ( 'false' ) | ( 'e' ) | ( 'E' ) )
+            int alt18=5;
             switch ( input.LA(1) ) {
             case RULE_ID:
                 {
-                alt15=1;
+                alt18=1;
                 }
                 break;
             case 19:
                 {
-                alt15=2;
+                alt18=2;
                 }
                 break;
             case 20:
                 {
-                alt15=3;
+                alt18=3;
+                }
+                break;
+            case 21:
+                {
+                alt18=4;
+                }
+                break;
+            case 22:
+                {
+                alt18=5;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("", 15, 0, input);
+                    new NoViableAltException("", 18, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt15) {
+            switch (alt18) {
                 case 1 :
-                    // InternalProblem.g:1026:2: ( RULE_ID )
+                    // InternalProblem.g:1425:2: ( RULE_ID )
                     {
-                    // InternalProblem.g:1026:2: ( RULE_ID )
-                    // InternalProblem.g:1027:3: RULE_ID
+                    // InternalProblem.g:1425:2: ( RULE_ID )
+                    // InternalProblem.g:1426:3: RULE_ID
                     {
                      before(grammarAccess.getIdentifierAccess().getIDTerminalRuleCall_0()); 
                     match(input,RULE_ID,FOLLOW_2); 
@@ -3350,10 +4642,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1032:2: ( 'true' )
+                    // InternalProblem.g:1431:2: ( 'true' )
                     {
-                    // InternalProblem.g:1032:2: ( 'true' )
-                    // InternalProblem.g:1033:3: 'true'
+                    // InternalProblem.g:1431:2: ( 'true' )
+                    // InternalProblem.g:1432:3: 'true'
                     {
                      before(grammarAccess.getIdentifierAccess().getTrueKeyword_1()); 
                     match(input,19,FOLLOW_2); 
@@ -3365,10 +4657,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalProblem.g:1038:2: ( 'false' )
+                    // InternalProblem.g:1437:2: ( 'false' )
                     {
-                    // InternalProblem.g:1038:2: ( 'false' )
-                    // InternalProblem.g:1039:3: 'false'
+                    // InternalProblem.g:1437:2: ( 'false' )
+                    // InternalProblem.g:1438:3: 'false'
                     {
                      before(grammarAccess.getIdentifierAccess().getFalseKeyword_2()); 
                     match(input,20,FOLLOW_2); 
@@ -3379,6 +4671,36 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
                     }
                     break;
+                case 4 :
+                    // InternalProblem.g:1443:2: ( 'e' )
+                    {
+                    // InternalProblem.g:1443:2: ( 'e' )
+                    // InternalProblem.g:1444:3: 'e'
+                    {
+                     before(grammarAccess.getIdentifierAccess().getEKeyword_3()); 
+                    match(input,21,FOLLOW_2); 
+                     after(grammarAccess.getIdentifierAccess().getEKeyword_3()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 5 :
+                    // InternalProblem.g:1449:2: ( 'E' )
+                    {
+                    // InternalProblem.g:1449:2: ( 'E' )
+                    // InternalProblem.g:1450:3: 'E'
+                    {
+                     before(grammarAccess.getIdentifierAccess().getEKeyword_4()); 
+                    match(input,22,FOLLOW_2); 
+                     after(grammarAccess.getIdentifierAccess().getEKeyword_4()); 
+
+                    }
+
+
+                    }
+                    break;
 
             }
         }
@@ -3396,48 +4718,304 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__Identifier__Alternatives"
 
 
+    // $ANTLR start "rule__Real__Alternatives_2"
+    // InternalProblem.g:1459:1: rule__Real__Alternatives_2 : ( ( ( rule__Real__Group_2_0__0 ) ) | ( ( rule__Real__Group_2_1__0 ) ) );
+    public final void rule__Real__Alternatives_2() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1463:1: ( ( ( rule__Real__Group_2_0__0 ) ) | ( ( rule__Real__Group_2_1__0 ) ) )
+            int alt19=2;
+            int LA19_0 = input.LA(1);
+
+            if ( (LA19_0==12) ) {
+                int LA19_1 = input.LA(2);
+
+                if ( (LA19_1==RULE_INT) ) {
+                    int LA19_3 = input.LA(3);
+
+                    if ( ((LA19_3>=21 && LA19_3<=22)) ) {
+                        alt19=2;
+                    }
+                    else if ( (LA19_3==EOF||(LA19_3>=12 && LA19_3<=13)||LA19_3==38) ) {
+                        alt19=1;
+                    }
+                    else {
+                        NoViableAltException nvae =
+                            new NoViableAltException("", 19, 3, input);
+
+                        throw nvae;
+                    }
+                }
+                else {
+                    NoViableAltException nvae =
+                        new NoViableAltException("", 19, 1, input);
+
+                    throw nvae;
+                }
+            }
+            else if ( ((LA19_0>=21 && LA19_0<=22)) ) {
+                alt19=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 19, 0, input);
+
+                throw nvae;
+            }
+            switch (alt19) {
+                case 1 :
+                    // InternalProblem.g:1464:2: ( ( rule__Real__Group_2_0__0 ) )
+                    {
+                    // InternalProblem.g:1464:2: ( ( rule__Real__Group_2_0__0 ) )
+                    // InternalProblem.g:1465:3: ( rule__Real__Group_2_0__0 )
+                    {
+                     before(grammarAccess.getRealAccess().getGroup_2_0()); 
+                    // InternalProblem.g:1466:3: ( rule__Real__Group_2_0__0 )
+                    // InternalProblem.g:1466:4: rule__Real__Group_2_0__0
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__Real__Group_2_0__0();
+
+                    state._fsp--;
+
+
+                    }
+
+                     after(grammarAccess.getRealAccess().getGroup_2_0()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:1470:2: ( ( rule__Real__Group_2_1__0 ) )
+                    {
+                    // InternalProblem.g:1470:2: ( ( rule__Real__Group_2_1__0 ) )
+                    // InternalProblem.g:1471:3: ( rule__Real__Group_2_1__0 )
+                    {
+                     before(grammarAccess.getRealAccess().getGroup_2_1()); 
+                    // InternalProblem.g:1472:3: ( rule__Real__Group_2_1__0 )
+                    // InternalProblem.g:1472:4: rule__Real__Group_2_1__0
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__Real__Group_2_1__0();
+
+                    state._fsp--;
+
+
+                    }
+
+                     after(grammarAccess.getRealAccess().getGroup_2_1()); 
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Alternatives_2"
+
+
+    // $ANTLR start "rule__Real__Alternatives_2_1_1"
+    // InternalProblem.g:1480:1: rule__Real__Alternatives_2_1_1 : ( ( 'e' ) | ( 'E' ) );
+    public final void rule__Real__Alternatives_2_1_1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1484:1: ( ( 'e' ) | ( 'E' ) )
+            int alt20=2;
+            int LA20_0 = input.LA(1);
+
+            if ( (LA20_0==21) ) {
+                alt20=1;
+            }
+            else if ( (LA20_0==22) ) {
+                alt20=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 20, 0, input);
+
+                throw nvae;
+            }
+            switch (alt20) {
+                case 1 :
+                    // InternalProblem.g:1485:2: ( 'e' )
+                    {
+                    // InternalProblem.g:1485:2: ( 'e' )
+                    // InternalProblem.g:1486:3: 'e'
+                    {
+                     before(grammarAccess.getRealAccess().getEKeyword_2_1_1_0()); 
+                    match(input,21,FOLLOW_2); 
+                     after(grammarAccess.getRealAccess().getEKeyword_2_1_1_0()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:1491:2: ( 'E' )
+                    {
+                    // InternalProblem.g:1491:2: ( 'E' )
+                    // InternalProblem.g:1492:3: 'E'
+                    {
+                     before(grammarAccess.getRealAccess().getEKeyword_2_1_1_1()); 
+                    match(input,22,FOLLOW_2); 
+                     after(grammarAccess.getRealAccess().getEKeyword_2_1_1_1()); 
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Alternatives_2_1_1"
+
+
+    // $ANTLR start "rule__Real__Alternatives_2_1_2"
+    // InternalProblem.g:1501:1: rule__Real__Alternatives_2_1_2 : ( ( '-' ) | ( '+' ) );
+    public final void rule__Real__Alternatives_2_1_2() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1505:1: ( ( '-' ) | ( '+' ) )
+            int alt21=2;
+            int LA21_0 = input.LA(1);
+
+            if ( (LA21_0==23) ) {
+                alt21=1;
+            }
+            else if ( (LA21_0==24) ) {
+                alt21=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 21, 0, input);
+
+                throw nvae;
+            }
+            switch (alt21) {
+                case 1 :
+                    // InternalProblem.g:1506:2: ( '-' )
+                    {
+                    // InternalProblem.g:1506:2: ( '-' )
+                    // InternalProblem.g:1507:3: '-'
+                    {
+                     before(grammarAccess.getRealAccess().getHyphenMinusKeyword_2_1_2_0()); 
+                    match(input,23,FOLLOW_2); 
+                     after(grammarAccess.getRealAccess().getHyphenMinusKeyword_2_1_2_0()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:1512:2: ( '+' )
+                    {
+                    // InternalProblem.g:1512:2: ( '+' )
+                    // InternalProblem.g:1513:3: '+'
+                    {
+                     before(grammarAccess.getRealAccess().getPlusSignKeyword_2_1_2_1()); 
+                    match(input,24,FOLLOW_2); 
+                     after(grammarAccess.getRealAccess().getPlusSignKeyword_2_1_2_1()); 
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Alternatives_2_1_2"
+
+
     // $ANTLR start "rule__LogicValue__Alternatives"
-    // InternalProblem.g:1048:1: rule__LogicValue__Alternatives : ( ( ( 'true' ) ) | ( ( 'false' ) ) | ( ( 'unknown' ) ) );
+    // InternalProblem.g:1522:1: rule__LogicValue__Alternatives : ( ( ( 'true' ) ) | ( ( 'false' ) ) | ( ( 'unknown' ) ) );
     public final void rule__LogicValue__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1052:1: ( ( ( 'true' ) ) | ( ( 'false' ) ) | ( ( 'unknown' ) ) )
-            int alt16=3;
+            // InternalProblem.g:1526:1: ( ( ( 'true' ) ) | ( ( 'false' ) ) | ( ( 'unknown' ) ) )
+            int alt22=3;
             switch ( input.LA(1) ) {
             case 19:
                 {
-                alt16=1;
+                alt22=1;
                 }
                 break;
             case 20:
                 {
-                alt16=2;
+                alt22=2;
                 }
                 break;
-            case 21:
+            case 25:
                 {
-                alt16=3;
+                alt22=3;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("", 16, 0, input);
+                    new NoViableAltException("", 22, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt16) {
+            switch (alt22) {
                 case 1 :
-                    // InternalProblem.g:1053:2: ( ( 'true' ) )
+                    // InternalProblem.g:1527:2: ( ( 'true' ) )
                     {
-                    // InternalProblem.g:1053:2: ( ( 'true' ) )
-                    // InternalProblem.g:1054:3: ( 'true' )
+                    // InternalProblem.g:1527:2: ( ( 'true' ) )
+                    // InternalProblem.g:1528:3: ( 'true' )
                     {
                      before(grammarAccess.getLogicValueAccess().getTRUEEnumLiteralDeclaration_0()); 
-                    // InternalProblem.g:1055:3: ( 'true' )
-                    // InternalProblem.g:1055:4: 'true'
+                    // InternalProblem.g:1529:3: ( 'true' )
+                    // InternalProblem.g:1529:4: 'true'
                     {
                     match(input,19,FOLLOW_2); 
 
@@ -3451,14 +5029,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1059:2: ( ( 'false' ) )
+                    // InternalProblem.g:1533:2: ( ( 'false' ) )
                     {
-                    // InternalProblem.g:1059:2: ( ( 'false' ) )
-                    // InternalProblem.g:1060:3: ( 'false' )
+                    // InternalProblem.g:1533:2: ( ( 'false' ) )
+                    // InternalProblem.g:1534:3: ( 'false' )
                     {
                      before(grammarAccess.getLogicValueAccess().getFALSEEnumLiteralDeclaration_1()); 
-                    // InternalProblem.g:1061:3: ( 'false' )
-                    // InternalProblem.g:1061:4: 'false'
+                    // InternalProblem.g:1535:3: ( 'false' )
+                    // InternalProblem.g:1535:4: 'false'
                     {
                     match(input,20,FOLLOW_2); 
 
@@ -3472,16 +5050,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalProblem.g:1065:2: ( ( 'unknown' ) )
+                    // InternalProblem.g:1539:2: ( ( 'unknown' ) )
                     {
-                    // InternalProblem.g:1065:2: ( ( 'unknown' ) )
-                    // InternalProblem.g:1066:3: ( 'unknown' )
+                    // InternalProblem.g:1539:2: ( ( 'unknown' ) )
+                    // InternalProblem.g:1540:3: ( 'unknown' )
                     {
                      before(grammarAccess.getLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_2()); 
-                    // InternalProblem.g:1067:3: ( 'unknown' )
-                    // InternalProblem.g:1067:4: 'unknown'
+                    // InternalProblem.g:1541:3: ( 'unknown' )
+                    // InternalProblem.g:1541:4: 'unknown'
                     {
-                    match(input,21,FOLLOW_2); 
+                    match(input,25,FOLLOW_2); 
 
                     }
 
@@ -3510,40 +5088,40 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ShortLogicValue__Alternatives"
-    // InternalProblem.g:1075:1: rule__ShortLogicValue__Alternatives : ( ( ( '!' ) ) | ( ( '?' ) ) );
+    // InternalProblem.g:1549:1: rule__ShortLogicValue__Alternatives : ( ( ( '!' ) ) | ( ( '?' ) ) );
     public final void rule__ShortLogicValue__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1079:1: ( ( ( '!' ) ) | ( ( '?' ) ) )
-            int alt17=2;
-            int LA17_0 = input.LA(1);
+            // InternalProblem.g:1553:1: ( ( ( '!' ) ) | ( ( '?' ) ) )
+            int alt23=2;
+            int LA23_0 = input.LA(1);
 
-            if ( (LA17_0==22) ) {
-                alt17=1;
+            if ( (LA23_0==26) ) {
+                alt23=1;
             }
-            else if ( (LA17_0==23) ) {
-                alt17=2;
+            else if ( (LA23_0==27) ) {
+                alt23=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 17, 0, input);
+                    new NoViableAltException("", 23, 0, input);
 
                 throw nvae;
             }
-            switch (alt17) {
+            switch (alt23) {
                 case 1 :
-                    // InternalProblem.g:1080:2: ( ( '!' ) )
+                    // InternalProblem.g:1554:2: ( ( '!' ) )
                     {
-                    // InternalProblem.g:1080:2: ( ( '!' ) )
-                    // InternalProblem.g:1081:3: ( '!' )
+                    // InternalProblem.g:1554:2: ( ( '!' ) )
+                    // InternalProblem.g:1555:3: ( '!' )
                     {
                      before(grammarAccess.getShortLogicValueAccess().getFALSEEnumLiteralDeclaration_0()); 
-                    // InternalProblem.g:1082:3: ( '!' )
-                    // InternalProblem.g:1082:4: '!'
+                    // InternalProblem.g:1556:3: ( '!' )
+                    // InternalProblem.g:1556:4: '!'
                     {
-                    match(input,22,FOLLOW_2); 
+                    match(input,26,FOLLOW_2); 
 
                     }
 
@@ -3555,16 +5133,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1086:2: ( ( '?' ) )
+                    // InternalProblem.g:1560:2: ( ( '?' ) )
                     {
-                    // InternalProblem.g:1086:2: ( ( '?' ) )
-                    // InternalProblem.g:1087:3: ( '?' )
+                    // InternalProblem.g:1560:2: ( ( '?' ) )
+                    // InternalProblem.g:1561:3: ( '?' )
                     {
                      before(grammarAccess.getShortLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_1()); 
-                    // InternalProblem.g:1088:3: ( '?' )
-                    // InternalProblem.g:1088:4: '?'
+                    // InternalProblem.g:1562:3: ( '?' )
+                    // InternalProblem.g:1562:4: '?'
                     {
-                    match(input,23,FOLLOW_2); 
+                    match(input,27,FOLLOW_2); 
 
                     }
 
@@ -3593,14 +5171,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group__0"
-    // InternalProblem.g:1096:1: rule__Problem__Group__0 : rule__Problem__Group__0__Impl rule__Problem__Group__1 ;
+    // InternalProblem.g:1570: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:1100:1: ( rule__Problem__Group__0__Impl rule__Problem__Group__1 )
-            // InternalProblem.g:1101:2: rule__Problem__Group__0__Impl rule__Problem__Group__1
+            // InternalProblem.g:1574:1: ( rule__Problem__Group__0__Impl rule__Problem__Group__1 )
+            // InternalProblem.g:1575:2: rule__Problem__Group__0__Impl rule__Problem__Group__1
             {
             pushFollow(FOLLOW_3);
             rule__Problem__Group__0__Impl();
@@ -3631,29 +5209,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group__0__Impl"
-    // InternalProblem.g:1108:1: rule__Problem__Group__0__Impl : ( ( rule__Problem__Group_0__0 )? ) ;
+    // InternalProblem.g:1582: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:1112:1: ( ( ( rule__Problem__Group_0__0 )? ) )
-            // InternalProblem.g:1113:1: ( ( rule__Problem__Group_0__0 )? )
+            // InternalProblem.g:1586:1: ( ( ( rule__Problem__Group_0__0 )? ) )
+            // InternalProblem.g:1587:1: ( ( rule__Problem__Group_0__0 )? )
             {
-            // InternalProblem.g:1113:1: ( ( rule__Problem__Group_0__0 )? )
-            // InternalProblem.g:1114:2: ( rule__Problem__Group_0__0 )?
+            // InternalProblem.g:1587:1: ( ( rule__Problem__Group_0__0 )? )
+            // InternalProblem.g:1588:2: ( rule__Problem__Group_0__0 )?
             {
              before(grammarAccess.getProblemAccess().getGroup_0()); 
-            // InternalProblem.g:1115:2: ( rule__Problem__Group_0__0 )?
-            int alt18=2;
-            int LA18_0 = input.LA(1);
+            // InternalProblem.g:1589:2: ( rule__Problem__Group_0__0 )?
+            int alt24=2;
+            int LA24_0 = input.LA(1);
 
-            if ( (LA18_0==24) ) {
-                alt18=1;
+            if ( (LA24_0==28) ) {
+                alt24=1;
             }
-            switch (alt18) {
+            switch (alt24) {
                 case 1 :
-                    // InternalProblem.g:1115:3: rule__Problem__Group_0__0
+                    // InternalProblem.g:1589:3: rule__Problem__Group_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Problem__Group_0__0();
@@ -3689,14 +5267,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group__1"
-    // InternalProblem.g:1123:1: rule__Problem__Group__1 : rule__Problem__Group__1__Impl ;
+    // InternalProblem.g:1597: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:1127:1: ( rule__Problem__Group__1__Impl )
-            // InternalProblem.g:1128:2: rule__Problem__Group__1__Impl
+            // InternalProblem.g:1601:1: ( rule__Problem__Group__1__Impl )
+            // InternalProblem.g:1602:2: rule__Problem__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Problem__Group__1__Impl();
@@ -3722,33 +5300,33 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group__1__Impl"
-    // InternalProblem.g:1134:1: rule__Problem__Group__1__Impl : ( ( rule__Problem__StatementsAssignment_1 )* ) ;
+    // InternalProblem.g:1608: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:1138:1: ( ( ( rule__Problem__StatementsAssignment_1 )* ) )
-            // InternalProblem.g:1139:1: ( ( rule__Problem__StatementsAssignment_1 )* )
+            // InternalProblem.g:1612:1: ( ( ( rule__Problem__StatementsAssignment_1 )* ) )
+            // InternalProblem.g:1613:1: ( ( rule__Problem__StatementsAssignment_1 )* )
             {
-            // InternalProblem.g:1139:1: ( ( rule__Problem__StatementsAssignment_1 )* )
-            // InternalProblem.g:1140:2: ( rule__Problem__StatementsAssignment_1 )*
+            // InternalProblem.g:1613:1: ( ( rule__Problem__StatementsAssignment_1 )* )
+            // InternalProblem.g:1614:2: ( rule__Problem__StatementsAssignment_1 )*
             {
              before(grammarAccess.getProblemAccess().getStatementsAssignment_1()); 
-            // InternalProblem.g:1141:2: ( rule__Problem__StatementsAssignment_1 )*
-            loop19:
+            // InternalProblem.g:1615:2: ( rule__Problem__StatementsAssignment_1 )*
+            loop25:
             do {
-                int alt19=2;
-                int LA19_0 = input.LA(1);
+                int alt25=2;
+                int LA25_0 = input.LA(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==40||LA19_0==42) ) {
-                    alt19=1;
+                if ( ((LA25_0>=RULE_QUOTED_ID && LA25_0<=RULE_ID)||LA25_0==16||(LA25_0>=19 && LA25_0<=22)||(LA25_0>=26 && LA25_0<=27)||LA25_0==29||LA25_0==33||LA25_0==41||LA25_0==44||LA25_0==46) ) {
+                    alt25=1;
                 }
 
 
-                switch (alt19) {
+                switch (alt25) {
                 case 1 :
-                    // InternalProblem.g:1141:3: rule__Problem__StatementsAssignment_1
+                    // InternalProblem.g:1615:3: rule__Problem__StatementsAssignment_1
                     {
                     pushFollow(FOLLOW_4);
                     rule__Problem__StatementsAssignment_1();
@@ -3760,7 +5338,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop19;
+                    break loop25;
                 }
             } while (true);
 
@@ -3787,14 +5365,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group_0__0"
-    // InternalProblem.g:1150:1: rule__Problem__Group_0__0 : rule__Problem__Group_0__0__Impl rule__Problem__Group_0__1 ;
+    // InternalProblem.g:1624: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: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
+            // InternalProblem.g:1628:1: ( rule__Problem__Group_0__0__Impl rule__Problem__Group_0__1 )
+            // InternalProblem.g:1629:2: rule__Problem__Group_0__0__Impl rule__Problem__Group_0__1
             {
             pushFollow(FOLLOW_5);
             rule__Problem__Group_0__0__Impl();
@@ -3825,20 +5403,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group_0__0__Impl"
-    // InternalProblem.g:1162:1: rule__Problem__Group_0__0__Impl : ( 'problem' ) ;
+    // InternalProblem.g:1636: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:1166:1: ( ( 'problem' ) )
-            // InternalProblem.g:1167:1: ( 'problem' )
+            // InternalProblem.g:1640:1: ( ( 'problem' ) )
+            // InternalProblem.g:1641:1: ( 'problem' )
             {
-            // InternalProblem.g:1167:1: ( 'problem' )
-            // InternalProblem.g:1168:2: 'problem'
+            // InternalProblem.g:1641:1: ( 'problem' )
+            // InternalProblem.g:1642:2: 'problem'
             {
              before(grammarAccess.getProblemAccess().getProblemKeyword_0_0()); 
-            match(input,24,FOLLOW_2); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getProblemAccess().getProblemKeyword_0_0()); 
 
             }
@@ -3862,14 +5440,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group_0__1"
-    // InternalProblem.g:1177:1: rule__Problem__Group_0__1 : rule__Problem__Group_0__1__Impl rule__Problem__Group_0__2 ;
+    // InternalProblem.g:1651: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: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
+            // InternalProblem.g:1655:1: ( rule__Problem__Group_0__1__Impl rule__Problem__Group_0__2 )
+            // InternalProblem.g:1656:2: rule__Problem__Group_0__1__Impl rule__Problem__Group_0__2
             {
             pushFollow(FOLLOW_6);
             rule__Problem__Group_0__1__Impl();
@@ -3900,21 +5478,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group_0__1__Impl"
-    // InternalProblem.g:1189:1: rule__Problem__Group_0__1__Impl : ( ( rule__Problem__NameAssignment_0_1 ) ) ;
+    // InternalProblem.g:1663: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:1193:1: ( ( ( rule__Problem__NameAssignment_0_1 ) ) )
-            // InternalProblem.g:1194:1: ( ( rule__Problem__NameAssignment_0_1 ) )
+            // InternalProblem.g:1667:1: ( ( ( rule__Problem__NameAssignment_0_1 ) ) )
+            // InternalProblem.g:1668:1: ( ( rule__Problem__NameAssignment_0_1 ) )
             {
-            // InternalProblem.g:1194:1: ( ( rule__Problem__NameAssignment_0_1 ) )
-            // InternalProblem.g:1195:2: ( rule__Problem__NameAssignment_0_1 )
+            // InternalProblem.g:1668:1: ( ( rule__Problem__NameAssignment_0_1 ) )
+            // InternalProblem.g:1669:2: ( rule__Problem__NameAssignment_0_1 )
             {
              before(grammarAccess.getProblemAccess().getNameAssignment_0_1()); 
-            // InternalProblem.g:1196:2: ( rule__Problem__NameAssignment_0_1 )
-            // InternalProblem.g:1196:3: rule__Problem__NameAssignment_0_1
+            // InternalProblem.g:1670:2: ( rule__Problem__NameAssignment_0_1 )
+            // InternalProblem.g:1670:3: rule__Problem__NameAssignment_0_1
             {
             pushFollow(FOLLOW_2);
             rule__Problem__NameAssignment_0_1();
@@ -3947,14 +5525,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group_0__2"
-    // InternalProblem.g:1204:1: rule__Problem__Group_0__2 : rule__Problem__Group_0__2__Impl ;
+    // InternalProblem.g:1678: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:1208:1: ( rule__Problem__Group_0__2__Impl )
-            // InternalProblem.g:1209:2: rule__Problem__Group_0__2__Impl
+            // InternalProblem.g:1682:1: ( rule__Problem__Group_0__2__Impl )
+            // InternalProblem.g:1683:2: rule__Problem__Group_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Problem__Group_0__2__Impl();
@@ -3980,17 +5558,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__Group_0__2__Impl"
-    // InternalProblem.g:1215:1: rule__Problem__Group_0__2__Impl : ( '.' ) ;
+    // InternalProblem.g:1689:1: rule__Problem__Group_0__2__Impl : ( '.' ) ;
     public final void rule__Problem__Group_0__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1219:1: ( ( '.' ) )
-            // InternalProblem.g:1220:1: ( '.' )
+            // InternalProblem.g:1693:1: ( ( '.' ) )
+            // InternalProblem.g:1694:1: ( '.' )
             {
-            // InternalProblem.g:1220:1: ( '.' )
-            // InternalProblem.g:1221:2: '.'
+            // InternalProblem.g:1694:1: ( '.' )
+            // InternalProblem.g:1695:2: '.'
             {
              before(grammarAccess.getProblemAccess().getFullStopKeyword_0_2()); 
             match(input,12,FOLLOW_2); 
@@ -4017,14 +5595,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__0"
-    // InternalProblem.g:1231:1: rule__ClassDeclaration__Group__0 : rule__ClassDeclaration__Group__0__Impl rule__ClassDeclaration__Group__1 ;
+    // InternalProblem.g:1705: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:1235:1: ( rule__ClassDeclaration__Group__0__Impl rule__ClassDeclaration__Group__1 )
-            // InternalProblem.g:1236:2: rule__ClassDeclaration__Group__0__Impl rule__ClassDeclaration__Group__1
+            // InternalProblem.g:1709:1: ( rule__ClassDeclaration__Group__0__Impl rule__ClassDeclaration__Group__1 )
+            // InternalProblem.g:1710:2: rule__ClassDeclaration__Group__0__Impl rule__ClassDeclaration__Group__1
             {
             pushFollow(FOLLOW_7);
             rule__ClassDeclaration__Group__0__Impl();
@@ -4055,29 +5633,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__0__Impl"
-    // InternalProblem.g:1243:1: rule__ClassDeclaration__Group__0__Impl : ( ( rule__ClassDeclaration__AbstractAssignment_0 )? ) ;
+    // InternalProblem.g:1717: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:1247:1: ( ( ( rule__ClassDeclaration__AbstractAssignment_0 )? ) )
-            // InternalProblem.g:1248:1: ( ( rule__ClassDeclaration__AbstractAssignment_0 )? )
+            // InternalProblem.g:1721:1: ( ( ( rule__ClassDeclaration__AbstractAssignment_0 )? ) )
+            // InternalProblem.g:1722:1: ( ( rule__ClassDeclaration__AbstractAssignment_0 )? )
             {
-            // InternalProblem.g:1248:1: ( ( rule__ClassDeclaration__AbstractAssignment_0 )? )
-            // InternalProblem.g:1249:2: ( rule__ClassDeclaration__AbstractAssignment_0 )?
+            // InternalProblem.g:1722:1: ( ( rule__ClassDeclaration__AbstractAssignment_0 )? )
+            // InternalProblem.g:1723:2: ( rule__ClassDeclaration__AbstractAssignment_0 )?
             {
              before(grammarAccess.getClassDeclarationAccess().getAbstractAssignment_0()); 
-            // InternalProblem.g:1250:2: ( rule__ClassDeclaration__AbstractAssignment_0 )?
-            int alt20=2;
-            int LA20_0 = input.LA(1);
+            // InternalProblem.g:1724:2: ( rule__ClassDeclaration__AbstractAssignment_0 )?
+            int alt26=2;
+            int LA26_0 = input.LA(1);
 
-            if ( (LA20_0==40) ) {
-                alt20=1;
+            if ( (LA26_0==44) ) {
+                alt26=1;
             }
-            switch (alt20) {
+            switch (alt26) {
                 case 1 :
-                    // InternalProblem.g:1250:3: rule__ClassDeclaration__AbstractAssignment_0
+                    // InternalProblem.g:1724:3: rule__ClassDeclaration__AbstractAssignment_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__ClassDeclaration__AbstractAssignment_0();
@@ -4113,14 +5691,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__1"
-    // InternalProblem.g:1258:1: rule__ClassDeclaration__Group__1 : rule__ClassDeclaration__Group__1__Impl rule__ClassDeclaration__Group__2 ;
+    // InternalProblem.g:1732: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:1262:1: ( rule__ClassDeclaration__Group__1__Impl rule__ClassDeclaration__Group__2 )
-            // InternalProblem.g:1263:2: rule__ClassDeclaration__Group__1__Impl rule__ClassDeclaration__Group__2
+            // InternalProblem.g:1736:1: ( rule__ClassDeclaration__Group__1__Impl rule__ClassDeclaration__Group__2 )
+            // InternalProblem.g:1737:2: rule__ClassDeclaration__Group__1__Impl rule__ClassDeclaration__Group__2
             {
             pushFollow(FOLLOW_5);
             rule__ClassDeclaration__Group__1__Impl();
@@ -4151,20 +5729,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__1__Impl"
-    // InternalProblem.g:1270:1: rule__ClassDeclaration__Group__1__Impl : ( 'class' ) ;
+    // InternalProblem.g:1744:1: rule__ClassDeclaration__Group__1__Impl : ( 'class' ) ;
     public final void rule__ClassDeclaration__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1274:1: ( ( 'class' ) )
-            // InternalProblem.g:1275:1: ( 'class' )
+            // InternalProblem.g:1748:1: ( ( 'class' ) )
+            // InternalProblem.g:1749:1: ( 'class' )
             {
-            // InternalProblem.g:1275:1: ( 'class' )
-            // InternalProblem.g:1276:2: 'class'
+            // InternalProblem.g:1749:1: ( 'class' )
+            // InternalProblem.g:1750:2: 'class'
             {
              before(grammarAccess.getClassDeclarationAccess().getClassKeyword_1()); 
-            match(input,25,FOLLOW_2); 
+            match(input,29,FOLLOW_2); 
              after(grammarAccess.getClassDeclarationAccess().getClassKeyword_1()); 
 
             }
@@ -4188,14 +5766,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__2"
-    // InternalProblem.g:1285:1: rule__ClassDeclaration__Group__2 : rule__ClassDeclaration__Group__2__Impl rule__ClassDeclaration__Group__3 ;
+    // InternalProblem.g:1759: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:1289:1: ( rule__ClassDeclaration__Group__2__Impl rule__ClassDeclaration__Group__3 )
-            // InternalProblem.g:1290:2: rule__ClassDeclaration__Group__2__Impl rule__ClassDeclaration__Group__3
+            // InternalProblem.g:1763:1: ( rule__ClassDeclaration__Group__2__Impl rule__ClassDeclaration__Group__3 )
+            // InternalProblem.g:1764:2: rule__ClassDeclaration__Group__2__Impl rule__ClassDeclaration__Group__3
             {
             pushFollow(FOLLOW_8);
             rule__ClassDeclaration__Group__2__Impl();
@@ -4226,21 +5804,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__2__Impl"
-    // InternalProblem.g:1297:1: rule__ClassDeclaration__Group__2__Impl : ( ( rule__ClassDeclaration__NameAssignment_2 ) ) ;
+    // InternalProblem.g:1771: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:1301:1: ( ( ( rule__ClassDeclaration__NameAssignment_2 ) ) )
-            // InternalProblem.g:1302:1: ( ( rule__ClassDeclaration__NameAssignment_2 ) )
+            // InternalProblem.g:1775:1: ( ( ( rule__ClassDeclaration__NameAssignment_2 ) ) )
+            // InternalProblem.g:1776:1: ( ( rule__ClassDeclaration__NameAssignment_2 ) )
             {
-            // InternalProblem.g:1302:1: ( ( rule__ClassDeclaration__NameAssignment_2 ) )
-            // InternalProblem.g:1303:2: ( rule__ClassDeclaration__NameAssignment_2 )
+            // InternalProblem.g:1776:1: ( ( rule__ClassDeclaration__NameAssignment_2 ) )
+            // InternalProblem.g:1777:2: ( rule__ClassDeclaration__NameAssignment_2 )
             {
              before(grammarAccess.getClassDeclarationAccess().getNameAssignment_2()); 
-            // InternalProblem.g:1304:2: ( rule__ClassDeclaration__NameAssignment_2 )
-            // InternalProblem.g:1304:3: rule__ClassDeclaration__NameAssignment_2
+            // InternalProblem.g:1778:2: ( rule__ClassDeclaration__NameAssignment_2 )
+            // InternalProblem.g:1778:3: rule__ClassDeclaration__NameAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__NameAssignment_2();
@@ -4273,14 +5851,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__3"
-    // InternalProblem.g:1312:1: rule__ClassDeclaration__Group__3 : rule__ClassDeclaration__Group__3__Impl rule__ClassDeclaration__Group__4 ;
+    // InternalProblem.g:1786: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:1316:1: ( rule__ClassDeclaration__Group__3__Impl rule__ClassDeclaration__Group__4 )
-            // InternalProblem.g:1317:2: rule__ClassDeclaration__Group__3__Impl rule__ClassDeclaration__Group__4
+            // InternalProblem.g:1790:1: ( rule__ClassDeclaration__Group__3__Impl rule__ClassDeclaration__Group__4 )
+            // InternalProblem.g:1791:2: rule__ClassDeclaration__Group__3__Impl rule__ClassDeclaration__Group__4
             {
             pushFollow(FOLLOW_8);
             rule__ClassDeclaration__Group__3__Impl();
@@ -4311,29 +5889,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__3__Impl"
-    // InternalProblem.g:1324:1: rule__ClassDeclaration__Group__3__Impl : ( ( rule__ClassDeclaration__Group_3__0 )? ) ;
+    // InternalProblem.g:1798: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:1328:1: ( ( ( rule__ClassDeclaration__Group_3__0 )? ) )
-            // InternalProblem.g:1329:1: ( ( rule__ClassDeclaration__Group_3__0 )? )
+            // InternalProblem.g:1802:1: ( ( ( rule__ClassDeclaration__Group_3__0 )? ) )
+            // InternalProblem.g:1803:1: ( ( rule__ClassDeclaration__Group_3__0 )? )
             {
-            // InternalProblem.g:1329:1: ( ( rule__ClassDeclaration__Group_3__0 )? )
-            // InternalProblem.g:1330:2: ( rule__ClassDeclaration__Group_3__0 )?
+            // InternalProblem.g:1803:1: ( ( rule__ClassDeclaration__Group_3__0 )? )
+            // InternalProblem.g:1804:2: ( rule__ClassDeclaration__Group_3__0 )?
             {
              before(grammarAccess.getClassDeclarationAccess().getGroup_3()); 
-            // InternalProblem.g:1331:2: ( rule__ClassDeclaration__Group_3__0 )?
-            int alt21=2;
-            int LA21_0 = input.LA(1);
+            // InternalProblem.g:1805:2: ( rule__ClassDeclaration__Group_3__0 )?
+            int alt27=2;
+            int LA27_0 = input.LA(1);
 
-            if ( (LA21_0==26) ) {
-                alt21=1;
+            if ( (LA27_0==30) ) {
+                alt27=1;
             }
-            switch (alt21) {
+            switch (alt27) {
                 case 1 :
-                    // InternalProblem.g:1331:3: rule__ClassDeclaration__Group_3__0
+                    // InternalProblem.g:1805:3: rule__ClassDeclaration__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__ClassDeclaration__Group_3__0();
@@ -4369,14 +5947,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__4"
-    // InternalProblem.g:1339:1: rule__ClassDeclaration__Group__4 : rule__ClassDeclaration__Group__4__Impl ;
+    // InternalProblem.g:1813: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:1343:1: ( rule__ClassDeclaration__Group__4__Impl )
-            // InternalProblem.g:1344:2: rule__ClassDeclaration__Group__4__Impl
+            // InternalProblem.g:1817:1: ( rule__ClassDeclaration__Group__4__Impl )
+            // InternalProblem.g:1818:2: rule__ClassDeclaration__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__Group__4__Impl();
@@ -4402,21 +5980,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group__4__Impl"
-    // InternalProblem.g:1350:1: rule__ClassDeclaration__Group__4__Impl : ( ( rule__ClassDeclaration__Alternatives_4 ) ) ;
+    // InternalProblem.g:1824: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:1354:1: ( ( ( rule__ClassDeclaration__Alternatives_4 ) ) )
-            // InternalProblem.g:1355:1: ( ( rule__ClassDeclaration__Alternatives_4 ) )
+            // InternalProblem.g:1828:1: ( ( ( rule__ClassDeclaration__Alternatives_4 ) ) )
+            // InternalProblem.g:1829:1: ( ( rule__ClassDeclaration__Alternatives_4 ) )
             {
-            // InternalProblem.g:1355:1: ( ( rule__ClassDeclaration__Alternatives_4 ) )
-            // InternalProblem.g:1356:2: ( rule__ClassDeclaration__Alternatives_4 )
+            // InternalProblem.g:1829:1: ( ( rule__ClassDeclaration__Alternatives_4 ) )
+            // InternalProblem.g:1830:2: ( rule__ClassDeclaration__Alternatives_4 )
             {
              before(grammarAccess.getClassDeclarationAccess().getAlternatives_4()); 
-            // InternalProblem.g:1357:2: ( rule__ClassDeclaration__Alternatives_4 )
-            // InternalProblem.g:1357:3: rule__ClassDeclaration__Alternatives_4
+            // InternalProblem.g:1831:2: ( rule__ClassDeclaration__Alternatives_4 )
+            // InternalProblem.g:1831:3: rule__ClassDeclaration__Alternatives_4
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__Alternatives_4();
@@ -4449,14 +6027,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3__0"
-    // InternalProblem.g:1366:1: rule__ClassDeclaration__Group_3__0 : rule__ClassDeclaration__Group_3__0__Impl rule__ClassDeclaration__Group_3__1 ;
+    // InternalProblem.g:1840: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: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
+            // InternalProblem.g:1844:1: ( rule__ClassDeclaration__Group_3__0__Impl rule__ClassDeclaration__Group_3__1 )
+            // InternalProblem.g:1845:2: rule__ClassDeclaration__Group_3__0__Impl rule__ClassDeclaration__Group_3__1
             {
             pushFollow(FOLLOW_5);
             rule__ClassDeclaration__Group_3__0__Impl();
@@ -4487,20 +6065,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3__0__Impl"
-    // InternalProblem.g:1378:1: rule__ClassDeclaration__Group_3__0__Impl : ( 'extends' ) ;
+    // InternalProblem.g:1852: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:1382:1: ( ( 'extends' ) )
-            // InternalProblem.g:1383:1: ( 'extends' )
+            // InternalProblem.g:1856:1: ( ( 'extends' ) )
+            // InternalProblem.g:1857:1: ( 'extends' )
             {
-            // InternalProblem.g:1383:1: ( 'extends' )
-            // InternalProblem.g:1384:2: 'extends'
+            // InternalProblem.g:1857:1: ( 'extends' )
+            // InternalProblem.g:1858:2: 'extends'
             {
              before(grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0()); 
-            match(input,26,FOLLOW_2); 
+            match(input,30,FOLLOW_2); 
              after(grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0()); 
 
             }
@@ -4524,14 +6102,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3__1"
-    // InternalProblem.g:1393:1: rule__ClassDeclaration__Group_3__1 : rule__ClassDeclaration__Group_3__1__Impl rule__ClassDeclaration__Group_3__2 ;
+    // InternalProblem.g:1867: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: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
+            // InternalProblem.g:1871:1: ( rule__ClassDeclaration__Group_3__1__Impl rule__ClassDeclaration__Group_3__2 )
+            // InternalProblem.g:1872:2: rule__ClassDeclaration__Group_3__1__Impl rule__ClassDeclaration__Group_3__2
             {
             pushFollow(FOLLOW_9);
             rule__ClassDeclaration__Group_3__1__Impl();
@@ -4562,21 +6140,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3__1__Impl"
-    // InternalProblem.g:1405:1: rule__ClassDeclaration__Group_3__1__Impl : ( ( rule__ClassDeclaration__SuperTypesAssignment_3_1 ) ) ;
+    // InternalProblem.g:1879: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:1409:1: ( ( ( rule__ClassDeclaration__SuperTypesAssignment_3_1 ) ) )
-            // InternalProblem.g:1410:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_1 ) )
+            // InternalProblem.g:1883:1: ( ( ( rule__ClassDeclaration__SuperTypesAssignment_3_1 ) ) )
+            // InternalProblem.g:1884:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_1 ) )
             {
-            // InternalProblem.g:1410:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_1 ) )
-            // InternalProblem.g:1411:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_1 )
+            // InternalProblem.g:1884:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_1 ) )
+            // InternalProblem.g:1885:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_1 )
             {
              before(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_1()); 
-            // InternalProblem.g:1412:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_1 )
-            // InternalProblem.g:1412:3: rule__ClassDeclaration__SuperTypesAssignment_3_1
+            // InternalProblem.g:1886:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_1 )
+            // InternalProblem.g:1886:3: rule__ClassDeclaration__SuperTypesAssignment_3_1
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__SuperTypesAssignment_3_1();
@@ -4609,14 +6187,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3__2"
-    // InternalProblem.g:1420:1: rule__ClassDeclaration__Group_3__2 : rule__ClassDeclaration__Group_3__2__Impl ;
+    // InternalProblem.g:1894: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:1424:1: ( rule__ClassDeclaration__Group_3__2__Impl )
-            // InternalProblem.g:1425:2: rule__ClassDeclaration__Group_3__2__Impl
+            // InternalProblem.g:1898:1: ( rule__ClassDeclaration__Group_3__2__Impl )
+            // InternalProblem.g:1899:2: rule__ClassDeclaration__Group_3__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__Group_3__2__Impl();
@@ -4642,33 +6220,33 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3__2__Impl"
-    // InternalProblem.g:1431:1: rule__ClassDeclaration__Group_3__2__Impl : ( ( rule__ClassDeclaration__Group_3_2__0 )* ) ;
+    // InternalProblem.g:1905: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:1435:1: ( ( ( rule__ClassDeclaration__Group_3_2__0 )* ) )
-            // InternalProblem.g:1436:1: ( ( rule__ClassDeclaration__Group_3_2__0 )* )
+            // InternalProblem.g:1909:1: ( ( ( rule__ClassDeclaration__Group_3_2__0 )* ) )
+            // InternalProblem.g:1910:1: ( ( 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 )*
+            // InternalProblem.g:1910:1: ( ( rule__ClassDeclaration__Group_3_2__0 )* )
+            // InternalProblem.g:1911:2: ( rule__ClassDeclaration__Group_3_2__0 )*
             {
              before(grammarAccess.getClassDeclarationAccess().getGroup_3_2()); 
-            // InternalProblem.g:1438:2: ( rule__ClassDeclaration__Group_3_2__0 )*
-            loop22:
+            // InternalProblem.g:1912:2: ( rule__ClassDeclaration__Group_3_2__0 )*
+            loop28:
             do {
-                int alt22=2;
-                int LA22_0 = input.LA(1);
+                int alt28=2;
+                int LA28_0 = input.LA(1);
 
-                if ( (LA22_0==13) ) {
-                    alt22=1;
+                if ( (LA28_0==13) ) {
+                    alt28=1;
                 }
 
 
-                switch (alt22) {
+                switch (alt28) {
                 case 1 :
-                    // InternalProblem.g:1438:3: rule__ClassDeclaration__Group_3_2__0
+                    // InternalProblem.g:1912:3: rule__ClassDeclaration__Group_3_2__0
                     {
                     pushFollow(FOLLOW_10);
                     rule__ClassDeclaration__Group_3_2__0();
@@ -4680,7 +6258,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop22;
+                    break loop28;
                 }
             } while (true);
 
@@ -4707,14 +6285,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3_2__0"
-    // InternalProblem.g:1447:1: rule__ClassDeclaration__Group_3_2__0 : rule__ClassDeclaration__Group_3_2__0__Impl rule__ClassDeclaration__Group_3_2__1 ;
+    // InternalProblem.g:1921: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: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
+            // InternalProblem.g:1925:1: ( rule__ClassDeclaration__Group_3_2__0__Impl rule__ClassDeclaration__Group_3_2__1 )
+            // InternalProblem.g:1926:2: rule__ClassDeclaration__Group_3_2__0__Impl rule__ClassDeclaration__Group_3_2__1
             {
             pushFollow(FOLLOW_5);
             rule__ClassDeclaration__Group_3_2__0__Impl();
@@ -4745,17 +6323,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3_2__0__Impl"
-    // InternalProblem.g:1459:1: rule__ClassDeclaration__Group_3_2__0__Impl : ( ',' ) ;
+    // InternalProblem.g:1933: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:1463:1: ( ( ',' ) )
-            // InternalProblem.g:1464:1: ( ',' )
+            // InternalProblem.g:1937:1: ( ( ',' ) )
+            // InternalProblem.g:1938:1: ( ',' )
             {
-            // InternalProblem.g:1464:1: ( ',' )
-            // InternalProblem.g:1465:2: ','
+            // InternalProblem.g:1938:1: ( ',' )
+            // InternalProblem.g:1939:2: ','
             {
              before(grammarAccess.getClassDeclarationAccess().getCommaKeyword_3_2_0()); 
             match(input,13,FOLLOW_2); 
@@ -4782,14 +6360,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3_2__1"
-    // InternalProblem.g:1474:1: rule__ClassDeclaration__Group_3_2__1 : rule__ClassDeclaration__Group_3_2__1__Impl ;
+    // InternalProblem.g:1948: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:1478:1: ( rule__ClassDeclaration__Group_3_2__1__Impl )
-            // InternalProblem.g:1479:2: rule__ClassDeclaration__Group_3_2__1__Impl
+            // InternalProblem.g:1952:1: ( rule__ClassDeclaration__Group_3_2__1__Impl )
+            // InternalProblem.g:1953:2: rule__ClassDeclaration__Group_3_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__Group_3_2__1__Impl();
@@ -4815,21 +6393,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_3_2__1__Impl"
-    // InternalProblem.g:1485:1: rule__ClassDeclaration__Group_3_2__1__Impl : ( ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 ) ) ;
+    // InternalProblem.g:1959: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:1489:1: ( ( ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 ) ) )
-            // InternalProblem.g:1490:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 ) )
+            // InternalProblem.g:1963:1: ( ( ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 ) ) )
+            // InternalProblem.g:1964:1: ( ( 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 )
+            // InternalProblem.g:1964:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 ) )
+            // InternalProblem.g:1965:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 )
             {
              before(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_2_1()); 
-            // InternalProblem.g:1492:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 )
-            // InternalProblem.g:1492:3: rule__ClassDeclaration__SuperTypesAssignment_3_2_1
+            // InternalProblem.g:1966:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 )
+            // InternalProblem.g:1966:3: rule__ClassDeclaration__SuperTypesAssignment_3_2_1
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__SuperTypesAssignment_3_2_1();
@@ -4862,14 +6440,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0__0"
-    // InternalProblem.g:1501:1: rule__ClassDeclaration__Group_4_0__0 : rule__ClassDeclaration__Group_4_0__0__Impl rule__ClassDeclaration__Group_4_0__1 ;
+    // InternalProblem.g:1975: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: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
+            // InternalProblem.g:1979:1: ( rule__ClassDeclaration__Group_4_0__0__Impl rule__ClassDeclaration__Group_4_0__1 )
+            // InternalProblem.g:1980:2: rule__ClassDeclaration__Group_4_0__0__Impl rule__ClassDeclaration__Group_4_0__1
             {
             pushFollow(FOLLOW_11);
             rule__ClassDeclaration__Group_4_0__0__Impl();
@@ -4900,20 +6478,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0__0__Impl"
-    // InternalProblem.g:1513:1: rule__ClassDeclaration__Group_4_0__0__Impl : ( '{' ) ;
+    // InternalProblem.g:1987: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:1517:1: ( ( '{' ) )
-            // InternalProblem.g:1518:1: ( '{' )
+            // InternalProblem.g:1991:1: ( ( '{' ) )
+            // InternalProblem.g:1992:1: ( '{' )
             {
-            // InternalProblem.g:1518:1: ( '{' )
-            // InternalProblem.g:1519:2: '{'
+            // InternalProblem.g:1992:1: ( '{' )
+            // InternalProblem.g:1993:2: '{'
             {
              before(grammarAccess.getClassDeclarationAccess().getLeftCurlyBracketKeyword_4_0_0()); 
-            match(input,27,FOLLOW_2); 
+            match(input,31,FOLLOW_2); 
              after(grammarAccess.getClassDeclarationAccess().getLeftCurlyBracketKeyword_4_0_0()); 
 
             }
@@ -4937,14 +6515,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0__1"
-    // InternalProblem.g:1528:1: rule__ClassDeclaration__Group_4_0__1 : rule__ClassDeclaration__Group_4_0__1__Impl rule__ClassDeclaration__Group_4_0__2 ;
+    // InternalProblem.g:2002: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: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
+            // InternalProblem.g:2006:1: ( rule__ClassDeclaration__Group_4_0__1__Impl rule__ClassDeclaration__Group_4_0__2 )
+            // InternalProblem.g:2007:2: rule__ClassDeclaration__Group_4_0__1__Impl rule__ClassDeclaration__Group_4_0__2
             {
             pushFollow(FOLLOW_11);
             rule__ClassDeclaration__Group_4_0__1__Impl();
@@ -4975,33 +6553,33 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0__1__Impl"
-    // InternalProblem.g:1540:1: rule__ClassDeclaration__Group_4_0__1__Impl : ( ( rule__ClassDeclaration__Group_4_0_1__0 )* ) ;
+    // InternalProblem.g:2014: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:1544:1: ( ( ( rule__ClassDeclaration__Group_4_0_1__0 )* ) )
-            // InternalProblem.g:1545:1: ( ( rule__ClassDeclaration__Group_4_0_1__0 )* )
+            // InternalProblem.g:2018:1: ( ( ( rule__ClassDeclaration__Group_4_0_1__0 )* ) )
+            // InternalProblem.g:2019:1: ( ( 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 )*
+            // InternalProblem.g:2019:1: ( ( rule__ClassDeclaration__Group_4_0_1__0 )* )
+            // InternalProblem.g:2020:2: ( rule__ClassDeclaration__Group_4_0_1__0 )*
             {
              before(grammarAccess.getClassDeclarationAccess().getGroup_4_0_1()); 
-            // InternalProblem.g:1547:2: ( rule__ClassDeclaration__Group_4_0_1__0 )*
-            loop23:
+            // InternalProblem.g:2021:2: ( rule__ClassDeclaration__Group_4_0_1__0 )*
+            loop29:
             do {
-                int alt23=2;
-                int LA23_0 = input.LA(1);
+                int alt29=2;
+                int LA29_0 = input.LA(1);
 
-                if ( ((LA23_0>=RULE_QUOTED_ID && LA23_0<=RULE_ID)||LA23_0==15||(LA23_0>=19 && LA23_0<=20)||LA23_0==41) ) {
-                    alt23=1;
+                if ( ((LA29_0>=RULE_QUOTED_ID && LA29_0<=RULE_ID)||LA29_0==15||(LA29_0>=19 && LA29_0<=22)||LA29_0==45) ) {
+                    alt29=1;
                 }
 
 
-                switch (alt23) {
+                switch (alt29) {
                 case 1 :
-                    // InternalProblem.g:1547:3: rule__ClassDeclaration__Group_4_0_1__0
+                    // InternalProblem.g:2021:3: rule__ClassDeclaration__Group_4_0_1__0
                     {
                     pushFollow(FOLLOW_12);
                     rule__ClassDeclaration__Group_4_0_1__0();
@@ -5013,7 +6591,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop23;
+                    break loop29;
                 }
             } while (true);
 
@@ -5040,14 +6618,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0__2"
-    // InternalProblem.g:1555:1: rule__ClassDeclaration__Group_4_0__2 : rule__ClassDeclaration__Group_4_0__2__Impl ;
+    // InternalProblem.g:2029: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:1559:1: ( rule__ClassDeclaration__Group_4_0__2__Impl )
-            // InternalProblem.g:1560:2: rule__ClassDeclaration__Group_4_0__2__Impl
+            // InternalProblem.g:2033:1: ( rule__ClassDeclaration__Group_4_0__2__Impl )
+            // InternalProblem.g:2034:2: rule__ClassDeclaration__Group_4_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__Group_4_0__2__Impl();
@@ -5073,20 +6651,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0__2__Impl"
-    // InternalProblem.g:1566:1: rule__ClassDeclaration__Group_4_0__2__Impl : ( '}' ) ;
+    // InternalProblem.g:2040: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:1570:1: ( ( '}' ) )
-            // InternalProblem.g:1571:1: ( '}' )
+            // InternalProblem.g:2044:1: ( ( '}' ) )
+            // InternalProblem.g:2045:1: ( '}' )
             {
-            // InternalProblem.g:1571:1: ( '}' )
-            // InternalProblem.g:1572:2: '}'
+            // InternalProblem.g:2045:1: ( '}' )
+            // InternalProblem.g:2046:2: '}'
             {
              before(grammarAccess.getClassDeclarationAccess().getRightCurlyBracketKeyword_4_0_2()); 
-            match(input,28,FOLLOW_2); 
+            match(input,32,FOLLOW_2); 
              after(grammarAccess.getClassDeclarationAccess().getRightCurlyBracketKeyword_4_0_2()); 
 
             }
@@ -5110,14 +6688,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0_1__0"
-    // 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 ;
+    // InternalProblem.g:2056: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: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
+            // InternalProblem.g:2060:1: ( rule__ClassDeclaration__Group_4_0_1__0__Impl rule__ClassDeclaration__Group_4_0_1__1 )
+            // InternalProblem.g:2061:2: rule__ClassDeclaration__Group_4_0_1__0__Impl rule__ClassDeclaration__Group_4_0_1__1
             {
             pushFollow(FOLLOW_13);
             rule__ClassDeclaration__Group_4_0_1__0__Impl();
@@ -5148,21 +6726,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0_1__0__Impl"
-    // InternalProblem.g:1594:1: rule__ClassDeclaration__Group_4_0_1__0__Impl : ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 ) ) ;
+    // InternalProblem.g:2068: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:1598:1: ( ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 ) ) )
-            // InternalProblem.g:1599:1: ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 ) )
+            // InternalProblem.g:2072:1: ( ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 ) ) )
+            // InternalProblem.g:2073:1: ( ( 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 )
+            // InternalProblem.g:2073:1: ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 ) )
+            // InternalProblem.g:2074:2: ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 )
             {
              before(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsAssignment_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
+            // InternalProblem.g:2075:2: ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 )
+            // InternalProblem.g:2075:3: rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0();
@@ -5195,14 +6773,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0_1__1"
-    // InternalProblem.g:1609:1: rule__ClassDeclaration__Group_4_0_1__1 : rule__ClassDeclaration__Group_4_0_1__1__Impl ;
+    // InternalProblem.g:2083: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:1613:1: ( rule__ClassDeclaration__Group_4_0_1__1__Impl )
-            // InternalProblem.g:1614:2: rule__ClassDeclaration__Group_4_0_1__1__Impl
+            // InternalProblem.g:2087:1: ( rule__ClassDeclaration__Group_4_0_1__1__Impl )
+            // InternalProblem.g:2088:2: rule__ClassDeclaration__Group_4_0_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ClassDeclaration__Group_4_0_1__1__Impl();
@@ -5228,29 +6806,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__Group_4_0_1__1__Impl"
-    // InternalProblem.g:1620:1: rule__ClassDeclaration__Group_4_0_1__1__Impl : ( ( ';' )? ) ;
+    // InternalProblem.g:2094: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:1624:1: ( ( ( ';' )? ) )
-            // InternalProblem.g:1625:1: ( ( ';' )? )
+            // InternalProblem.g:2098:1: ( ( ( ';' )? ) )
+            // InternalProblem.g:2099:1: ( ( ';' )? )
             {
-            // InternalProblem.g:1625:1: ( ( ';' )? )
-            // InternalProblem.g:1626:2: ( ';' )?
+            // InternalProblem.g:2099:1: ( ( ';' )? )
+            // InternalProblem.g:2100:2: ( ';' )?
             {
              before(grammarAccess.getClassDeclarationAccess().getSemicolonKeyword_4_0_1_1()); 
-            // InternalProblem.g:1627:2: ( ';' )?
-            int alt24=2;
-            int LA24_0 = input.LA(1);
+            // InternalProblem.g:2101:2: ( ';' )?
+            int alt30=2;
+            int LA30_0 = input.LA(1);
 
-            if ( (LA24_0==14) ) {
-                alt24=1;
+            if ( (LA30_0==14) ) {
+                alt30=1;
             }
-            switch (alt24) {
+            switch (alt30) {
                 case 1 :
-                    // InternalProblem.g:1627:3: ';'
+                    // InternalProblem.g:2101:3: ';'
                     {
                     match(input,14,FOLLOW_2); 
 
@@ -5282,14 +6860,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumDeclaration__Group__0"
-    // InternalProblem.g:1636:1: rule__EnumDeclaration__Group__0 : rule__EnumDeclaration__Group__0__Impl rule__EnumDeclaration__Group__1 ;
+    // InternalProblem.g:2110: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
+            // InternalProblem.g:2114:1: ( rule__EnumDeclaration__Group__0__Impl rule__EnumDeclaration__Group__1 )
+            // InternalProblem.g:2115:2: rule__EnumDeclaration__Group__0__Impl rule__EnumDeclaration__Group__1
             {
             pushFollow(FOLLOW_5);
             rule__EnumDeclaration__Group__0__Impl();
@@ -5320,20 +6898,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumDeclaration__Group__0__Impl"
-    // InternalProblem.g:1648:1: rule__EnumDeclaration__Group__0__Impl : ( 'enum' ) ;
+    // InternalProblem.g:2122: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:2126:1: ( ( 'enum' ) )
+            // InternalProblem.g:2127:1: ( 'enum' )
             {
-            // InternalProblem.g:1653:1: ( 'enum' )
-            // InternalProblem.g:1654:2: 'enum'
+            // InternalProblem.g:2127:1: ( 'enum' )
+            // InternalProblem.g:2128:2: 'enum'
             {
              before(grammarAccess.getEnumDeclarationAccess().getEnumKeyword_0()); 
-            match(input,29,FOLLOW_2); 
+            match(input,33,FOLLOW_2); 
              after(grammarAccess.getEnumDeclarationAccess().getEnumKeyword_0()); 
 
             }
@@ -5357,14 +6935,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumDeclaration__Group__1"
-    // InternalProblem.g:1663:1: rule__EnumDeclaration__Group__1 : rule__EnumDeclaration__Group__1__Impl rule__EnumDeclaration__Group__2 ;
+    // InternalProblem.g:2137: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
+            // InternalProblem.g:2141:1: ( rule__EnumDeclaration__Group__1__Impl rule__EnumDeclaration__Group__2 )
+            // InternalProblem.g:2142:2: rule__EnumDeclaration__Group__1__Impl rule__EnumDeclaration__Group__2
             {
             pushFollow(FOLLOW_14);
             rule__EnumDeclaration__Group__1__Impl();
@@ -5395,21 +6973,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumDeclaration__Group__1__Impl"
-    // InternalProblem.g:1675:1: rule__EnumDeclaration__Group__1__Impl : ( ( rule__EnumDeclaration__NameAssignment_1 ) ) ;
+    // InternalProblem.g:2149: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:2153:1: ( ( ( rule__EnumDeclaration__NameAssignment_1 ) ) )
+            // InternalProblem.g:2154:1: ( ( rule__EnumDeclaration__NameAssignment_1 ) )
             {
-            // InternalProblem.g:1680:1: ( ( rule__EnumDeclaration__NameAssignment_1 ) )
-            // InternalProblem.g:1681:2: ( rule__EnumDeclaration__NameAssignment_1 )
+            // InternalProblem.g:2154:1: ( ( rule__EnumDeclaration__NameAssignment_1 ) )
+            // InternalProblem.g:2155: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
+            // InternalProblem.g:2156:2: ( rule__EnumDeclaration__NameAssignment_1 )
+            // InternalProblem.g:2156:3: rule__EnumDeclaration__NameAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__EnumDeclaration__NameAssignment_1();
@@ -5442,14 +7020,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumDeclaration__Group__2"
-    // InternalProblem.g:1690:1: rule__EnumDeclaration__Group__2 : rule__EnumDeclaration__Group__2__Impl ;
+    // InternalProblem.g:2164: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
+            // InternalProblem.g:2168:1: ( rule__EnumDeclaration__Group__2__Impl )
+            // InternalProblem.g:2169:2: rule__EnumDeclaration__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__EnumDeclaration__Group__2__Impl();
@@ -5475,21 +7053,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumDeclaration__Group__2__Impl"
-    // InternalProblem.g:1701:1: rule__EnumDeclaration__Group__2__Impl : ( ( rule__EnumDeclaration__Alternatives_2 ) ) ;
+    // InternalProblem.g:2175: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:2179:1: ( ( ( rule__EnumDeclaration__Alternatives_2 ) ) )
+            // InternalProblem.g:2180:1: ( ( rule__EnumDeclaration__Alternatives_2 ) )
             {
-            // InternalProblem.g:1706:1: ( ( rule__EnumDeclaration__Alternatives_2 ) )
-            // InternalProblem.g:1707:2: ( rule__EnumDeclaration__Alternatives_2 )
+            // InternalProblem.g:2180:1: ( ( rule__EnumDeclaration__Alternatives_2 ) )
+            // InternalProblem.g:2181: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
+            // InternalProblem.g:2182:2: ( rule__EnumDeclaration__Alternatives_2 )
+            // InternalProblem.g:2182:3: rule__EnumDeclaration__Alternatives_2
             {
             pushFollow(FOLLOW_2);
             rule__EnumDeclaration__Alternatives_2();
@@ -5522,14 +7100,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $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 ;
+    // InternalProblem.g:2191: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
+            // InternalProblem.g:2195:1: ( rule__EnumDeclaration__Group_2_0__0__Impl rule__EnumDeclaration__Group_2_0__1 )
+            // InternalProblem.g:2196:2: rule__EnumDeclaration__Group_2_0__0__Impl rule__EnumDeclaration__Group_2_0__1
             {
             pushFollow(FOLLOW_15);
             rule__EnumDeclaration__Group_2_0__0__Impl();
@@ -5560,20 +7138,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumDeclaration__Group_2_0__0__Impl"
-    // InternalProblem.g:1729:1: rule__EnumDeclaration__Group_2_0__0__Impl : ( '{' ) ;
+    // InternalProblem.g:2203: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:2207:1: ( ( '{' ) )
+            // InternalProblem.g:2208:1: ( '{' )
             {
-            // InternalProblem.g:1734:1: ( '{' )
-            // InternalProblem.g:1735:2: '{'
+            // InternalProblem.g:2208:1: ( '{' )
+            // InternalProblem.g:2209:2: '{'
             {
              before(grammarAccess.getEnumDeclarationAccess().getLeftCurlyBracketKeyword_2_0_0()); 
-            match(input,27,FOLLOW_2); 
+            match(input,31,FOLLOW_2); 
              after(grammarAccess.getEnumDeclarationAccess().getLeftCurlyBracketKeyword_2_0_0()); 
 
             }
@@ -5597,14 +7175,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $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 ;
+    // InternalProblem.g:2218: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
+            // InternalProblem.g:2222:1: ( rule__EnumDeclaration__Group_2_0__1__Impl rule__EnumDeclaration__Group_2_0__2 )
+            // InternalProblem.g:2223:2: rule__EnumDeclaration__Group_2_0__1__Impl rule__EnumDeclaration__Group_2_0__2
             {
             pushFollow(FOLLOW_15);
             rule__EnumDeclaration__Group_2_0__1__Impl();
@@ -5635,29 +7213,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $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 )? ) ;
+    // InternalProblem.g:2230: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:2234:1: ( ( ( rule__EnumDeclaration__Group_2_0_1__0 )? ) )
+            // InternalProblem.g:2235: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 )?
+            // InternalProblem.g:2235:1: ( ( rule__EnumDeclaration__Group_2_0_1__0 )? )
+            // InternalProblem.g:2236: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);
+            // InternalProblem.g:2237:2: ( rule__EnumDeclaration__Group_2_0_1__0 )?
+            int alt31=2;
+            int LA31_0 = input.LA(1);
 
-            if ( ((LA25_0>=RULE_QUOTED_ID && LA25_0<=RULE_ID)||(LA25_0>=19 && LA25_0<=20)) ) {
-                alt25=1;
+            if ( ((LA31_0>=RULE_QUOTED_ID && LA31_0<=RULE_ID)||(LA31_0>=19 && LA31_0<=22)) ) {
+                alt31=1;
             }
-            switch (alt25) {
+            switch (alt31) {
                 case 1 :
-                    // InternalProblem.g:1763:3: rule__EnumDeclaration__Group_2_0_1__0
+                    // InternalProblem.g:2237:3: rule__EnumDeclaration__Group_2_0_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__EnumDeclaration__Group_2_0_1__0();
@@ -5693,14 +7271,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $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 ;
+    // InternalProblem.g:2245: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
+            // InternalProblem.g:2249:1: ( rule__EnumDeclaration__Group_2_0__2__Impl )
+            // InternalProblem.g:2250:2: rule__EnumDeclaration__Group_2_0__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__EnumDeclaration__Group_2_0__2__Impl();
@@ -5726,20 +7304,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumDeclaration__Group_2_0__2__Impl"
-    // InternalProblem.g:1782:1: rule__EnumDeclaration__Group_2_0__2__Impl : ( '}' ) ;
+    // InternalProblem.g:2256: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:2260:1: ( ( '}' ) )
+            // InternalProblem.g:2261:1: ( '}' )
             {
-            // InternalProblem.g:1787:1: ( '}' )
-            // InternalProblem.g:1788:2: '}'
+            // InternalProblem.g:2261:1: ( '}' )
+            // InternalProblem.g:2262:2: '}'
             {
              before(grammarAccess.getEnumDeclarationAccess().getRightCurlyBracketKeyword_2_0_2()); 
-            match(input,28,FOLLOW_2); 
+            match(input,32,FOLLOW_2); 
              after(grammarAccess.getEnumDeclarationAccess().getRightCurlyBracketKeyword_2_0_2()); 
 
             }
@@ -5763,14 +7341,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $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 ;
+    // InternalProblem.g:2272: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
+            // InternalProblem.g:2276:1: ( rule__EnumDeclaration__Group_2_0_1__0__Impl rule__EnumDeclaration__Group_2_0_1__1 )
+            // InternalProblem.g:2277: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();
@@ -5801,21 +7379,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $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 ) ) ;
+    // InternalProblem.g:2284: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:2288:1: ( ( ( rule__EnumDeclaration__LiteralsAssignment_2_0_1_0 ) ) )
+            // InternalProblem.g:2289: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 )
+            // InternalProblem.g:2289:1: ( ( rule__EnumDeclaration__LiteralsAssignment_2_0_1_0 ) )
+            // InternalProblem.g:2290: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
+            // InternalProblem.g:2291:2: ( rule__EnumDeclaration__LiteralsAssignment_2_0_1_0 )
+            // InternalProblem.g:2291:3: rule__EnumDeclaration__LiteralsAssignment_2_0_1_0
             {
             pushFollow(FOLLOW_2);
             rule__EnumDeclaration__LiteralsAssignment_2_0_1_0();
@@ -5848,14 +7426,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $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 ;
+    // InternalProblem.g:2299: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
+            // InternalProblem.g:2303:1: ( rule__EnumDeclaration__Group_2_0_1__1__Impl rule__EnumDeclaration__Group_2_0_1__2 )
+            // InternalProblem.g:2304: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();
@@ -5886,39 +7464,39 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $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 )* ) ;
+    // InternalProblem.g:2311: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:2315:1: ( ( ( rule__EnumDeclaration__Group_2_0_1_1__0 )* ) )
+            // InternalProblem.g:2316: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 )*
+            // InternalProblem.g:2316:1: ( ( rule__EnumDeclaration__Group_2_0_1_1__0 )* )
+            // InternalProblem.g:2317: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:
+            // InternalProblem.g:2318:2: ( rule__EnumDeclaration__Group_2_0_1_1__0 )*
+            loop32:
             do {
-                int alt26=2;
-                int LA26_0 = input.LA(1);
+                int alt32=2;
+                int LA32_0 = input.LA(1);
 
-                if ( (LA26_0==13) ) {
-                    int LA26_1 = input.LA(2);
+                if ( (LA32_0==13) ) {
+                    int LA32_1 = input.LA(2);
 
-                    if ( ((LA26_1>=RULE_QUOTED_ID && LA26_1<=RULE_ID)||(LA26_1>=19 && LA26_1<=20)) ) {
-                        alt26=1;
+                    if ( ((LA32_1>=RULE_QUOTED_ID && LA32_1<=RULE_ID)||(LA32_1>=19 && LA32_1<=22)) ) {
+                        alt32=1;
                     }
 
 
                 }
 
 
-                switch (alt26) {
+                switch (alt32) {
                 case 1 :
-                    // InternalProblem.g:1844:3: rule__EnumDeclaration__Group_2_0_1_1__0
+                    // InternalProblem.g:2318:3: rule__EnumDeclaration__Group_2_0_1_1__0
                     {
                     pushFollow(FOLLOW_10);
                     rule__EnumDeclaration__Group_2_0_1_1__0();
@@ -5930,7 +7508,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop26;
+                    break loop32;
                 }
             } while (true);
 
@@ -5957,14 +7535,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $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 ;
+    // InternalProblem.g:2326: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
+            // InternalProblem.g:2330:1: ( rule__EnumDeclaration__Group_2_0_1__2__Impl )
+            // InternalProblem.g:2331:2: rule__EnumDeclaration__Group_2_0_1__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__EnumDeclaration__Group_2_0_1__2__Impl();
@@ -5990,29 +7568,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $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 )? ) ;
+    // InternalProblem.g:2337: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:2341:1: ( ( ( rule__EnumDeclaration__Alternatives_2_0_1_2 )? ) )
+            // InternalProblem.g:2342: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 )?
+            // InternalProblem.g:2342:1: ( ( rule__EnumDeclaration__Alternatives_2_0_1_2 )? )
+            // InternalProblem.g:2343: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);
+            // InternalProblem.g:2344:2: ( rule__EnumDeclaration__Alternatives_2_0_1_2 )?
+            int alt33=2;
+            int LA33_0 = input.LA(1);
 
-            if ( ((LA27_0>=13 && LA27_0<=14)) ) {
-                alt27=1;
+            if ( ((LA33_0>=13 && LA33_0<=14)) ) {
+                alt33=1;
             }
-            switch (alt27) {
+            switch (alt33) {
                 case 1 :
-                    // InternalProblem.g:1870:3: rule__EnumDeclaration__Alternatives_2_0_1_2
+                    // InternalProblem.g:2344:3: rule__EnumDeclaration__Alternatives_2_0_1_2
                     {
                     pushFollow(FOLLOW_2);
                     rule__EnumDeclaration__Alternatives_2_0_1_2();
@@ -6048,14 +7626,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $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 ;
+    // InternalProblem.g:2353: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
+            // InternalProblem.g:2357:1: ( rule__EnumDeclaration__Group_2_0_1_1__0__Impl rule__EnumDeclaration__Group_2_0_1_1__1 )
+            // InternalProblem.g:2358: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();
@@ -6086,17 +7664,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumDeclaration__Group_2_0_1_1__0__Impl"
-    // InternalProblem.g:1891:1: rule__EnumDeclaration__Group_2_0_1_1__0__Impl : ( ',' ) ;
+    // InternalProblem.g:2365: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:2369:1: ( ( ',' ) )
+            // InternalProblem.g:2370:1: ( ',' )
             {
-            // InternalProblem.g:1896:1: ( ',' )
-            // InternalProblem.g:1897:2: ','
+            // InternalProblem.g:2370:1: ( ',' )
+            // InternalProblem.g:2371:2: ','
             {
              before(grammarAccess.getEnumDeclarationAccess().getCommaKeyword_2_0_1_1_0()); 
             match(input,13,FOLLOW_2); 
@@ -6123,14 +7701,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $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 ;
+    // InternalProblem.g:2380: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
+            // InternalProblem.g:2384:1: ( rule__EnumDeclaration__Group_2_0_1_1__1__Impl )
+            // InternalProblem.g:2385:2: rule__EnumDeclaration__Group_2_0_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__EnumDeclaration__Group_2_0_1_1__1__Impl();
@@ -6156,21 +7734,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $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 ) ) ;
+    // InternalProblem.g:2391: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:2395:1: ( ( ( rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1 ) ) )
+            // InternalProblem.g:2396: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 )
+            // InternalProblem.g:2396:1: ( ( rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1 ) )
+            // InternalProblem.g:2397: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
+            // InternalProblem.g:2398:2: ( rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1 )
+            // InternalProblem.g:2398:3: rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1
             {
             pushFollow(FOLLOW_2);
             rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1();
@@ -6203,14 +7781,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__0"
-    // InternalProblem.g:1933:1: rule__ReferenceDeclaration__Group__0 : rule__ReferenceDeclaration__Group__0__Impl rule__ReferenceDeclaration__Group__1 ;
+    // InternalProblem.g:2407: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:1937:1: ( rule__ReferenceDeclaration__Group__0__Impl rule__ReferenceDeclaration__Group__1 )
-            // InternalProblem.g:1938:2: rule__ReferenceDeclaration__Group__0__Impl rule__ReferenceDeclaration__Group__1
+            // InternalProblem.g:2411:1: ( rule__ReferenceDeclaration__Group__0__Impl rule__ReferenceDeclaration__Group__1 )
+            // InternalProblem.g:2412:2: rule__ReferenceDeclaration__Group__0__Impl rule__ReferenceDeclaration__Group__1
             {
             pushFollow(FOLLOW_17);
             rule__ReferenceDeclaration__Group__0__Impl();
@@ -6241,29 +7819,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__0__Impl"
-    // InternalProblem.g:1945:1: rule__ReferenceDeclaration__Group__0__Impl : ( ( rule__ReferenceDeclaration__Alternatives_0 )? ) ;
+    // InternalProblem.g:2419: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:1949:1: ( ( ( rule__ReferenceDeclaration__Alternatives_0 )? ) )
-            // InternalProblem.g:1950:1: ( ( rule__ReferenceDeclaration__Alternatives_0 )? )
+            // InternalProblem.g:2423:1: ( ( ( rule__ReferenceDeclaration__Alternatives_0 )? ) )
+            // InternalProblem.g:2424:1: ( ( rule__ReferenceDeclaration__Alternatives_0 )? )
             {
-            // InternalProblem.g:1950:1: ( ( rule__ReferenceDeclaration__Alternatives_0 )? )
-            // InternalProblem.g:1951:2: ( rule__ReferenceDeclaration__Alternatives_0 )?
+            // InternalProblem.g:2424:1: ( ( rule__ReferenceDeclaration__Alternatives_0 )? )
+            // InternalProblem.g:2425:2: ( rule__ReferenceDeclaration__Alternatives_0 )?
             {
              before(grammarAccess.getReferenceDeclarationAccess().getAlternatives_0()); 
-            // InternalProblem.g:1952:2: ( rule__ReferenceDeclaration__Alternatives_0 )?
-            int alt28=2;
-            int LA28_0 = input.LA(1);
+            // InternalProblem.g:2426:2: ( rule__ReferenceDeclaration__Alternatives_0 )?
+            int alt34=2;
+            int LA34_0 = input.LA(1);
 
-            if ( (LA28_0==15||LA28_0==41) ) {
-                alt28=1;
+            if ( (LA34_0==15||LA34_0==45) ) {
+                alt34=1;
             }
-            switch (alt28) {
+            switch (alt34) {
                 case 1 :
-                    // InternalProblem.g:1952:3: rule__ReferenceDeclaration__Alternatives_0
+                    // InternalProblem.g:2426:3: rule__ReferenceDeclaration__Alternatives_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__ReferenceDeclaration__Alternatives_0();
@@ -6299,14 +7877,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__1"
-    // InternalProblem.g:1960:1: rule__ReferenceDeclaration__Group__1 : rule__ReferenceDeclaration__Group__1__Impl rule__ReferenceDeclaration__Group__2 ;
+    // InternalProblem.g:2434: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:1964:1: ( rule__ReferenceDeclaration__Group__1__Impl rule__ReferenceDeclaration__Group__2 )
-            // InternalProblem.g:1965:2: rule__ReferenceDeclaration__Group__1__Impl rule__ReferenceDeclaration__Group__2
+            // InternalProblem.g:2438:1: ( rule__ReferenceDeclaration__Group__1__Impl rule__ReferenceDeclaration__Group__2 )
+            // InternalProblem.g:2439:2: rule__ReferenceDeclaration__Group__1__Impl rule__ReferenceDeclaration__Group__2
             {
             pushFollow(FOLLOW_18);
             rule__ReferenceDeclaration__Group__1__Impl();
@@ -6337,21 +7915,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__1__Impl"
-    // InternalProblem.g:1972:1: rule__ReferenceDeclaration__Group__1__Impl : ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) ) ;
+    // InternalProblem.g:2446: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:1976:1: ( ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) ) )
-            // InternalProblem.g:1977:1: ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) )
+            // InternalProblem.g:2450:1: ( ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) ) )
+            // InternalProblem.g:2451:1: ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) )
             {
-            // InternalProblem.g:1977:1: ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) )
-            // InternalProblem.g:1978:2: ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 )
+            // InternalProblem.g:2451:1: ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) )
+            // InternalProblem.g:2452:2: ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 )
             {
              before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeAssignment_1()); 
-            // InternalProblem.g:1979:2: ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 )
-            // InternalProblem.g:1979:3: rule__ReferenceDeclaration__ReferenceTypeAssignment_1
+            // InternalProblem.g:2453:2: ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 )
+            // InternalProblem.g:2453:3: rule__ReferenceDeclaration__ReferenceTypeAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__ReferenceDeclaration__ReferenceTypeAssignment_1();
@@ -6384,14 +7962,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__2"
-    // InternalProblem.g:1987:1: rule__ReferenceDeclaration__Group__2 : rule__ReferenceDeclaration__Group__2__Impl rule__ReferenceDeclaration__Group__3 ;
+    // InternalProblem.g:2461: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:1991:1: ( rule__ReferenceDeclaration__Group__2__Impl rule__ReferenceDeclaration__Group__3 )
-            // InternalProblem.g:1992:2: rule__ReferenceDeclaration__Group__2__Impl rule__ReferenceDeclaration__Group__3
+            // InternalProblem.g:2465:1: ( rule__ReferenceDeclaration__Group__2__Impl rule__ReferenceDeclaration__Group__3 )
+            // InternalProblem.g:2466:2: rule__ReferenceDeclaration__Group__2__Impl rule__ReferenceDeclaration__Group__3
             {
             pushFollow(FOLLOW_18);
             rule__ReferenceDeclaration__Group__2__Impl();
@@ -6422,29 +8000,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__2__Impl"
-    // InternalProblem.g:1999:1: rule__ReferenceDeclaration__Group__2__Impl : ( ( rule__ReferenceDeclaration__Group_2__0 )? ) ;
+    // InternalProblem.g:2473: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:2003:1: ( ( ( rule__ReferenceDeclaration__Group_2__0 )? ) )
-            // InternalProblem.g:2004:1: ( ( rule__ReferenceDeclaration__Group_2__0 )? )
+            // InternalProblem.g:2477:1: ( ( ( rule__ReferenceDeclaration__Group_2__0 )? ) )
+            // InternalProblem.g:2478:1: ( ( rule__ReferenceDeclaration__Group_2__0 )? )
             {
-            // InternalProblem.g:2004:1: ( ( rule__ReferenceDeclaration__Group_2__0 )? )
-            // InternalProblem.g:2005:2: ( rule__ReferenceDeclaration__Group_2__0 )?
+            // InternalProblem.g:2478:1: ( ( rule__ReferenceDeclaration__Group_2__0 )? )
+            // InternalProblem.g:2479:2: ( rule__ReferenceDeclaration__Group_2__0 )?
             {
              before(grammarAccess.getReferenceDeclarationAccess().getGroup_2()); 
-            // InternalProblem.g:2006:2: ( rule__ReferenceDeclaration__Group_2__0 )?
-            int alt29=2;
-            int LA29_0 = input.LA(1);
+            // InternalProblem.g:2480:2: ( rule__ReferenceDeclaration__Group_2__0 )?
+            int alt35=2;
+            int LA35_0 = input.LA(1);
 
-            if ( (LA29_0==30) ) {
-                alt29=1;
+            if ( (LA35_0==34) ) {
+                alt35=1;
             }
-            switch (alt29) {
+            switch (alt35) {
                 case 1 :
-                    // InternalProblem.g:2006:3: rule__ReferenceDeclaration__Group_2__0
+                    // InternalProblem.g:2480:3: rule__ReferenceDeclaration__Group_2__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__ReferenceDeclaration__Group_2__0();
@@ -6480,14 +8058,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__3"
-    // InternalProblem.g:2014:1: rule__ReferenceDeclaration__Group__3 : rule__ReferenceDeclaration__Group__3__Impl rule__ReferenceDeclaration__Group__4 ;
+    // InternalProblem.g:2488: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:2018:1: ( rule__ReferenceDeclaration__Group__3__Impl rule__ReferenceDeclaration__Group__4 )
-            // InternalProblem.g:2019:2: rule__ReferenceDeclaration__Group__3__Impl rule__ReferenceDeclaration__Group__4
+            // InternalProblem.g:2492:1: ( rule__ReferenceDeclaration__Group__3__Impl rule__ReferenceDeclaration__Group__4 )
+            // InternalProblem.g:2493:2: rule__ReferenceDeclaration__Group__3__Impl rule__ReferenceDeclaration__Group__4
             {
             pushFollow(FOLLOW_19);
             rule__ReferenceDeclaration__Group__3__Impl();
@@ -6518,21 +8096,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__3__Impl"
-    // InternalProblem.g:2026:1: rule__ReferenceDeclaration__Group__3__Impl : ( ( rule__ReferenceDeclaration__NameAssignment_3 ) ) ;
+    // InternalProblem.g:2500: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:2030:1: ( ( ( rule__ReferenceDeclaration__NameAssignment_3 ) ) )
-            // InternalProblem.g:2031:1: ( ( rule__ReferenceDeclaration__NameAssignment_3 ) )
+            // InternalProblem.g:2504:1: ( ( ( rule__ReferenceDeclaration__NameAssignment_3 ) ) )
+            // InternalProblem.g:2505:1: ( ( rule__ReferenceDeclaration__NameAssignment_3 ) )
             {
-            // InternalProblem.g:2031:1: ( ( rule__ReferenceDeclaration__NameAssignment_3 ) )
-            // InternalProblem.g:2032:2: ( rule__ReferenceDeclaration__NameAssignment_3 )
+            // InternalProblem.g:2505:1: ( ( rule__ReferenceDeclaration__NameAssignment_3 ) )
+            // InternalProblem.g:2506:2: ( rule__ReferenceDeclaration__NameAssignment_3 )
             {
              before(grammarAccess.getReferenceDeclarationAccess().getNameAssignment_3()); 
-            // InternalProblem.g:2033:2: ( rule__ReferenceDeclaration__NameAssignment_3 )
-            // InternalProblem.g:2033:3: rule__ReferenceDeclaration__NameAssignment_3
+            // InternalProblem.g:2507:2: ( rule__ReferenceDeclaration__NameAssignment_3 )
+            // InternalProblem.g:2507:3: rule__ReferenceDeclaration__NameAssignment_3
             {
             pushFollow(FOLLOW_2);
             rule__ReferenceDeclaration__NameAssignment_3();
@@ -6565,14 +8143,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__4"
-    // InternalProblem.g:2041:1: rule__ReferenceDeclaration__Group__4 : rule__ReferenceDeclaration__Group__4__Impl ;
+    // InternalProblem.g:2515: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:2045:1: ( rule__ReferenceDeclaration__Group__4__Impl )
-            // InternalProblem.g:2046:2: rule__ReferenceDeclaration__Group__4__Impl
+            // InternalProblem.g:2519:1: ( rule__ReferenceDeclaration__Group__4__Impl )
+            // InternalProblem.g:2520:2: rule__ReferenceDeclaration__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ReferenceDeclaration__Group__4__Impl();
@@ -6598,29 +8176,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__4__Impl"
-    // InternalProblem.g:2052:1: rule__ReferenceDeclaration__Group__4__Impl : ( ( rule__ReferenceDeclaration__Group_4__0 )? ) ;
+    // InternalProblem.g:2526: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:2056:1: ( ( ( rule__ReferenceDeclaration__Group_4__0 )? ) )
-            // InternalProblem.g:2057:1: ( ( rule__ReferenceDeclaration__Group_4__0 )? )
+            // InternalProblem.g:2530:1: ( ( ( rule__ReferenceDeclaration__Group_4__0 )? ) )
+            // InternalProblem.g:2531:1: ( ( rule__ReferenceDeclaration__Group_4__0 )? )
             {
-            // InternalProblem.g:2057:1: ( ( rule__ReferenceDeclaration__Group_4__0 )? )
-            // InternalProblem.g:2058:2: ( rule__ReferenceDeclaration__Group_4__0 )?
+            // InternalProblem.g:2531:1: ( ( rule__ReferenceDeclaration__Group_4__0 )? )
+            // InternalProblem.g:2532:2: ( rule__ReferenceDeclaration__Group_4__0 )?
             {
              before(grammarAccess.getReferenceDeclarationAccess().getGroup_4()); 
-            // InternalProblem.g:2059:2: ( rule__ReferenceDeclaration__Group_4__0 )?
-            int alt30=2;
-            int LA30_0 = input.LA(1);
+            // InternalProblem.g:2533:2: ( rule__ReferenceDeclaration__Group_4__0 )?
+            int alt36=2;
+            int LA36_0 = input.LA(1);
 
-            if ( (LA30_0==32) ) {
-                alt30=1;
+            if ( (LA36_0==36) ) {
+                alt36=1;
             }
-            switch (alt30) {
+            switch (alt36) {
                 case 1 :
-                    // InternalProblem.g:2059:3: rule__ReferenceDeclaration__Group_4__0
+                    // InternalProblem.g:2533:3: rule__ReferenceDeclaration__Group_4__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__ReferenceDeclaration__Group_4__0();
@@ -6656,14 +8234,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_2__0"
-    // InternalProblem.g:2068:1: rule__ReferenceDeclaration__Group_2__0 : rule__ReferenceDeclaration__Group_2__0__Impl rule__ReferenceDeclaration__Group_2__1 ;
+    // InternalProblem.g:2542: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: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
+            // InternalProblem.g:2546:1: ( rule__ReferenceDeclaration__Group_2__0__Impl rule__ReferenceDeclaration__Group_2__1 )
+            // InternalProblem.g:2547:2: rule__ReferenceDeclaration__Group_2__0__Impl rule__ReferenceDeclaration__Group_2__1
             {
             pushFollow(FOLLOW_20);
             rule__ReferenceDeclaration__Group_2__0__Impl();
@@ -6694,20 +8272,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_2__0__Impl"
-    // InternalProblem.g:2080:1: rule__ReferenceDeclaration__Group_2__0__Impl : ( '[' ) ;
+    // InternalProblem.g:2554:1: rule__ReferenceDeclaration__Group_2__0__Impl : ( '[' ) ;
     public final void rule__ReferenceDeclaration__Group_2__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2084:1: ( ( '[' ) )
-            // InternalProblem.g:2085:1: ( '[' )
+            // InternalProblem.g:2558:1: ( ( '[' ) )
+            // InternalProblem.g:2559:1: ( '[' )
             {
-            // InternalProblem.g:2085:1: ( '[' )
-            // InternalProblem.g:2086:2: '['
+            // InternalProblem.g:2559:1: ( '[' )
+            // InternalProblem.g:2560:2: '['
             {
              before(grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2_0()); 
-            match(input,30,FOLLOW_2); 
+            match(input,34,FOLLOW_2); 
              after(grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2_0()); 
 
             }
@@ -6731,14 +8309,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_2__1"
-    // InternalProblem.g:2095:1: rule__ReferenceDeclaration__Group_2__1 : rule__ReferenceDeclaration__Group_2__1__Impl rule__ReferenceDeclaration__Group_2__2 ;
+    // InternalProblem.g:2569: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: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
+            // InternalProblem.g:2573:1: ( rule__ReferenceDeclaration__Group_2__1__Impl rule__ReferenceDeclaration__Group_2__2 )
+            // InternalProblem.g:2574:2: rule__ReferenceDeclaration__Group_2__1__Impl rule__ReferenceDeclaration__Group_2__2
             {
             pushFollow(FOLLOW_21);
             rule__ReferenceDeclaration__Group_2__1__Impl();
@@ -6769,21 +8347,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_2__1__Impl"
-    // InternalProblem.g:2107:1: rule__ReferenceDeclaration__Group_2__1__Impl : ( ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 ) ) ;
+    // InternalProblem.g:2581: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:2111:1: ( ( ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 ) ) )
-            // InternalProblem.g:2112:1: ( ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 ) )
+            // InternalProblem.g:2585:1: ( ( ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 ) ) )
+            // InternalProblem.g:2586:1: ( ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 ) )
             {
-            // InternalProblem.g:2112:1: ( ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 ) )
-            // InternalProblem.g:2113:2: ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 )
+            // InternalProblem.g:2586:1: ( ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 ) )
+            // InternalProblem.g:2587:2: ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 )
             {
              before(grammarAccess.getReferenceDeclarationAccess().getMultiplicityAssignment_2_1()); 
-            // InternalProblem.g:2114:2: ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 )
-            // InternalProblem.g:2114:3: rule__ReferenceDeclaration__MultiplicityAssignment_2_1
+            // InternalProblem.g:2588:2: ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 )
+            // InternalProblem.g:2588:3: rule__ReferenceDeclaration__MultiplicityAssignment_2_1
             {
             pushFollow(FOLLOW_2);
             rule__ReferenceDeclaration__MultiplicityAssignment_2_1();
@@ -6816,14 +8394,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_2__2"
-    // InternalProblem.g:2122:1: rule__ReferenceDeclaration__Group_2__2 : rule__ReferenceDeclaration__Group_2__2__Impl ;
+    // InternalProblem.g:2596: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:2126:1: ( rule__ReferenceDeclaration__Group_2__2__Impl )
-            // InternalProblem.g:2127:2: rule__ReferenceDeclaration__Group_2__2__Impl
+            // InternalProblem.g:2600:1: ( rule__ReferenceDeclaration__Group_2__2__Impl )
+            // InternalProblem.g:2601:2: rule__ReferenceDeclaration__Group_2__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ReferenceDeclaration__Group_2__2__Impl();
@@ -6849,20 +8427,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_2__2__Impl"
-    // InternalProblem.g:2133:1: rule__ReferenceDeclaration__Group_2__2__Impl : ( ']' ) ;
+    // InternalProblem.g:2607:1: rule__ReferenceDeclaration__Group_2__2__Impl : ( ']' ) ;
     public final void rule__ReferenceDeclaration__Group_2__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2137:1: ( ( ']' ) )
-            // InternalProblem.g:2138:1: ( ']' )
+            // InternalProblem.g:2611:1: ( ( ']' ) )
+            // InternalProblem.g:2612:1: ( ']' )
             {
-            // InternalProblem.g:2138:1: ( ']' )
-            // InternalProblem.g:2139:2: ']'
+            // InternalProblem.g:2612:1: ( ']' )
+            // InternalProblem.g:2613:2: ']'
             {
              before(grammarAccess.getReferenceDeclarationAccess().getRightSquareBracketKeyword_2_2()); 
-            match(input,31,FOLLOW_2); 
+            match(input,35,FOLLOW_2); 
              after(grammarAccess.getReferenceDeclarationAccess().getRightSquareBracketKeyword_2_2()); 
 
             }
@@ -6886,14 +8464,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_4__0"
-    // InternalProblem.g:2149:1: rule__ReferenceDeclaration__Group_4__0 : rule__ReferenceDeclaration__Group_4__0__Impl rule__ReferenceDeclaration__Group_4__1 ;
+    // InternalProblem.g:2623: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: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
+            // InternalProblem.g:2627:1: ( rule__ReferenceDeclaration__Group_4__0__Impl rule__ReferenceDeclaration__Group_4__1 )
+            // InternalProblem.g:2628:2: rule__ReferenceDeclaration__Group_4__0__Impl rule__ReferenceDeclaration__Group_4__1
             {
             pushFollow(FOLLOW_5);
             rule__ReferenceDeclaration__Group_4__0__Impl();
@@ -6924,20 +8502,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_4__0__Impl"
-    // InternalProblem.g:2161:1: rule__ReferenceDeclaration__Group_4__0__Impl : ( 'opposite' ) ;
+    // InternalProblem.g:2635: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:2165:1: ( ( 'opposite' ) )
-            // InternalProblem.g:2166:1: ( 'opposite' )
+            // InternalProblem.g:2639:1: ( ( 'opposite' ) )
+            // InternalProblem.g:2640:1: ( 'opposite' )
             {
-            // InternalProblem.g:2166:1: ( 'opposite' )
-            // InternalProblem.g:2167:2: 'opposite'
+            // InternalProblem.g:2640:1: ( 'opposite' )
+            // InternalProblem.g:2641:2: 'opposite'
             {
              before(grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_4_0()); 
-            match(input,32,FOLLOW_2); 
+            match(input,36,FOLLOW_2); 
              after(grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_4_0()); 
 
             }
@@ -6961,14 +8539,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_4__1"
-    // InternalProblem.g:2176:1: rule__ReferenceDeclaration__Group_4__1 : rule__ReferenceDeclaration__Group_4__1__Impl ;
+    // InternalProblem.g:2650: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:2180:1: ( rule__ReferenceDeclaration__Group_4__1__Impl )
-            // InternalProblem.g:2181:2: rule__ReferenceDeclaration__Group_4__1__Impl
+            // InternalProblem.g:2654:1: ( rule__ReferenceDeclaration__Group_4__1__Impl )
+            // InternalProblem.g:2655:2: rule__ReferenceDeclaration__Group_4__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ReferenceDeclaration__Group_4__1__Impl();
@@ -6994,21 +8572,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group_4__1__Impl"
-    // InternalProblem.g:2187:1: rule__ReferenceDeclaration__Group_4__1__Impl : ( ( rule__ReferenceDeclaration__OppositeAssignment_4_1 ) ) ;
+    // InternalProblem.g:2661: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:2191:1: ( ( ( rule__ReferenceDeclaration__OppositeAssignment_4_1 ) ) )
-            // InternalProblem.g:2192:1: ( ( rule__ReferenceDeclaration__OppositeAssignment_4_1 ) )
+            // InternalProblem.g:2665:1: ( ( ( rule__ReferenceDeclaration__OppositeAssignment_4_1 ) ) )
+            // InternalProblem.g:2666:1: ( ( rule__ReferenceDeclaration__OppositeAssignment_4_1 ) )
             {
-            // InternalProblem.g:2192:1: ( ( rule__ReferenceDeclaration__OppositeAssignment_4_1 ) )
-            // InternalProblem.g:2193:2: ( rule__ReferenceDeclaration__OppositeAssignment_4_1 )
+            // InternalProblem.g:2666:1: ( ( rule__ReferenceDeclaration__OppositeAssignment_4_1 ) )
+            // InternalProblem.g:2667:2: ( rule__ReferenceDeclaration__OppositeAssignment_4_1 )
             {
              before(grammarAccess.getReferenceDeclarationAccess().getOppositeAssignment_4_1()); 
-            // InternalProblem.g:2194:2: ( rule__ReferenceDeclaration__OppositeAssignment_4_1 )
-            // InternalProblem.g:2194:3: rule__ReferenceDeclaration__OppositeAssignment_4_1
+            // InternalProblem.g:2668:2: ( rule__ReferenceDeclaration__OppositeAssignment_4_1 )
+            // InternalProblem.g:2668:3: rule__ReferenceDeclaration__OppositeAssignment_4_1
             {
             pushFollow(FOLLOW_2);
             rule__ReferenceDeclaration__OppositeAssignment_4_1();
@@ -7041,14 +8619,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__0"
-    // InternalProblem.g:2203:1: rule__PredicateDefinition__Group__0 : rule__PredicateDefinition__Group__0__Impl rule__PredicateDefinition__Group__1 ;
+    // InternalProblem.g:2677: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:2207:1: ( rule__PredicateDefinition__Group__0__Impl rule__PredicateDefinition__Group__1 )
-            // InternalProblem.g:2208:2: rule__PredicateDefinition__Group__0__Impl rule__PredicateDefinition__Group__1
+            // InternalProblem.g:2681:1: ( rule__PredicateDefinition__Group__0__Impl rule__PredicateDefinition__Group__1 )
+            // InternalProblem.g:2682:2: rule__PredicateDefinition__Group__0__Impl rule__PredicateDefinition__Group__1
             {
             pushFollow(FOLLOW_5);
             rule__PredicateDefinition__Group__0__Impl();
@@ -7079,21 +8657,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__0__Impl"
-    // InternalProblem.g:2215:1: rule__PredicateDefinition__Group__0__Impl : ( ( rule__PredicateDefinition__Alternatives_0 ) ) ;
+    // InternalProblem.g:2689: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:2219:1: ( ( ( rule__PredicateDefinition__Alternatives_0 ) ) )
-            // InternalProblem.g:2220:1: ( ( rule__PredicateDefinition__Alternatives_0 ) )
+            // InternalProblem.g:2693:1: ( ( ( rule__PredicateDefinition__Alternatives_0 ) ) )
+            // InternalProblem.g:2694:1: ( ( rule__PredicateDefinition__Alternatives_0 ) )
             {
-            // InternalProblem.g:2220:1: ( ( rule__PredicateDefinition__Alternatives_0 ) )
-            // InternalProblem.g:2221:2: ( rule__PredicateDefinition__Alternatives_0 )
+            // InternalProblem.g:2694:1: ( ( rule__PredicateDefinition__Alternatives_0 ) )
+            // InternalProblem.g:2695:2: ( rule__PredicateDefinition__Alternatives_0 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getAlternatives_0()); 
-            // InternalProblem.g:2222:2: ( rule__PredicateDefinition__Alternatives_0 )
-            // InternalProblem.g:2222:3: rule__PredicateDefinition__Alternatives_0
+            // InternalProblem.g:2696:2: ( rule__PredicateDefinition__Alternatives_0 )
+            // InternalProblem.g:2696:3: rule__PredicateDefinition__Alternatives_0
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Alternatives_0();
@@ -7126,14 +8704,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__1"
-    // InternalProblem.g:2230:1: rule__PredicateDefinition__Group__1 : rule__PredicateDefinition__Group__1__Impl rule__PredicateDefinition__Group__2 ;
+    // InternalProblem.g:2704: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:2234:1: ( rule__PredicateDefinition__Group__1__Impl rule__PredicateDefinition__Group__2 )
-            // InternalProblem.g:2235:2: rule__PredicateDefinition__Group__1__Impl rule__PredicateDefinition__Group__2
+            // InternalProblem.g:2708:1: ( rule__PredicateDefinition__Group__1__Impl rule__PredicateDefinition__Group__2 )
+            // InternalProblem.g:2709:2: rule__PredicateDefinition__Group__1__Impl rule__PredicateDefinition__Group__2
             {
             pushFollow(FOLLOW_22);
             rule__PredicateDefinition__Group__1__Impl();
@@ -7164,21 +8742,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__1__Impl"
-    // InternalProblem.g:2242:1: rule__PredicateDefinition__Group__1__Impl : ( ( rule__PredicateDefinition__NameAssignment_1 ) ) ;
+    // InternalProblem.g:2716: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:2246:1: ( ( ( rule__PredicateDefinition__NameAssignment_1 ) ) )
-            // InternalProblem.g:2247:1: ( ( rule__PredicateDefinition__NameAssignment_1 ) )
+            // InternalProblem.g:2720:1: ( ( ( rule__PredicateDefinition__NameAssignment_1 ) ) )
+            // InternalProblem.g:2721:1: ( ( rule__PredicateDefinition__NameAssignment_1 ) )
             {
-            // InternalProblem.g:2247:1: ( ( rule__PredicateDefinition__NameAssignment_1 ) )
-            // InternalProblem.g:2248:2: ( rule__PredicateDefinition__NameAssignment_1 )
+            // InternalProblem.g:2721:1: ( ( rule__PredicateDefinition__NameAssignment_1 ) )
+            // InternalProblem.g:2722:2: ( rule__PredicateDefinition__NameAssignment_1 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getNameAssignment_1()); 
-            // InternalProblem.g:2249:2: ( rule__PredicateDefinition__NameAssignment_1 )
-            // InternalProblem.g:2249:3: rule__PredicateDefinition__NameAssignment_1
+            // InternalProblem.g:2723:2: ( rule__PredicateDefinition__NameAssignment_1 )
+            // InternalProblem.g:2723:3: rule__PredicateDefinition__NameAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__NameAssignment_1();
@@ -7211,14 +8789,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__2"
-    // InternalProblem.g:2257:1: rule__PredicateDefinition__Group__2 : rule__PredicateDefinition__Group__2__Impl rule__PredicateDefinition__Group__3 ;
+    // InternalProblem.g:2731: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:2261:1: ( rule__PredicateDefinition__Group__2__Impl rule__PredicateDefinition__Group__3 )
-            // InternalProblem.g:2262:2: rule__PredicateDefinition__Group__2__Impl rule__PredicateDefinition__Group__3
+            // InternalProblem.g:2735:1: ( rule__PredicateDefinition__Group__2__Impl rule__PredicateDefinition__Group__3 )
+            // InternalProblem.g:2736:2: rule__PredicateDefinition__Group__2__Impl rule__PredicateDefinition__Group__3
             {
             pushFollow(FOLLOW_23);
             rule__PredicateDefinition__Group__2__Impl();
@@ -7249,20 +8827,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__2__Impl"
-    // InternalProblem.g:2269:1: rule__PredicateDefinition__Group__2__Impl : ( '(' ) ;
+    // InternalProblem.g:2743:1: rule__PredicateDefinition__Group__2__Impl : ( '(' ) ;
     public final void rule__PredicateDefinition__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2273:1: ( ( '(' ) )
-            // InternalProblem.g:2274:1: ( '(' )
+            // InternalProblem.g:2747:1: ( ( '(' ) )
+            // InternalProblem.g:2748:1: ( '(' )
             {
-            // InternalProblem.g:2274:1: ( '(' )
-            // InternalProblem.g:2275:2: '('
+            // InternalProblem.g:2748:1: ( '(' )
+            // InternalProblem.g:2749:2: '('
             {
              before(grammarAccess.getPredicateDefinitionAccess().getLeftParenthesisKeyword_2()); 
-            match(input,33,FOLLOW_2); 
+            match(input,37,FOLLOW_2); 
              after(grammarAccess.getPredicateDefinitionAccess().getLeftParenthesisKeyword_2()); 
 
             }
@@ -7286,14 +8864,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__3"
-    // InternalProblem.g:2284:1: rule__PredicateDefinition__Group__3 : rule__PredicateDefinition__Group__3__Impl rule__PredicateDefinition__Group__4 ;
+    // InternalProblem.g:2758: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:2288:1: ( rule__PredicateDefinition__Group__3__Impl rule__PredicateDefinition__Group__4 )
-            // InternalProblem.g:2289:2: rule__PredicateDefinition__Group__3__Impl rule__PredicateDefinition__Group__4
+            // InternalProblem.g:2762:1: ( rule__PredicateDefinition__Group__3__Impl rule__PredicateDefinition__Group__4 )
+            // InternalProblem.g:2763:2: rule__PredicateDefinition__Group__3__Impl rule__PredicateDefinition__Group__4
             {
             pushFollow(FOLLOW_23);
             rule__PredicateDefinition__Group__3__Impl();
@@ -7324,29 +8902,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__3__Impl"
-    // InternalProblem.g:2296:1: rule__PredicateDefinition__Group__3__Impl : ( ( rule__PredicateDefinition__Group_3__0 )? ) ;
+    // InternalProblem.g:2770: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:2300:1: ( ( ( rule__PredicateDefinition__Group_3__0 )? ) )
-            // InternalProblem.g:2301:1: ( ( rule__PredicateDefinition__Group_3__0 )? )
+            // InternalProblem.g:2774:1: ( ( ( rule__PredicateDefinition__Group_3__0 )? ) )
+            // InternalProblem.g:2775:1: ( ( rule__PredicateDefinition__Group_3__0 )? )
             {
-            // InternalProblem.g:2301:1: ( ( rule__PredicateDefinition__Group_3__0 )? )
-            // InternalProblem.g:2302:2: ( rule__PredicateDefinition__Group_3__0 )?
+            // InternalProblem.g:2775:1: ( ( rule__PredicateDefinition__Group_3__0 )? )
+            // InternalProblem.g:2776:2: ( rule__PredicateDefinition__Group_3__0 )?
             {
              before(grammarAccess.getPredicateDefinitionAccess().getGroup_3()); 
-            // InternalProblem.g:2303:2: ( rule__PredicateDefinition__Group_3__0 )?
-            int alt31=2;
-            int LA31_0 = input.LA(1);
+            // InternalProblem.g:2777:2: ( rule__PredicateDefinition__Group_3__0 )?
+            int alt37=2;
+            int LA37_0 = input.LA(1);
 
-            if ( ((LA31_0>=RULE_QUOTED_ID && LA31_0<=RULE_ID)||(LA31_0>=19 && LA31_0<=20)) ) {
-                alt31=1;
+            if ( ((LA37_0>=RULE_QUOTED_ID && LA37_0<=RULE_ID)||(LA37_0>=19 && LA37_0<=22)) ) {
+                alt37=1;
             }
-            switch (alt31) {
+            switch (alt37) {
                 case 1 :
-                    // InternalProblem.g:2303:3: rule__PredicateDefinition__Group_3__0
+                    // InternalProblem.g:2777:3: rule__PredicateDefinition__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__PredicateDefinition__Group_3__0();
@@ -7382,14 +8960,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__4"
-    // InternalProblem.g:2311:1: rule__PredicateDefinition__Group__4 : rule__PredicateDefinition__Group__4__Impl rule__PredicateDefinition__Group__5 ;
+    // InternalProblem.g:2785: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:2315:1: ( rule__PredicateDefinition__Group__4__Impl rule__PredicateDefinition__Group__5 )
-            // InternalProblem.g:2316:2: rule__PredicateDefinition__Group__4__Impl rule__PredicateDefinition__Group__5
+            // InternalProblem.g:2789:1: ( rule__PredicateDefinition__Group__4__Impl rule__PredicateDefinition__Group__5 )
+            // InternalProblem.g:2790:2: rule__PredicateDefinition__Group__4__Impl rule__PredicateDefinition__Group__5
             {
             pushFollow(FOLLOW_24);
             rule__PredicateDefinition__Group__4__Impl();
@@ -7420,20 +8998,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__4__Impl"
-    // InternalProblem.g:2323:1: rule__PredicateDefinition__Group__4__Impl : ( ')' ) ;
+    // InternalProblem.g:2797:1: rule__PredicateDefinition__Group__4__Impl : ( ')' ) ;
     public final void rule__PredicateDefinition__Group__4__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2327:1: ( ( ')' ) )
-            // InternalProblem.g:2328:1: ( ')' )
+            // InternalProblem.g:2801:1: ( ( ')' ) )
+            // InternalProblem.g:2802:1: ( ')' )
             {
-            // InternalProblem.g:2328:1: ( ')' )
-            // InternalProblem.g:2329:2: ')'
+            // InternalProblem.g:2802:1: ( ')' )
+            // InternalProblem.g:2803:2: ')'
             {
              before(grammarAccess.getPredicateDefinitionAccess().getRightParenthesisKeyword_4()); 
-            match(input,34,FOLLOW_2); 
+            match(input,38,FOLLOW_2); 
              after(grammarAccess.getPredicateDefinitionAccess().getRightParenthesisKeyword_4()); 
 
             }
@@ -7457,14 +9035,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__5"
-    // InternalProblem.g:2338:1: rule__PredicateDefinition__Group__5 : rule__PredicateDefinition__Group__5__Impl rule__PredicateDefinition__Group__6 ;
+    // InternalProblem.g:2812: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:2342:1: ( rule__PredicateDefinition__Group__5__Impl rule__PredicateDefinition__Group__6 )
-            // InternalProblem.g:2343:2: rule__PredicateDefinition__Group__5__Impl rule__PredicateDefinition__Group__6
+            // InternalProblem.g:2816:1: ( rule__PredicateDefinition__Group__5__Impl rule__PredicateDefinition__Group__6 )
+            // InternalProblem.g:2817:2: rule__PredicateDefinition__Group__5__Impl rule__PredicateDefinition__Group__6
             {
             pushFollow(FOLLOW_24);
             rule__PredicateDefinition__Group__5__Impl();
@@ -7495,29 +9073,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__5__Impl"
-    // InternalProblem.g:2350:1: rule__PredicateDefinition__Group__5__Impl : ( ( rule__PredicateDefinition__Group_5__0 )? ) ;
+    // InternalProblem.g:2824: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:2354:1: ( ( ( rule__PredicateDefinition__Group_5__0 )? ) )
-            // InternalProblem.g:2355:1: ( ( rule__PredicateDefinition__Group_5__0 )? )
+            // InternalProblem.g:2828:1: ( ( ( rule__PredicateDefinition__Group_5__0 )? ) )
+            // InternalProblem.g:2829:1: ( ( rule__PredicateDefinition__Group_5__0 )? )
             {
-            // InternalProblem.g:2355:1: ( ( rule__PredicateDefinition__Group_5__0 )? )
-            // InternalProblem.g:2356:2: ( rule__PredicateDefinition__Group_5__0 )?
+            // InternalProblem.g:2829:1: ( ( rule__PredicateDefinition__Group_5__0 )? )
+            // InternalProblem.g:2830:2: ( rule__PredicateDefinition__Group_5__0 )?
             {
              before(grammarAccess.getPredicateDefinitionAccess().getGroup_5()); 
-            // InternalProblem.g:2357:2: ( rule__PredicateDefinition__Group_5__0 )?
-            int alt32=2;
-            int LA32_0 = input.LA(1);
+            // InternalProblem.g:2831:2: ( rule__PredicateDefinition__Group_5__0 )?
+            int alt38=2;
+            int LA38_0 = input.LA(1);
 
-            if ( (LA32_0==35) ) {
-                alt32=1;
+            if ( (LA38_0==39) ) {
+                alt38=1;
             }
-            switch (alt32) {
+            switch (alt38) {
                 case 1 :
-                    // InternalProblem.g:2357:3: rule__PredicateDefinition__Group_5__0
+                    // InternalProblem.g:2831:3: rule__PredicateDefinition__Group_5__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__PredicateDefinition__Group_5__0();
@@ -7553,14 +9131,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__6"
-    // InternalProblem.g:2365:1: rule__PredicateDefinition__Group__6 : rule__PredicateDefinition__Group__6__Impl ;
+    // InternalProblem.g:2839: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:2369:1: ( rule__PredicateDefinition__Group__6__Impl )
-            // InternalProblem.g:2370:2: rule__PredicateDefinition__Group__6__Impl
+            // InternalProblem.g:2843:1: ( rule__PredicateDefinition__Group__6__Impl )
+            // InternalProblem.g:2844:2: rule__PredicateDefinition__Group__6__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group__6__Impl();
@@ -7586,17 +9164,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__6__Impl"
-    // InternalProblem.g:2376:1: rule__PredicateDefinition__Group__6__Impl : ( '.' ) ;
+    // InternalProblem.g:2850:1: rule__PredicateDefinition__Group__6__Impl : ( '.' ) ;
     public final void rule__PredicateDefinition__Group__6__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2380:1: ( ( '.' ) )
-            // InternalProblem.g:2381:1: ( '.' )
+            // InternalProblem.g:2854:1: ( ( '.' ) )
+            // InternalProblem.g:2855:1: ( '.' )
             {
-            // InternalProblem.g:2381:1: ( '.' )
-            // InternalProblem.g:2382:2: '.'
+            // InternalProblem.g:2855:1: ( '.' )
+            // InternalProblem.g:2856:2: '.'
             {
              before(grammarAccess.getPredicateDefinitionAccess().getFullStopKeyword_6()); 
             match(input,12,FOLLOW_2); 
@@ -7623,14 +9201,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_0_0__0"
-    // InternalProblem.g:2392:1: rule__PredicateDefinition__Group_0_0__0 : rule__PredicateDefinition__Group_0_0__0__Impl rule__PredicateDefinition__Group_0_0__1 ;
+    // InternalProblem.g:2866: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: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
+            // InternalProblem.g:2870:1: ( rule__PredicateDefinition__Group_0_0__0__Impl rule__PredicateDefinition__Group_0_0__1 )
+            // InternalProblem.g:2871:2: rule__PredicateDefinition__Group_0_0__0__Impl rule__PredicateDefinition__Group_0_0__1
             {
             pushFollow(FOLLOW_25);
             rule__PredicateDefinition__Group_0_0__0__Impl();
@@ -7661,21 +9239,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_0_0__0__Impl"
-    // InternalProblem.g:2404:1: rule__PredicateDefinition__Group_0_0__0__Impl : ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) ) ;
+    // InternalProblem.g:2878: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:2408:1: ( ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) ) )
-            // InternalProblem.g:2409:1: ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) )
+            // InternalProblem.g:2882:1: ( ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) ) )
+            // InternalProblem.g:2883:1: ( ( 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 )
+            // InternalProblem.g:2883:1: ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) )
+            // InternalProblem.g:2884:2: ( rule__PredicateDefinition__ErrorAssignment_0_0_0 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getErrorAssignment_0_0_0()); 
-            // InternalProblem.g:2411:2: ( rule__PredicateDefinition__ErrorAssignment_0_0_0 )
-            // InternalProblem.g:2411:3: rule__PredicateDefinition__ErrorAssignment_0_0_0
+            // InternalProblem.g:2885:2: ( rule__PredicateDefinition__ErrorAssignment_0_0_0 )
+            // InternalProblem.g:2885:3: rule__PredicateDefinition__ErrorAssignment_0_0_0
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__ErrorAssignment_0_0_0();
@@ -7708,14 +9286,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_0_0__1"
-    // InternalProblem.g:2419:1: rule__PredicateDefinition__Group_0_0__1 : rule__PredicateDefinition__Group_0_0__1__Impl ;
+    // InternalProblem.g:2893: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:2423:1: ( rule__PredicateDefinition__Group_0_0__1__Impl )
-            // InternalProblem.g:2424:2: rule__PredicateDefinition__Group_0_0__1__Impl
+            // InternalProblem.g:2897:1: ( rule__PredicateDefinition__Group_0_0__1__Impl )
+            // InternalProblem.g:2898:2: rule__PredicateDefinition__Group_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group_0_0__1__Impl();
@@ -7741,29 +9319,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_0_0__1__Impl"
-    // InternalProblem.g:2430:1: rule__PredicateDefinition__Group_0_0__1__Impl : ( ( 'pred' )? ) ;
+    // InternalProblem.g:2904: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:2434:1: ( ( ( 'pred' )? ) )
-            // InternalProblem.g:2435:1: ( ( 'pred' )? )
+            // InternalProblem.g:2908:1: ( ( ( 'pred' )? ) )
+            // InternalProblem.g:2909:1: ( ( 'pred' )? )
             {
-            // InternalProblem.g:2435:1: ( ( 'pred' )? )
-            // InternalProblem.g:2436:2: ( 'pred' )?
+            // InternalProblem.g:2909:1: ( ( 'pred' )? )
+            // InternalProblem.g:2910:2: ( 'pred' )?
             {
              before(grammarAccess.getPredicateDefinitionAccess().getPredKeyword_0_0_1()); 
-            // InternalProblem.g:2437:2: ( 'pred' )?
-            int alt33=2;
-            int LA33_0 = input.LA(1);
+            // InternalProblem.g:2911:2: ( 'pred' )?
+            int alt39=2;
+            int LA39_0 = input.LA(1);
 
-            if ( (LA33_0==16) ) {
-                alt33=1;
+            if ( (LA39_0==16) ) {
+                alt39=1;
             }
-            switch (alt33) {
+            switch (alt39) {
                 case 1 :
-                    // InternalProblem.g:2437:3: 'pred'
+                    // InternalProblem.g:2911:3: 'pred'
                     {
                     match(input,16,FOLLOW_2); 
 
@@ -7795,14 +9373,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3__0"
-    // InternalProblem.g:2446:1: rule__PredicateDefinition__Group_3__0 : rule__PredicateDefinition__Group_3__0__Impl rule__PredicateDefinition__Group_3__1 ;
+    // InternalProblem.g:2920: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: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
+            // InternalProblem.g:2924:1: ( rule__PredicateDefinition__Group_3__0__Impl rule__PredicateDefinition__Group_3__1 )
+            // InternalProblem.g:2925:2: rule__PredicateDefinition__Group_3__0__Impl rule__PredicateDefinition__Group_3__1
             {
             pushFollow(FOLLOW_9);
             rule__PredicateDefinition__Group_3__0__Impl();
@@ -7833,21 +9411,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3__0__Impl"
-    // InternalProblem.g:2458:1: rule__PredicateDefinition__Group_3__0__Impl : ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) ) ;
+    // InternalProblem.g:2932: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:2462:1: ( ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) ) )
-            // InternalProblem.g:2463:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) )
+            // InternalProblem.g:2936:1: ( ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) ) )
+            // InternalProblem.g:2937:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) )
             {
-            // InternalProblem.g:2463:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) )
-            // InternalProblem.g:2464:2: ( rule__PredicateDefinition__ParametersAssignment_3_0 )
+            // InternalProblem.g:2937:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) )
+            // InternalProblem.g:2938:2: ( rule__PredicateDefinition__ParametersAssignment_3_0 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getParametersAssignment_3_0()); 
-            // InternalProblem.g:2465:2: ( rule__PredicateDefinition__ParametersAssignment_3_0 )
-            // InternalProblem.g:2465:3: rule__PredicateDefinition__ParametersAssignment_3_0
+            // InternalProblem.g:2939:2: ( rule__PredicateDefinition__ParametersAssignment_3_0 )
+            // InternalProblem.g:2939:3: rule__PredicateDefinition__ParametersAssignment_3_0
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__ParametersAssignment_3_0();
@@ -7880,14 +9458,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3__1"
-    // InternalProblem.g:2473:1: rule__PredicateDefinition__Group_3__1 : rule__PredicateDefinition__Group_3__1__Impl ;
+    // InternalProblem.g:2947: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:2477:1: ( rule__PredicateDefinition__Group_3__1__Impl )
-            // InternalProblem.g:2478:2: rule__PredicateDefinition__Group_3__1__Impl
+            // InternalProblem.g:2951:1: ( rule__PredicateDefinition__Group_3__1__Impl )
+            // InternalProblem.g:2952:2: rule__PredicateDefinition__Group_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group_3__1__Impl();
@@ -7913,33 +9491,33 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3__1__Impl"
-    // InternalProblem.g:2484:1: rule__PredicateDefinition__Group_3__1__Impl : ( ( rule__PredicateDefinition__Group_3_1__0 )* ) ;
+    // InternalProblem.g:2958: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:2488:1: ( ( ( rule__PredicateDefinition__Group_3_1__0 )* ) )
-            // InternalProblem.g:2489:1: ( ( rule__PredicateDefinition__Group_3_1__0 )* )
+            // InternalProblem.g:2962:1: ( ( ( rule__PredicateDefinition__Group_3_1__0 )* ) )
+            // InternalProblem.g:2963:1: ( ( 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 )*
+            // InternalProblem.g:2963:1: ( ( rule__PredicateDefinition__Group_3_1__0 )* )
+            // InternalProblem.g:2964:2: ( rule__PredicateDefinition__Group_3_1__0 )*
             {
              before(grammarAccess.getPredicateDefinitionAccess().getGroup_3_1()); 
-            // InternalProblem.g:2491:2: ( rule__PredicateDefinition__Group_3_1__0 )*
-            loop34:
+            // InternalProblem.g:2965:2: ( rule__PredicateDefinition__Group_3_1__0 )*
+            loop40:
             do {
-                int alt34=2;
-                int LA34_0 = input.LA(1);
+                int alt40=2;
+                int LA40_0 = input.LA(1);
 
-                if ( (LA34_0==13) ) {
-                    alt34=1;
+                if ( (LA40_0==13) ) {
+                    alt40=1;
                 }
 
 
-                switch (alt34) {
+                switch (alt40) {
                 case 1 :
-                    // InternalProblem.g:2491:3: rule__PredicateDefinition__Group_3_1__0
+                    // InternalProblem.g:2965:3: rule__PredicateDefinition__Group_3_1__0
                     {
                     pushFollow(FOLLOW_10);
                     rule__PredicateDefinition__Group_3_1__0();
@@ -7951,7 +9529,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop34;
+                    break loop40;
                 }
             } while (true);
 
@@ -7978,14 +9556,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3_1__0"
-    // InternalProblem.g:2500:1: rule__PredicateDefinition__Group_3_1__0 : rule__PredicateDefinition__Group_3_1__0__Impl rule__PredicateDefinition__Group_3_1__1 ;
+    // InternalProblem.g:2974: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: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
+            // InternalProblem.g:2978:1: ( rule__PredicateDefinition__Group_3_1__0__Impl rule__PredicateDefinition__Group_3_1__1 )
+            // InternalProblem.g:2979:2: rule__PredicateDefinition__Group_3_1__0__Impl rule__PredicateDefinition__Group_3_1__1
             {
             pushFollow(FOLLOW_5);
             rule__PredicateDefinition__Group_3_1__0__Impl();
@@ -8016,17 +9594,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3_1__0__Impl"
-    // InternalProblem.g:2512:1: rule__PredicateDefinition__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalProblem.g:2986: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:2516:1: ( ( ',' ) )
-            // InternalProblem.g:2517:1: ( ',' )
+            // InternalProblem.g:2990:1: ( ( ',' ) )
+            // InternalProblem.g:2991:1: ( ',' )
             {
-            // InternalProblem.g:2517:1: ( ',' )
-            // InternalProblem.g:2518:2: ','
+            // InternalProblem.g:2991:1: ( ',' )
+            // InternalProblem.g:2992:2: ','
             {
              before(grammarAccess.getPredicateDefinitionAccess().getCommaKeyword_3_1_0()); 
             match(input,13,FOLLOW_2); 
@@ -8053,14 +9631,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3_1__1"
-    // InternalProblem.g:2527:1: rule__PredicateDefinition__Group_3_1__1 : rule__PredicateDefinition__Group_3_1__1__Impl ;
+    // InternalProblem.g:3001: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:2531:1: ( rule__PredicateDefinition__Group_3_1__1__Impl )
-            // InternalProblem.g:2532:2: rule__PredicateDefinition__Group_3_1__1__Impl
+            // InternalProblem.g:3005:1: ( rule__PredicateDefinition__Group_3_1__1__Impl )
+            // InternalProblem.g:3006:2: rule__PredicateDefinition__Group_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group_3_1__1__Impl();
@@ -8086,21 +9664,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3_1__1__Impl"
-    // InternalProblem.g:2538:1: rule__PredicateDefinition__Group_3_1__1__Impl : ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) ) ;
+    // InternalProblem.g:3012: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:2542:1: ( ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) ) )
-            // InternalProblem.g:2543:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) )
+            // InternalProblem.g:3016:1: ( ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) ) )
+            // InternalProblem.g:3017:1: ( ( 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 )
+            // InternalProblem.g:3017:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) )
+            // InternalProblem.g:3018:2: ( rule__PredicateDefinition__ParametersAssignment_3_1_1 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getParametersAssignment_3_1_1()); 
-            // InternalProblem.g:2545:2: ( rule__PredicateDefinition__ParametersAssignment_3_1_1 )
-            // InternalProblem.g:2545:3: rule__PredicateDefinition__ParametersAssignment_3_1_1
+            // InternalProblem.g:3019:2: ( rule__PredicateDefinition__ParametersAssignment_3_1_1 )
+            // InternalProblem.g:3019:3: rule__PredicateDefinition__ParametersAssignment_3_1_1
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__ParametersAssignment_3_1_1();
@@ -8133,14 +9711,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5__0"
-    // InternalProblem.g:2554:1: rule__PredicateDefinition__Group_5__0 : rule__PredicateDefinition__Group_5__0__Impl rule__PredicateDefinition__Group_5__1 ;
+    // InternalProblem.g:3028: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: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
+            // InternalProblem.g:3032:1: ( rule__PredicateDefinition__Group_5__0__Impl rule__PredicateDefinition__Group_5__1 )
+            // InternalProblem.g:3033:2: rule__PredicateDefinition__Group_5__0__Impl rule__PredicateDefinition__Group_5__1
             {
             pushFollow(FOLLOW_26);
             rule__PredicateDefinition__Group_5__0__Impl();
@@ -8171,20 +9749,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5__0__Impl"
-    // InternalProblem.g:2566:1: rule__PredicateDefinition__Group_5__0__Impl : ( ':-' ) ;
+    // InternalProblem.g:3040:1: rule__PredicateDefinition__Group_5__0__Impl : ( ':-' ) ;
     public final void rule__PredicateDefinition__Group_5__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2570:1: ( ( ':-' ) )
-            // InternalProblem.g:2571:1: ( ':-' )
+            // InternalProblem.g:3044:1: ( ( ':-' ) )
+            // InternalProblem.g:3045:1: ( ':-' )
             {
-            // InternalProblem.g:2571:1: ( ':-' )
-            // InternalProblem.g:2572:2: ':-'
+            // InternalProblem.g:3045:1: ( ':-' )
+            // InternalProblem.g:3046:2: ':-'
             {
              before(grammarAccess.getPredicateDefinitionAccess().getColonHyphenMinusKeyword_5_0()); 
-            match(input,35,FOLLOW_2); 
+            match(input,39,FOLLOW_2); 
              after(grammarAccess.getPredicateDefinitionAccess().getColonHyphenMinusKeyword_5_0()); 
 
             }
@@ -8208,14 +9786,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5__1"
-    // InternalProblem.g:2581:1: rule__PredicateDefinition__Group_5__1 : rule__PredicateDefinition__Group_5__1__Impl rule__PredicateDefinition__Group_5__2 ;
+    // InternalProblem.g:3055: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: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
+            // InternalProblem.g:3059:1: ( rule__PredicateDefinition__Group_5__1__Impl rule__PredicateDefinition__Group_5__2 )
+            // InternalProblem.g:3060:2: rule__PredicateDefinition__Group_5__1__Impl rule__PredicateDefinition__Group_5__2
             {
             pushFollow(FOLLOW_13);
             rule__PredicateDefinition__Group_5__1__Impl();
@@ -8246,21 +9824,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5__1__Impl"
-    // InternalProblem.g:2593:1: rule__PredicateDefinition__Group_5__1__Impl : ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) ) ;
+    // InternalProblem.g:3067: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:2597:1: ( ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) ) )
-            // InternalProblem.g:2598:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) )
+            // InternalProblem.g:3071:1: ( ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) ) )
+            // InternalProblem.g:3072:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) )
             {
-            // InternalProblem.g:2598:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) )
-            // InternalProblem.g:2599:2: ( rule__PredicateDefinition__BodiesAssignment_5_1 )
+            // InternalProblem.g:3072:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) )
+            // InternalProblem.g:3073:2: ( rule__PredicateDefinition__BodiesAssignment_5_1 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getBodiesAssignment_5_1()); 
-            // InternalProblem.g:2600:2: ( rule__PredicateDefinition__BodiesAssignment_5_1 )
-            // InternalProblem.g:2600:3: rule__PredicateDefinition__BodiesAssignment_5_1
+            // InternalProblem.g:3074:2: ( rule__PredicateDefinition__BodiesAssignment_5_1 )
+            // InternalProblem.g:3074:3: rule__PredicateDefinition__BodiesAssignment_5_1
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__BodiesAssignment_5_1();
@@ -8293,14 +9871,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5__2"
-    // InternalProblem.g:2608:1: rule__PredicateDefinition__Group_5__2 : rule__PredicateDefinition__Group_5__2__Impl ;
+    // InternalProblem.g:3082: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:2612:1: ( rule__PredicateDefinition__Group_5__2__Impl )
-            // InternalProblem.g:2613:2: rule__PredicateDefinition__Group_5__2__Impl
+            // InternalProblem.g:3086:1: ( rule__PredicateDefinition__Group_5__2__Impl )
+            // InternalProblem.g:3087:2: rule__PredicateDefinition__Group_5__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group_5__2__Impl();
@@ -8326,33 +9904,33 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5__2__Impl"
-    // InternalProblem.g:2619:1: rule__PredicateDefinition__Group_5__2__Impl : ( ( rule__PredicateDefinition__Group_5_2__0 )* ) ;
+    // InternalProblem.g:3093: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:2623:1: ( ( ( rule__PredicateDefinition__Group_5_2__0 )* ) )
-            // InternalProblem.g:2624:1: ( ( rule__PredicateDefinition__Group_5_2__0 )* )
+            // InternalProblem.g:3097:1: ( ( ( rule__PredicateDefinition__Group_5_2__0 )* ) )
+            // InternalProblem.g:3098:1: ( ( 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 )*
+            // InternalProblem.g:3098:1: ( ( rule__PredicateDefinition__Group_5_2__0 )* )
+            // InternalProblem.g:3099:2: ( rule__PredicateDefinition__Group_5_2__0 )*
             {
              before(grammarAccess.getPredicateDefinitionAccess().getGroup_5_2()); 
-            // InternalProblem.g:2626:2: ( rule__PredicateDefinition__Group_5_2__0 )*
-            loop35:
+            // InternalProblem.g:3100:2: ( rule__PredicateDefinition__Group_5_2__0 )*
+            loop41:
             do {
-                int alt35=2;
-                int LA35_0 = input.LA(1);
+                int alt41=2;
+                int LA41_0 = input.LA(1);
 
-                if ( (LA35_0==14) ) {
-                    alt35=1;
+                if ( (LA41_0==14) ) {
+                    alt41=1;
                 }
 
 
-                switch (alt35) {
+                switch (alt41) {
                 case 1 :
-                    // InternalProblem.g:2626:3: rule__PredicateDefinition__Group_5_2__0
+                    // InternalProblem.g:3100:3: rule__PredicateDefinition__Group_5_2__0
                     {
                     pushFollow(FOLLOW_27);
                     rule__PredicateDefinition__Group_5_2__0();
@@ -8364,7 +9942,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop35;
+                    break loop41;
                 }
             } while (true);
 
@@ -8391,14 +9969,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5_2__0"
-    // InternalProblem.g:2635:1: rule__PredicateDefinition__Group_5_2__0 : rule__PredicateDefinition__Group_5_2__0__Impl rule__PredicateDefinition__Group_5_2__1 ;
+    // InternalProblem.g:3109: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: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
+            // InternalProblem.g:3113:1: ( rule__PredicateDefinition__Group_5_2__0__Impl rule__PredicateDefinition__Group_5_2__1 )
+            // InternalProblem.g:3114:2: rule__PredicateDefinition__Group_5_2__0__Impl rule__PredicateDefinition__Group_5_2__1
             {
             pushFollow(FOLLOW_26);
             rule__PredicateDefinition__Group_5_2__0__Impl();
@@ -8429,17 +10007,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5_2__0__Impl"
-    // InternalProblem.g:2647:1: rule__PredicateDefinition__Group_5_2__0__Impl : ( ';' ) ;
+    // InternalProblem.g:3121: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:2651:1: ( ( ';' ) )
-            // InternalProblem.g:2652:1: ( ';' )
+            // InternalProblem.g:3125:1: ( ( ';' ) )
+            // InternalProblem.g:3126:1: ( ';' )
             {
-            // InternalProblem.g:2652:1: ( ';' )
-            // InternalProblem.g:2653:2: ';'
+            // InternalProblem.g:3126:1: ( ';' )
+            // InternalProblem.g:3127:2: ';'
             {
              before(grammarAccess.getPredicateDefinitionAccess().getSemicolonKeyword_5_2_0()); 
             match(input,14,FOLLOW_2); 
@@ -8466,14 +10044,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5_2__1"
-    // InternalProblem.g:2662:1: rule__PredicateDefinition__Group_5_2__1 : rule__PredicateDefinition__Group_5_2__1__Impl ;
+    // InternalProblem.g:3136: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:2666:1: ( rule__PredicateDefinition__Group_5_2__1__Impl )
-            // InternalProblem.g:2667:2: rule__PredicateDefinition__Group_5_2__1__Impl
+            // InternalProblem.g:3140:1: ( rule__PredicateDefinition__Group_5_2__1__Impl )
+            // InternalProblem.g:3141:2: rule__PredicateDefinition__Group_5_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group_5_2__1__Impl();
@@ -8499,21 +10077,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5_2__1__Impl"
-    // InternalProblem.g:2673:1: rule__PredicateDefinition__Group_5_2__1__Impl : ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) ) ;
+    // InternalProblem.g:3147: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:2677:1: ( ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) ) )
-            // InternalProblem.g:2678:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) )
+            // InternalProblem.g:3151:1: ( ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) ) )
+            // InternalProblem.g:3152:1: ( ( 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 )
+            // InternalProblem.g:3152:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) )
+            // InternalProblem.g:3153:2: ( rule__PredicateDefinition__BodiesAssignment_5_2_1 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getBodiesAssignment_5_2_1()); 
-            // InternalProblem.g:2680:2: ( rule__PredicateDefinition__BodiesAssignment_5_2_1 )
-            // InternalProblem.g:2680:3: rule__PredicateDefinition__BodiesAssignment_5_2_1
+            // InternalProblem.g:3154:2: ( rule__PredicateDefinition__BodiesAssignment_5_2_1 )
+            // InternalProblem.g:3154:3: rule__PredicateDefinition__BodiesAssignment_5_2_1
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__BodiesAssignment_5_2_1();
@@ -8546,14 +10124,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Parameter__Group__0"
-    // InternalProblem.g:2689:1: rule__Parameter__Group__0 : rule__Parameter__Group__0__Impl rule__Parameter__Group__1 ;
+    // InternalProblem.g:3163: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:2693:1: ( rule__Parameter__Group__0__Impl rule__Parameter__Group__1 )
-            // InternalProblem.g:2694:2: rule__Parameter__Group__0__Impl rule__Parameter__Group__1
+            // InternalProblem.g:3167:1: ( rule__Parameter__Group__0__Impl rule__Parameter__Group__1 )
+            // InternalProblem.g:3168:2: rule__Parameter__Group__0__Impl rule__Parameter__Group__1
             {
             pushFollow(FOLLOW_5);
             rule__Parameter__Group__0__Impl();
@@ -8584,59 +10162,77 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Parameter__Group__0__Impl"
-    // InternalProblem.g:2701:1: rule__Parameter__Group__0__Impl : ( ( rule__Parameter__ParameterTypeAssignment_0 )? ) ;
+    // InternalProblem.g:3175: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:2705:1: ( ( ( rule__Parameter__ParameterTypeAssignment_0 )? ) )
-            // InternalProblem.g:2706:1: ( ( rule__Parameter__ParameterTypeAssignment_0 )? )
+            // InternalProblem.g:3179:1: ( ( ( rule__Parameter__ParameterTypeAssignment_0 )? ) )
+            // InternalProblem.g:3180:1: ( ( rule__Parameter__ParameterTypeAssignment_0 )? )
             {
-            // InternalProblem.g:2706:1: ( ( rule__Parameter__ParameterTypeAssignment_0 )? )
-            // InternalProblem.g:2707:2: ( rule__Parameter__ParameterTypeAssignment_0 )?
+            // InternalProblem.g:3180:1: ( ( rule__Parameter__ParameterTypeAssignment_0 )? )
+            // InternalProblem.g:3181:2: ( rule__Parameter__ParameterTypeAssignment_0 )?
             {
              before(grammarAccess.getParameterAccess().getParameterTypeAssignment_0()); 
-            // InternalProblem.g:2708:2: ( rule__Parameter__ParameterTypeAssignment_0 )?
-            int alt36=2;
+            // InternalProblem.g:3182:2: ( rule__Parameter__ParameterTypeAssignment_0 )?
+            int alt42=2;
             switch ( input.LA(1) ) {
                 case RULE_QUOTED_ID:
                     {
-                    alt36=1;
+                    alt42=1;
                     }
                     break;
                 case RULE_ID:
                     {
-                    int LA36_2 = input.LA(2);
+                    int LA42_2 = input.LA(2);
 
-                    if ( (LA36_2==RULE_ID||(LA36_2>=19 && LA36_2<=20)||LA36_2==39) ) {
-                        alt36=1;
+                    if ( (LA42_2==RULE_ID||(LA42_2>=19 && LA42_2<=22)||LA42_2==43) ) {
+                        alt42=1;
                     }
                     }
                     break;
                 case 19:
                     {
-                    int LA36_3 = input.LA(2);
+                    int LA42_3 = input.LA(2);
 
-                    if ( (LA36_3==RULE_ID||(LA36_3>=19 && LA36_3<=20)||LA36_3==39) ) {
-                        alt36=1;
+                    if ( (LA42_3==RULE_ID||(LA42_3>=19 && LA42_3<=22)||LA42_3==43) ) {
+                        alt42=1;
                     }
                     }
                     break;
                 case 20:
                     {
-                    int LA36_4 = input.LA(2);
+                    int LA42_4 = input.LA(2);
+
+                    if ( (LA42_4==RULE_ID||(LA42_4>=19 && LA42_4<=22)||LA42_4==43) ) {
+                        alt42=1;
+                    }
+                    }
+                    break;
+                case 21:
+                    {
+                    int LA42_5 = input.LA(2);
+
+                    if ( (LA42_5==RULE_ID||(LA42_5>=19 && LA42_5<=22)||LA42_5==43) ) {
+                        alt42=1;
+                    }
+                    }
+                    break;
+                case 22:
+                    {
+                    int LA42_6 = input.LA(2);
 
-                    if ( (LA36_4==RULE_ID||(LA36_4>=19 && LA36_4<=20)||LA36_4==39) ) {
-                        alt36=1;
+                    if ( (LA42_6==RULE_ID||(LA42_6>=19 && LA42_6<=22)||LA42_6==43) ) {
+                        alt42=1;
                     }
                     }
                     break;
             }
 
-            switch (alt36) {
+            switch (alt42) {
                 case 1 :
-                    // InternalProblem.g:2708:3: rule__Parameter__ParameterTypeAssignment_0
+                    // InternalProblem.g:3182:3: rule__Parameter__ParameterTypeAssignment_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Parameter__ParameterTypeAssignment_0();
@@ -8672,14 +10268,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Parameter__Group__1"
-    // InternalProblem.g:2716:1: rule__Parameter__Group__1 : rule__Parameter__Group__1__Impl ;
+    // InternalProblem.g:3190: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:2720:1: ( rule__Parameter__Group__1__Impl )
-            // InternalProblem.g:2721:2: rule__Parameter__Group__1__Impl
+            // InternalProblem.g:3194:1: ( rule__Parameter__Group__1__Impl )
+            // InternalProblem.g:3195:2: rule__Parameter__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Parameter__Group__1__Impl();
@@ -8705,21 +10301,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Parameter__Group__1__Impl"
-    // InternalProblem.g:2727:1: rule__Parameter__Group__1__Impl : ( ( rule__Parameter__NameAssignment_1 ) ) ;
+    // InternalProblem.g:3201: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:2731:1: ( ( ( rule__Parameter__NameAssignment_1 ) ) )
-            // InternalProblem.g:2732:1: ( ( rule__Parameter__NameAssignment_1 ) )
+            // InternalProblem.g:3205:1: ( ( ( rule__Parameter__NameAssignment_1 ) ) )
+            // InternalProblem.g:3206:1: ( ( rule__Parameter__NameAssignment_1 ) )
             {
-            // InternalProblem.g:2732:1: ( ( rule__Parameter__NameAssignment_1 ) )
-            // InternalProblem.g:2733:2: ( rule__Parameter__NameAssignment_1 )
+            // InternalProblem.g:3206:1: ( ( rule__Parameter__NameAssignment_1 ) )
+            // InternalProblem.g:3207:2: ( rule__Parameter__NameAssignment_1 )
             {
              before(grammarAccess.getParameterAccess().getNameAssignment_1()); 
-            // InternalProblem.g:2734:2: ( rule__Parameter__NameAssignment_1 )
-            // InternalProblem.g:2734:3: rule__Parameter__NameAssignment_1
+            // InternalProblem.g:3208:2: ( rule__Parameter__NameAssignment_1 )
+            // InternalProblem.g:3208:3: rule__Parameter__NameAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__Parameter__NameAssignment_1();
@@ -8752,14 +10348,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group__0"
-    // InternalProblem.g:2743:1: rule__Conjunction__Group__0 : rule__Conjunction__Group__0__Impl rule__Conjunction__Group__1 ;
+    // InternalProblem.g:3217: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:2747:1: ( rule__Conjunction__Group__0__Impl rule__Conjunction__Group__1 )
-            // InternalProblem.g:2748:2: rule__Conjunction__Group__0__Impl rule__Conjunction__Group__1
+            // InternalProblem.g:3221:1: ( rule__Conjunction__Group__0__Impl rule__Conjunction__Group__1 )
+            // InternalProblem.g:3222:2: rule__Conjunction__Group__0__Impl rule__Conjunction__Group__1
             {
             pushFollow(FOLLOW_9);
             rule__Conjunction__Group__0__Impl();
@@ -8790,21 +10386,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group__0__Impl"
-    // InternalProblem.g:2755:1: rule__Conjunction__Group__0__Impl : ( ( rule__Conjunction__LiteralsAssignment_0 ) ) ;
+    // InternalProblem.g:3229: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:2759:1: ( ( ( rule__Conjunction__LiteralsAssignment_0 ) ) )
-            // InternalProblem.g:2760:1: ( ( rule__Conjunction__LiteralsAssignment_0 ) )
+            // InternalProblem.g:3233:1: ( ( ( rule__Conjunction__LiteralsAssignment_0 ) ) )
+            // InternalProblem.g:3234:1: ( ( rule__Conjunction__LiteralsAssignment_0 ) )
             {
-            // InternalProblem.g:2760:1: ( ( rule__Conjunction__LiteralsAssignment_0 ) )
-            // InternalProblem.g:2761:2: ( rule__Conjunction__LiteralsAssignment_0 )
+            // InternalProblem.g:3234:1: ( ( rule__Conjunction__LiteralsAssignment_0 ) )
+            // InternalProblem.g:3235:2: ( rule__Conjunction__LiteralsAssignment_0 )
             {
              before(grammarAccess.getConjunctionAccess().getLiteralsAssignment_0()); 
-            // InternalProblem.g:2762:2: ( rule__Conjunction__LiteralsAssignment_0 )
-            // InternalProblem.g:2762:3: rule__Conjunction__LiteralsAssignment_0
+            // InternalProblem.g:3236:2: ( rule__Conjunction__LiteralsAssignment_0 )
+            // InternalProblem.g:3236:3: rule__Conjunction__LiteralsAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__Conjunction__LiteralsAssignment_0();
@@ -8837,14 +10433,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group__1"
-    // InternalProblem.g:2770:1: rule__Conjunction__Group__1 : rule__Conjunction__Group__1__Impl ;
+    // InternalProblem.g:3244: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:2774:1: ( rule__Conjunction__Group__1__Impl )
-            // InternalProblem.g:2775:2: rule__Conjunction__Group__1__Impl
+            // InternalProblem.g:3248:1: ( rule__Conjunction__Group__1__Impl )
+            // InternalProblem.g:3249:2: rule__Conjunction__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Conjunction__Group__1__Impl();
@@ -8870,33 +10466,33 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group__1__Impl"
-    // InternalProblem.g:2781:1: rule__Conjunction__Group__1__Impl : ( ( rule__Conjunction__Group_1__0 )* ) ;
+    // InternalProblem.g:3255: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:2785:1: ( ( ( rule__Conjunction__Group_1__0 )* ) )
-            // InternalProblem.g:2786:1: ( ( rule__Conjunction__Group_1__0 )* )
+            // InternalProblem.g:3259:1: ( ( ( rule__Conjunction__Group_1__0 )* ) )
+            // InternalProblem.g:3260:1: ( ( rule__Conjunction__Group_1__0 )* )
             {
-            // InternalProblem.g:2786:1: ( ( rule__Conjunction__Group_1__0 )* )
-            // InternalProblem.g:2787:2: ( rule__Conjunction__Group_1__0 )*
+            // InternalProblem.g:3260:1: ( ( rule__Conjunction__Group_1__0 )* )
+            // InternalProblem.g:3261:2: ( rule__Conjunction__Group_1__0 )*
             {
              before(grammarAccess.getConjunctionAccess().getGroup_1()); 
-            // InternalProblem.g:2788:2: ( rule__Conjunction__Group_1__0 )*
-            loop37:
+            // InternalProblem.g:3262:2: ( rule__Conjunction__Group_1__0 )*
+            loop43:
             do {
-                int alt37=2;
-                int LA37_0 = input.LA(1);
+                int alt43=2;
+                int LA43_0 = input.LA(1);
 
-                if ( (LA37_0==13) ) {
-                    alt37=1;
+                if ( (LA43_0==13) ) {
+                    alt43=1;
                 }
 
 
-                switch (alt37) {
+                switch (alt43) {
                 case 1 :
-                    // InternalProblem.g:2788:3: rule__Conjunction__Group_1__0
+                    // InternalProblem.g:3262:3: rule__Conjunction__Group_1__0
                     {
                     pushFollow(FOLLOW_10);
                     rule__Conjunction__Group_1__0();
@@ -8908,7 +10504,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop37;
+                    break loop43;
                 }
             } while (true);
 
@@ -8935,14 +10531,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group_1__0"
-    // InternalProblem.g:2797:1: rule__Conjunction__Group_1__0 : rule__Conjunction__Group_1__0__Impl rule__Conjunction__Group_1__1 ;
+    // InternalProblem.g:3271: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: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
+            // InternalProblem.g:3275:1: ( rule__Conjunction__Group_1__0__Impl rule__Conjunction__Group_1__1 )
+            // InternalProblem.g:3276:2: rule__Conjunction__Group_1__0__Impl rule__Conjunction__Group_1__1
             {
             pushFollow(FOLLOW_26);
             rule__Conjunction__Group_1__0__Impl();
@@ -8973,17 +10569,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group_1__0__Impl"
-    // InternalProblem.g:2809:1: rule__Conjunction__Group_1__0__Impl : ( ',' ) ;
+    // InternalProblem.g:3283:1: rule__Conjunction__Group_1__0__Impl : ( ',' ) ;
     public final void rule__Conjunction__Group_1__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2813:1: ( ( ',' ) )
-            // InternalProblem.g:2814:1: ( ',' )
+            // InternalProblem.g:3287:1: ( ( ',' ) )
+            // InternalProblem.g:3288:1: ( ',' )
             {
-            // InternalProblem.g:2814:1: ( ',' )
-            // InternalProblem.g:2815:2: ','
+            // InternalProblem.g:3288:1: ( ',' )
+            // InternalProblem.g:3289:2: ','
             {
              before(grammarAccess.getConjunctionAccess().getCommaKeyword_1_0()); 
             match(input,13,FOLLOW_2); 
@@ -9010,14 +10606,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group_1__1"
-    // InternalProblem.g:2824:1: rule__Conjunction__Group_1__1 : rule__Conjunction__Group_1__1__Impl ;
+    // InternalProblem.g:3298: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:2828:1: ( rule__Conjunction__Group_1__1__Impl )
-            // InternalProblem.g:2829:2: rule__Conjunction__Group_1__1__Impl
+            // InternalProblem.g:3302:1: ( rule__Conjunction__Group_1__1__Impl )
+            // InternalProblem.g:3303:2: rule__Conjunction__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Conjunction__Group_1__1__Impl();
@@ -9043,21 +10639,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group_1__1__Impl"
-    // InternalProblem.g:2835:1: rule__Conjunction__Group_1__1__Impl : ( ( rule__Conjunction__LiteralsAssignment_1_1 ) ) ;
+    // InternalProblem.g:3309: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:2839:1: ( ( ( rule__Conjunction__LiteralsAssignment_1_1 ) ) )
-            // InternalProblem.g:2840:1: ( ( rule__Conjunction__LiteralsAssignment_1_1 ) )
+            // InternalProblem.g:3313:1: ( ( ( rule__Conjunction__LiteralsAssignment_1_1 ) ) )
+            // InternalProblem.g:3314:1: ( ( rule__Conjunction__LiteralsAssignment_1_1 ) )
             {
-            // InternalProblem.g:2840:1: ( ( rule__Conjunction__LiteralsAssignment_1_1 ) )
-            // InternalProblem.g:2841:2: ( rule__Conjunction__LiteralsAssignment_1_1 )
+            // InternalProblem.g:3314:1: ( ( rule__Conjunction__LiteralsAssignment_1_1 ) )
+            // InternalProblem.g:3315:2: ( rule__Conjunction__LiteralsAssignment_1_1 )
             {
              before(grammarAccess.getConjunctionAccess().getLiteralsAssignment_1_1()); 
-            // InternalProblem.g:2842:2: ( rule__Conjunction__LiteralsAssignment_1_1 )
-            // InternalProblem.g:2842:3: rule__Conjunction__LiteralsAssignment_1_1
+            // InternalProblem.g:3316:2: ( rule__Conjunction__LiteralsAssignment_1_1 )
+            // InternalProblem.g:3316:3: rule__Conjunction__LiteralsAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__Conjunction__LiteralsAssignment_1_1();
@@ -9090,14 +10686,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NegativeLiteral__Group__0"
-    // InternalProblem.g:2851:1: rule__NegativeLiteral__Group__0 : rule__NegativeLiteral__Group__0__Impl rule__NegativeLiteral__Group__1 ;
+    // InternalProblem.g:3325: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:2855:1: ( rule__NegativeLiteral__Group__0__Impl rule__NegativeLiteral__Group__1 )
-            // InternalProblem.g:2856:2: rule__NegativeLiteral__Group__0__Impl rule__NegativeLiteral__Group__1
+            // InternalProblem.g:3329:1: ( rule__NegativeLiteral__Group__0__Impl rule__NegativeLiteral__Group__1 )
+            // InternalProblem.g:3330:2: rule__NegativeLiteral__Group__0__Impl rule__NegativeLiteral__Group__1
             {
             pushFollow(FOLLOW_5);
             rule__NegativeLiteral__Group__0__Impl();
@@ -9128,20 +10724,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NegativeLiteral__Group__0__Impl"
-    // InternalProblem.g:2863:1: rule__NegativeLiteral__Group__0__Impl : ( '!' ) ;
+    // InternalProblem.g:3337:1: rule__NegativeLiteral__Group__0__Impl : ( '!' ) ;
     public final void rule__NegativeLiteral__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2867:1: ( ( '!' ) )
-            // InternalProblem.g:2868:1: ( '!' )
+            // InternalProblem.g:3341:1: ( ( '!' ) )
+            // InternalProblem.g:3342:1: ( '!' )
             {
-            // InternalProblem.g:2868:1: ( '!' )
-            // InternalProblem.g:2869:2: '!'
+            // InternalProblem.g:3342:1: ( '!' )
+            // InternalProblem.g:3343:2: '!'
             {
              before(grammarAccess.getNegativeLiteralAccess().getExclamationMarkKeyword_0()); 
-            match(input,22,FOLLOW_2); 
+            match(input,26,FOLLOW_2); 
              after(grammarAccess.getNegativeLiteralAccess().getExclamationMarkKeyword_0()); 
 
             }
@@ -9165,14 +10761,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NegativeLiteral__Group__1"
-    // InternalProblem.g:2878:1: rule__NegativeLiteral__Group__1 : rule__NegativeLiteral__Group__1__Impl ;
+    // InternalProblem.g:3352: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:2882:1: ( rule__NegativeLiteral__Group__1__Impl )
-            // InternalProblem.g:2883:2: rule__NegativeLiteral__Group__1__Impl
+            // InternalProblem.g:3356:1: ( rule__NegativeLiteral__Group__1__Impl )
+            // InternalProblem.g:3357:2: rule__NegativeLiteral__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__NegativeLiteral__Group__1__Impl();
@@ -9198,21 +10794,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NegativeLiteral__Group__1__Impl"
-    // InternalProblem.g:2889:1: rule__NegativeLiteral__Group__1__Impl : ( ( rule__NegativeLiteral__AtomAssignment_1 ) ) ;
+    // InternalProblem.g:3363: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:2893:1: ( ( ( rule__NegativeLiteral__AtomAssignment_1 ) ) )
-            // InternalProblem.g:2894:1: ( ( rule__NegativeLiteral__AtomAssignment_1 ) )
+            // InternalProblem.g:3367:1: ( ( ( rule__NegativeLiteral__AtomAssignment_1 ) ) )
+            // InternalProblem.g:3368:1: ( ( rule__NegativeLiteral__AtomAssignment_1 ) )
             {
-            // InternalProblem.g:2894:1: ( ( rule__NegativeLiteral__AtomAssignment_1 ) )
-            // InternalProblem.g:2895:2: ( rule__NegativeLiteral__AtomAssignment_1 )
+            // InternalProblem.g:3368:1: ( ( rule__NegativeLiteral__AtomAssignment_1 ) )
+            // InternalProblem.g:3369:2: ( rule__NegativeLiteral__AtomAssignment_1 )
             {
              before(grammarAccess.getNegativeLiteralAccess().getAtomAssignment_1()); 
-            // InternalProblem.g:2896:2: ( rule__NegativeLiteral__AtomAssignment_1 )
-            // InternalProblem.g:2896:3: rule__NegativeLiteral__AtomAssignment_1
+            // InternalProblem.g:3370:2: ( rule__NegativeLiteral__AtomAssignment_1 )
+            // InternalProblem.g:3370:3: rule__NegativeLiteral__AtomAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__NegativeLiteral__AtomAssignment_1();
@@ -9245,14 +10841,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__0"
-    // InternalProblem.g:2905:1: rule__Atom__Group__0 : rule__Atom__Group__0__Impl rule__Atom__Group__1 ;
+    // InternalProblem.g:3379: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:2909:1: ( rule__Atom__Group__0__Impl rule__Atom__Group__1 )
-            // InternalProblem.g:2910:2: rule__Atom__Group__0__Impl rule__Atom__Group__1
+            // InternalProblem.g:3383:1: ( rule__Atom__Group__0__Impl rule__Atom__Group__1 )
+            // InternalProblem.g:3384:2: rule__Atom__Group__0__Impl rule__Atom__Group__1
             {
             pushFollow(FOLLOW_28);
             rule__Atom__Group__0__Impl();
@@ -9283,21 +10879,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__0__Impl"
-    // InternalProblem.g:2917:1: rule__Atom__Group__0__Impl : ( ( rule__Atom__RelationAssignment_0 ) ) ;
+    // InternalProblem.g:3391: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:2921:1: ( ( ( rule__Atom__RelationAssignment_0 ) ) )
-            // InternalProblem.g:2922:1: ( ( rule__Atom__RelationAssignment_0 ) )
+            // InternalProblem.g:3395:1: ( ( ( rule__Atom__RelationAssignment_0 ) ) )
+            // InternalProblem.g:3396:1: ( ( rule__Atom__RelationAssignment_0 ) )
             {
-            // InternalProblem.g:2922:1: ( ( rule__Atom__RelationAssignment_0 ) )
-            // InternalProblem.g:2923:2: ( rule__Atom__RelationAssignment_0 )
+            // InternalProblem.g:3396:1: ( ( rule__Atom__RelationAssignment_0 ) )
+            // InternalProblem.g:3397:2: ( rule__Atom__RelationAssignment_0 )
             {
              before(grammarAccess.getAtomAccess().getRelationAssignment_0()); 
-            // InternalProblem.g:2924:2: ( rule__Atom__RelationAssignment_0 )
-            // InternalProblem.g:2924:3: rule__Atom__RelationAssignment_0
+            // InternalProblem.g:3398:2: ( rule__Atom__RelationAssignment_0 )
+            // InternalProblem.g:3398:3: rule__Atom__RelationAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__Atom__RelationAssignment_0();
@@ -9330,14 +10926,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__1"
-    // InternalProblem.g:2932:1: rule__Atom__Group__1 : rule__Atom__Group__1__Impl rule__Atom__Group__2 ;
+    // InternalProblem.g:3406: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:2936:1: ( rule__Atom__Group__1__Impl rule__Atom__Group__2 )
-            // InternalProblem.g:2937:2: rule__Atom__Group__1__Impl rule__Atom__Group__2
+            // InternalProblem.g:3410:1: ( rule__Atom__Group__1__Impl rule__Atom__Group__2 )
+            // InternalProblem.g:3411:2: rule__Atom__Group__1__Impl rule__Atom__Group__2
             {
             pushFollow(FOLLOW_28);
             rule__Atom__Group__1__Impl();
@@ -9368,29 +10964,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__1__Impl"
-    // InternalProblem.g:2944:1: rule__Atom__Group__1__Impl : ( ( rule__Atom__TransitiveClosureAssignment_1 )? ) ;
+    // InternalProblem.g:3418: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:2948:1: ( ( ( rule__Atom__TransitiveClosureAssignment_1 )? ) )
-            // InternalProblem.g:2949:1: ( ( rule__Atom__TransitiveClosureAssignment_1 )? )
+            // InternalProblem.g:3422:1: ( ( ( rule__Atom__TransitiveClosureAssignment_1 )? ) )
+            // InternalProblem.g:3423:1: ( ( rule__Atom__TransitiveClosureAssignment_1 )? )
             {
-            // InternalProblem.g:2949:1: ( ( rule__Atom__TransitiveClosureAssignment_1 )? )
-            // InternalProblem.g:2950:2: ( rule__Atom__TransitiveClosureAssignment_1 )?
+            // InternalProblem.g:3423:1: ( ( rule__Atom__TransitiveClosureAssignment_1 )? )
+            // InternalProblem.g:3424:2: ( rule__Atom__TransitiveClosureAssignment_1 )?
             {
              before(grammarAccess.getAtomAccess().getTransitiveClosureAssignment_1()); 
-            // InternalProblem.g:2951:2: ( rule__Atom__TransitiveClosureAssignment_1 )?
-            int alt38=2;
-            int LA38_0 = input.LA(1);
+            // InternalProblem.g:3425:2: ( rule__Atom__TransitiveClosureAssignment_1 )?
+            int alt44=2;
+            int LA44_0 = input.LA(1);
 
-            if ( (LA38_0==43) ) {
-                alt38=1;
+            if ( (LA44_0==24) ) {
+                alt44=1;
             }
-            switch (alt38) {
+            switch (alt44) {
                 case 1 :
-                    // InternalProblem.g:2951:3: rule__Atom__TransitiveClosureAssignment_1
+                    // InternalProblem.g:3425:3: rule__Atom__TransitiveClosureAssignment_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__Atom__TransitiveClosureAssignment_1();
@@ -9426,16 +11022,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__2"
-    // InternalProblem.g:2959:1: rule__Atom__Group__2 : rule__Atom__Group__2__Impl rule__Atom__Group__3 ;
+    // InternalProblem.g:3433: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:2963:1: ( rule__Atom__Group__2__Impl rule__Atom__Group__3 )
-            // InternalProblem.g:2964:2: rule__Atom__Group__2__Impl rule__Atom__Group__3
+            // InternalProblem.g:3437:1: ( rule__Atom__Group__2__Impl rule__Atom__Group__3 )
+            // InternalProblem.g:3438:2: rule__Atom__Group__2__Impl rule__Atom__Group__3
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_29);
             rule__Atom__Group__2__Impl();
 
             state._fsp--;
@@ -9464,20 +11060,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__2__Impl"
-    // InternalProblem.g:2971:1: rule__Atom__Group__2__Impl : ( '(' ) ;
+    // InternalProblem.g:3445:1: rule__Atom__Group__2__Impl : ( '(' ) ;
     public final void rule__Atom__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2975:1: ( ( '(' ) )
-            // InternalProblem.g:2976:1: ( '(' )
+            // InternalProblem.g:3449:1: ( ( '(' ) )
+            // InternalProblem.g:3450:1: ( '(' )
             {
-            // InternalProblem.g:2976:1: ( '(' )
-            // InternalProblem.g:2977:2: '('
+            // InternalProblem.g:3450:1: ( '(' )
+            // InternalProblem.g:3451:2: '('
             {
              before(grammarAccess.getAtomAccess().getLeftParenthesisKeyword_2()); 
-            match(input,33,FOLLOW_2); 
+            match(input,37,FOLLOW_2); 
              after(grammarAccess.getAtomAccess().getLeftParenthesisKeyword_2()); 
 
             }
@@ -9501,16 +11097,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__3"
-    // InternalProblem.g:2986:1: rule__Atom__Group__3 : rule__Atom__Group__3__Impl rule__Atom__Group__4 ;
+    // InternalProblem.g:3460: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:2990:1: ( rule__Atom__Group__3__Impl rule__Atom__Group__4 )
-            // InternalProblem.g:2991:2: rule__Atom__Group__3__Impl rule__Atom__Group__4
+            // InternalProblem.g:3464:1: ( rule__Atom__Group__3__Impl rule__Atom__Group__4 )
+            // InternalProblem.g:3465:2: rule__Atom__Group__3__Impl rule__Atom__Group__4
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_29);
             rule__Atom__Group__3__Impl();
 
             state._fsp--;
@@ -9539,29 +11135,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__3__Impl"
-    // InternalProblem.g:2998:1: rule__Atom__Group__3__Impl : ( ( rule__Atom__Group_3__0 )? ) ;
+    // InternalProblem.g:3472: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:3002:1: ( ( ( rule__Atom__Group_3__0 )? ) )
-            // InternalProblem.g:3003:1: ( ( rule__Atom__Group_3__0 )? )
+            // InternalProblem.g:3476:1: ( ( ( rule__Atom__Group_3__0 )? ) )
+            // InternalProblem.g:3477:1: ( ( rule__Atom__Group_3__0 )? )
             {
-            // InternalProblem.g:3003:1: ( ( rule__Atom__Group_3__0 )? )
-            // InternalProblem.g:3004:2: ( rule__Atom__Group_3__0 )?
+            // InternalProblem.g:3477:1: ( ( rule__Atom__Group_3__0 )? )
+            // InternalProblem.g:3478:2: ( rule__Atom__Group_3__0 )?
             {
              before(grammarAccess.getAtomAccess().getGroup_3()); 
-            // InternalProblem.g:3005:2: ( rule__Atom__Group_3__0 )?
-            int alt39=2;
-            int LA39_0 = input.LA(1);
+            // InternalProblem.g:3479:2: ( rule__Atom__Group_3__0 )?
+            int alt45=2;
+            int LA45_0 = input.LA(1);
 
-            if ( ((LA39_0>=RULE_QUOTED_ID && LA39_0<=RULE_ID)||(LA39_0>=19 && LA39_0<=20)) ) {
-                alt39=1;
+            if ( ((LA45_0>=RULE_INT && LA45_0<=RULE_STRING)||(LA45_0>=19 && LA45_0<=23)) ) {
+                alt45=1;
             }
-            switch (alt39) {
+            switch (alt45) {
                 case 1 :
-                    // InternalProblem.g:3005:3: rule__Atom__Group_3__0
+                    // InternalProblem.g:3479:3: rule__Atom__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Atom__Group_3__0();
@@ -9597,14 +11193,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__4"
-    // InternalProblem.g:3013:1: rule__Atom__Group__4 : rule__Atom__Group__4__Impl ;
+    // InternalProblem.g:3487: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:3017:1: ( rule__Atom__Group__4__Impl )
-            // InternalProblem.g:3018:2: rule__Atom__Group__4__Impl
+            // InternalProblem.g:3491:1: ( rule__Atom__Group__4__Impl )
+            // InternalProblem.g:3492:2: rule__Atom__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Atom__Group__4__Impl();
@@ -9630,20 +11226,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__4__Impl"
-    // InternalProblem.g:3024:1: rule__Atom__Group__4__Impl : ( ')' ) ;
+    // InternalProblem.g:3498:1: rule__Atom__Group__4__Impl : ( ')' ) ;
     public final void rule__Atom__Group__4__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3028:1: ( ( ')' ) )
-            // InternalProblem.g:3029:1: ( ')' )
+            // InternalProblem.g:3502:1: ( ( ')' ) )
+            // InternalProblem.g:3503:1: ( ')' )
             {
-            // InternalProblem.g:3029:1: ( ')' )
-            // InternalProblem.g:3030:2: ')'
+            // InternalProblem.g:3503:1: ( ')' )
+            // InternalProblem.g:3504:2: ')'
             {
              before(grammarAccess.getAtomAccess().getRightParenthesisKeyword_4()); 
-            match(input,34,FOLLOW_2); 
+            match(input,38,FOLLOW_2); 
              after(grammarAccess.getAtomAccess().getRightParenthesisKeyword_4()); 
 
             }
@@ -9667,14 +11263,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3__0"
-    // InternalProblem.g:3040:1: rule__Atom__Group_3__0 : rule__Atom__Group_3__0__Impl rule__Atom__Group_3__1 ;
+    // InternalProblem.g:3514: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: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
+            // InternalProblem.g:3518:1: ( rule__Atom__Group_3__0__Impl rule__Atom__Group_3__1 )
+            // InternalProblem.g:3519:2: rule__Atom__Group_3__0__Impl rule__Atom__Group_3__1
             {
             pushFollow(FOLLOW_9);
             rule__Atom__Group_3__0__Impl();
@@ -9705,21 +11301,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3__0__Impl"
-    // InternalProblem.g:3052:1: rule__Atom__Group_3__0__Impl : ( ( rule__Atom__ArgumentsAssignment_3_0 ) ) ;
+    // InternalProblem.g:3526: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:3056:1: ( ( ( rule__Atom__ArgumentsAssignment_3_0 ) ) )
-            // InternalProblem.g:3057:1: ( ( rule__Atom__ArgumentsAssignment_3_0 ) )
+            // InternalProblem.g:3530:1: ( ( ( rule__Atom__ArgumentsAssignment_3_0 ) ) )
+            // InternalProblem.g:3531:1: ( ( rule__Atom__ArgumentsAssignment_3_0 ) )
             {
-            // InternalProblem.g:3057:1: ( ( rule__Atom__ArgumentsAssignment_3_0 ) )
-            // InternalProblem.g:3058:2: ( rule__Atom__ArgumentsAssignment_3_0 )
+            // InternalProblem.g:3531:1: ( ( rule__Atom__ArgumentsAssignment_3_0 ) )
+            // InternalProblem.g:3532:2: ( rule__Atom__ArgumentsAssignment_3_0 )
             {
              before(grammarAccess.getAtomAccess().getArgumentsAssignment_3_0()); 
-            // InternalProblem.g:3059:2: ( rule__Atom__ArgumentsAssignment_3_0 )
-            // InternalProblem.g:3059:3: rule__Atom__ArgumentsAssignment_3_0
+            // InternalProblem.g:3533:2: ( rule__Atom__ArgumentsAssignment_3_0 )
+            // InternalProblem.g:3533:3: rule__Atom__ArgumentsAssignment_3_0
             {
             pushFollow(FOLLOW_2);
             rule__Atom__ArgumentsAssignment_3_0();
@@ -9752,14 +11348,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3__1"
-    // InternalProblem.g:3067:1: rule__Atom__Group_3__1 : rule__Atom__Group_3__1__Impl ;
+    // InternalProblem.g:3541: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:3071:1: ( rule__Atom__Group_3__1__Impl )
-            // InternalProblem.g:3072:2: rule__Atom__Group_3__1__Impl
+            // InternalProblem.g:3545:1: ( rule__Atom__Group_3__1__Impl )
+            // InternalProblem.g:3546:2: rule__Atom__Group_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Atom__Group_3__1__Impl();
@@ -9785,33 +11381,33 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3__1__Impl"
-    // InternalProblem.g:3078:1: rule__Atom__Group_3__1__Impl : ( ( rule__Atom__Group_3_1__0 )* ) ;
+    // InternalProblem.g:3552: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:3082:1: ( ( ( rule__Atom__Group_3_1__0 )* ) )
-            // InternalProblem.g:3083:1: ( ( rule__Atom__Group_3_1__0 )* )
+            // InternalProblem.g:3556:1: ( ( ( rule__Atom__Group_3_1__0 )* ) )
+            // InternalProblem.g:3557:1: ( ( 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 )*
+            // InternalProblem.g:3557:1: ( ( rule__Atom__Group_3_1__0 )* )
+            // InternalProblem.g:3558:2: ( rule__Atom__Group_3_1__0 )*
             {
              before(grammarAccess.getAtomAccess().getGroup_3_1()); 
-            // InternalProblem.g:3085:2: ( rule__Atom__Group_3_1__0 )*
-            loop40:
+            // InternalProblem.g:3559:2: ( rule__Atom__Group_3_1__0 )*
+            loop46:
             do {
-                int alt40=2;
-                int LA40_0 = input.LA(1);
+                int alt46=2;
+                int LA46_0 = input.LA(1);
 
-                if ( (LA40_0==13) ) {
-                    alt40=1;
+                if ( (LA46_0==13) ) {
+                    alt46=1;
                 }
 
 
-                switch (alt40) {
+                switch (alt46) {
                 case 1 :
-                    // InternalProblem.g:3085:3: rule__Atom__Group_3_1__0
+                    // InternalProblem.g:3559:3: rule__Atom__Group_3_1__0
                     {
                     pushFollow(FOLLOW_10);
                     rule__Atom__Group_3_1__0();
@@ -9823,7 +11419,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop40;
+                    break loop46;
                 }
             } while (true);
 
@@ -9850,16 +11446,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3_1__0"
-    // InternalProblem.g:3094:1: rule__Atom__Group_3_1__0 : rule__Atom__Group_3_1__0__Impl rule__Atom__Group_3_1__1 ;
+    // InternalProblem.g:3568: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: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
+            // InternalProblem.g:3572:1: ( rule__Atom__Group_3_1__0__Impl rule__Atom__Group_3_1__1 )
+            // InternalProblem.g:3573:2: rule__Atom__Group_3_1__0__Impl rule__Atom__Group_3_1__1
             {
-            pushFollow(FOLLOW_5);
+            pushFollow(FOLLOW_30);
             rule__Atom__Group_3_1__0__Impl();
 
             state._fsp--;
@@ -9888,17 +11484,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3_1__0__Impl"
-    // InternalProblem.g:3106:1: rule__Atom__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalProblem.g:3580: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:3110:1: ( ( ',' ) )
-            // InternalProblem.g:3111:1: ( ',' )
+            // InternalProblem.g:3584:1: ( ( ',' ) )
+            // InternalProblem.g:3585:1: ( ',' )
             {
-            // InternalProblem.g:3111:1: ( ',' )
-            // InternalProblem.g:3112:2: ','
+            // InternalProblem.g:3585:1: ( ',' )
+            // InternalProblem.g:3586:2: ','
             {
              before(grammarAccess.getAtomAccess().getCommaKeyword_3_1_0()); 
             match(input,13,FOLLOW_2); 
@@ -9925,14 +11521,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3_1__1"
-    // InternalProblem.g:3121:1: rule__Atom__Group_3_1__1 : rule__Atom__Group_3_1__1__Impl ;
+    // InternalProblem.g:3595: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:3125:1: ( rule__Atom__Group_3_1__1__Impl )
-            // InternalProblem.g:3126:2: rule__Atom__Group_3_1__1__Impl
+            // InternalProblem.g:3599:1: ( rule__Atom__Group_3_1__1__Impl )
+            // InternalProblem.g:3600:2: rule__Atom__Group_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Atom__Group_3_1__1__Impl();
@@ -9958,21 +11554,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3_1__1__Impl"
-    // InternalProblem.g:3132:1: rule__Atom__Group_3_1__1__Impl : ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) ) ;
+    // InternalProblem.g:3606: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:3136:1: ( ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) ) )
-            // InternalProblem.g:3137:1: ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) )
+            // InternalProblem.g:3610:1: ( ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) ) )
+            // InternalProblem.g:3611:1: ( ( 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 )
+            // InternalProblem.g:3611:1: ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) )
+            // InternalProblem.g:3612:2: ( rule__Atom__ArgumentsAssignment_3_1_1 )
             {
              before(grammarAccess.getAtomAccess().getArgumentsAssignment_3_1_1()); 
-            // InternalProblem.g:3139:2: ( rule__Atom__ArgumentsAssignment_3_1_1 )
-            // InternalProblem.g:3139:3: rule__Atom__ArgumentsAssignment_3_1_1
+            // InternalProblem.g:3613:2: ( rule__Atom__ArgumentsAssignment_3_1_1 )
+            // InternalProblem.g:3613:3: rule__Atom__ArgumentsAssignment_3_1_1
             {
             pushFollow(FOLLOW_2);
             rule__Atom__ArgumentsAssignment_3_1_1();
@@ -10005,14 +11601,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group__0"
-    // InternalProblem.g:3148:1: rule__Assertion__Group__0 : rule__Assertion__Group__0__Impl rule__Assertion__Group__1 ;
+    // InternalProblem.g:3622: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:3152:1: ( rule__Assertion__Group__0__Impl rule__Assertion__Group__1 )
-            // InternalProblem.g:3153:2: rule__Assertion__Group__0__Impl rule__Assertion__Group__1
+            // InternalProblem.g:3626:1: ( rule__Assertion__Group__0__Impl rule__Assertion__Group__1 )
+            // InternalProblem.g:3627:2: rule__Assertion__Group__0__Impl rule__Assertion__Group__1
             {
             pushFollow(FOLLOW_6);
             rule__Assertion__Group__0__Impl();
@@ -10043,21 +11639,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group__0__Impl"
-    // InternalProblem.g:3160:1: rule__Assertion__Group__0__Impl : ( ( rule__Assertion__Alternatives_0 ) ) ;
+    // InternalProblem.g:3634: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:3164:1: ( ( ( rule__Assertion__Alternatives_0 ) ) )
-            // InternalProblem.g:3165:1: ( ( rule__Assertion__Alternatives_0 ) )
+            // InternalProblem.g:3638:1: ( ( ( rule__Assertion__Alternatives_0 ) ) )
+            // InternalProblem.g:3639:1: ( ( rule__Assertion__Alternatives_0 ) )
             {
-            // InternalProblem.g:3165:1: ( ( rule__Assertion__Alternatives_0 ) )
-            // InternalProblem.g:3166:2: ( rule__Assertion__Alternatives_0 )
+            // InternalProblem.g:3639:1: ( ( rule__Assertion__Alternatives_0 ) )
+            // InternalProblem.g:3640:2: ( rule__Assertion__Alternatives_0 )
             {
              before(grammarAccess.getAssertionAccess().getAlternatives_0()); 
-            // InternalProblem.g:3167:2: ( rule__Assertion__Alternatives_0 )
-            // InternalProblem.g:3167:3: rule__Assertion__Alternatives_0
+            // InternalProblem.g:3641:2: ( rule__Assertion__Alternatives_0 )
+            // InternalProblem.g:3641:3: rule__Assertion__Alternatives_0
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Alternatives_0();
@@ -10090,14 +11686,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group__1"
-    // InternalProblem.g:3175:1: rule__Assertion__Group__1 : rule__Assertion__Group__1__Impl ;
+    // InternalProblem.g:3649: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:3179:1: ( rule__Assertion__Group__1__Impl )
-            // InternalProblem.g:3180:2: rule__Assertion__Group__1__Impl
+            // InternalProblem.g:3653:1: ( rule__Assertion__Group__1__Impl )
+            // InternalProblem.g:3654:2: rule__Assertion__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group__1__Impl();
@@ -10123,17 +11719,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group__1__Impl"
-    // InternalProblem.g:3186:1: rule__Assertion__Group__1__Impl : ( '.' ) ;
+    // InternalProblem.g:3660:1: rule__Assertion__Group__1__Impl : ( '.' ) ;
     public final void rule__Assertion__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3190:1: ( ( '.' ) )
-            // InternalProblem.g:3191:1: ( '.' )
+            // InternalProblem.g:3664:1: ( ( '.' ) )
+            // InternalProblem.g:3665:1: ( '.' )
             {
-            // InternalProblem.g:3191:1: ( '.' )
-            // InternalProblem.g:3192:2: '.'
+            // InternalProblem.g:3665:1: ( '.' )
+            // InternalProblem.g:3666:2: '.'
             {
              before(grammarAccess.getAssertionAccess().getFullStopKeyword_1()); 
             match(input,12,FOLLOW_2); 
@@ -10160,14 +11756,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__0"
-    // InternalProblem.g:3202:1: rule__Assertion__Group_0_0__0 : rule__Assertion__Group_0_0__0__Impl rule__Assertion__Group_0_0__1 ;
+    // InternalProblem.g:3676: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: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
+            // InternalProblem.g:3680:1: ( rule__Assertion__Group_0_0__0__Impl rule__Assertion__Group_0_0__1 )
+            // InternalProblem.g:3681:2: rule__Assertion__Group_0_0__0__Impl rule__Assertion__Group_0_0__1
             {
             pushFollow(FOLLOW_22);
             rule__Assertion__Group_0_0__0__Impl();
@@ -10198,21 +11794,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__0__Impl"
-    // InternalProblem.g:3214:1: rule__Assertion__Group_0_0__0__Impl : ( ( rule__Assertion__RelationAssignment_0_0_0 ) ) ;
+    // InternalProblem.g:3688: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:3218:1: ( ( ( rule__Assertion__RelationAssignment_0_0_0 ) ) )
-            // InternalProblem.g:3219:1: ( ( rule__Assertion__RelationAssignment_0_0_0 ) )
+            // InternalProblem.g:3692:1: ( ( ( rule__Assertion__RelationAssignment_0_0_0 ) ) )
+            // InternalProblem.g:3693:1: ( ( 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 )
+            // InternalProblem.g:3693:1: ( ( rule__Assertion__RelationAssignment_0_0_0 ) )
+            // InternalProblem.g:3694:2: ( rule__Assertion__RelationAssignment_0_0_0 )
             {
              before(grammarAccess.getAssertionAccess().getRelationAssignment_0_0_0()); 
-            // InternalProblem.g:3221:2: ( rule__Assertion__RelationAssignment_0_0_0 )
-            // InternalProblem.g:3221:3: rule__Assertion__RelationAssignment_0_0_0
+            // InternalProblem.g:3695:2: ( rule__Assertion__RelationAssignment_0_0_0 )
+            // InternalProblem.g:3695:3: rule__Assertion__RelationAssignment_0_0_0
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__RelationAssignment_0_0_0();
@@ -10245,16 +11841,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__1"
-    // InternalProblem.g:3229:1: rule__Assertion__Group_0_0__1 : rule__Assertion__Group_0_0__1__Impl rule__Assertion__Group_0_0__2 ;
+    // InternalProblem.g:3703: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: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
+            // InternalProblem.g:3707:1: ( rule__Assertion__Group_0_0__1__Impl rule__Assertion__Group_0_0__2 )
+            // InternalProblem.g:3708:2: rule__Assertion__Group_0_0__1__Impl rule__Assertion__Group_0_0__2
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_29);
             rule__Assertion__Group_0_0__1__Impl();
 
             state._fsp--;
@@ -10283,20 +11879,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__1__Impl"
-    // InternalProblem.g:3241:1: rule__Assertion__Group_0_0__1__Impl : ( '(' ) ;
+    // InternalProblem.g:3715: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:3245:1: ( ( '(' ) )
-            // InternalProblem.g:3246:1: ( '(' )
+            // InternalProblem.g:3719:1: ( ( '(' ) )
+            // InternalProblem.g:3720:1: ( '(' )
             {
-            // InternalProblem.g:3246:1: ( '(' )
-            // InternalProblem.g:3247:2: '('
+            // InternalProblem.g:3720:1: ( '(' )
+            // InternalProblem.g:3721:2: '('
             {
              before(grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_0_1()); 
-            match(input,33,FOLLOW_2); 
+            match(input,37,FOLLOW_2); 
              after(grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_0_1()); 
 
             }
@@ -10320,16 +11916,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__2"
-    // InternalProblem.g:3256:1: rule__Assertion__Group_0_0__2 : rule__Assertion__Group_0_0__2__Impl rule__Assertion__Group_0_0__3 ;
+    // InternalProblem.g:3730: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: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
+            // InternalProblem.g:3734:1: ( rule__Assertion__Group_0_0__2__Impl rule__Assertion__Group_0_0__3 )
+            // InternalProblem.g:3735:2: rule__Assertion__Group_0_0__2__Impl rule__Assertion__Group_0_0__3
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_29);
             rule__Assertion__Group_0_0__2__Impl();
 
             state._fsp--;
@@ -10358,29 +11954,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__2__Impl"
-    // InternalProblem.g:3268:1: rule__Assertion__Group_0_0__2__Impl : ( ( rule__Assertion__Group_0_0_2__0 )? ) ;
+    // InternalProblem.g:3742: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:3272:1: ( ( ( rule__Assertion__Group_0_0_2__0 )? ) )
-            // InternalProblem.g:3273:1: ( ( rule__Assertion__Group_0_0_2__0 )? )
+            // InternalProblem.g:3746:1: ( ( ( rule__Assertion__Group_0_0_2__0 )? ) )
+            // InternalProblem.g:3747:1: ( ( 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 )?
+            // InternalProblem.g:3747:1: ( ( rule__Assertion__Group_0_0_2__0 )? )
+            // InternalProblem.g:3748:2: ( rule__Assertion__Group_0_0_2__0 )?
             {
              before(grammarAccess.getAssertionAccess().getGroup_0_0_2()); 
-            // InternalProblem.g:3275:2: ( rule__Assertion__Group_0_0_2__0 )?
-            int alt41=2;
-            int LA41_0 = input.LA(1);
+            // InternalProblem.g:3749:2: ( rule__Assertion__Group_0_0_2__0 )?
+            int alt47=2;
+            int LA47_0 = input.LA(1);
 
-            if ( ((LA41_0>=RULE_QUOTED_ID && LA41_0<=RULE_ID)||(LA41_0>=19 && LA41_0<=20)) ) {
-                alt41=1;
+            if ( ((LA47_0>=RULE_INT && LA47_0<=RULE_STRING)||(LA47_0>=19 && LA47_0<=23)) ) {
+                alt47=1;
             }
-            switch (alt41) {
+            switch (alt47) {
                 case 1 :
-                    // InternalProblem.g:3275:3: rule__Assertion__Group_0_0_2__0
+                    // InternalProblem.g:3749:3: rule__Assertion__Group_0_0_2__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Assertion__Group_0_0_2__0();
@@ -10416,16 +12012,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__3"
-    // InternalProblem.g:3283:1: rule__Assertion__Group_0_0__3 : rule__Assertion__Group_0_0__3__Impl rule__Assertion__Group_0_0__4 ;
+    // InternalProblem.g:3757: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: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
+            // InternalProblem.g:3761:1: ( rule__Assertion__Group_0_0__3__Impl rule__Assertion__Group_0_0__4 )
+            // InternalProblem.g:3762:2: rule__Assertion__Group_0_0__3__Impl rule__Assertion__Group_0_0__4
             {
-            pushFollow(FOLLOW_29);
+            pushFollow(FOLLOW_31);
             rule__Assertion__Group_0_0__3__Impl();
 
             state._fsp--;
@@ -10454,20 +12050,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__3__Impl"
-    // InternalProblem.g:3295:1: rule__Assertion__Group_0_0__3__Impl : ( ')' ) ;
+    // InternalProblem.g:3769: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:3299:1: ( ( ')' ) )
-            // InternalProblem.g:3300:1: ( ')' )
+            // InternalProblem.g:3773:1: ( ( ')' ) )
+            // InternalProblem.g:3774:1: ( ')' )
             {
-            // InternalProblem.g:3300:1: ( ')' )
-            // InternalProblem.g:3301:2: ')'
+            // InternalProblem.g:3774:1: ( ')' )
+            // InternalProblem.g:3775:2: ')'
             {
              before(grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_0_3()); 
-            match(input,34,FOLLOW_2); 
+            match(input,38,FOLLOW_2); 
              after(grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_0_3()); 
 
             }
@@ -10491,16 +12087,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__4"
-    // InternalProblem.g:3310:1: rule__Assertion__Group_0_0__4 : rule__Assertion__Group_0_0__4__Impl rule__Assertion__Group_0_0__5 ;
+    // InternalProblem.g:3784: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: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
+            // InternalProblem.g:3788:1: ( rule__Assertion__Group_0_0__4__Impl rule__Assertion__Group_0_0__5 )
+            // InternalProblem.g:3789:2: rule__Assertion__Group_0_0__4__Impl rule__Assertion__Group_0_0__5
             {
-            pushFollow(FOLLOW_30);
+            pushFollow(FOLLOW_32);
             rule__Assertion__Group_0_0__4__Impl();
 
             state._fsp--;
@@ -10529,20 +12125,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__4__Impl"
-    // InternalProblem.g:3322:1: rule__Assertion__Group_0_0__4__Impl : ( ':' ) ;
+    // InternalProblem.g:3796: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:3326:1: ( ( ':' ) )
-            // InternalProblem.g:3327:1: ( ':' )
+            // InternalProblem.g:3800:1: ( ( ':' ) )
+            // InternalProblem.g:3801:1: ( ':' )
             {
-            // InternalProblem.g:3327:1: ( ':' )
-            // InternalProblem.g:3328:2: ':'
+            // InternalProblem.g:3801:1: ( ':' )
+            // InternalProblem.g:3802:2: ':'
             {
              before(grammarAccess.getAssertionAccess().getColonKeyword_0_0_4()); 
-            match(input,36,FOLLOW_2); 
+            match(input,40,FOLLOW_2); 
              after(grammarAccess.getAssertionAccess().getColonKeyword_0_0_4()); 
 
             }
@@ -10566,14 +12162,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__5"
-    // InternalProblem.g:3337:1: rule__Assertion__Group_0_0__5 : rule__Assertion__Group_0_0__5__Impl ;
+    // InternalProblem.g:3811: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:3341:1: ( rule__Assertion__Group_0_0__5__Impl )
-            // InternalProblem.g:3342:2: rule__Assertion__Group_0_0__5__Impl
+            // InternalProblem.g:3815:1: ( rule__Assertion__Group_0_0__5__Impl )
+            // InternalProblem.g:3816:2: rule__Assertion__Group_0_0__5__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group_0_0__5__Impl();
@@ -10599,21 +12195,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__5__Impl"
-    // InternalProblem.g:3348:1: rule__Assertion__Group_0_0__5__Impl : ( ( rule__Assertion__ValueAssignment_0_0_5 ) ) ;
+    // InternalProblem.g:3822: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:3352:1: ( ( ( rule__Assertion__ValueAssignment_0_0_5 ) ) )
-            // InternalProblem.g:3353:1: ( ( rule__Assertion__ValueAssignment_0_0_5 ) )
+            // InternalProblem.g:3826:1: ( ( ( rule__Assertion__ValueAssignment_0_0_5 ) ) )
+            // InternalProblem.g:3827:1: ( ( 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 )
+            // InternalProblem.g:3827:1: ( ( rule__Assertion__ValueAssignment_0_0_5 ) )
+            // InternalProblem.g:3828:2: ( rule__Assertion__ValueAssignment_0_0_5 )
             {
              before(grammarAccess.getAssertionAccess().getValueAssignment_0_0_5()); 
-            // InternalProblem.g:3355:2: ( rule__Assertion__ValueAssignment_0_0_5 )
-            // InternalProblem.g:3355:3: rule__Assertion__ValueAssignment_0_0_5
+            // InternalProblem.g:3829:2: ( rule__Assertion__ValueAssignment_0_0_5 )
+            // InternalProblem.g:3829:3: rule__Assertion__ValueAssignment_0_0_5
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__ValueAssignment_0_0_5();
@@ -10646,14 +12242,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2__0"
-    // 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 ;
+    // InternalProblem.g:3838: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: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
+            // InternalProblem.g:3842:1: ( rule__Assertion__Group_0_0_2__0__Impl rule__Assertion__Group_0_0_2__1 )
+            // InternalProblem.g:3843:2: rule__Assertion__Group_0_0_2__0__Impl rule__Assertion__Group_0_0_2__1
             {
             pushFollow(FOLLOW_9);
             rule__Assertion__Group_0_0_2__0__Impl();
@@ -10684,21 +12280,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2__0__Impl"
-    // InternalProblem.g:3376:1: rule__Assertion__Group_0_0_2__0__Impl : ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) ) ;
+    // InternalProblem.g:3850: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:3380:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) ) )
-            // InternalProblem.g:3381:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) )
+            // InternalProblem.g:3854:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) ) )
+            // InternalProblem.g:3855:1: ( ( 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 )
+            // InternalProblem.g:3855:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) )
+            // InternalProblem.g:3856:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_0 )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsAssignment_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
+            // InternalProblem.g:3857:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_0 )
+            // InternalProblem.g:3857:3: rule__Assertion__ArgumentsAssignment_0_0_2_0
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__ArgumentsAssignment_0_0_2_0();
@@ -10731,14 +12327,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2__1"
-    // InternalProblem.g:3391:1: rule__Assertion__Group_0_0_2__1 : rule__Assertion__Group_0_0_2__1__Impl ;
+    // InternalProblem.g:3865: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:3395:1: ( rule__Assertion__Group_0_0_2__1__Impl )
-            // InternalProblem.g:3396:2: rule__Assertion__Group_0_0_2__1__Impl
+            // InternalProblem.g:3869:1: ( rule__Assertion__Group_0_0_2__1__Impl )
+            // InternalProblem.g:3870:2: rule__Assertion__Group_0_0_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group_0_0_2__1__Impl();
@@ -10764,33 +12360,33 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2__1__Impl"
-    // InternalProblem.g:3402:1: rule__Assertion__Group_0_0_2__1__Impl : ( ( rule__Assertion__Group_0_0_2_1__0 )* ) ;
+    // InternalProblem.g:3876: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:3406:1: ( ( ( rule__Assertion__Group_0_0_2_1__0 )* ) )
-            // InternalProblem.g:3407:1: ( ( rule__Assertion__Group_0_0_2_1__0 )* )
+            // InternalProblem.g:3880:1: ( ( ( rule__Assertion__Group_0_0_2_1__0 )* ) )
+            // InternalProblem.g:3881:1: ( ( 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 )*
+            // InternalProblem.g:3881:1: ( ( rule__Assertion__Group_0_0_2_1__0 )* )
+            // InternalProblem.g:3882:2: ( rule__Assertion__Group_0_0_2_1__0 )*
             {
              before(grammarAccess.getAssertionAccess().getGroup_0_0_2_1()); 
-            // InternalProblem.g:3409:2: ( rule__Assertion__Group_0_0_2_1__0 )*
-            loop42:
+            // InternalProblem.g:3883:2: ( rule__Assertion__Group_0_0_2_1__0 )*
+            loop48:
             do {
-                int alt42=2;
-                int LA42_0 = input.LA(1);
+                int alt48=2;
+                int LA48_0 = input.LA(1);
 
-                if ( (LA42_0==13) ) {
-                    alt42=1;
+                if ( (LA48_0==13) ) {
+                    alt48=1;
                 }
 
 
-                switch (alt42) {
+                switch (alt48) {
                 case 1 :
-                    // InternalProblem.g:3409:3: rule__Assertion__Group_0_0_2_1__0
+                    // InternalProblem.g:3883:3: rule__Assertion__Group_0_0_2_1__0
                     {
                     pushFollow(FOLLOW_10);
                     rule__Assertion__Group_0_0_2_1__0();
@@ -10802,7 +12398,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop42;
+                    break loop48;
                 }
             } while (true);
 
@@ -10829,16 +12425,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2_1__0"
-    // 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 ;
+    // InternalProblem.g:3892: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: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
+            // InternalProblem.g:3896:1: ( rule__Assertion__Group_0_0_2_1__0__Impl rule__Assertion__Group_0_0_2_1__1 )
+            // InternalProblem.g:3897:2: rule__Assertion__Group_0_0_2_1__0__Impl rule__Assertion__Group_0_0_2_1__1
             {
-            pushFollow(FOLLOW_5);
+            pushFollow(FOLLOW_30);
             rule__Assertion__Group_0_0_2_1__0__Impl();
 
             state._fsp--;
@@ -10867,17 +12463,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2_1__0__Impl"
-    // InternalProblem.g:3430:1: rule__Assertion__Group_0_0_2_1__0__Impl : ( ',' ) ;
+    // InternalProblem.g:3904: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:3434:1: ( ( ',' ) )
-            // InternalProblem.g:3435:1: ( ',' )
+            // InternalProblem.g:3908:1: ( ( ',' ) )
+            // InternalProblem.g:3909:1: ( ',' )
             {
-            // InternalProblem.g:3435:1: ( ',' )
-            // InternalProblem.g:3436:2: ','
+            // InternalProblem.g:3909:1: ( ',' )
+            // InternalProblem.g:3910:2: ','
             {
              before(grammarAccess.getAssertionAccess().getCommaKeyword_0_0_2_1_0()); 
             match(input,13,FOLLOW_2); 
@@ -10904,14 +12500,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2_1__1"
-    // InternalProblem.g:3445:1: rule__Assertion__Group_0_0_2_1__1 : rule__Assertion__Group_0_0_2_1__1__Impl ;
+    // InternalProblem.g:3919: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:3449:1: ( rule__Assertion__Group_0_0_2_1__1__Impl )
-            // InternalProblem.g:3450:2: rule__Assertion__Group_0_0_2_1__1__Impl
+            // InternalProblem.g:3923:1: ( rule__Assertion__Group_0_0_2_1__1__Impl )
+            // InternalProblem.g:3924:2: rule__Assertion__Group_0_0_2_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group_0_0_2_1__1__Impl();
@@ -10937,21 +12533,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2_1__1__Impl"
-    // InternalProblem.g:3456:1: rule__Assertion__Group_0_0_2_1__1__Impl : ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) ) ;
+    // InternalProblem.g:3930: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:3460:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) ) )
-            // InternalProblem.g:3461:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) )
+            // InternalProblem.g:3934:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) ) )
+            // InternalProblem.g:3935:1: ( ( 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 )
+            // InternalProblem.g:3935:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) )
+            // InternalProblem.g:3936:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsAssignment_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
+            // InternalProblem.g:3937:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 )
+            // InternalProblem.g:3937:3: rule__Assertion__ArgumentsAssignment_0_0_2_1_1
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__ArgumentsAssignment_0_0_2_1_1();
@@ -10984,16 +12580,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__0"
-    // InternalProblem.g:3472:1: rule__Assertion__Group_0_1__0 : rule__Assertion__Group_0_1__0__Impl rule__Assertion__Group_0_1__1 ;
+    // InternalProblem.g:3946: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: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
+            // InternalProblem.g:3950:1: ( rule__Assertion__Group_0_1__0__Impl rule__Assertion__Group_0_1__1 )
+            // InternalProblem.g:3951:2: rule__Assertion__Group_0_1__0__Impl rule__Assertion__Group_0_1__1
             {
-            pushFollow(FOLLOW_31);
+            pushFollow(FOLLOW_33);
             rule__Assertion__Group_0_1__0__Impl();
 
             state._fsp--;
@@ -11022,29 +12618,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__0__Impl"
-    // InternalProblem.g:3484:1: rule__Assertion__Group_0_1__0__Impl : ( ( rule__Assertion__ValueAssignment_0_1_0 )? ) ;
+    // InternalProblem.g:3958: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:3488:1: ( ( ( rule__Assertion__ValueAssignment_0_1_0 )? ) )
-            // InternalProblem.g:3489:1: ( ( rule__Assertion__ValueAssignment_0_1_0 )? )
+            // InternalProblem.g:3962:1: ( ( ( rule__Assertion__ValueAssignment_0_1_0 )? ) )
+            // InternalProblem.g:3963:1: ( ( 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 )?
+            // InternalProblem.g:3963:1: ( ( rule__Assertion__ValueAssignment_0_1_0 )? )
+            // InternalProblem.g:3964:2: ( rule__Assertion__ValueAssignment_0_1_0 )?
             {
              before(grammarAccess.getAssertionAccess().getValueAssignment_0_1_0()); 
-            // InternalProblem.g:3491:2: ( rule__Assertion__ValueAssignment_0_1_0 )?
-            int alt43=2;
-            int LA43_0 = input.LA(1);
+            // InternalProblem.g:3965:2: ( rule__Assertion__ValueAssignment_0_1_0 )?
+            int alt49=2;
+            int LA49_0 = input.LA(1);
 
-            if ( ((LA43_0>=22 && LA43_0<=23)) ) {
-                alt43=1;
+            if ( ((LA49_0>=26 && LA49_0<=27)) ) {
+                alt49=1;
             }
-            switch (alt43) {
+            switch (alt49) {
                 case 1 :
-                    // InternalProblem.g:3491:3: rule__Assertion__ValueAssignment_0_1_0
+                    // InternalProblem.g:3965:3: rule__Assertion__ValueAssignment_0_1_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Assertion__ValueAssignment_0_1_0();
@@ -11080,14 +12676,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__1"
-    // InternalProblem.g:3499:1: rule__Assertion__Group_0_1__1 : rule__Assertion__Group_0_1__1__Impl rule__Assertion__Group_0_1__2 ;
+    // InternalProblem.g:3973: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: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
+            // InternalProblem.g:3977:1: ( rule__Assertion__Group_0_1__1__Impl rule__Assertion__Group_0_1__2 )
+            // InternalProblem.g:3978:2: rule__Assertion__Group_0_1__1__Impl rule__Assertion__Group_0_1__2
             {
             pushFollow(FOLLOW_22);
             rule__Assertion__Group_0_1__1__Impl();
@@ -11118,21 +12714,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__1__Impl"
-    // InternalProblem.g:3511:1: rule__Assertion__Group_0_1__1__Impl : ( ( rule__Assertion__RelationAssignment_0_1_1 ) ) ;
+    // InternalProblem.g:3985: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:3515:1: ( ( ( rule__Assertion__RelationAssignment_0_1_1 ) ) )
-            // InternalProblem.g:3516:1: ( ( rule__Assertion__RelationAssignment_0_1_1 ) )
+            // InternalProblem.g:3989:1: ( ( ( rule__Assertion__RelationAssignment_0_1_1 ) ) )
+            // InternalProblem.g:3990:1: ( ( 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 )
+            // InternalProblem.g:3990:1: ( ( rule__Assertion__RelationAssignment_0_1_1 ) )
+            // InternalProblem.g:3991:2: ( rule__Assertion__RelationAssignment_0_1_1 )
             {
              before(grammarAccess.getAssertionAccess().getRelationAssignment_0_1_1()); 
-            // InternalProblem.g:3518:2: ( rule__Assertion__RelationAssignment_0_1_1 )
-            // InternalProblem.g:3518:3: rule__Assertion__RelationAssignment_0_1_1
+            // InternalProblem.g:3992:2: ( rule__Assertion__RelationAssignment_0_1_1 )
+            // InternalProblem.g:3992:3: rule__Assertion__RelationAssignment_0_1_1
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__RelationAssignment_0_1_1();
@@ -11165,16 +12761,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__2"
-    // InternalProblem.g:3526:1: rule__Assertion__Group_0_1__2 : rule__Assertion__Group_0_1__2__Impl rule__Assertion__Group_0_1__3 ;
+    // InternalProblem.g:4000: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: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
+            // InternalProblem.g:4004:1: ( rule__Assertion__Group_0_1__2__Impl rule__Assertion__Group_0_1__3 )
+            // InternalProblem.g:4005:2: rule__Assertion__Group_0_1__2__Impl rule__Assertion__Group_0_1__3
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_29);
             rule__Assertion__Group_0_1__2__Impl();
 
             state._fsp--;
@@ -11203,20 +12799,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__2__Impl"
-    // InternalProblem.g:3538:1: rule__Assertion__Group_0_1__2__Impl : ( '(' ) ;
+    // InternalProblem.g:4012: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:3542:1: ( ( '(' ) )
-            // InternalProblem.g:3543:1: ( '(' )
+            // InternalProblem.g:4016:1: ( ( '(' ) )
+            // InternalProblem.g:4017:1: ( '(' )
             {
-            // InternalProblem.g:3543:1: ( '(' )
-            // InternalProblem.g:3544:2: '('
+            // InternalProblem.g:4017:1: ( '(' )
+            // InternalProblem.g:4018:2: '('
             {
              before(grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_1_2()); 
-            match(input,33,FOLLOW_2); 
+            match(input,37,FOLLOW_2); 
              after(grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_1_2()); 
 
             }
@@ -11240,16 +12836,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__3"
-    // InternalProblem.g:3553:1: rule__Assertion__Group_0_1__3 : rule__Assertion__Group_0_1__3__Impl rule__Assertion__Group_0_1__4 ;
+    // InternalProblem.g:4027: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: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
+            // InternalProblem.g:4031:1: ( rule__Assertion__Group_0_1__3__Impl rule__Assertion__Group_0_1__4 )
+            // InternalProblem.g:4032:2: rule__Assertion__Group_0_1__3__Impl rule__Assertion__Group_0_1__4
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_29);
             rule__Assertion__Group_0_1__3__Impl();
 
             state._fsp--;
@@ -11278,29 +12874,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__3__Impl"
-    // InternalProblem.g:3565:1: rule__Assertion__Group_0_1__3__Impl : ( ( rule__Assertion__Group_0_1_3__0 )? ) ;
+    // InternalProblem.g:4039: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:3569:1: ( ( ( rule__Assertion__Group_0_1_3__0 )? ) )
-            // InternalProblem.g:3570:1: ( ( rule__Assertion__Group_0_1_3__0 )? )
+            // InternalProblem.g:4043:1: ( ( ( rule__Assertion__Group_0_1_3__0 )? ) )
+            // InternalProblem.g:4044:1: ( ( 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 )?
+            // InternalProblem.g:4044:1: ( ( rule__Assertion__Group_0_1_3__0 )? )
+            // InternalProblem.g:4045:2: ( rule__Assertion__Group_0_1_3__0 )?
             {
              before(grammarAccess.getAssertionAccess().getGroup_0_1_3()); 
-            // InternalProblem.g:3572:2: ( rule__Assertion__Group_0_1_3__0 )?
-            int alt44=2;
-            int LA44_0 = input.LA(1);
+            // InternalProblem.g:4046:2: ( rule__Assertion__Group_0_1_3__0 )?
+            int alt50=2;
+            int LA50_0 = input.LA(1);
 
-            if ( ((LA44_0>=RULE_QUOTED_ID && LA44_0<=RULE_ID)||(LA44_0>=19 && LA44_0<=20)) ) {
-                alt44=1;
+            if ( ((LA50_0>=RULE_INT && LA50_0<=RULE_STRING)||(LA50_0>=19 && LA50_0<=23)) ) {
+                alt50=1;
             }
-            switch (alt44) {
+            switch (alt50) {
                 case 1 :
-                    // InternalProblem.g:3572:3: rule__Assertion__Group_0_1_3__0
+                    // InternalProblem.g:4046:3: rule__Assertion__Group_0_1_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Assertion__Group_0_1_3__0();
@@ -11336,14 +12932,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__4"
-    // InternalProblem.g:3580:1: rule__Assertion__Group_0_1__4 : rule__Assertion__Group_0_1__4__Impl ;
+    // InternalProblem.g:4054: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:3584:1: ( rule__Assertion__Group_0_1__4__Impl )
-            // InternalProblem.g:3585:2: rule__Assertion__Group_0_1__4__Impl
+            // InternalProblem.g:4058:1: ( rule__Assertion__Group_0_1__4__Impl )
+            // InternalProblem.g:4059:2: rule__Assertion__Group_0_1__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group_0_1__4__Impl();
@@ -11369,20 +12965,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__4__Impl"
-    // InternalProblem.g:3591:1: rule__Assertion__Group_0_1__4__Impl : ( ')' ) ;
+    // InternalProblem.g:4065: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:3595:1: ( ( ')' ) )
-            // InternalProblem.g:3596:1: ( ')' )
+            // InternalProblem.g:4069:1: ( ( ')' ) )
+            // InternalProblem.g:4070:1: ( ')' )
             {
-            // InternalProblem.g:3596:1: ( ')' )
-            // InternalProblem.g:3597:2: ')'
+            // InternalProblem.g:4070:1: ( ')' )
+            // InternalProblem.g:4071:2: ')'
             {
              before(grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_1_4()); 
-            match(input,34,FOLLOW_2); 
+            match(input,38,FOLLOW_2); 
              after(grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_1_4()); 
 
             }
@@ -11406,14 +13002,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3__0"
-    // 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 ;
+    // InternalProblem.g:4081: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: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
+            // InternalProblem.g:4085:1: ( rule__Assertion__Group_0_1_3__0__Impl rule__Assertion__Group_0_1_3__1 )
+            // InternalProblem.g:4086:2: rule__Assertion__Group_0_1_3__0__Impl rule__Assertion__Group_0_1_3__1
             {
             pushFollow(FOLLOW_9);
             rule__Assertion__Group_0_1_3__0__Impl();
@@ -11444,21 +13040,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3__0__Impl"
-    // InternalProblem.g:3619:1: rule__Assertion__Group_0_1_3__0__Impl : ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) ) ;
+    // InternalProblem.g:4093: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:3623:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) ) )
-            // InternalProblem.g:3624:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) )
+            // InternalProblem.g:4097:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) ) )
+            // InternalProblem.g:4098:1: ( ( 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 )
+            // InternalProblem.g:4098:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) )
+            // InternalProblem.g:4099:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_0 )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsAssignment_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
+            // InternalProblem.g:4100:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_0 )
+            // InternalProblem.g:4100:3: rule__Assertion__ArgumentsAssignment_0_1_3_0
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__ArgumentsAssignment_0_1_3_0();
@@ -11491,14 +13087,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3__1"
-    // InternalProblem.g:3634:1: rule__Assertion__Group_0_1_3__1 : rule__Assertion__Group_0_1_3__1__Impl ;
+    // InternalProblem.g:4108: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:3638:1: ( rule__Assertion__Group_0_1_3__1__Impl )
-            // InternalProblem.g:3639:2: rule__Assertion__Group_0_1_3__1__Impl
+            // InternalProblem.g:4112:1: ( rule__Assertion__Group_0_1_3__1__Impl )
+            // InternalProblem.g:4113:2: rule__Assertion__Group_0_1_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group_0_1_3__1__Impl();
@@ -11524,33 +13120,33 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3__1__Impl"
-    // InternalProblem.g:3645:1: rule__Assertion__Group_0_1_3__1__Impl : ( ( rule__Assertion__Group_0_1_3_1__0 )* ) ;
+    // InternalProblem.g:4119: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:3649:1: ( ( ( rule__Assertion__Group_0_1_3_1__0 )* ) )
-            // InternalProblem.g:3650:1: ( ( rule__Assertion__Group_0_1_3_1__0 )* )
+            // InternalProblem.g:4123:1: ( ( ( rule__Assertion__Group_0_1_3_1__0 )* ) )
+            // InternalProblem.g:4124:1: ( ( 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 )*
+            // InternalProblem.g:4124:1: ( ( rule__Assertion__Group_0_1_3_1__0 )* )
+            // InternalProblem.g:4125:2: ( rule__Assertion__Group_0_1_3_1__0 )*
             {
              before(grammarAccess.getAssertionAccess().getGroup_0_1_3_1()); 
-            // InternalProblem.g:3652:2: ( rule__Assertion__Group_0_1_3_1__0 )*
-            loop45:
+            // InternalProblem.g:4126:2: ( rule__Assertion__Group_0_1_3_1__0 )*
+            loop51:
             do {
-                int alt45=2;
-                int LA45_0 = input.LA(1);
+                int alt51=2;
+                int LA51_0 = input.LA(1);
 
-                if ( (LA45_0==13) ) {
-                    alt45=1;
+                if ( (LA51_0==13) ) {
+                    alt51=1;
                 }
 
 
-                switch (alt45) {
+                switch (alt51) {
                 case 1 :
-                    // InternalProblem.g:3652:3: rule__Assertion__Group_0_1_3_1__0
+                    // InternalProblem.g:4126:3: rule__Assertion__Group_0_1_3_1__0
                     {
                     pushFollow(FOLLOW_10);
                     rule__Assertion__Group_0_1_3_1__0();
@@ -11562,7 +13158,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop45;
+                    break loop51;
                 }
             } while (true);
 
@@ -11589,16 +13185,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3_1__0"
-    // 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 ;
+    // InternalProblem.g:4135: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: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
+            // InternalProblem.g:4139:1: ( rule__Assertion__Group_0_1_3_1__0__Impl rule__Assertion__Group_0_1_3_1__1 )
+            // InternalProblem.g:4140:2: rule__Assertion__Group_0_1_3_1__0__Impl rule__Assertion__Group_0_1_3_1__1
             {
-            pushFollow(FOLLOW_5);
+            pushFollow(FOLLOW_30);
             rule__Assertion__Group_0_1_3_1__0__Impl();
 
             state._fsp--;
@@ -11627,17 +13223,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3_1__0__Impl"
-    // InternalProblem.g:3673:1: rule__Assertion__Group_0_1_3_1__0__Impl : ( ',' ) ;
+    // InternalProblem.g:4147: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:3677:1: ( ( ',' ) )
-            // InternalProblem.g:3678:1: ( ',' )
+            // InternalProblem.g:4151:1: ( ( ',' ) )
+            // InternalProblem.g:4152:1: ( ',' )
             {
-            // InternalProblem.g:3678:1: ( ',' )
-            // InternalProblem.g:3679:2: ','
+            // InternalProblem.g:4152:1: ( ',' )
+            // InternalProblem.g:4153:2: ','
             {
              before(grammarAccess.getAssertionAccess().getCommaKeyword_0_1_3_1_0()); 
             match(input,13,FOLLOW_2); 
@@ -11664,14 +13260,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3_1__1"
-    // InternalProblem.g:3688:1: rule__Assertion__Group_0_1_3_1__1 : rule__Assertion__Group_0_1_3_1__1__Impl ;
+    // InternalProblem.g:4162: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:3692:1: ( rule__Assertion__Group_0_1_3_1__1__Impl )
-            // InternalProblem.g:3693:2: rule__Assertion__Group_0_1_3_1__1__Impl
+            // InternalProblem.g:4166:1: ( rule__Assertion__Group_0_1_3_1__1__Impl )
+            // InternalProblem.g:4167:2: rule__Assertion__Group_0_1_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group_0_1_3_1__1__Impl();
@@ -11697,21 +13293,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3_1__1__Impl"
-    // InternalProblem.g:3699:1: rule__Assertion__Group_0_1_3_1__1__Impl : ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) ) ;
+    // InternalProblem.g:4173: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:3703:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) ) )
-            // InternalProblem.g:3704:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) )
+            // InternalProblem.g:4177:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) ) )
+            // InternalProblem.g:4178:1: ( ( 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 )
+            // InternalProblem.g:4178:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) )
+            // InternalProblem.g:4179:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsAssignment_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
+            // InternalProblem.g:4180:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 )
+            // InternalProblem.g:4180:3: rule__Assertion__ArgumentsAssignment_0_1_3_1_1
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__ArgumentsAssignment_0_1_3_1_1();
@@ -11743,17 +13339,332 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__Assertion__Group_0_1_3_1__1__Impl"
 
 
+    // $ANTLR start "rule__NodeValueAssertion__Group__0"
+    // InternalProblem.g:4189:1: rule__NodeValueAssertion__Group__0 : rule__NodeValueAssertion__Group__0__Impl rule__NodeValueAssertion__Group__1 ;
+    public final void rule__NodeValueAssertion__Group__0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4193:1: ( rule__NodeValueAssertion__Group__0__Impl rule__NodeValueAssertion__Group__1 )
+            // InternalProblem.g:4194:2: rule__NodeValueAssertion__Group__0__Impl rule__NodeValueAssertion__Group__1
+            {
+            pushFollow(FOLLOW_31);
+            rule__NodeValueAssertion__Group__0__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__NodeValueAssertion__Group__1();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__NodeValueAssertion__Group__0"
+
+
+    // $ANTLR start "rule__NodeValueAssertion__Group__0__Impl"
+    // InternalProblem.g:4201:1: rule__NodeValueAssertion__Group__0__Impl : ( ( rule__NodeValueAssertion__NodeAssignment_0 ) ) ;
+    public final void rule__NodeValueAssertion__Group__0__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4205:1: ( ( ( rule__NodeValueAssertion__NodeAssignment_0 ) ) )
+            // InternalProblem.g:4206:1: ( ( rule__NodeValueAssertion__NodeAssignment_0 ) )
+            {
+            // InternalProblem.g:4206:1: ( ( rule__NodeValueAssertion__NodeAssignment_0 ) )
+            // InternalProblem.g:4207:2: ( rule__NodeValueAssertion__NodeAssignment_0 )
+            {
+             before(grammarAccess.getNodeValueAssertionAccess().getNodeAssignment_0()); 
+            // InternalProblem.g:4208:2: ( rule__NodeValueAssertion__NodeAssignment_0 )
+            // InternalProblem.g:4208:3: rule__NodeValueAssertion__NodeAssignment_0
+            {
+            pushFollow(FOLLOW_2);
+            rule__NodeValueAssertion__NodeAssignment_0();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getNodeValueAssertionAccess().getNodeAssignment_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__NodeValueAssertion__Group__0__Impl"
+
+
+    // $ANTLR start "rule__NodeValueAssertion__Group__1"
+    // InternalProblem.g:4216:1: rule__NodeValueAssertion__Group__1 : rule__NodeValueAssertion__Group__1__Impl rule__NodeValueAssertion__Group__2 ;
+    public final void rule__NodeValueAssertion__Group__1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4220:1: ( rule__NodeValueAssertion__Group__1__Impl rule__NodeValueAssertion__Group__2 )
+            // InternalProblem.g:4221:2: rule__NodeValueAssertion__Group__1__Impl rule__NodeValueAssertion__Group__2
+            {
+            pushFollow(FOLLOW_30);
+            rule__NodeValueAssertion__Group__1__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__NodeValueAssertion__Group__2();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__NodeValueAssertion__Group__1"
+
+
+    // $ANTLR start "rule__NodeValueAssertion__Group__1__Impl"
+    // InternalProblem.g:4228:1: rule__NodeValueAssertion__Group__1__Impl : ( ':' ) ;
+    public final void rule__NodeValueAssertion__Group__1__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4232:1: ( ( ':' ) )
+            // InternalProblem.g:4233:1: ( ':' )
+            {
+            // InternalProblem.g:4233:1: ( ':' )
+            // InternalProblem.g:4234:2: ':'
+            {
+             before(grammarAccess.getNodeValueAssertionAccess().getColonKeyword_1()); 
+            match(input,40,FOLLOW_2); 
+             after(grammarAccess.getNodeValueAssertionAccess().getColonKeyword_1()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__NodeValueAssertion__Group__1__Impl"
+
+
+    // $ANTLR start "rule__NodeValueAssertion__Group__2"
+    // InternalProblem.g:4243:1: rule__NodeValueAssertion__Group__2 : rule__NodeValueAssertion__Group__2__Impl rule__NodeValueAssertion__Group__3 ;
+    public final void rule__NodeValueAssertion__Group__2() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4247:1: ( rule__NodeValueAssertion__Group__2__Impl rule__NodeValueAssertion__Group__3 )
+            // InternalProblem.g:4248:2: rule__NodeValueAssertion__Group__2__Impl rule__NodeValueAssertion__Group__3
+            {
+            pushFollow(FOLLOW_6);
+            rule__NodeValueAssertion__Group__2__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__NodeValueAssertion__Group__3();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__NodeValueAssertion__Group__2"
+
+
+    // $ANTLR start "rule__NodeValueAssertion__Group__2__Impl"
+    // InternalProblem.g:4255:1: rule__NodeValueAssertion__Group__2__Impl : ( ( rule__NodeValueAssertion__ValueAssignment_2 ) ) ;
+    public final void rule__NodeValueAssertion__Group__2__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4259:1: ( ( ( rule__NodeValueAssertion__ValueAssignment_2 ) ) )
+            // InternalProblem.g:4260:1: ( ( rule__NodeValueAssertion__ValueAssignment_2 ) )
+            {
+            // InternalProblem.g:4260:1: ( ( rule__NodeValueAssertion__ValueAssignment_2 ) )
+            // InternalProblem.g:4261:2: ( rule__NodeValueAssertion__ValueAssignment_2 )
+            {
+             before(grammarAccess.getNodeValueAssertionAccess().getValueAssignment_2()); 
+            // InternalProblem.g:4262:2: ( rule__NodeValueAssertion__ValueAssignment_2 )
+            // InternalProblem.g:4262:3: rule__NodeValueAssertion__ValueAssignment_2
+            {
+            pushFollow(FOLLOW_2);
+            rule__NodeValueAssertion__ValueAssignment_2();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getNodeValueAssertionAccess().getValueAssignment_2()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__NodeValueAssertion__Group__2__Impl"
+
+
+    // $ANTLR start "rule__NodeValueAssertion__Group__3"
+    // InternalProblem.g:4270:1: rule__NodeValueAssertion__Group__3 : rule__NodeValueAssertion__Group__3__Impl ;
+    public final void rule__NodeValueAssertion__Group__3() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4274:1: ( rule__NodeValueAssertion__Group__3__Impl )
+            // InternalProblem.g:4275:2: rule__NodeValueAssertion__Group__3__Impl
+            {
+            pushFollow(FOLLOW_2);
+            rule__NodeValueAssertion__Group__3__Impl();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__NodeValueAssertion__Group__3"
+
+
+    // $ANTLR start "rule__NodeValueAssertion__Group__3__Impl"
+    // InternalProblem.g:4281:1: rule__NodeValueAssertion__Group__3__Impl : ( '.' ) ;
+    public final void rule__NodeValueAssertion__Group__3__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4285:1: ( ( '.' ) )
+            // InternalProblem.g:4286:1: ( '.' )
+            {
+            // InternalProblem.g:4286:1: ( '.' )
+            // InternalProblem.g:4287:2: '.'
+            {
+             before(grammarAccess.getNodeValueAssertionAccess().getFullStopKeyword_3()); 
+            match(input,12,FOLLOW_2); 
+             after(grammarAccess.getNodeValueAssertionAccess().getFullStopKeyword_3()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__NodeValueAssertion__Group__3__Impl"
+
+
     // $ANTLR start "rule__ScopeDeclaration__Group__0"
-    // InternalProblem.g:3715:1: rule__ScopeDeclaration__Group__0 : rule__ScopeDeclaration__Group__0__Impl rule__ScopeDeclaration__Group__1 ;
+    // InternalProblem.g:4297: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:3719:1: ( rule__ScopeDeclaration__Group__0__Impl rule__ScopeDeclaration__Group__1 )
-            // InternalProblem.g:3720:2: rule__ScopeDeclaration__Group__0__Impl rule__ScopeDeclaration__Group__1
+            // InternalProblem.g:4301:1: ( rule__ScopeDeclaration__Group__0__Impl rule__ScopeDeclaration__Group__1 )
+            // InternalProblem.g:4302:2: rule__ScopeDeclaration__Group__0__Impl rule__ScopeDeclaration__Group__1
             {
-            pushFollow(FOLLOW_32);
+            pushFollow(FOLLOW_34);
             rule__ScopeDeclaration__Group__0__Impl();
 
             state._fsp--;
@@ -11782,20 +13693,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__0__Impl"
-    // InternalProblem.g:3727:1: rule__ScopeDeclaration__Group__0__Impl : ( 'scope' ) ;
+    // InternalProblem.g:4309:1: rule__ScopeDeclaration__Group__0__Impl : ( 'scope' ) ;
     public final void rule__ScopeDeclaration__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3731:1: ( ( 'scope' ) )
-            // InternalProblem.g:3732:1: ( 'scope' )
+            // InternalProblem.g:4313:1: ( ( 'scope' ) )
+            // InternalProblem.g:4314:1: ( 'scope' )
             {
-            // InternalProblem.g:3732:1: ( 'scope' )
-            // InternalProblem.g:3733:2: 'scope'
+            // InternalProblem.g:4314:1: ( 'scope' )
+            // InternalProblem.g:4315:2: 'scope'
             {
              before(grammarAccess.getScopeDeclarationAccess().getScopeKeyword_0()); 
-            match(input,37,FOLLOW_2); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getScopeDeclarationAccess().getScopeKeyword_0()); 
 
             }
@@ -11819,16 +13730,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__1"
-    // InternalProblem.g:3742:1: rule__ScopeDeclaration__Group__1 : rule__ScopeDeclaration__Group__1__Impl rule__ScopeDeclaration__Group__2 ;
+    // InternalProblem.g:4324: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:3746:1: ( rule__ScopeDeclaration__Group__1__Impl rule__ScopeDeclaration__Group__2 )
-            // InternalProblem.g:3747:2: rule__ScopeDeclaration__Group__1__Impl rule__ScopeDeclaration__Group__2
+            // InternalProblem.g:4328:1: ( rule__ScopeDeclaration__Group__1__Impl rule__ScopeDeclaration__Group__2 )
+            // InternalProblem.g:4329:2: rule__ScopeDeclaration__Group__1__Impl rule__ScopeDeclaration__Group__2
             {
-            pushFollow(FOLLOW_33);
+            pushFollow(FOLLOW_35);
             rule__ScopeDeclaration__Group__1__Impl();
 
             state._fsp--;
@@ -11857,21 +13768,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__1__Impl"
-    // InternalProblem.g:3754:1: rule__ScopeDeclaration__Group__1__Impl : ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) ) ;
+    // InternalProblem.g:4336: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:3758:1: ( ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) ) )
-            // InternalProblem.g:3759:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) )
+            // InternalProblem.g:4340:1: ( ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) ) )
+            // InternalProblem.g:4341:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) )
             {
-            // InternalProblem.g:3759:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) )
-            // InternalProblem.g:3760:2: ( rule__ScopeDeclaration__TypeScopesAssignment_1 )
+            // InternalProblem.g:4341:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) )
+            // InternalProblem.g:4342:2: ( rule__ScopeDeclaration__TypeScopesAssignment_1 )
             {
              before(grammarAccess.getScopeDeclarationAccess().getTypeScopesAssignment_1()); 
-            // InternalProblem.g:3761:2: ( rule__ScopeDeclaration__TypeScopesAssignment_1 )
-            // InternalProblem.g:3761:3: rule__ScopeDeclaration__TypeScopesAssignment_1
+            // InternalProblem.g:4343:2: ( rule__ScopeDeclaration__TypeScopesAssignment_1 )
+            // InternalProblem.g:4343:3: rule__ScopeDeclaration__TypeScopesAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__ScopeDeclaration__TypeScopesAssignment_1();
@@ -11904,16 +13815,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__2"
-    // InternalProblem.g:3769:1: rule__ScopeDeclaration__Group__2 : rule__ScopeDeclaration__Group__2__Impl rule__ScopeDeclaration__Group__3 ;
+    // InternalProblem.g:4351: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:3773:1: ( rule__ScopeDeclaration__Group__2__Impl rule__ScopeDeclaration__Group__3 )
-            // InternalProblem.g:3774:2: rule__ScopeDeclaration__Group__2__Impl rule__ScopeDeclaration__Group__3
+            // InternalProblem.g:4355:1: ( rule__ScopeDeclaration__Group__2__Impl rule__ScopeDeclaration__Group__3 )
+            // InternalProblem.g:4356:2: rule__ScopeDeclaration__Group__2__Impl rule__ScopeDeclaration__Group__3
             {
-            pushFollow(FOLLOW_33);
+            pushFollow(FOLLOW_35);
             rule__ScopeDeclaration__Group__2__Impl();
 
             state._fsp--;
@@ -11942,33 +13853,33 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__2__Impl"
-    // InternalProblem.g:3781:1: rule__ScopeDeclaration__Group__2__Impl : ( ( rule__ScopeDeclaration__Group_2__0 )* ) ;
+    // InternalProblem.g:4363: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:3785:1: ( ( ( rule__ScopeDeclaration__Group_2__0 )* ) )
-            // InternalProblem.g:3786:1: ( ( rule__ScopeDeclaration__Group_2__0 )* )
+            // InternalProblem.g:4367:1: ( ( ( rule__ScopeDeclaration__Group_2__0 )* ) )
+            // InternalProblem.g:4368:1: ( ( rule__ScopeDeclaration__Group_2__0 )* )
             {
-            // InternalProblem.g:3786:1: ( ( rule__ScopeDeclaration__Group_2__0 )* )
-            // InternalProblem.g:3787:2: ( rule__ScopeDeclaration__Group_2__0 )*
+            // InternalProblem.g:4368:1: ( ( rule__ScopeDeclaration__Group_2__0 )* )
+            // InternalProblem.g:4369:2: ( rule__ScopeDeclaration__Group_2__0 )*
             {
              before(grammarAccess.getScopeDeclarationAccess().getGroup_2()); 
-            // InternalProblem.g:3788:2: ( rule__ScopeDeclaration__Group_2__0 )*
-            loop46:
+            // InternalProblem.g:4370:2: ( rule__ScopeDeclaration__Group_2__0 )*
+            loop52:
             do {
-                int alt46=2;
-                int LA46_0 = input.LA(1);
+                int alt52=2;
+                int LA52_0 = input.LA(1);
 
-                if ( (LA46_0==13) ) {
-                    alt46=1;
+                if ( (LA52_0==13) ) {
+                    alt52=1;
                 }
 
 
-                switch (alt46) {
+                switch (alt52) {
                 case 1 :
-                    // InternalProblem.g:3788:3: rule__ScopeDeclaration__Group_2__0
+                    // InternalProblem.g:4370:3: rule__ScopeDeclaration__Group_2__0
                     {
                     pushFollow(FOLLOW_10);
                     rule__ScopeDeclaration__Group_2__0();
@@ -11980,7 +13891,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop46;
+                    break loop52;
                 }
             } while (true);
 
@@ -12007,14 +13918,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__3"
-    // InternalProblem.g:3796:1: rule__ScopeDeclaration__Group__3 : rule__ScopeDeclaration__Group__3__Impl ;
+    // InternalProblem.g:4378: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:3800:1: ( rule__ScopeDeclaration__Group__3__Impl )
-            // InternalProblem.g:3801:2: rule__ScopeDeclaration__Group__3__Impl
+            // InternalProblem.g:4382:1: ( rule__ScopeDeclaration__Group__3__Impl )
+            // InternalProblem.g:4383:2: rule__ScopeDeclaration__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ScopeDeclaration__Group__3__Impl();
@@ -12040,17 +13951,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__3__Impl"
-    // InternalProblem.g:3807:1: rule__ScopeDeclaration__Group__3__Impl : ( '.' ) ;
+    // InternalProblem.g:4389:1: rule__ScopeDeclaration__Group__3__Impl : ( '.' ) ;
     public final void rule__ScopeDeclaration__Group__3__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3811:1: ( ( '.' ) )
-            // InternalProblem.g:3812:1: ( '.' )
+            // InternalProblem.g:4393:1: ( ( '.' ) )
+            // InternalProblem.g:4394:1: ( '.' )
             {
-            // InternalProblem.g:3812:1: ( '.' )
-            // InternalProblem.g:3813:2: '.'
+            // InternalProblem.g:4394:1: ( '.' )
+            // InternalProblem.g:4395:2: '.'
             {
              before(grammarAccess.getScopeDeclarationAccess().getFullStopKeyword_3()); 
             match(input,12,FOLLOW_2); 
@@ -12077,16 +13988,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group_2__0"
-    // InternalProblem.g:3823:1: rule__ScopeDeclaration__Group_2__0 : rule__ScopeDeclaration__Group_2__0__Impl rule__ScopeDeclaration__Group_2__1 ;
+    // InternalProblem.g:4405: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: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
+            // InternalProblem.g:4409:1: ( rule__ScopeDeclaration__Group_2__0__Impl rule__ScopeDeclaration__Group_2__1 )
+            // InternalProblem.g:4410:2: rule__ScopeDeclaration__Group_2__0__Impl rule__ScopeDeclaration__Group_2__1
             {
-            pushFollow(FOLLOW_32);
+            pushFollow(FOLLOW_34);
             rule__ScopeDeclaration__Group_2__0__Impl();
 
             state._fsp--;
@@ -12115,17 +14026,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group_2__0__Impl"
-    // InternalProblem.g:3835:1: rule__ScopeDeclaration__Group_2__0__Impl : ( ',' ) ;
+    // InternalProblem.g:4417:1: rule__ScopeDeclaration__Group_2__0__Impl : ( ',' ) ;
     public final void rule__ScopeDeclaration__Group_2__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3839:1: ( ( ',' ) )
-            // InternalProblem.g:3840:1: ( ',' )
+            // InternalProblem.g:4421:1: ( ( ',' ) )
+            // InternalProblem.g:4422:1: ( ',' )
             {
-            // InternalProblem.g:3840:1: ( ',' )
-            // InternalProblem.g:3841:2: ','
+            // InternalProblem.g:4422:1: ( ',' )
+            // InternalProblem.g:4423:2: ','
             {
              before(grammarAccess.getScopeDeclarationAccess().getCommaKeyword_2_0()); 
             match(input,13,FOLLOW_2); 
@@ -12152,14 +14063,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group_2__1"
-    // InternalProblem.g:3850:1: rule__ScopeDeclaration__Group_2__1 : rule__ScopeDeclaration__Group_2__1__Impl ;
+    // InternalProblem.g:4432: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:3854:1: ( rule__ScopeDeclaration__Group_2__1__Impl )
-            // InternalProblem.g:3855:2: rule__ScopeDeclaration__Group_2__1__Impl
+            // InternalProblem.g:4436:1: ( rule__ScopeDeclaration__Group_2__1__Impl )
+            // InternalProblem.g:4437:2: rule__ScopeDeclaration__Group_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ScopeDeclaration__Group_2__1__Impl();
@@ -12185,21 +14096,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group_2__1__Impl"
-    // InternalProblem.g:3861:1: rule__ScopeDeclaration__Group_2__1__Impl : ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) ) ;
+    // InternalProblem.g:4443: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:3865:1: ( ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) ) )
-            // InternalProblem.g:3866:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) )
+            // InternalProblem.g:4447:1: ( ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) ) )
+            // InternalProblem.g:4448:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) )
             {
-            // InternalProblem.g:3866:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) )
-            // InternalProblem.g:3867:2: ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 )
+            // InternalProblem.g:4448:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) )
+            // InternalProblem.g:4449:2: ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 )
             {
              before(grammarAccess.getScopeDeclarationAccess().getTypeScopesAssignment_2_1()); 
-            // InternalProblem.g:3868:2: ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 )
-            // InternalProblem.g:3868:3: rule__ScopeDeclaration__TypeScopesAssignment_2_1
+            // InternalProblem.g:4450:2: ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 )
+            // InternalProblem.g:4450:3: rule__ScopeDeclaration__TypeScopesAssignment_2_1
             {
             pushFollow(FOLLOW_2);
             rule__ScopeDeclaration__TypeScopesAssignment_2_1();
@@ -12232,16 +14143,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Group__0"
-    // InternalProblem.g:3877:1: rule__TypeScope__Group__0 : rule__TypeScope__Group__0__Impl rule__TypeScope__Group__1 ;
+    // InternalProblem.g:4459: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:3881:1: ( rule__TypeScope__Group__0__Impl rule__TypeScope__Group__1 )
-            // InternalProblem.g:3882:2: rule__TypeScope__Group__0__Impl rule__TypeScope__Group__1
+            // InternalProblem.g:4463:1: ( rule__TypeScope__Group__0__Impl rule__TypeScope__Group__1 )
+            // InternalProblem.g:4464:2: rule__TypeScope__Group__0__Impl rule__TypeScope__Group__1
             {
-            pushFollow(FOLLOW_34);
+            pushFollow(FOLLOW_36);
             rule__TypeScope__Group__0__Impl();
 
             state._fsp--;
@@ -12270,21 +14181,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Group__0__Impl"
-    // InternalProblem.g:3889:1: rule__TypeScope__Group__0__Impl : ( ( rule__TypeScope__TargetTypeAssignment_0 ) ) ;
+    // InternalProblem.g:4471: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:3893:1: ( ( ( rule__TypeScope__TargetTypeAssignment_0 ) ) )
-            // InternalProblem.g:3894:1: ( ( rule__TypeScope__TargetTypeAssignment_0 ) )
+            // InternalProblem.g:4475:1: ( ( ( rule__TypeScope__TargetTypeAssignment_0 ) ) )
+            // InternalProblem.g:4476:1: ( ( rule__TypeScope__TargetTypeAssignment_0 ) )
             {
-            // InternalProblem.g:3894:1: ( ( rule__TypeScope__TargetTypeAssignment_0 ) )
-            // InternalProblem.g:3895:2: ( rule__TypeScope__TargetTypeAssignment_0 )
+            // InternalProblem.g:4476:1: ( ( rule__TypeScope__TargetTypeAssignment_0 ) )
+            // InternalProblem.g:4477:2: ( rule__TypeScope__TargetTypeAssignment_0 )
             {
              before(grammarAccess.getTypeScopeAccess().getTargetTypeAssignment_0()); 
-            // InternalProblem.g:3896:2: ( rule__TypeScope__TargetTypeAssignment_0 )
-            // InternalProblem.g:3896:3: rule__TypeScope__TargetTypeAssignment_0
+            // InternalProblem.g:4478:2: ( rule__TypeScope__TargetTypeAssignment_0 )
+            // InternalProblem.g:4478:3: rule__TypeScope__TargetTypeAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__TypeScope__TargetTypeAssignment_0();
@@ -12317,14 +14228,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Group__1"
-    // InternalProblem.g:3904:1: rule__TypeScope__Group__1 : rule__TypeScope__Group__1__Impl rule__TypeScope__Group__2 ;
+    // InternalProblem.g:4486: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:3908:1: ( rule__TypeScope__Group__1__Impl rule__TypeScope__Group__2 )
-            // InternalProblem.g:3909:2: rule__TypeScope__Group__1__Impl rule__TypeScope__Group__2
+            // InternalProblem.g:4490:1: ( rule__TypeScope__Group__1__Impl rule__TypeScope__Group__2 )
+            // InternalProblem.g:4491:2: rule__TypeScope__Group__1__Impl rule__TypeScope__Group__2
             {
             pushFollow(FOLLOW_20);
             rule__TypeScope__Group__1__Impl();
@@ -12355,21 +14266,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Group__1__Impl"
-    // InternalProblem.g:3916:1: rule__TypeScope__Group__1__Impl : ( ( rule__TypeScope__Alternatives_1 ) ) ;
+    // InternalProblem.g:4498: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:3920:1: ( ( ( rule__TypeScope__Alternatives_1 ) ) )
-            // InternalProblem.g:3921:1: ( ( rule__TypeScope__Alternatives_1 ) )
+            // InternalProblem.g:4502:1: ( ( ( rule__TypeScope__Alternatives_1 ) ) )
+            // InternalProblem.g:4503:1: ( ( rule__TypeScope__Alternatives_1 ) )
             {
-            // InternalProblem.g:3921:1: ( ( rule__TypeScope__Alternatives_1 ) )
-            // InternalProblem.g:3922:2: ( rule__TypeScope__Alternatives_1 )
+            // InternalProblem.g:4503:1: ( ( rule__TypeScope__Alternatives_1 ) )
+            // InternalProblem.g:4504:2: ( rule__TypeScope__Alternatives_1 )
             {
              before(grammarAccess.getTypeScopeAccess().getAlternatives_1()); 
-            // InternalProblem.g:3923:2: ( rule__TypeScope__Alternatives_1 )
-            // InternalProblem.g:3923:3: rule__TypeScope__Alternatives_1
+            // InternalProblem.g:4505:2: ( rule__TypeScope__Alternatives_1 )
+            // InternalProblem.g:4505:3: rule__TypeScope__Alternatives_1
             {
             pushFollow(FOLLOW_2);
             rule__TypeScope__Alternatives_1();
@@ -12402,14 +14313,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Group__2"
-    // InternalProblem.g:3931:1: rule__TypeScope__Group__2 : rule__TypeScope__Group__2__Impl ;
+    // InternalProblem.g:4513: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:3935:1: ( rule__TypeScope__Group__2__Impl )
-            // InternalProblem.g:3936:2: rule__TypeScope__Group__2__Impl
+            // InternalProblem.g:4517:1: ( rule__TypeScope__Group__2__Impl )
+            // InternalProblem.g:4518:2: rule__TypeScope__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TypeScope__Group__2__Impl();
@@ -12435,21 +14346,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Group__2__Impl"
-    // InternalProblem.g:3942:1: rule__TypeScope__Group__2__Impl : ( ( rule__TypeScope__MultiplicityAssignment_2 ) ) ;
+    // InternalProblem.g:4524: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:3946:1: ( ( ( rule__TypeScope__MultiplicityAssignment_2 ) ) )
-            // InternalProblem.g:3947:1: ( ( rule__TypeScope__MultiplicityAssignment_2 ) )
+            // InternalProblem.g:4528:1: ( ( ( rule__TypeScope__MultiplicityAssignment_2 ) ) )
+            // InternalProblem.g:4529:1: ( ( rule__TypeScope__MultiplicityAssignment_2 ) )
             {
-            // InternalProblem.g:3947:1: ( ( rule__TypeScope__MultiplicityAssignment_2 ) )
-            // InternalProblem.g:3948:2: ( rule__TypeScope__MultiplicityAssignment_2 )
+            // InternalProblem.g:4529:1: ( ( rule__TypeScope__MultiplicityAssignment_2 ) )
+            // InternalProblem.g:4530:2: ( rule__TypeScope__MultiplicityAssignment_2 )
             {
              before(grammarAccess.getTypeScopeAccess().getMultiplicityAssignment_2()); 
-            // InternalProblem.g:3949:2: ( rule__TypeScope__MultiplicityAssignment_2 )
-            // InternalProblem.g:3949:3: rule__TypeScope__MultiplicityAssignment_2
+            // InternalProblem.g:4531:2: ( rule__TypeScope__MultiplicityAssignment_2 )
+            // InternalProblem.g:4531:3: rule__TypeScope__MultiplicityAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__TypeScope__MultiplicityAssignment_2();
@@ -12482,16 +14393,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__Group__0"
-    // InternalProblem.g:3958:1: rule__RangeMultiplicity__Group__0 : rule__RangeMultiplicity__Group__0__Impl rule__RangeMultiplicity__Group__1 ;
+    // InternalProblem.g:4540: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:3962:1: ( rule__RangeMultiplicity__Group__0__Impl rule__RangeMultiplicity__Group__1 )
-            // InternalProblem.g:3963:2: rule__RangeMultiplicity__Group__0__Impl rule__RangeMultiplicity__Group__1
+            // InternalProblem.g:4544:1: ( rule__RangeMultiplicity__Group__0__Impl rule__RangeMultiplicity__Group__1 )
+            // InternalProblem.g:4545:2: rule__RangeMultiplicity__Group__0__Impl rule__RangeMultiplicity__Group__1
             {
-            pushFollow(FOLLOW_35);
+            pushFollow(FOLLOW_37);
             rule__RangeMultiplicity__Group__0__Impl();
 
             state._fsp--;
@@ -12520,21 +14431,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__Group__0__Impl"
-    // InternalProblem.g:3970:1: rule__RangeMultiplicity__Group__0__Impl : ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) ) ;
+    // InternalProblem.g:4552: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:3974:1: ( ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) ) )
-            // InternalProblem.g:3975:1: ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) )
+            // InternalProblem.g:4556:1: ( ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) ) )
+            // InternalProblem.g:4557:1: ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) )
             {
-            // InternalProblem.g:3975:1: ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) )
-            // InternalProblem.g:3976:2: ( rule__RangeMultiplicity__LowerBoundAssignment_0 )
+            // InternalProblem.g:4557:1: ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) )
+            // InternalProblem.g:4558:2: ( rule__RangeMultiplicity__LowerBoundAssignment_0 )
             {
              before(grammarAccess.getRangeMultiplicityAccess().getLowerBoundAssignment_0()); 
-            // InternalProblem.g:3977:2: ( rule__RangeMultiplicity__LowerBoundAssignment_0 )
-            // InternalProblem.g:3977:3: rule__RangeMultiplicity__LowerBoundAssignment_0
+            // InternalProblem.g:4559:2: ( rule__RangeMultiplicity__LowerBoundAssignment_0 )
+            // InternalProblem.g:4559:3: rule__RangeMultiplicity__LowerBoundAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__RangeMultiplicity__LowerBoundAssignment_0();
@@ -12567,16 +14478,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__Group__1"
-    // InternalProblem.g:3985:1: rule__RangeMultiplicity__Group__1 : rule__RangeMultiplicity__Group__1__Impl rule__RangeMultiplicity__Group__2 ;
+    // InternalProblem.g:4567: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:3989:1: ( rule__RangeMultiplicity__Group__1__Impl rule__RangeMultiplicity__Group__2 )
-            // InternalProblem.g:3990:2: rule__RangeMultiplicity__Group__1__Impl rule__RangeMultiplicity__Group__2
+            // InternalProblem.g:4571:1: ( rule__RangeMultiplicity__Group__1__Impl rule__RangeMultiplicity__Group__2 )
+            // InternalProblem.g:4572:2: rule__RangeMultiplicity__Group__1__Impl rule__RangeMultiplicity__Group__2
             {
-            pushFollow(FOLLOW_36);
+            pushFollow(FOLLOW_38);
             rule__RangeMultiplicity__Group__1__Impl();
 
             state._fsp--;
@@ -12605,20 +14516,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__Group__1__Impl"
-    // InternalProblem.g:3997:1: rule__RangeMultiplicity__Group__1__Impl : ( '..' ) ;
+    // InternalProblem.g:4579:1: rule__RangeMultiplicity__Group__1__Impl : ( '..' ) ;
     public final void rule__RangeMultiplicity__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4001:1: ( ( '..' ) )
-            // InternalProblem.g:4002:1: ( '..' )
+            // InternalProblem.g:4583:1: ( ( '..' ) )
+            // InternalProblem.g:4584:1: ( '..' )
             {
-            // InternalProblem.g:4002:1: ( '..' )
-            // InternalProblem.g:4003:2: '..'
+            // InternalProblem.g:4584:1: ( '..' )
+            // InternalProblem.g:4585:2: '..'
             {
              before(grammarAccess.getRangeMultiplicityAccess().getFullStopFullStopKeyword_1()); 
-            match(input,38,FOLLOW_2); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getRangeMultiplicityAccess().getFullStopFullStopKeyword_1()); 
 
             }
@@ -12642,14 +14553,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__Group__2"
-    // InternalProblem.g:4012:1: rule__RangeMultiplicity__Group__2 : rule__RangeMultiplicity__Group__2__Impl ;
+    // InternalProblem.g:4594: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:4016:1: ( rule__RangeMultiplicity__Group__2__Impl )
-            // InternalProblem.g:4017:2: rule__RangeMultiplicity__Group__2__Impl
+            // InternalProblem.g:4598:1: ( rule__RangeMultiplicity__Group__2__Impl )
+            // InternalProblem.g:4599:2: rule__RangeMultiplicity__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__RangeMultiplicity__Group__2__Impl();
@@ -12675,21 +14586,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__Group__2__Impl"
-    // InternalProblem.g:4023:1: rule__RangeMultiplicity__Group__2__Impl : ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) ) ;
+    // InternalProblem.g:4605: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:4027:1: ( ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) ) )
-            // InternalProblem.g:4028:1: ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) )
+            // InternalProblem.g:4609:1: ( ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) ) )
+            // InternalProblem.g:4610:1: ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) )
             {
-            // InternalProblem.g:4028:1: ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) )
-            // InternalProblem.g:4029:2: ( rule__RangeMultiplicity__UpperBoundAssignment_2 )
+            // InternalProblem.g:4610:1: ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) )
+            // InternalProblem.g:4611:2: ( rule__RangeMultiplicity__UpperBoundAssignment_2 )
             {
              before(grammarAccess.getRangeMultiplicityAccess().getUpperBoundAssignment_2()); 
-            // InternalProblem.g:4030:2: ( rule__RangeMultiplicity__UpperBoundAssignment_2 )
-            // InternalProblem.g:4030:3: rule__RangeMultiplicity__UpperBoundAssignment_2
+            // InternalProblem.g:4612:2: ( rule__RangeMultiplicity__UpperBoundAssignment_2 )
+            // InternalProblem.g:4612:3: rule__RangeMultiplicity__UpperBoundAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__RangeMultiplicity__UpperBoundAssignment_2();
@@ -12722,16 +14633,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0"
-    // InternalProblem.g:4039:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
+    // InternalProblem.g:4621: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: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
+            // InternalProblem.g:4625:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
+            // InternalProblem.g:4626:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
             {
-            pushFollow(FOLLOW_37);
+            pushFollow(FOLLOW_39);
             rule__QualifiedName__Group_1__0__Impl();
 
             state._fsp--;
@@ -12760,17 +14671,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__0__Impl"
-    // InternalProblem.g:4051:1: rule__QualifiedName__Group_1__0__Impl : ( ruleIdentifier ) ;
+    // InternalProblem.g:4633: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:4055:1: ( ( ruleIdentifier ) )
-            // InternalProblem.g:4056:1: ( ruleIdentifier )
+            // InternalProblem.g:4637:1: ( ( ruleIdentifier ) )
+            // InternalProblem.g:4638:1: ( ruleIdentifier )
             {
-            // InternalProblem.g:4056:1: ( ruleIdentifier )
-            // InternalProblem.g:4057:2: ruleIdentifier
+            // InternalProblem.g:4638:1: ( ruleIdentifier )
+            // InternalProblem.g:4639:2: ruleIdentifier
             {
              before(grammarAccess.getQualifiedNameAccess().getIdentifierParserRuleCall_1_0()); 
             pushFollow(FOLLOW_2);
@@ -12801,16 +14712,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1"
-    // InternalProblem.g:4066:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl rule__QualifiedName__Group_1__2 ;
+    // InternalProblem.g:4648: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: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
+            // InternalProblem.g:4652:1: ( rule__QualifiedName__Group_1__1__Impl rule__QualifiedName__Group_1__2 )
+            // InternalProblem.g:4653:2: rule__QualifiedName__Group_1__1__Impl rule__QualifiedName__Group_1__2
             {
-            pushFollow(FOLLOW_37);
+            pushFollow(FOLLOW_39);
             rule__QualifiedName__Group_1__1__Impl();
 
             state._fsp--;
@@ -12839,41 +14750,41 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__1__Impl"
-    // InternalProblem.g:4078:1: rule__QualifiedName__Group_1__1__Impl : ( ( rule__QualifiedName__Group_1_1__0 )* ) ;
+    // InternalProblem.g:4660: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:4082:1: ( ( ( rule__QualifiedName__Group_1_1__0 )* ) )
-            // InternalProblem.g:4083:1: ( ( rule__QualifiedName__Group_1_1__0 )* )
+            // InternalProblem.g:4664:1: ( ( ( rule__QualifiedName__Group_1_1__0 )* ) )
+            // InternalProblem.g:4665:1: ( ( 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 )*
+            // InternalProblem.g:4665:1: ( ( rule__QualifiedName__Group_1_1__0 )* )
+            // InternalProblem.g:4666:2: ( rule__QualifiedName__Group_1_1__0 )*
             {
              before(grammarAccess.getQualifiedNameAccess().getGroup_1_1()); 
-            // InternalProblem.g:4085:2: ( rule__QualifiedName__Group_1_1__0 )*
-            loop47:
+            // InternalProblem.g:4667:2: ( rule__QualifiedName__Group_1_1__0 )*
+            loop53:
             do {
-                int alt47=2;
-                int LA47_0 = input.LA(1);
+                int alt53=2;
+                int LA53_0 = input.LA(1);
 
-                if ( (LA47_0==39) ) {
-                    int LA47_1 = input.LA(2);
+                if ( (LA53_0==43) ) {
+                    int LA53_1 = input.LA(2);
 
-                    if ( (LA47_1==RULE_ID||(LA47_1>=19 && LA47_1<=20)) ) {
-                        alt47=1;
+                    if ( (LA53_1==RULE_ID||(LA53_1>=19 && LA53_1<=22)) ) {
+                        alt53=1;
                     }
 
 
                 }
 
 
-                switch (alt47) {
+                switch (alt53) {
                 case 1 :
-                    // InternalProblem.g:4085:3: rule__QualifiedName__Group_1_1__0
+                    // InternalProblem.g:4667:3: rule__QualifiedName__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_38);
+                    pushFollow(FOLLOW_40);
                     rule__QualifiedName__Group_1_1__0();
 
                     state._fsp--;
@@ -12883,7 +14794,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop47;
+                    break loop53;
                 }
             } while (true);
 
@@ -12910,14 +14821,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__2"
-    // InternalProblem.g:4093:1: rule__QualifiedName__Group_1__2 : rule__QualifiedName__Group_1__2__Impl ;
+    // InternalProblem.g:4675: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:4097:1: ( rule__QualifiedName__Group_1__2__Impl )
-            // InternalProblem.g:4098:2: rule__QualifiedName__Group_1__2__Impl
+            // InternalProblem.g:4679:1: ( rule__QualifiedName__Group_1__2__Impl )
+            // InternalProblem.g:4680:2: rule__QualifiedName__Group_1__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedName__Group_1__2__Impl();
@@ -12943,29 +14854,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1__2__Impl"
-    // InternalProblem.g:4104:1: rule__QualifiedName__Group_1__2__Impl : ( ( rule__QualifiedName__Group_1_2__0 )? ) ;
+    // InternalProblem.g:4686: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:4108:1: ( ( ( rule__QualifiedName__Group_1_2__0 )? ) )
-            // InternalProblem.g:4109:1: ( ( rule__QualifiedName__Group_1_2__0 )? )
+            // InternalProblem.g:4690:1: ( ( ( rule__QualifiedName__Group_1_2__0 )? ) )
+            // InternalProblem.g:4691:1: ( ( 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 )?
+            // InternalProblem.g:4691:1: ( ( rule__QualifiedName__Group_1_2__0 )? )
+            // InternalProblem.g:4692:2: ( rule__QualifiedName__Group_1_2__0 )?
             {
              before(grammarAccess.getQualifiedNameAccess().getGroup_1_2()); 
-            // InternalProblem.g:4111:2: ( rule__QualifiedName__Group_1_2__0 )?
-            int alt48=2;
-            int LA48_0 = input.LA(1);
+            // InternalProblem.g:4693:2: ( rule__QualifiedName__Group_1_2__0 )?
+            int alt54=2;
+            int LA54_0 = input.LA(1);
 
-            if ( (LA48_0==39) ) {
-                alt48=1;
+            if ( (LA54_0==43) ) {
+                alt54=1;
             }
-            switch (alt48) {
+            switch (alt54) {
                 case 1 :
-                    // InternalProblem.g:4111:3: rule__QualifiedName__Group_1_2__0
+                    // InternalProblem.g:4693:3: rule__QualifiedName__Group_1_2__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__QualifiedName__Group_1_2__0();
@@ -13001,14 +14912,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1_1__0"
-    // InternalProblem.g:4120:1: rule__QualifiedName__Group_1_1__0 : rule__QualifiedName__Group_1_1__0__Impl rule__QualifiedName__Group_1_1__1 ;
+    // InternalProblem.g:4702: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: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
+            // InternalProblem.g:4706:1: ( rule__QualifiedName__Group_1_1__0__Impl rule__QualifiedName__Group_1_1__1 )
+            // InternalProblem.g:4707:2: rule__QualifiedName__Group_1_1__0__Impl rule__QualifiedName__Group_1_1__1
             {
             pushFollow(FOLLOW_5);
             rule__QualifiedName__Group_1_1__0__Impl();
@@ -13039,20 +14950,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1_1__0__Impl"
-    // InternalProblem.g:4132:1: rule__QualifiedName__Group_1_1__0__Impl : ( '::' ) ;
+    // InternalProblem.g:4714: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:4136:1: ( ( '::' ) )
-            // InternalProblem.g:4137:1: ( '::' )
+            // InternalProblem.g:4718:1: ( ( '::' ) )
+            // InternalProblem.g:4719:1: ( '::' )
             {
-            // InternalProblem.g:4137:1: ( '::' )
-            // InternalProblem.g:4138:2: '::'
+            // InternalProblem.g:4719:1: ( '::' )
+            // InternalProblem.g:4720:2: '::'
             {
              before(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1_1_0()); 
-            match(input,39,FOLLOW_2); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1_1_0()); 
 
             }
@@ -13076,14 +14987,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1_1__1"
-    // InternalProblem.g:4147:1: rule__QualifiedName__Group_1_1__1 : rule__QualifiedName__Group_1_1__1__Impl ;
+    // InternalProblem.g:4729: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:4151:1: ( rule__QualifiedName__Group_1_1__1__Impl )
-            // InternalProblem.g:4152:2: rule__QualifiedName__Group_1_1__1__Impl
+            // InternalProblem.g:4733:1: ( rule__QualifiedName__Group_1_1__1__Impl )
+            // InternalProblem.g:4734:2: rule__QualifiedName__Group_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedName__Group_1_1__1__Impl();
@@ -13109,17 +15020,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1_1__1__Impl"
-    // InternalProblem.g:4158:1: rule__QualifiedName__Group_1_1__1__Impl : ( ruleIdentifier ) ;
+    // InternalProblem.g:4740: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:4162:1: ( ( ruleIdentifier ) )
-            // InternalProblem.g:4163:1: ( ruleIdentifier )
+            // InternalProblem.g:4744:1: ( ( ruleIdentifier ) )
+            // InternalProblem.g:4745:1: ( ruleIdentifier )
             {
-            // InternalProblem.g:4163:1: ( ruleIdentifier )
-            // InternalProblem.g:4164:2: ruleIdentifier
+            // InternalProblem.g:4745:1: ( ruleIdentifier )
+            // InternalProblem.g:4746:2: ruleIdentifier
             {
              before(grammarAccess.getQualifiedNameAccess().getIdentifierParserRuleCall_1_1_1()); 
             pushFollow(FOLLOW_2);
@@ -13150,16 +15061,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1_2__0"
-    // InternalProblem.g:4174:1: rule__QualifiedName__Group_1_2__0 : rule__QualifiedName__Group_1_2__0__Impl rule__QualifiedName__Group_1_2__1 ;
+    // InternalProblem.g:4756: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: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
+            // InternalProblem.g:4760:1: ( rule__QualifiedName__Group_1_2__0__Impl rule__QualifiedName__Group_1_2__1 )
+            // InternalProblem.g:4761:2: rule__QualifiedName__Group_1_2__0__Impl rule__QualifiedName__Group_1_2__1
             {
-            pushFollow(FOLLOW_39);
+            pushFollow(FOLLOW_41);
             rule__QualifiedName__Group_1_2__0__Impl();
 
             state._fsp--;
@@ -13188,20 +15099,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1_2__0__Impl"
-    // InternalProblem.g:4186:1: rule__QualifiedName__Group_1_2__0__Impl : ( '::' ) ;
+    // InternalProblem.g:4768: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:4190:1: ( ( '::' ) )
-            // InternalProblem.g:4191:1: ( '::' )
+            // InternalProblem.g:4772:1: ( ( '::' ) )
+            // InternalProblem.g:4773:1: ( '::' )
             {
-            // InternalProblem.g:4191:1: ( '::' )
-            // InternalProblem.g:4192:2: '::'
+            // InternalProblem.g:4773:1: ( '::' )
+            // InternalProblem.g:4774:2: '::'
             {
              before(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1_2_0()); 
-            match(input,39,FOLLOW_2); 
+            match(input,43,FOLLOW_2); 
              after(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1_2_0()); 
 
             }
@@ -13225,14 +15136,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1_2__1"
-    // InternalProblem.g:4201:1: rule__QualifiedName__Group_1_2__1 : rule__QualifiedName__Group_1_2__1__Impl ;
+    // InternalProblem.g:4783: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:4205:1: ( rule__QualifiedName__Group_1_2__1__Impl )
-            // InternalProblem.g:4206:2: rule__QualifiedName__Group_1_2__1__Impl
+            // InternalProblem.g:4787:1: ( rule__QualifiedName__Group_1_2__1__Impl )
+            // InternalProblem.g:4788:2: rule__QualifiedName__Group_1_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__QualifiedName__Group_1_2__1__Impl();
@@ -13258,17 +15169,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__QualifiedName__Group_1_2__1__Impl"
-    // InternalProblem.g:4212:1: rule__QualifiedName__Group_1_2__1__Impl : ( RULE_QUOTED_ID ) ;
+    // InternalProblem.g:4794: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:4216:1: ( ( RULE_QUOTED_ID ) )
-            // InternalProblem.g:4217:1: ( RULE_QUOTED_ID )
+            // InternalProblem.g:4798:1: ( ( RULE_QUOTED_ID ) )
+            // InternalProblem.g:4799:1: ( RULE_QUOTED_ID )
             {
-            // InternalProblem.g:4217:1: ( RULE_QUOTED_ID )
-            // InternalProblem.g:4218:2: RULE_QUOTED_ID
+            // InternalProblem.g:4799:1: ( RULE_QUOTED_ID )
+            // InternalProblem.g:4800:2: RULE_QUOTED_ID
             {
              before(grammarAccess.getQualifiedNameAccess().getQUOTED_IDTerminalRuleCall_1_2_1()); 
             match(input,RULE_QUOTED_ID,FOLLOW_2); 
@@ -13294,18 +15205,1064 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__QualifiedName__Group_1_2__1__Impl"
 
 
+    // $ANTLR start "rule__Integer__Group__0"
+    // InternalProblem.g:4810:1: rule__Integer__Group__0 : rule__Integer__Group__0__Impl rule__Integer__Group__1 ;
+    public final void rule__Integer__Group__0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4814:1: ( rule__Integer__Group__0__Impl rule__Integer__Group__1 )
+            // InternalProblem.g:4815:2: rule__Integer__Group__0__Impl rule__Integer__Group__1
+            {
+            pushFollow(FOLLOW_42);
+            rule__Integer__Group__0__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__Integer__Group__1();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Integer__Group__0"
+
+
+    // $ANTLR start "rule__Integer__Group__0__Impl"
+    // InternalProblem.g:4822:1: rule__Integer__Group__0__Impl : ( ( '-' )? ) ;
+    public final void rule__Integer__Group__0__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4826:1: ( ( ( '-' )? ) )
+            // InternalProblem.g:4827:1: ( ( '-' )? )
+            {
+            // InternalProblem.g:4827:1: ( ( '-' )? )
+            // InternalProblem.g:4828:2: ( '-' )?
+            {
+             before(grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0()); 
+            // InternalProblem.g:4829:2: ( '-' )?
+            int alt55=2;
+            int LA55_0 = input.LA(1);
+
+            if ( (LA55_0==23) ) {
+                alt55=1;
+            }
+            switch (alt55) {
+                case 1 :
+                    // InternalProblem.g:4829:3: '-'
+                    {
+                    match(input,23,FOLLOW_2); 
+
+                    }
+                    break;
+
+            }
+
+             after(grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Integer__Group__0__Impl"
+
+
+    // $ANTLR start "rule__Integer__Group__1"
+    // InternalProblem.g:4837:1: rule__Integer__Group__1 : rule__Integer__Group__1__Impl ;
+    public final void rule__Integer__Group__1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4841:1: ( rule__Integer__Group__1__Impl )
+            // InternalProblem.g:4842:2: rule__Integer__Group__1__Impl
+            {
+            pushFollow(FOLLOW_2);
+            rule__Integer__Group__1__Impl();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Integer__Group__1"
+
+
+    // $ANTLR start "rule__Integer__Group__1__Impl"
+    // InternalProblem.g:4848:1: rule__Integer__Group__1__Impl : ( RULE_INT ) ;
+    public final void rule__Integer__Group__1__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4852:1: ( ( RULE_INT ) )
+            // InternalProblem.g:4853:1: ( RULE_INT )
+            {
+            // InternalProblem.g:4853:1: ( RULE_INT )
+            // InternalProblem.g:4854:2: RULE_INT
+            {
+             before(grammarAccess.getIntegerAccess().getINTTerminalRuleCall_1()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getIntegerAccess().getINTTerminalRuleCall_1()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Integer__Group__1__Impl"
+
+
+    // $ANTLR start "rule__Real__Group__0"
+    // InternalProblem.g:4864:1: rule__Real__Group__0 : rule__Real__Group__0__Impl rule__Real__Group__1 ;
+    public final void rule__Real__Group__0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4868:1: ( rule__Real__Group__0__Impl rule__Real__Group__1 )
+            // InternalProblem.g:4869:2: rule__Real__Group__0__Impl rule__Real__Group__1
+            {
+            pushFollow(FOLLOW_42);
+            rule__Real__Group__0__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__Real__Group__1();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group__0"
+
+
+    // $ANTLR start "rule__Real__Group__0__Impl"
+    // InternalProblem.g:4876:1: rule__Real__Group__0__Impl : ( ( '-' )? ) ;
+    public final void rule__Real__Group__0__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4880:1: ( ( ( '-' )? ) )
+            // InternalProblem.g:4881:1: ( ( '-' )? )
+            {
+            // InternalProblem.g:4881:1: ( ( '-' )? )
+            // InternalProblem.g:4882:2: ( '-' )?
+            {
+             before(grammarAccess.getRealAccess().getHyphenMinusKeyword_0()); 
+            // InternalProblem.g:4883:2: ( '-' )?
+            int alt56=2;
+            int LA56_0 = input.LA(1);
+
+            if ( (LA56_0==23) ) {
+                alt56=1;
+            }
+            switch (alt56) {
+                case 1 :
+                    // InternalProblem.g:4883:3: '-'
+                    {
+                    match(input,23,FOLLOW_2); 
+
+                    }
+                    break;
+
+            }
+
+             after(grammarAccess.getRealAccess().getHyphenMinusKeyword_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group__0__Impl"
+
+
+    // $ANTLR start "rule__Real__Group__1"
+    // InternalProblem.g:4891:1: rule__Real__Group__1 : rule__Real__Group__1__Impl rule__Real__Group__2 ;
+    public final void rule__Real__Group__1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4895:1: ( rule__Real__Group__1__Impl rule__Real__Group__2 )
+            // InternalProblem.g:4896:2: rule__Real__Group__1__Impl rule__Real__Group__2
+            {
+            pushFollow(FOLLOW_43);
+            rule__Real__Group__1__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__Real__Group__2();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group__1"
+
+
+    // $ANTLR start "rule__Real__Group__1__Impl"
+    // InternalProblem.g:4903:1: rule__Real__Group__1__Impl : ( RULE_INT ) ;
+    public final void rule__Real__Group__1__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4907:1: ( ( RULE_INT ) )
+            // InternalProblem.g:4908:1: ( RULE_INT )
+            {
+            // InternalProblem.g:4908:1: ( RULE_INT )
+            // InternalProblem.g:4909:2: RULE_INT
+            {
+             before(grammarAccess.getRealAccess().getINTTerminalRuleCall_1()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getRealAccess().getINTTerminalRuleCall_1()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group__1__Impl"
+
+
+    // $ANTLR start "rule__Real__Group__2"
+    // InternalProblem.g:4918:1: rule__Real__Group__2 : rule__Real__Group__2__Impl ;
+    public final void rule__Real__Group__2() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4922:1: ( rule__Real__Group__2__Impl )
+            // InternalProblem.g:4923:2: rule__Real__Group__2__Impl
+            {
+            pushFollow(FOLLOW_2);
+            rule__Real__Group__2__Impl();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group__2"
+
+
+    // $ANTLR start "rule__Real__Group__2__Impl"
+    // InternalProblem.g:4929:1: rule__Real__Group__2__Impl : ( ( rule__Real__Alternatives_2 ) ) ;
+    public final void rule__Real__Group__2__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4933:1: ( ( ( rule__Real__Alternatives_2 ) ) )
+            // InternalProblem.g:4934:1: ( ( rule__Real__Alternatives_2 ) )
+            {
+            // InternalProblem.g:4934:1: ( ( rule__Real__Alternatives_2 ) )
+            // InternalProblem.g:4935:2: ( rule__Real__Alternatives_2 )
+            {
+             before(grammarAccess.getRealAccess().getAlternatives_2()); 
+            // InternalProblem.g:4936:2: ( rule__Real__Alternatives_2 )
+            // InternalProblem.g:4936:3: rule__Real__Alternatives_2
+            {
+            pushFollow(FOLLOW_2);
+            rule__Real__Alternatives_2();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getRealAccess().getAlternatives_2()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group__2__Impl"
+
+
+    // $ANTLR start "rule__Real__Group_2_0__0"
+    // InternalProblem.g:4945:1: rule__Real__Group_2_0__0 : rule__Real__Group_2_0__0__Impl rule__Real__Group_2_0__1 ;
+    public final void rule__Real__Group_2_0__0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4949:1: ( rule__Real__Group_2_0__0__Impl rule__Real__Group_2_0__1 )
+            // InternalProblem.g:4950:2: rule__Real__Group_2_0__0__Impl rule__Real__Group_2_0__1
+            {
+            pushFollow(FOLLOW_20);
+            rule__Real__Group_2_0__0__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__Real__Group_2_0__1();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group_2_0__0"
+
+
+    // $ANTLR start "rule__Real__Group_2_0__0__Impl"
+    // InternalProblem.g:4957:1: rule__Real__Group_2_0__0__Impl : ( '.' ) ;
+    public final void rule__Real__Group_2_0__0__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4961:1: ( ( '.' ) )
+            // InternalProblem.g:4962:1: ( '.' )
+            {
+            // InternalProblem.g:4962:1: ( '.' )
+            // InternalProblem.g:4963:2: '.'
+            {
+             before(grammarAccess.getRealAccess().getFullStopKeyword_2_0_0()); 
+            match(input,12,FOLLOW_2); 
+             after(grammarAccess.getRealAccess().getFullStopKeyword_2_0_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group_2_0__0__Impl"
+
+
+    // $ANTLR start "rule__Real__Group_2_0__1"
+    // InternalProblem.g:4972:1: rule__Real__Group_2_0__1 : rule__Real__Group_2_0__1__Impl ;
+    public final void rule__Real__Group_2_0__1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4976:1: ( rule__Real__Group_2_0__1__Impl )
+            // InternalProblem.g:4977:2: rule__Real__Group_2_0__1__Impl
+            {
+            pushFollow(FOLLOW_2);
+            rule__Real__Group_2_0__1__Impl();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group_2_0__1"
+
+
+    // $ANTLR start "rule__Real__Group_2_0__1__Impl"
+    // InternalProblem.g:4983:1: rule__Real__Group_2_0__1__Impl : ( RULE_INT ) ;
+    public final void rule__Real__Group_2_0__1__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4987:1: ( ( RULE_INT ) )
+            // InternalProblem.g:4988:1: ( RULE_INT )
+            {
+            // InternalProblem.g:4988:1: ( RULE_INT )
+            // InternalProblem.g:4989:2: RULE_INT
+            {
+             before(grammarAccess.getRealAccess().getINTTerminalRuleCall_2_0_1()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getRealAccess().getINTTerminalRuleCall_2_0_1()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group_2_0__1__Impl"
+
+
+    // $ANTLR start "rule__Real__Group_2_1__0"
+    // InternalProblem.g:4999:1: rule__Real__Group_2_1__0 : rule__Real__Group_2_1__0__Impl rule__Real__Group_2_1__1 ;
+    public final void rule__Real__Group_2_1__0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5003:1: ( rule__Real__Group_2_1__0__Impl rule__Real__Group_2_1__1 )
+            // InternalProblem.g:5004:2: rule__Real__Group_2_1__0__Impl rule__Real__Group_2_1__1
+            {
+            pushFollow(FOLLOW_43);
+            rule__Real__Group_2_1__0__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__Real__Group_2_1__1();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group_2_1__0"
+
+
+    // $ANTLR start "rule__Real__Group_2_1__0__Impl"
+    // InternalProblem.g:5011:1: rule__Real__Group_2_1__0__Impl : ( ( rule__Real__Group_2_1_0__0 )? ) ;
+    public final void rule__Real__Group_2_1__0__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5015:1: ( ( ( rule__Real__Group_2_1_0__0 )? ) )
+            // InternalProblem.g:5016:1: ( ( rule__Real__Group_2_1_0__0 )? )
+            {
+            // InternalProblem.g:5016:1: ( ( rule__Real__Group_2_1_0__0 )? )
+            // InternalProblem.g:5017:2: ( rule__Real__Group_2_1_0__0 )?
+            {
+             before(grammarAccess.getRealAccess().getGroup_2_1_0()); 
+            // InternalProblem.g:5018:2: ( rule__Real__Group_2_1_0__0 )?
+            int alt57=2;
+            int LA57_0 = input.LA(1);
+
+            if ( (LA57_0==12) ) {
+                alt57=1;
+            }
+            switch (alt57) {
+                case 1 :
+                    // InternalProblem.g:5018:3: rule__Real__Group_2_1_0__0
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__Real__Group_2_1_0__0();
+
+                    state._fsp--;
+
+
+                    }
+                    break;
+
+            }
+
+             after(grammarAccess.getRealAccess().getGroup_2_1_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group_2_1__0__Impl"
+
+
+    // $ANTLR start "rule__Real__Group_2_1__1"
+    // InternalProblem.g:5026:1: rule__Real__Group_2_1__1 : rule__Real__Group_2_1__1__Impl rule__Real__Group_2_1__2 ;
+    public final void rule__Real__Group_2_1__1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5030:1: ( rule__Real__Group_2_1__1__Impl rule__Real__Group_2_1__2 )
+            // InternalProblem.g:5031:2: rule__Real__Group_2_1__1__Impl rule__Real__Group_2_1__2
+            {
+            pushFollow(FOLLOW_44);
+            rule__Real__Group_2_1__1__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__Real__Group_2_1__2();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group_2_1__1"
+
+
+    // $ANTLR start "rule__Real__Group_2_1__1__Impl"
+    // InternalProblem.g:5038:1: rule__Real__Group_2_1__1__Impl : ( ( rule__Real__Alternatives_2_1_1 ) ) ;
+    public final void rule__Real__Group_2_1__1__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5042:1: ( ( ( rule__Real__Alternatives_2_1_1 ) ) )
+            // InternalProblem.g:5043:1: ( ( rule__Real__Alternatives_2_1_1 ) )
+            {
+            // InternalProblem.g:5043:1: ( ( rule__Real__Alternatives_2_1_1 ) )
+            // InternalProblem.g:5044:2: ( rule__Real__Alternatives_2_1_1 )
+            {
+             before(grammarAccess.getRealAccess().getAlternatives_2_1_1()); 
+            // InternalProblem.g:5045:2: ( rule__Real__Alternatives_2_1_1 )
+            // InternalProblem.g:5045:3: rule__Real__Alternatives_2_1_1
+            {
+            pushFollow(FOLLOW_2);
+            rule__Real__Alternatives_2_1_1();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getRealAccess().getAlternatives_2_1_1()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group_2_1__1__Impl"
+
+
+    // $ANTLR start "rule__Real__Group_2_1__2"
+    // InternalProblem.g:5053:1: rule__Real__Group_2_1__2 : rule__Real__Group_2_1__2__Impl rule__Real__Group_2_1__3 ;
+    public final void rule__Real__Group_2_1__2() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5057:1: ( rule__Real__Group_2_1__2__Impl rule__Real__Group_2_1__3 )
+            // InternalProblem.g:5058:2: rule__Real__Group_2_1__2__Impl rule__Real__Group_2_1__3
+            {
+            pushFollow(FOLLOW_44);
+            rule__Real__Group_2_1__2__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__Real__Group_2_1__3();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group_2_1__2"
+
+
+    // $ANTLR start "rule__Real__Group_2_1__2__Impl"
+    // InternalProblem.g:5065:1: rule__Real__Group_2_1__2__Impl : ( ( rule__Real__Alternatives_2_1_2 )? ) ;
+    public final void rule__Real__Group_2_1__2__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5069:1: ( ( ( rule__Real__Alternatives_2_1_2 )? ) )
+            // InternalProblem.g:5070:1: ( ( rule__Real__Alternatives_2_1_2 )? )
+            {
+            // InternalProblem.g:5070:1: ( ( rule__Real__Alternatives_2_1_2 )? )
+            // InternalProblem.g:5071:2: ( rule__Real__Alternatives_2_1_2 )?
+            {
+             before(grammarAccess.getRealAccess().getAlternatives_2_1_2()); 
+            // InternalProblem.g:5072:2: ( rule__Real__Alternatives_2_1_2 )?
+            int alt58=2;
+            int LA58_0 = input.LA(1);
+
+            if ( ((LA58_0>=23 && LA58_0<=24)) ) {
+                alt58=1;
+            }
+            switch (alt58) {
+                case 1 :
+                    // InternalProblem.g:5072:3: rule__Real__Alternatives_2_1_2
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__Real__Alternatives_2_1_2();
+
+                    state._fsp--;
+
+
+                    }
+                    break;
+
+            }
+
+             after(grammarAccess.getRealAccess().getAlternatives_2_1_2()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group_2_1__2__Impl"
+
+
+    // $ANTLR start "rule__Real__Group_2_1__3"
+    // InternalProblem.g:5080:1: rule__Real__Group_2_1__3 : rule__Real__Group_2_1__3__Impl ;
+    public final void rule__Real__Group_2_1__3() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5084:1: ( rule__Real__Group_2_1__3__Impl )
+            // InternalProblem.g:5085:2: rule__Real__Group_2_1__3__Impl
+            {
+            pushFollow(FOLLOW_2);
+            rule__Real__Group_2_1__3__Impl();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group_2_1__3"
+
+
+    // $ANTLR start "rule__Real__Group_2_1__3__Impl"
+    // InternalProblem.g:5091:1: rule__Real__Group_2_1__3__Impl : ( RULE_INT ) ;
+    public final void rule__Real__Group_2_1__3__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5095:1: ( ( RULE_INT ) )
+            // InternalProblem.g:5096:1: ( RULE_INT )
+            {
+            // InternalProblem.g:5096:1: ( RULE_INT )
+            // InternalProblem.g:5097:2: RULE_INT
+            {
+             before(grammarAccess.getRealAccess().getINTTerminalRuleCall_2_1_3()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getRealAccess().getINTTerminalRuleCall_2_1_3()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group_2_1__3__Impl"
+
+
+    // $ANTLR start "rule__Real__Group_2_1_0__0"
+    // InternalProblem.g:5107:1: rule__Real__Group_2_1_0__0 : rule__Real__Group_2_1_0__0__Impl rule__Real__Group_2_1_0__1 ;
+    public final void rule__Real__Group_2_1_0__0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5111:1: ( rule__Real__Group_2_1_0__0__Impl rule__Real__Group_2_1_0__1 )
+            // InternalProblem.g:5112:2: rule__Real__Group_2_1_0__0__Impl rule__Real__Group_2_1_0__1
+            {
+            pushFollow(FOLLOW_20);
+            rule__Real__Group_2_1_0__0__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__Real__Group_2_1_0__1();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group_2_1_0__0"
+
+
+    // $ANTLR start "rule__Real__Group_2_1_0__0__Impl"
+    // InternalProblem.g:5119:1: rule__Real__Group_2_1_0__0__Impl : ( '.' ) ;
+    public final void rule__Real__Group_2_1_0__0__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5123:1: ( ( '.' ) )
+            // InternalProblem.g:5124:1: ( '.' )
+            {
+            // InternalProblem.g:5124:1: ( '.' )
+            // InternalProblem.g:5125:2: '.'
+            {
+             before(grammarAccess.getRealAccess().getFullStopKeyword_2_1_0_0()); 
+            match(input,12,FOLLOW_2); 
+             after(grammarAccess.getRealAccess().getFullStopKeyword_2_1_0_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group_2_1_0__0__Impl"
+
+
+    // $ANTLR start "rule__Real__Group_2_1_0__1"
+    // InternalProblem.g:5134:1: rule__Real__Group_2_1_0__1 : rule__Real__Group_2_1_0__1__Impl ;
+    public final void rule__Real__Group_2_1_0__1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5138:1: ( rule__Real__Group_2_1_0__1__Impl )
+            // InternalProblem.g:5139:2: rule__Real__Group_2_1_0__1__Impl
+            {
+            pushFollow(FOLLOW_2);
+            rule__Real__Group_2_1_0__1__Impl();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group_2_1_0__1"
+
+
+    // $ANTLR start "rule__Real__Group_2_1_0__1__Impl"
+    // InternalProblem.g:5145:1: rule__Real__Group_2_1_0__1__Impl : ( RULE_INT ) ;
+    public final void rule__Real__Group_2_1_0__1__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5149:1: ( ( RULE_INT ) )
+            // InternalProblem.g:5150:1: ( RULE_INT )
+            {
+            // InternalProblem.g:5150:1: ( RULE_INT )
+            // InternalProblem.g:5151:2: RULE_INT
+            {
+             before(grammarAccess.getRealAccess().getINTTerminalRuleCall_2_1_0_1()); 
+            match(input,RULE_INT,FOLLOW_2); 
+             after(grammarAccess.getRealAccess().getINTTerminalRuleCall_2_1_0_1()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Real__Group_2_1_0__1__Impl"
+
+
     // $ANTLR start "rule__Problem__NameAssignment_0_1"
-    // InternalProblem.g:4228:1: rule__Problem__NameAssignment_0_1 : ( ruleIdentifier ) ;
+    // InternalProblem.g:5161:1: rule__Problem__NameAssignment_0_1 : ( ruleIdentifier ) ;
     public final void rule__Problem__NameAssignment_0_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4232:1: ( ( ruleIdentifier ) )
-            // InternalProblem.g:4233:2: ( ruleIdentifier )
+            // InternalProblem.g:5165:1: ( ( ruleIdentifier ) )
+            // InternalProblem.g:5166:2: ( ruleIdentifier )
             {
-            // InternalProblem.g:4233:2: ( ruleIdentifier )
-            // InternalProblem.g:4234:3: ruleIdentifier
+            // InternalProblem.g:5166:2: ( ruleIdentifier )
+            // InternalProblem.g:5167:3: ruleIdentifier
             {
              before(grammarAccess.getProblemAccess().getNameIdentifierParserRuleCall_0_1_0()); 
             pushFollow(FOLLOW_2);
@@ -13336,17 +16293,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Problem__StatementsAssignment_1"
-    // InternalProblem.g:4243:1: rule__Problem__StatementsAssignment_1 : ( ruleStatement ) ;
+    // InternalProblem.g:5176:1: rule__Problem__StatementsAssignment_1 : ( ruleStatement ) ;
     public final void rule__Problem__StatementsAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4247:1: ( ( ruleStatement ) )
-            // InternalProblem.g:4248:2: ( ruleStatement )
+            // InternalProblem.g:5180:1: ( ( ruleStatement ) )
+            // InternalProblem.g:5181:2: ( ruleStatement )
             {
-            // InternalProblem.g:4248:2: ( ruleStatement )
-            // InternalProblem.g:4249:3: ruleStatement
+            // InternalProblem.g:5181:2: ( ruleStatement )
+            // InternalProblem.g:5182:3: ruleStatement
             {
              before(grammarAccess.getProblemAccess().getStatementsStatementParserRuleCall_1_0()); 
             pushFollow(FOLLOW_2);
@@ -13377,24 +16334,24 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__AbstractAssignment_0"
-    // InternalProblem.g:4258:1: rule__ClassDeclaration__AbstractAssignment_0 : ( ( 'abstract' ) ) ;
+    // InternalProblem.g:5191:1: rule__ClassDeclaration__AbstractAssignment_0 : ( ( 'abstract' ) ) ;
     public final void rule__ClassDeclaration__AbstractAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4262:1: ( ( ( 'abstract' ) ) )
-            // InternalProblem.g:4263:2: ( ( 'abstract' ) )
+            // InternalProblem.g:5195:1: ( ( ( 'abstract' ) ) )
+            // InternalProblem.g:5196:2: ( ( 'abstract' ) )
             {
-            // InternalProblem.g:4263:2: ( ( 'abstract' ) )
-            // InternalProblem.g:4264:3: ( 'abstract' )
+            // InternalProblem.g:5196:2: ( ( 'abstract' ) )
+            // InternalProblem.g:5197:3: ( 'abstract' )
             {
              before(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); 
-            // InternalProblem.g:4265:3: ( 'abstract' )
-            // InternalProblem.g:4266:4: 'abstract'
+            // InternalProblem.g:5198:3: ( 'abstract' )
+            // InternalProblem.g:5199:4: 'abstract'
             {
              before(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); 
-            match(input,40,FOLLOW_2); 
+            match(input,44,FOLLOW_2); 
              after(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); 
 
             }
@@ -13422,17 +16379,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__NameAssignment_2"
-    // InternalProblem.g:4277:1: rule__ClassDeclaration__NameAssignment_2 : ( ruleIdentifier ) ;
+    // InternalProblem.g:5210:1: rule__ClassDeclaration__NameAssignment_2 : ( ruleIdentifier ) ;
     public final void rule__ClassDeclaration__NameAssignment_2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4281:1: ( ( ruleIdentifier ) )
-            // InternalProblem.g:4282:2: ( ruleIdentifier )
+            // InternalProblem.g:5214:1: ( ( ruleIdentifier ) )
+            // InternalProblem.g:5215:2: ( ruleIdentifier )
             {
-            // InternalProblem.g:4282:2: ( ruleIdentifier )
-            // InternalProblem.g:4283:3: ruleIdentifier
+            // InternalProblem.g:5215:2: ( ruleIdentifier )
+            // InternalProblem.g:5216:3: ruleIdentifier
             {
              before(grammarAccess.getClassDeclarationAccess().getNameIdentifierParserRuleCall_2_0()); 
             pushFollow(FOLLOW_2);
@@ -13463,21 +16420,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__SuperTypesAssignment_3_1"
-    // InternalProblem.g:4292:1: rule__ClassDeclaration__SuperTypesAssignment_3_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:5225:1: rule__ClassDeclaration__SuperTypesAssignment_3_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__ClassDeclaration__SuperTypesAssignment_3_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4296:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4297:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5229:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:5230:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4297:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4298:3: ( ruleQualifiedName )
+            // InternalProblem.g:5230:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5231:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationCrossReference_3_1_0()); 
-            // InternalProblem.g:4299:3: ( ruleQualifiedName )
-            // InternalProblem.g:4300:4: ruleQualifiedName
+            // InternalProblem.g:5232:3: ( ruleQualifiedName )
+            // InternalProblem.g:5233:4: ruleQualifiedName
             {
              before(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationQualifiedNameParserRuleCall_3_1_0_1()); 
             pushFollow(FOLLOW_2);
@@ -13512,21 +16469,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__SuperTypesAssignment_3_2_1"
-    // InternalProblem.g:4311:1: rule__ClassDeclaration__SuperTypesAssignment_3_2_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:5244: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:4315:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4316:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5248:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:5249:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4316:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4317:3: ( ruleQualifiedName )
+            // InternalProblem.g:5249:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5250:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationCrossReference_3_2_1_0()); 
-            // InternalProblem.g:4318:3: ( ruleQualifiedName )
-            // InternalProblem.g:4319:4: ruleQualifiedName
+            // InternalProblem.g:5251:3: ( ruleQualifiedName )
+            // InternalProblem.g:5252:4: ruleQualifiedName
             {
              before(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationQualifiedNameParserRuleCall_3_2_1_0_1()); 
             pushFollow(FOLLOW_2);
@@ -13561,17 +16518,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0"
-    // InternalProblem.g:4330:1: rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 : ( ruleReferenceDeclaration ) ;
+    // InternalProblem.g:5263: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:4334:1: ( ( ruleReferenceDeclaration ) )
-            // InternalProblem.g:4335:2: ( ruleReferenceDeclaration )
+            // InternalProblem.g:5267:1: ( ( ruleReferenceDeclaration ) )
+            // InternalProblem.g:5268:2: ( ruleReferenceDeclaration )
             {
-            // InternalProblem.g:4335:2: ( ruleReferenceDeclaration )
-            // InternalProblem.g:4336:3: ruleReferenceDeclaration
+            // InternalProblem.g:5268:2: ( ruleReferenceDeclaration )
+            // InternalProblem.g:5269:3: ruleReferenceDeclaration
             {
              before(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_0_1_0_0()); 
             pushFollow(FOLLOW_2);
@@ -13602,17 +16559,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumDeclaration__NameAssignment_1"
-    // InternalProblem.g:4345:1: rule__EnumDeclaration__NameAssignment_1 : ( ruleIdentifier ) ;
+    // InternalProblem.g:5278: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:5282:1: ( ( ruleIdentifier ) )
+            // InternalProblem.g:5283:2: ( ruleIdentifier )
             {
-            // InternalProblem.g:4350:2: ( ruleIdentifier )
-            // InternalProblem.g:4351:3: ruleIdentifier
+            // InternalProblem.g:5283:2: ( ruleIdentifier )
+            // InternalProblem.g:5284:3: ruleIdentifier
             {
              before(grammarAccess.getEnumDeclarationAccess().getNameIdentifierParserRuleCall_1_0()); 
             pushFollow(FOLLOW_2);
@@ -13643,17 +16600,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumDeclaration__LiteralsAssignment_2_0_1_0"
-    // InternalProblem.g:4360:1: rule__EnumDeclaration__LiteralsAssignment_2_0_1_0 : ( ruleEnumLiteral ) ;
+    // InternalProblem.g:5293: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:5297:1: ( ( ruleEnumLiteral ) )
+            // InternalProblem.g:5298:2: ( ruleEnumLiteral )
             {
-            // InternalProblem.g:4365:2: ( ruleEnumLiteral )
-            // InternalProblem.g:4366:3: ruleEnumLiteral
+            // InternalProblem.g:5298:2: ( ruleEnumLiteral )
+            // InternalProblem.g:5299:3: ruleEnumLiteral
             {
              before(grammarAccess.getEnumDeclarationAccess().getLiteralsEnumLiteralParserRuleCall_2_0_1_0_0()); 
             pushFollow(FOLLOW_2);
@@ -13684,17 +16641,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1"
-    // InternalProblem.g:4375:1: rule__EnumDeclaration__LiteralsAssignment_2_0_1_1_1 : ( ruleEnumLiteral ) ;
+    // InternalProblem.g:5308: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:5312:1: ( ( ruleEnumLiteral ) )
+            // InternalProblem.g:5313:2: ( ruleEnumLiteral )
             {
-            // InternalProblem.g:4380:2: ( ruleEnumLiteral )
-            // InternalProblem.g:4381:3: ruleEnumLiteral
+            // InternalProblem.g:5313:2: ( ruleEnumLiteral )
+            // InternalProblem.g:5314:3: ruleEnumLiteral
             {
              before(grammarAccess.getEnumDeclarationAccess().getLiteralsEnumLiteralParserRuleCall_2_0_1_1_1_0()); 
             pushFollow(FOLLOW_2);
@@ -13725,17 +16682,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__EnumLiteral__NameAssignment"
-    // InternalProblem.g:4390:1: rule__EnumLiteral__NameAssignment : ( ruleQuotedOrUnquotedId ) ;
+    // InternalProblem.g:5323: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:5327:1: ( ( ruleQuotedOrUnquotedId ) )
+            // InternalProblem.g:5328:2: ( ruleQuotedOrUnquotedId )
             {
-            // InternalProblem.g:4395:2: ( ruleQuotedOrUnquotedId )
-            // InternalProblem.g:4396:3: ruleQuotedOrUnquotedId
+            // InternalProblem.g:5328:2: ( ruleQuotedOrUnquotedId )
+            // InternalProblem.g:5329:3: ruleQuotedOrUnquotedId
             {
              before(grammarAccess.getEnumLiteralAccess().getNameQuotedOrUnquotedIdParserRuleCall_0()); 
             pushFollow(FOLLOW_2);
@@ -13766,24 +16723,24 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__ContainmentAssignment_0_0"
-    // InternalProblem.g:4405:1: rule__ReferenceDeclaration__ContainmentAssignment_0_0 : ( ( 'contains' ) ) ;
+    // InternalProblem.g:5338:1: rule__ReferenceDeclaration__ContainmentAssignment_0_0 : ( ( 'contains' ) ) ;
     public final void rule__ReferenceDeclaration__ContainmentAssignment_0_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4409:1: ( ( ( 'contains' ) ) )
-            // InternalProblem.g:4410:2: ( ( 'contains' ) )
+            // InternalProblem.g:5342:1: ( ( ( 'contains' ) ) )
+            // InternalProblem.g:5343:2: ( ( 'contains' ) )
             {
-            // InternalProblem.g:4410:2: ( ( 'contains' ) )
-            // InternalProblem.g:4411:3: ( 'contains' )
+            // InternalProblem.g:5343:2: ( ( 'contains' ) )
+            // InternalProblem.g:5344:3: ( 'contains' )
             {
              before(grammarAccess.getReferenceDeclarationAccess().getContainmentContainsKeyword_0_0_0()); 
-            // InternalProblem.g:4412:3: ( 'contains' )
-            // InternalProblem.g:4413:4: 'contains'
+            // InternalProblem.g:5345:3: ( 'contains' )
+            // InternalProblem.g:5346:4: 'contains'
             {
              before(grammarAccess.getReferenceDeclarationAccess().getContainmentContainsKeyword_0_0_0()); 
-            match(input,41,FOLLOW_2); 
+            match(input,45,FOLLOW_2); 
              after(grammarAccess.getReferenceDeclarationAccess().getContainmentContainsKeyword_0_0_0()); 
 
             }
@@ -13811,21 +16768,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__ReferenceTypeAssignment_1"
-    // InternalProblem.g:4424:1: rule__ReferenceDeclaration__ReferenceTypeAssignment_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:5357:1: rule__ReferenceDeclaration__ReferenceTypeAssignment_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__ReferenceDeclaration__ReferenceTypeAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4428:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4429:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5361:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:5362:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4429:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4430:3: ( ruleQualifiedName )
+            // InternalProblem.g:5362:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5363:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeRelationCrossReference_1_0()); 
-            // InternalProblem.g:4431:3: ( ruleQualifiedName )
-            // InternalProblem.g:4432:4: ruleQualifiedName
+            // InternalProblem.g:5364:3: ( ruleQualifiedName )
+            // InternalProblem.g:5365:4: ruleQualifiedName
             {
              before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeRelationQualifiedNameParserRuleCall_1_0_1()); 
             pushFollow(FOLLOW_2);
@@ -13860,17 +16817,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__MultiplicityAssignment_2_1"
-    // InternalProblem.g:4443:1: rule__ReferenceDeclaration__MultiplicityAssignment_2_1 : ( ruleMultiplicity ) ;
+    // InternalProblem.g:5376:1: rule__ReferenceDeclaration__MultiplicityAssignment_2_1 : ( ruleMultiplicity ) ;
     public final void rule__ReferenceDeclaration__MultiplicityAssignment_2_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4447:1: ( ( ruleMultiplicity ) )
-            // InternalProblem.g:4448:2: ( ruleMultiplicity )
+            // InternalProblem.g:5380:1: ( ( ruleMultiplicity ) )
+            // InternalProblem.g:5381:2: ( ruleMultiplicity )
             {
-            // InternalProblem.g:4448:2: ( ruleMultiplicity )
-            // InternalProblem.g:4449:3: ruleMultiplicity
+            // InternalProblem.g:5381:2: ( ruleMultiplicity )
+            // InternalProblem.g:5382:3: ruleMultiplicity
             {
              before(grammarAccess.getReferenceDeclarationAccess().getMultiplicityMultiplicityParserRuleCall_2_1_0()); 
             pushFollow(FOLLOW_2);
@@ -13901,17 +16858,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__NameAssignment_3"
-    // InternalProblem.g:4458:1: rule__ReferenceDeclaration__NameAssignment_3 : ( ruleIdentifier ) ;
+    // InternalProblem.g:5391:1: rule__ReferenceDeclaration__NameAssignment_3 : ( ruleIdentifier ) ;
     public final void rule__ReferenceDeclaration__NameAssignment_3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4462:1: ( ( ruleIdentifier ) )
-            // InternalProblem.g:4463:2: ( ruleIdentifier )
+            // InternalProblem.g:5395:1: ( ( ruleIdentifier ) )
+            // InternalProblem.g:5396:2: ( ruleIdentifier )
             {
-            // InternalProblem.g:4463:2: ( ruleIdentifier )
-            // InternalProblem.g:4464:3: ruleIdentifier
+            // InternalProblem.g:5396:2: ( ruleIdentifier )
+            // InternalProblem.g:5397:3: ruleIdentifier
             {
              before(grammarAccess.getReferenceDeclarationAccess().getNameIdentifierParserRuleCall_3_0()); 
             pushFollow(FOLLOW_2);
@@ -13942,21 +16899,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__OppositeAssignment_4_1"
-    // InternalProblem.g:4473:1: rule__ReferenceDeclaration__OppositeAssignment_4_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:5406:1: rule__ReferenceDeclaration__OppositeAssignment_4_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__ReferenceDeclaration__OppositeAssignment_4_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4477:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4478:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5410:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:5411:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4478:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4479:3: ( ruleQualifiedName )
+            // InternalProblem.g:5411:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5412:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationCrossReference_4_1_0()); 
-            // InternalProblem.g:4480:3: ( ruleQualifiedName )
-            // InternalProblem.g:4481:4: ruleQualifiedName
+            // InternalProblem.g:5413:3: ( ruleQualifiedName )
+            // InternalProblem.g:5414:4: ruleQualifiedName
             {
              before(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationQualifiedNameParserRuleCall_4_1_0_1()); 
             pushFollow(FOLLOW_2);
@@ -13991,24 +16948,24 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__ErrorAssignment_0_0_0"
-    // InternalProblem.g:4492:1: rule__PredicateDefinition__ErrorAssignment_0_0_0 : ( ( 'error' ) ) ;
+    // InternalProblem.g:5425: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:4496:1: ( ( ( 'error' ) ) )
-            // InternalProblem.g:4497:2: ( ( 'error' ) )
+            // InternalProblem.g:5429:1: ( ( ( 'error' ) ) )
+            // InternalProblem.g:5430:2: ( ( 'error' ) )
             {
-            // InternalProblem.g:4497:2: ( ( 'error' ) )
-            // InternalProblem.g:4498:3: ( 'error' )
+            // InternalProblem.g:5430:2: ( ( 'error' ) )
+            // InternalProblem.g:5431:3: ( 'error' )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getErrorErrorKeyword_0_0_0_0()); 
-            // InternalProblem.g:4499:3: ( 'error' )
-            // InternalProblem.g:4500:4: 'error'
+            // InternalProblem.g:5432:3: ( 'error' )
+            // InternalProblem.g:5433:4: 'error'
             {
              before(grammarAccess.getPredicateDefinitionAccess().getErrorErrorKeyword_0_0_0_0()); 
-            match(input,42,FOLLOW_2); 
+            match(input,46,FOLLOW_2); 
              after(grammarAccess.getPredicateDefinitionAccess().getErrorErrorKeyword_0_0_0_0()); 
 
             }
@@ -14036,17 +16993,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__NameAssignment_1"
-    // InternalProblem.g:4511:1: rule__PredicateDefinition__NameAssignment_1 : ( ruleIdentifier ) ;
+    // InternalProblem.g:5444:1: rule__PredicateDefinition__NameAssignment_1 : ( ruleIdentifier ) ;
     public final void rule__PredicateDefinition__NameAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4515:1: ( ( ruleIdentifier ) )
-            // InternalProblem.g:4516:2: ( ruleIdentifier )
+            // InternalProblem.g:5448:1: ( ( ruleIdentifier ) )
+            // InternalProblem.g:5449:2: ( ruleIdentifier )
             {
-            // InternalProblem.g:4516:2: ( ruleIdentifier )
-            // InternalProblem.g:4517:3: ruleIdentifier
+            // InternalProblem.g:5449:2: ( ruleIdentifier )
+            // InternalProblem.g:5450:3: ruleIdentifier
             {
              before(grammarAccess.getPredicateDefinitionAccess().getNameIdentifierParserRuleCall_1_0()); 
             pushFollow(FOLLOW_2);
@@ -14077,17 +17034,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__ParametersAssignment_3_0"
-    // InternalProblem.g:4526:1: rule__PredicateDefinition__ParametersAssignment_3_0 : ( ruleParameter ) ;
+    // InternalProblem.g:5459:1: rule__PredicateDefinition__ParametersAssignment_3_0 : ( ruleParameter ) ;
     public final void rule__PredicateDefinition__ParametersAssignment_3_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4530:1: ( ( ruleParameter ) )
-            // InternalProblem.g:4531:2: ( ruleParameter )
+            // InternalProblem.g:5463:1: ( ( ruleParameter ) )
+            // InternalProblem.g:5464:2: ( ruleParameter )
             {
-            // InternalProblem.g:4531:2: ( ruleParameter )
-            // InternalProblem.g:4532:3: ruleParameter
+            // InternalProblem.g:5464:2: ( ruleParameter )
+            // InternalProblem.g:5465:3: ruleParameter
             {
              before(grammarAccess.getPredicateDefinitionAccess().getParametersParameterParserRuleCall_3_0_0()); 
             pushFollow(FOLLOW_2);
@@ -14118,17 +17075,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__ParametersAssignment_3_1_1"
-    // InternalProblem.g:4541:1: rule__PredicateDefinition__ParametersAssignment_3_1_1 : ( ruleParameter ) ;
+    // InternalProblem.g:5474: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:4545:1: ( ( ruleParameter ) )
-            // InternalProblem.g:4546:2: ( ruleParameter )
+            // InternalProblem.g:5478:1: ( ( ruleParameter ) )
+            // InternalProblem.g:5479:2: ( ruleParameter )
             {
-            // InternalProblem.g:4546:2: ( ruleParameter )
-            // InternalProblem.g:4547:3: ruleParameter
+            // InternalProblem.g:5479:2: ( ruleParameter )
+            // InternalProblem.g:5480:3: ruleParameter
             {
              before(grammarAccess.getPredicateDefinitionAccess().getParametersParameterParserRuleCall_3_1_1_0()); 
             pushFollow(FOLLOW_2);
@@ -14159,17 +17116,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__BodiesAssignment_5_1"
-    // InternalProblem.g:4556:1: rule__PredicateDefinition__BodiesAssignment_5_1 : ( ruleConjunction ) ;
+    // InternalProblem.g:5489:1: rule__PredicateDefinition__BodiesAssignment_5_1 : ( ruleConjunction ) ;
     public final void rule__PredicateDefinition__BodiesAssignment_5_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4560:1: ( ( ruleConjunction ) )
-            // InternalProblem.g:4561:2: ( ruleConjunction )
+            // InternalProblem.g:5493:1: ( ( ruleConjunction ) )
+            // InternalProblem.g:5494:2: ( ruleConjunction )
             {
-            // InternalProblem.g:4561:2: ( ruleConjunction )
-            // InternalProblem.g:4562:3: ruleConjunction
+            // InternalProblem.g:5494:2: ( ruleConjunction )
+            // InternalProblem.g:5495:3: ruleConjunction
             {
              before(grammarAccess.getPredicateDefinitionAccess().getBodiesConjunctionParserRuleCall_5_1_0()); 
             pushFollow(FOLLOW_2);
@@ -14200,17 +17157,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__BodiesAssignment_5_2_1"
-    // InternalProblem.g:4571:1: rule__PredicateDefinition__BodiesAssignment_5_2_1 : ( ruleConjunction ) ;
+    // InternalProblem.g:5504: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:4575:1: ( ( ruleConjunction ) )
-            // InternalProblem.g:4576:2: ( ruleConjunction )
+            // InternalProblem.g:5508:1: ( ( ruleConjunction ) )
+            // InternalProblem.g:5509:2: ( ruleConjunction )
             {
-            // InternalProblem.g:4576:2: ( ruleConjunction )
-            // InternalProblem.g:4577:3: ruleConjunction
+            // InternalProblem.g:5509:2: ( ruleConjunction )
+            // InternalProblem.g:5510:3: ruleConjunction
             {
              before(grammarAccess.getPredicateDefinitionAccess().getBodiesConjunctionParserRuleCall_5_2_1_0()); 
             pushFollow(FOLLOW_2);
@@ -14241,21 +17198,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Parameter__ParameterTypeAssignment_0"
-    // InternalProblem.g:4586:1: rule__Parameter__ParameterTypeAssignment_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:5519:1: rule__Parameter__ParameterTypeAssignment_0 : ( ( ruleQualifiedName ) ) ;
     public final void rule__Parameter__ParameterTypeAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4590:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4591:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5523:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:5524:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4591:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4592:3: ( ruleQualifiedName )
+            // InternalProblem.g:5524:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5525:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getParameterAccess().getParameterTypeRelationCrossReference_0_0()); 
-            // InternalProblem.g:4593:3: ( ruleQualifiedName )
-            // InternalProblem.g:4594:4: ruleQualifiedName
+            // InternalProblem.g:5526:3: ( ruleQualifiedName )
+            // InternalProblem.g:5527:4: ruleQualifiedName
             {
              before(grammarAccess.getParameterAccess().getParameterTypeRelationQualifiedNameParserRuleCall_0_0_1()); 
             pushFollow(FOLLOW_2);
@@ -14290,17 +17247,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Parameter__NameAssignment_1"
-    // InternalProblem.g:4605:1: rule__Parameter__NameAssignment_1 : ( ruleIdentifier ) ;
+    // InternalProblem.g:5538:1: rule__Parameter__NameAssignment_1 : ( ruleIdentifier ) ;
     public final void rule__Parameter__NameAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4609:1: ( ( ruleIdentifier ) )
-            // InternalProblem.g:4610:2: ( ruleIdentifier )
+            // InternalProblem.g:5542:1: ( ( ruleIdentifier ) )
+            // InternalProblem.g:5543:2: ( ruleIdentifier )
             {
-            // InternalProblem.g:4610:2: ( ruleIdentifier )
-            // InternalProblem.g:4611:3: ruleIdentifier
+            // InternalProblem.g:5543:2: ( ruleIdentifier )
+            // InternalProblem.g:5544:3: ruleIdentifier
             {
              before(grammarAccess.getParameterAccess().getNameIdentifierParserRuleCall_1_0()); 
             pushFollow(FOLLOW_2);
@@ -14331,17 +17288,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__LiteralsAssignment_0"
-    // InternalProblem.g:4620:1: rule__Conjunction__LiteralsAssignment_0 : ( ruleLiteral ) ;
+    // InternalProblem.g:5553:1: rule__Conjunction__LiteralsAssignment_0 : ( ruleLiteral ) ;
     public final void rule__Conjunction__LiteralsAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4624:1: ( ( ruleLiteral ) )
-            // InternalProblem.g:4625:2: ( ruleLiteral )
+            // InternalProblem.g:5557:1: ( ( ruleLiteral ) )
+            // InternalProblem.g:5558:2: ( ruleLiteral )
             {
-            // InternalProblem.g:4625:2: ( ruleLiteral )
-            // InternalProblem.g:4626:3: ruleLiteral
+            // InternalProblem.g:5558:2: ( ruleLiteral )
+            // InternalProblem.g:5559:3: ruleLiteral
             {
              before(grammarAccess.getConjunctionAccess().getLiteralsLiteralParserRuleCall_0_0()); 
             pushFollow(FOLLOW_2);
@@ -14372,17 +17329,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__LiteralsAssignment_1_1"
-    // InternalProblem.g:4635:1: rule__Conjunction__LiteralsAssignment_1_1 : ( ruleLiteral ) ;
+    // InternalProblem.g:5568:1: rule__Conjunction__LiteralsAssignment_1_1 : ( ruleLiteral ) ;
     public final void rule__Conjunction__LiteralsAssignment_1_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4639:1: ( ( ruleLiteral ) )
-            // InternalProblem.g:4640:2: ( ruleLiteral )
+            // InternalProblem.g:5572:1: ( ( ruleLiteral ) )
+            // InternalProblem.g:5573:2: ( ruleLiteral )
             {
-            // InternalProblem.g:4640:2: ( ruleLiteral )
-            // InternalProblem.g:4641:3: ruleLiteral
+            // InternalProblem.g:5573:2: ( ruleLiteral )
+            // InternalProblem.g:5574:3: ruleLiteral
             {
              before(grammarAccess.getConjunctionAccess().getLiteralsLiteralParserRuleCall_1_1_0()); 
             pushFollow(FOLLOW_2);
@@ -14413,17 +17370,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NegativeLiteral__AtomAssignment_1"
-    // InternalProblem.g:4650:1: rule__NegativeLiteral__AtomAssignment_1 : ( ruleAtom ) ;
+    // InternalProblem.g:5583:1: rule__NegativeLiteral__AtomAssignment_1 : ( ruleAtom ) ;
     public final void rule__NegativeLiteral__AtomAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4654:1: ( ( ruleAtom ) )
-            // InternalProblem.g:4655:2: ( ruleAtom )
+            // InternalProblem.g:5587:1: ( ( ruleAtom ) )
+            // InternalProblem.g:5588:2: ( ruleAtom )
             {
-            // InternalProblem.g:4655:2: ( ruleAtom )
-            // InternalProblem.g:4656:3: ruleAtom
+            // InternalProblem.g:5588:2: ( ruleAtom )
+            // InternalProblem.g:5589:3: ruleAtom
             {
              before(grammarAccess.getNegativeLiteralAccess().getAtomAtomParserRuleCall_1_0()); 
             pushFollow(FOLLOW_2);
@@ -14454,21 +17411,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__RelationAssignment_0"
-    // InternalProblem.g:4665:1: rule__Atom__RelationAssignment_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:5598:1: rule__Atom__RelationAssignment_0 : ( ( ruleQualifiedName ) ) ;
     public final void rule__Atom__RelationAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4669:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4670:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5602:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:5603:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4670:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4671:3: ( ruleQualifiedName )
+            // InternalProblem.g:5603:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5604:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getAtomAccess().getRelationRelationCrossReference_0_0()); 
-            // InternalProblem.g:4672:3: ( ruleQualifiedName )
-            // InternalProblem.g:4673:4: ruleQualifiedName
+            // InternalProblem.g:5605:3: ( ruleQualifiedName )
+            // InternalProblem.g:5606:4: ruleQualifiedName
             {
              before(grammarAccess.getAtomAccess().getRelationRelationQualifiedNameParserRuleCall_0_0_1()); 
             pushFollow(FOLLOW_2);
@@ -14503,24 +17460,24 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__TransitiveClosureAssignment_1"
-    // InternalProblem.g:4684:1: rule__Atom__TransitiveClosureAssignment_1 : ( ( '+' ) ) ;
+    // InternalProblem.g:5617:1: rule__Atom__TransitiveClosureAssignment_1 : ( ( '+' ) ) ;
     public final void rule__Atom__TransitiveClosureAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4688:1: ( ( ( '+' ) ) )
-            // InternalProblem.g:4689:2: ( ( '+' ) )
+            // InternalProblem.g:5621:1: ( ( ( '+' ) ) )
+            // InternalProblem.g:5622:2: ( ( '+' ) )
             {
-            // InternalProblem.g:4689:2: ( ( '+' ) )
-            // InternalProblem.g:4690:3: ( '+' )
+            // InternalProblem.g:5622:2: ( ( '+' ) )
+            // InternalProblem.g:5623:3: ( '+' )
             {
              before(grammarAccess.getAtomAccess().getTransitiveClosurePlusSignKeyword_1_0()); 
-            // InternalProblem.g:4691:3: ( '+' )
-            // InternalProblem.g:4692:4: '+'
+            // InternalProblem.g:5624:3: ( '+' )
+            // InternalProblem.g:5625:4: '+'
             {
              before(grammarAccess.getAtomAccess().getTransitiveClosurePlusSignKeyword_1_0()); 
-            match(input,43,FOLLOW_2); 
+            match(input,24,FOLLOW_2); 
              after(grammarAccess.getAtomAccess().getTransitiveClosurePlusSignKeyword_1_0()); 
 
             }
@@ -14548,17 +17505,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__ArgumentsAssignment_3_0"
-    // InternalProblem.g:4703:1: rule__Atom__ArgumentsAssignment_3_0 : ( ruleArgument ) ;
+    // InternalProblem.g:5636:1: rule__Atom__ArgumentsAssignment_3_0 : ( ruleArgument ) ;
     public final void rule__Atom__ArgumentsAssignment_3_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4707:1: ( ( ruleArgument ) )
-            // InternalProblem.g:4708:2: ( ruleArgument )
+            // InternalProblem.g:5640:1: ( ( ruleArgument ) )
+            // InternalProblem.g:5641:2: ( ruleArgument )
             {
-            // InternalProblem.g:4708:2: ( ruleArgument )
-            // InternalProblem.g:4709:3: ruleArgument
+            // InternalProblem.g:5641:2: ( ruleArgument )
+            // InternalProblem.g:5642:3: ruleArgument
             {
              before(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_0_0()); 
             pushFollow(FOLLOW_2);
@@ -14589,17 +17546,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__ArgumentsAssignment_3_1_1"
-    // InternalProblem.g:4718:1: rule__Atom__ArgumentsAssignment_3_1_1 : ( ruleArgument ) ;
+    // InternalProblem.g:5651: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:4722:1: ( ( ruleArgument ) )
-            // InternalProblem.g:4723:2: ( ruleArgument )
+            // InternalProblem.g:5655:1: ( ( ruleArgument ) )
+            // InternalProblem.g:5656:2: ( ruleArgument )
             {
-            // InternalProblem.g:4723:2: ( ruleArgument )
-            // InternalProblem.g:4724:3: ruleArgument
+            // InternalProblem.g:5656:2: ( ruleArgument )
+            // InternalProblem.g:5657:3: ruleArgument
             {
              before(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_1_1_0()); 
             pushFollow(FOLLOW_2);
@@ -14629,34 +17586,75 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__Atom__ArgumentsAssignment_3_1_1"
 
 
-    // $ANTLR start "rule__Argument__VariableOrNodeAssignment"
-    // InternalProblem.g:4733:1: rule__Argument__VariableOrNodeAssignment : ( ( ruleQualifiedName ) ) ;
-    public final void rule__Argument__VariableOrNodeAssignment() throws RecognitionException {
+    // $ANTLR start "rule__VariableOrNodeArgument__VariableOrNodeAssignment"
+    // InternalProblem.g:5666:1: rule__VariableOrNodeArgument__VariableOrNodeAssignment : ( ( ruleQualifiedName ) ) ;
+    public final void rule__VariableOrNodeArgument__VariableOrNodeAssignment() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4737:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4738:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5670:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:5671:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4738:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4739:3: ( ruleQualifiedName )
+            // InternalProblem.g:5671:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5672:3: ( ruleQualifiedName )
             {
-             before(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0()); 
-            // InternalProblem.g:4740:3: ( ruleQualifiedName )
-            // InternalProblem.g:4741:4: ruleQualifiedName
+             before(grammarAccess.getVariableOrNodeArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0()); 
+            // InternalProblem.g:5673:3: ( ruleQualifiedName )
+            // InternalProblem.g:5674:4: ruleQualifiedName
             {
-             before(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1()); 
+             before(grammarAccess.getVariableOrNodeArgumentAccess().getVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1()); 
             pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
 
-             after(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1()); 
+             after(grammarAccess.getVariableOrNodeArgumentAccess().getVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1()); 
+
+            }
+
+             after(grammarAccess.getVariableOrNodeArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0()); 
 
             }
 
-             after(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0()); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__VariableOrNodeArgument__VariableOrNodeAssignment"
+
+
+    // $ANTLR start "rule__ConstantArgument__ConstantAssignment"
+    // InternalProblem.g:5685:1: rule__ConstantArgument__ConstantAssignment : ( ruleConstant ) ;
+    public final void rule__ConstantArgument__ConstantAssignment() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5689:1: ( ( ruleConstant ) )
+            // InternalProblem.g:5690:2: ( ruleConstant )
+            {
+            // InternalProblem.g:5690:2: ( ruleConstant )
+            // InternalProblem.g:5691:3: ruleConstant
+            {
+             before(grammarAccess.getConstantArgumentAccess().getConstantConstantParserRuleCall_0()); 
+            pushFollow(FOLLOW_2);
+            ruleConstant();
+
+            state._fsp--;
+
+             after(grammarAccess.getConstantArgumentAccess().getConstantConstantParserRuleCall_0()); 
 
             }
 
@@ -14675,25 +17673,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__Argument__VariableOrNodeAssignment"
+    // $ANTLR end "rule__ConstantArgument__ConstantAssignment"
 
 
     // $ANTLR start "rule__Assertion__RelationAssignment_0_0_0"
-    // InternalProblem.g:4752:1: rule__Assertion__RelationAssignment_0_0_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:5700: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:4756:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4757:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5704:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:5705:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4757:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4758:3: ( ruleQualifiedName )
+            // InternalProblem.g:5705:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5706:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getAssertionAccess().getRelationRelationCrossReference_0_0_0_0()); 
-            // InternalProblem.g:4759:3: ( ruleQualifiedName )
-            // InternalProblem.g:4760:4: ruleQualifiedName
+            // InternalProblem.g:5707:3: ( ruleQualifiedName )
+            // InternalProblem.g:5708:4: ruleQualifiedName
             {
              before(grammarAccess.getAssertionAccess().getRelationRelationQualifiedNameParserRuleCall_0_0_0_0_1()); 
             pushFollow(FOLLOW_2);
@@ -14728,33 +17726,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__ArgumentsAssignment_0_0_2_0"
-    // InternalProblem.g:4771:1: rule__Assertion__ArgumentsAssignment_0_0_2_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:5719:1: rule__Assertion__ArgumentsAssignment_0_0_2_0 : ( ruleAssertionArgument ) ;
     public final void rule__Assertion__ArgumentsAssignment_0_0_2_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4775:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4776:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5723:1: ( ( ruleAssertionArgument ) )
+            // InternalProblem.g:5724:2: ( ruleAssertionArgument )
             {
-            // InternalProblem.g:4776:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4777:3: ( ruleQualifiedName )
+            // InternalProblem.g:5724:2: ( ruleAssertionArgument )
+            // InternalProblem.g:5725:3: ruleAssertionArgument
             {
-             before(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_0_0()); 
-            // InternalProblem.g:4778:3: ( ruleQualifiedName )
-            // InternalProblem.g:4779:4: ruleQualifiedName
-            {
-             before(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_0_2_0_0_1()); 
+             before(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_0_2_0_0()); 
             pushFollow(FOLLOW_2);
-            ruleQualifiedName();
+            ruleAssertionArgument();
 
             state._fsp--;
 
-             after(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_0_2_0_0_1()); 
-
-            }
-
-             after(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_0_0()); 
+             after(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_0_2_0_0()); 
 
             }
 
@@ -14777,33 +17767,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__ArgumentsAssignment_0_0_2_1_1"
-    // InternalProblem.g:4790:1: rule__Assertion__ArgumentsAssignment_0_0_2_1_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:5734:1: rule__Assertion__ArgumentsAssignment_0_0_2_1_1 : ( ruleAssertionArgument ) ;
     public final void rule__Assertion__ArgumentsAssignment_0_0_2_1_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4794:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4795:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5738:1: ( ( ruleAssertionArgument ) )
+            // InternalProblem.g:5739:2: ( ruleAssertionArgument )
             {
-            // InternalProblem.g:4795:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4796:3: ( ruleQualifiedName )
+            // InternalProblem.g:5739:2: ( ruleAssertionArgument )
+            // InternalProblem.g:5740:3: ruleAssertionArgument
             {
-             before(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_1_1_0()); 
-            // InternalProblem.g:4797:3: ( ruleQualifiedName )
-            // InternalProblem.g:4798:4: ruleQualifiedName
-            {
-             before(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_0_2_1_1_0_1()); 
+             before(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_0_2_1_1_0()); 
             pushFollow(FOLLOW_2);
-            ruleQualifiedName();
+            ruleAssertionArgument();
 
             state._fsp--;
 
-             after(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_0_2_1_1_0_1()); 
-
-            }
-
-             after(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_1_1_0()); 
+             after(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_0_2_1_1_0()); 
 
             }
 
@@ -14826,17 +17808,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__ValueAssignment_0_0_5"
-    // InternalProblem.g:4809:1: rule__Assertion__ValueAssignment_0_0_5 : ( ruleLogicValue ) ;
+    // InternalProblem.g:5749: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:4813:1: ( ( ruleLogicValue ) )
-            // InternalProblem.g:4814:2: ( ruleLogicValue )
+            // InternalProblem.g:5753:1: ( ( ruleLogicValue ) )
+            // InternalProblem.g:5754:2: ( ruleLogicValue )
             {
-            // InternalProblem.g:4814:2: ( ruleLogicValue )
-            // InternalProblem.g:4815:3: ruleLogicValue
+            // InternalProblem.g:5754:2: ( ruleLogicValue )
+            // InternalProblem.g:5755:3: ruleLogicValue
             {
              before(grammarAccess.getAssertionAccess().getValueLogicValueEnumRuleCall_0_0_5_0()); 
             pushFollow(FOLLOW_2);
@@ -14867,17 +17849,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__ValueAssignment_0_1_0"
-    // InternalProblem.g:4824:1: rule__Assertion__ValueAssignment_0_1_0 : ( ruleShortLogicValue ) ;
+    // InternalProblem.g:5764: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:4828:1: ( ( ruleShortLogicValue ) )
-            // InternalProblem.g:4829:2: ( ruleShortLogicValue )
+            // InternalProblem.g:5768:1: ( ( ruleShortLogicValue ) )
+            // InternalProblem.g:5769:2: ( ruleShortLogicValue )
             {
-            // InternalProblem.g:4829:2: ( ruleShortLogicValue )
-            // InternalProblem.g:4830:3: ruleShortLogicValue
+            // InternalProblem.g:5769:2: ( ruleShortLogicValue )
+            // InternalProblem.g:5770:3: ruleShortLogicValue
             {
              before(grammarAccess.getAssertionAccess().getValueShortLogicValueEnumRuleCall_0_1_0_0()); 
             pushFollow(FOLLOW_2);
@@ -14908,21 +17890,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__RelationAssignment_0_1_1"
-    // InternalProblem.g:4839:1: rule__Assertion__RelationAssignment_0_1_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:5779: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:4843:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4844:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5783:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:5784:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4844:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4845:3: ( ruleQualifiedName )
+            // InternalProblem.g:5784:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5785:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getAssertionAccess().getRelationRelationCrossReference_0_1_1_0()); 
-            // InternalProblem.g:4846:3: ( ruleQualifiedName )
-            // InternalProblem.g:4847:4: ruleQualifiedName
+            // InternalProblem.g:5786:3: ( ruleQualifiedName )
+            // InternalProblem.g:5787:4: ruleQualifiedName
             {
              before(grammarAccess.getAssertionAccess().getRelationRelationQualifiedNameParserRuleCall_0_1_1_0_1()); 
             pushFollow(FOLLOW_2);
@@ -14957,33 +17939,115 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__ArgumentsAssignment_0_1_3_0"
-    // InternalProblem.g:4858:1: rule__Assertion__ArgumentsAssignment_0_1_3_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:5798:1: rule__Assertion__ArgumentsAssignment_0_1_3_0 : ( ruleAssertionArgument ) ;
     public final void rule__Assertion__ArgumentsAssignment_0_1_3_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4862:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4863:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5802:1: ( ( ruleAssertionArgument ) )
+            // InternalProblem.g:5803:2: ( ruleAssertionArgument )
+            {
+            // InternalProblem.g:5803:2: ( ruleAssertionArgument )
+            // InternalProblem.g:5804:3: ruleAssertionArgument
+            {
+             before(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_1_3_0_0()); 
+            pushFollow(FOLLOW_2);
+            ruleAssertionArgument();
+
+            state._fsp--;
+
+             after(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_1_3_0_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Assertion__ArgumentsAssignment_0_1_3_0"
+
+
+    // $ANTLR start "rule__Assertion__ArgumentsAssignment_0_1_3_1_1"
+    // InternalProblem.g:5813:1: rule__Assertion__ArgumentsAssignment_0_1_3_1_1 : ( ruleAssertionArgument ) ;
+    public final void rule__Assertion__ArgumentsAssignment_0_1_3_1_1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5817:1: ( ( ruleAssertionArgument ) )
+            // InternalProblem.g:5818:2: ( ruleAssertionArgument )
+            {
+            // InternalProblem.g:5818:2: ( ruleAssertionArgument )
+            // InternalProblem.g:5819:3: ruleAssertionArgument
+            {
+             before(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_1_3_1_1_0()); 
+            pushFollow(FOLLOW_2);
+            ruleAssertionArgument();
+
+            state._fsp--;
+
+             after(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_1_3_1_1_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Assertion__ArgumentsAssignment_0_1_3_1_1"
+
+
+    // $ANTLR start "rule__NodeAssertionArgument__NodeAssignment"
+    // InternalProblem.g:5828:1: rule__NodeAssertionArgument__NodeAssignment : ( ( ruleQualifiedName ) ) ;
+    public final void rule__NodeAssertionArgument__NodeAssignment() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5832:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:5833:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4863:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4864:3: ( ruleQualifiedName )
+            // InternalProblem.g:5833:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5834:3: ( ruleQualifiedName )
             {
-             before(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_0_0()); 
-            // InternalProblem.g:4865:3: ( ruleQualifiedName )
-            // InternalProblem.g:4866:4: ruleQualifiedName
+             before(grammarAccess.getNodeAssertionArgumentAccess().getNodeNodeCrossReference_0()); 
+            // InternalProblem.g:5835:3: ( ruleQualifiedName )
+            // InternalProblem.g:5836:4: ruleQualifiedName
             {
-             before(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_1_3_0_0_1()); 
+             before(grammarAccess.getNodeAssertionArgumentAccess().getNodeNodeQualifiedNameParserRuleCall_0_1()); 
             pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
 
-             after(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_1_3_0_0_1()); 
+             after(grammarAccess.getNodeAssertionArgumentAccess().getNodeNodeQualifiedNameParserRuleCall_0_1()); 
 
             }
 
-             after(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_0_0()); 
+             after(grammarAccess.getNodeAssertionArgumentAccess().getNodeNodeCrossReference_0()); 
 
             }
 
@@ -15002,37 +18066,78 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__Assertion__ArgumentsAssignment_0_1_3_0"
+    // $ANTLR end "rule__NodeAssertionArgument__NodeAssignment"
 
 
-    // $ANTLR start "rule__Assertion__ArgumentsAssignment_0_1_3_1_1"
-    // 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 {
+    // $ANTLR start "rule__ConstantAssertionArgument__ConstantAssignment"
+    // InternalProblem.g:5847:1: rule__ConstantAssertionArgument__ConstantAssignment : ( ruleConstant ) ;
+    public final void rule__ConstantAssertionArgument__ConstantAssignment() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4881:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4882:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5851:1: ( ( ruleConstant ) )
+            // InternalProblem.g:5852:2: ( ruleConstant )
             {
-            // InternalProblem.g:4882:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4883:3: ( ruleQualifiedName )
+            // InternalProblem.g:5852:2: ( ruleConstant )
+            // InternalProblem.g:5853:3: ruleConstant
             {
-             before(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_1_1_0()); 
-            // InternalProblem.g:4884:3: ( ruleQualifiedName )
-            // InternalProblem.g:4885:4: ruleQualifiedName
+             before(grammarAccess.getConstantAssertionArgumentAccess().getConstantConstantParserRuleCall_0()); 
+            pushFollow(FOLLOW_2);
+            ruleConstant();
+
+            state._fsp--;
+
+             after(grammarAccess.getConstantAssertionArgumentAccess().getConstantConstantParserRuleCall_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ConstantAssertionArgument__ConstantAssignment"
+
+
+    // $ANTLR start "rule__NodeValueAssertion__NodeAssignment_0"
+    // InternalProblem.g:5862:1: rule__NodeValueAssertion__NodeAssignment_0 : ( ( ruleQualifiedName ) ) ;
+    public final void rule__NodeValueAssertion__NodeAssignment_0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5866:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:5867:2: ( ( ruleQualifiedName ) )
+            {
+            // InternalProblem.g:5867:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:5868:3: ( ruleQualifiedName )
             {
-             before(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_1_3_1_1_0_1()); 
+             before(grammarAccess.getNodeValueAssertionAccess().getNodeNodeCrossReference_0_0()); 
+            // InternalProblem.g:5869:3: ( ruleQualifiedName )
+            // InternalProblem.g:5870:4: ruleQualifiedName
+            {
+             before(grammarAccess.getNodeValueAssertionAccess().getNodeNodeQualifiedNameParserRuleCall_0_0_1()); 
             pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
 
-             after(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_1_3_1_1_0_1()); 
+             after(grammarAccess.getNodeValueAssertionAccess().getNodeNodeQualifiedNameParserRuleCall_0_0_1()); 
 
             }
 
-             after(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_1_1_0()); 
+             after(grammarAccess.getNodeValueAssertionAccess().getNodeNodeCrossReference_0_0()); 
 
             }
 
@@ -15051,21 +18156,181 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__Assertion__ArgumentsAssignment_0_1_3_1_1"
+    // $ANTLR end "rule__NodeValueAssertion__NodeAssignment_0"
+
+
+    // $ANTLR start "rule__NodeValueAssertion__ValueAssignment_2"
+    // InternalProblem.g:5881:1: rule__NodeValueAssertion__ValueAssignment_2 : ( ruleConstant ) ;
+    public final void rule__NodeValueAssertion__ValueAssignment_2() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5885:1: ( ( ruleConstant ) )
+            // InternalProblem.g:5886:2: ( ruleConstant )
+            {
+            // InternalProblem.g:5886:2: ( ruleConstant )
+            // InternalProblem.g:5887:3: ruleConstant
+            {
+             before(grammarAccess.getNodeValueAssertionAccess().getValueConstantParserRuleCall_2_0()); 
+            pushFollow(FOLLOW_2);
+            ruleConstant();
+
+            state._fsp--;
+
+             after(grammarAccess.getNodeValueAssertionAccess().getValueConstantParserRuleCall_2_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__NodeValueAssertion__ValueAssignment_2"
+
+
+    // $ANTLR start "rule__IntConstant__IntValueAssignment"
+    // InternalProblem.g:5896:1: rule__IntConstant__IntValueAssignment : ( ruleInteger ) ;
+    public final void rule__IntConstant__IntValueAssignment() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5900:1: ( ( ruleInteger ) )
+            // InternalProblem.g:5901:2: ( ruleInteger )
+            {
+            // InternalProblem.g:5901:2: ( ruleInteger )
+            // InternalProblem.g:5902:3: ruleInteger
+            {
+             before(grammarAccess.getIntConstantAccess().getIntValueIntegerParserRuleCall_0()); 
+            pushFollow(FOLLOW_2);
+            ruleInteger();
+
+            state._fsp--;
+
+             after(grammarAccess.getIntConstantAccess().getIntValueIntegerParserRuleCall_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__IntConstant__IntValueAssignment"
+
+
+    // $ANTLR start "rule__RealConstant__RealValueAssignment"
+    // InternalProblem.g:5911:1: rule__RealConstant__RealValueAssignment : ( ruleReal ) ;
+    public final void rule__RealConstant__RealValueAssignment() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5915:1: ( ( ruleReal ) )
+            // InternalProblem.g:5916:2: ( ruleReal )
+            {
+            // InternalProblem.g:5916:2: ( ruleReal )
+            // InternalProblem.g:5917:3: ruleReal
+            {
+             before(grammarAccess.getRealConstantAccess().getRealValueRealParserRuleCall_0()); 
+            pushFollow(FOLLOW_2);
+            ruleReal();
+
+            state._fsp--;
+
+             after(grammarAccess.getRealConstantAccess().getRealValueRealParserRuleCall_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__RealConstant__RealValueAssignment"
+
+
+    // $ANTLR start "rule__StringConstant__StringValueAssignment"
+    // InternalProblem.g:5926:1: rule__StringConstant__StringValueAssignment : ( RULE_STRING ) ;
+    public final void rule__StringConstant__StringValueAssignment() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:5930:1: ( ( RULE_STRING ) )
+            // InternalProblem.g:5931:2: ( RULE_STRING )
+            {
+            // InternalProblem.g:5931:2: ( RULE_STRING )
+            // InternalProblem.g:5932:3: RULE_STRING
+            {
+             before(grammarAccess.getStringConstantAccess().getStringValueSTRINGTerminalRuleCall_0()); 
+            match(input,RULE_STRING,FOLLOW_2); 
+             after(grammarAccess.getStringConstantAccess().getStringValueSTRINGTerminalRuleCall_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__StringConstant__StringValueAssignment"
 
 
     // $ANTLR start "rule__ScopeDeclaration__TypeScopesAssignment_1"
-    // InternalProblem.g:4896:1: rule__ScopeDeclaration__TypeScopesAssignment_1 : ( ruleTypeScope ) ;
+    // InternalProblem.g:5941:1: rule__ScopeDeclaration__TypeScopesAssignment_1 : ( ruleTypeScope ) ;
     public final void rule__ScopeDeclaration__TypeScopesAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4900:1: ( ( ruleTypeScope ) )
-            // InternalProblem.g:4901:2: ( ruleTypeScope )
+            // InternalProblem.g:5945:1: ( ( ruleTypeScope ) )
+            // InternalProblem.g:5946:2: ( ruleTypeScope )
             {
-            // InternalProblem.g:4901:2: ( ruleTypeScope )
-            // InternalProblem.g:4902:3: ruleTypeScope
+            // InternalProblem.g:5946:2: ( ruleTypeScope )
+            // InternalProblem.g:5947:3: ruleTypeScope
             {
              before(grammarAccess.getScopeDeclarationAccess().getTypeScopesTypeScopeParserRuleCall_1_0()); 
             pushFollow(FOLLOW_2);
@@ -15096,17 +18361,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__TypeScopesAssignment_2_1"
-    // InternalProblem.g:4911:1: rule__ScopeDeclaration__TypeScopesAssignment_2_1 : ( ruleTypeScope ) ;
+    // InternalProblem.g:5956:1: rule__ScopeDeclaration__TypeScopesAssignment_2_1 : ( ruleTypeScope ) ;
     public final void rule__ScopeDeclaration__TypeScopesAssignment_2_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4915:1: ( ( ruleTypeScope ) )
-            // InternalProblem.g:4916:2: ( ruleTypeScope )
+            // InternalProblem.g:5960:1: ( ( ruleTypeScope ) )
+            // InternalProblem.g:5961:2: ( ruleTypeScope )
             {
-            // InternalProblem.g:4916:2: ( ruleTypeScope )
-            // InternalProblem.g:4917:3: ruleTypeScope
+            // InternalProblem.g:5961:2: ( ruleTypeScope )
+            // InternalProblem.g:5962:3: ruleTypeScope
             {
              before(grammarAccess.getScopeDeclarationAccess().getTypeScopesTypeScopeParserRuleCall_2_1_0()); 
             pushFollow(FOLLOW_2);
@@ -15137,21 +18402,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__TargetTypeAssignment_0"
-    // InternalProblem.g:4926:1: rule__TypeScope__TargetTypeAssignment_0 : ( ( RULE_ID ) ) ;
+    // InternalProblem.g:5971:1: rule__TypeScope__TargetTypeAssignment_0 : ( ( RULE_ID ) ) ;
     public final void rule__TypeScope__TargetTypeAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4930:1: ( ( ( RULE_ID ) ) )
-            // InternalProblem.g:4931:2: ( ( RULE_ID ) )
+            // InternalProblem.g:5975:1: ( ( ( RULE_ID ) ) )
+            // InternalProblem.g:5976:2: ( ( RULE_ID ) )
             {
-            // InternalProblem.g:4931:2: ( ( RULE_ID ) )
-            // InternalProblem.g:4932:3: ( RULE_ID )
+            // InternalProblem.g:5976:2: ( ( RULE_ID ) )
+            // InternalProblem.g:5977:3: ( RULE_ID )
             {
              before(grammarAccess.getTypeScopeAccess().getTargetTypeClassDeclarationCrossReference_0_0()); 
-            // InternalProblem.g:4933:3: ( RULE_ID )
-            // InternalProblem.g:4934:4: RULE_ID
+            // InternalProblem.g:5978:3: ( RULE_ID )
+            // InternalProblem.g:5979:4: RULE_ID
             {
              before(grammarAccess.getTypeScopeAccess().getTargetTypeClassDeclarationIDTerminalRuleCall_0_0_1()); 
             match(input,RULE_ID,FOLLOW_2); 
@@ -15182,24 +18447,24 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__IncrementAssignment_1_0"
-    // InternalProblem.g:4945:1: rule__TypeScope__IncrementAssignment_1_0 : ( ( '+=' ) ) ;
+    // InternalProblem.g:5990:1: rule__TypeScope__IncrementAssignment_1_0 : ( ( '+=' ) ) ;
     public final void rule__TypeScope__IncrementAssignment_1_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4949:1: ( ( ( '+=' ) ) )
-            // InternalProblem.g:4950:2: ( ( '+=' ) )
+            // InternalProblem.g:5994:1: ( ( ( '+=' ) ) )
+            // InternalProblem.g:5995:2: ( ( '+=' ) )
             {
-            // InternalProblem.g:4950:2: ( ( '+=' ) )
-            // InternalProblem.g:4951:3: ( '+=' )
+            // InternalProblem.g:5995:2: ( ( '+=' ) )
+            // InternalProblem.g:5996:3: ( '+=' )
             {
              before(grammarAccess.getTypeScopeAccess().getIncrementPlusSignEqualsSignKeyword_1_0_0()); 
-            // InternalProblem.g:4952:3: ( '+=' )
-            // InternalProblem.g:4953:4: '+='
+            // InternalProblem.g:5997:3: ( '+=' )
+            // InternalProblem.g:5998:4: '+='
             {
              before(grammarAccess.getTypeScopeAccess().getIncrementPlusSignEqualsSignKeyword_1_0_0()); 
-            match(input,44,FOLLOW_2); 
+            match(input,47,FOLLOW_2); 
              after(grammarAccess.getTypeScopeAccess().getIncrementPlusSignEqualsSignKeyword_1_0_0()); 
 
             }
@@ -15227,17 +18492,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__MultiplicityAssignment_2"
-    // InternalProblem.g:4964:1: rule__TypeScope__MultiplicityAssignment_2 : ( ruleDefiniteMultiplicity ) ;
+    // InternalProblem.g:6009:1: rule__TypeScope__MultiplicityAssignment_2 : ( ruleDefiniteMultiplicity ) ;
     public final void rule__TypeScope__MultiplicityAssignment_2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4968:1: ( ( ruleDefiniteMultiplicity ) )
-            // InternalProblem.g:4969:2: ( ruleDefiniteMultiplicity )
+            // InternalProblem.g:6013:1: ( ( ruleDefiniteMultiplicity ) )
+            // InternalProblem.g:6014:2: ( ruleDefiniteMultiplicity )
             {
-            // InternalProblem.g:4969:2: ( ruleDefiniteMultiplicity )
-            // InternalProblem.g:4970:3: ruleDefiniteMultiplicity
+            // InternalProblem.g:6014:2: ( ruleDefiniteMultiplicity )
+            // InternalProblem.g:6015:3: ruleDefiniteMultiplicity
             {
              before(grammarAccess.getTypeScopeAccess().getMultiplicityDefiniteMultiplicityParserRuleCall_2_0()); 
             pushFollow(FOLLOW_2);
@@ -15268,17 +18533,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__LowerBoundAssignment_0"
-    // InternalProblem.g:4979:1: rule__RangeMultiplicity__LowerBoundAssignment_0 : ( RULE_INT ) ;
+    // InternalProblem.g:6024:1: rule__RangeMultiplicity__LowerBoundAssignment_0 : ( RULE_INT ) ;
     public final void rule__RangeMultiplicity__LowerBoundAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4983:1: ( ( RULE_INT ) )
-            // InternalProblem.g:4984:2: ( RULE_INT )
+            // InternalProblem.g:6028:1: ( ( RULE_INT ) )
+            // InternalProblem.g:6029:2: ( RULE_INT )
             {
-            // InternalProblem.g:4984:2: ( RULE_INT )
-            // InternalProblem.g:4985:3: RULE_INT
+            // InternalProblem.g:6029:2: ( RULE_INT )
+            // InternalProblem.g:6030:3: RULE_INT
             {
              before(grammarAccess.getRangeMultiplicityAccess().getLowerBoundINTTerminalRuleCall_0_0()); 
             match(input,RULE_INT,FOLLOW_2); 
@@ -15305,17 +18570,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__UpperBoundAssignment_2"
-    // InternalProblem.g:4994:1: rule__RangeMultiplicity__UpperBoundAssignment_2 : ( ruleUpperBound ) ;
+    // InternalProblem.g:6039:1: rule__RangeMultiplicity__UpperBoundAssignment_2 : ( ruleUpperBound ) ;
     public final void rule__RangeMultiplicity__UpperBoundAssignment_2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4998:1: ( ( ruleUpperBound ) )
-            // InternalProblem.g:4999:2: ( ruleUpperBound )
+            // InternalProblem.g:6043:1: ( ( ruleUpperBound ) )
+            // InternalProblem.g:6044:2: ( ruleUpperBound )
             {
-            // InternalProblem.g:4999:2: ( ruleUpperBound )
-            // InternalProblem.g:5000:3: ruleUpperBound
+            // InternalProblem.g:6044:2: ( ruleUpperBound )
+            // InternalProblem.g:6045:3: ruleUpperBound
             {
              before(grammarAccess.getRangeMultiplicityAccess().getUpperBoundUpperBoundParserRuleCall_2_0()); 
             pushFollow(FOLLOW_2);
@@ -15346,17 +18611,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExactMultiplicity__ExactValueAssignment"
-    // InternalProblem.g:5009:1: rule__ExactMultiplicity__ExactValueAssignment : ( RULE_INT ) ;
+    // InternalProblem.g:6054:1: rule__ExactMultiplicity__ExactValueAssignment : ( RULE_INT ) ;
     public final void rule__ExactMultiplicity__ExactValueAssignment() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:5013:1: ( ( RULE_INT ) )
-            // InternalProblem.g:5014:2: ( RULE_INT )
+            // InternalProblem.g:6058:1: ( ( RULE_INT ) )
+            // InternalProblem.g:6059:2: ( RULE_INT )
             {
-            // InternalProblem.g:5014:2: ( RULE_INT )
-            // InternalProblem.g:5015:3: RULE_INT
+            // InternalProblem.g:6059:2: ( RULE_INT )
+            // InternalProblem.g:6060:3: RULE_INT
             {
              before(grammarAccess.getExactMultiplicityAccess().getExactValueINTTerminalRuleCall_0()); 
             match(input,RULE_INT,FOLLOW_2); 
@@ -15384,46 +18649,34 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // Delegated rules
 
 
-    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\47\1\uffff\1\42\1\24\1\42\3\47\1\44\1\41\3\47\2\24\1\uffff\1\42\6\47\1\42\1\24\1\42\3\47";
-    static final String dfa_4s = "\5\uffff\1\2\15\uffff\1\1\15\uffff";
-    static final String dfa_5s = "\41\uffff}>";
+    protected DFA1 dfa1 = new DFA1(this);
+    protected DFA9 dfa9 = new DFA9(this);
+    static final String dfa_1s = "\24\uffff";
+    static final String dfa_2s = "\1\5\3\uffff\6\45\3\uffff\1\5\6\45";
+    static final String dfa_3s = "\1\56\3\uffff\1\50\5\53\3\uffff\1\26\5\53\1\50";
+    static final String dfa_4s = "\1\uffff\1\1\1\2\1\3\6\uffff\1\4\1\6\1\5\7\uffff";
+    static final String dfa_5s = "\24\uffff}>";
     static final String[] dfa_6s = {
-            "\1\1\1\2\14\uffff\1\3\1\4\1\uffff\2\5",
-            "\1\6",
-            "\1\6\5\uffff\1\7",
-            "\1\6\5\uffff\1\7",
-            "\1\6\5\uffff\1\7",
+            "\1\4\1\5\11\uffff\1\3\2\uffff\1\6\1\7\1\10\1\11\3\uffff\2\12\1\uffff\1\1\3\uffff\1\2\7\uffff\1\13\2\uffff\1\1\1\uffff\1\3",
+            "",
+            "",
+            "",
+            "\1\12\2\uffff\1\14",
+            "\1\12\2\uffff\1\14\2\uffff\1\15",
+            "\1\12\2\uffff\1\14\2\uffff\1\15",
+            "\1\12\2\uffff\1\14\2\uffff\1\15",
+            "\1\12\2\uffff\1\14\2\uffff\1\15",
+            "\1\12\2\uffff\1\14\2\uffff\1\15",
             "",
-            "\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\4\uffff\1\22",
-            "\1\21\24\uffff\1\14\4\uffff\1\22",
-            "\1\21\24\uffff\1\14\4\uffff\1\22",
-            "\1\5\27\uffff\1\23",
-            "\1\6",
-            "\1\6\5\uffff\1\7",
-            "\1\6\5\uffff\1\7",
-            "\1\6\5\uffff\1\7",
-            "\1\24\1\25\14\uffff\1\26\1\27",
-            "\1\33\1\30\14\uffff\1\31\1\32",
             "",
-            "\1\21\24\uffff\1\14",
-            "\1\21\24\uffff\1\14\4\uffff\1\34",
-            "\1\21\24\uffff\1\14\4\uffff\1\34",
-            "\1\21\24\uffff\1\14\4\uffff\1\34",
-            "\1\21\24\uffff\1\14\4\uffff\1\22",
-            "\1\21\24\uffff\1\14\4\uffff\1\22",
-            "\1\21\24\uffff\1\14\4\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\4\uffff\1\34",
-            "\1\21\24\uffff\1\14\4\uffff\1\34",
-            "\1\21\24\uffff\1\14\4\uffff\1\34"
+            "",
+            "\1\23\1\16\14\uffff\1\17\1\20\1\21\1\22",
+            "\1\12\2\uffff\1\14\2\uffff\1\15",
+            "\1\12\2\uffff\1\14\2\uffff\1\15",
+            "\1\12\2\uffff\1\14\2\uffff\1\15",
+            "\1\12\2\uffff\1\14\2\uffff\1\15",
+            "\1\12\2\uffff\1\14\2\uffff\1\15",
+            "\1\12\2\uffff\1\14"
     };
 
     static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
@@ -15433,11 +18686,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
     static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
 
-    class DFA8 extends DFA {
+    class DFA1 extends DFA {
 
-        public DFA8(BaseRecognizer recognizer) {
+        public DFA1(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 8;
+            this.decisionNumber = 1;
             this.eot = dfa_1;
             this.eof = dfa_1;
             this.min = dfa_2;
@@ -15447,49 +18700,151 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_6;
         }
         public String getDescription() {
-            return "874:1: rule__Assertion__Alternatives_0 : ( ( ( rule__Assertion__Group_0_0__0 ) ) | ( ( rule__Assertion__Group_0_1__0 ) ) );";
+            return "1033:1: rule__Statement__Alternatives : ( ( ruleClassDeclaration ) | ( ruleEnumDeclaration ) | ( rulePredicateDefinition ) | ( ruleAssertion ) | ( ruleNodeValueAssertion ) | ( ruleScopeDeclaration ) );";
+        }
+    }
+    static final String dfa_7s = "\101\uffff";
+    static final String dfa_8s = "\1\5\6\45\1\uffff\1\4\1\5\6\15\1\4\1\14\1\15\1\14\6\45\1\4\1\5\3\4\1\uffff\6\15\1\4\1\14\10\15\2\4\1\15\1\5\3\4\7\15\2\4\1\15";
+    static final String dfa_9s = "\1\33\1\45\5\53\1\uffff\1\46\1\26\1\46\5\53\1\4\2\46\1\50\1\45\5\53\1\27\1\26\1\4\2\30\1\uffff\1\46\5\53\1\4\3\46\5\53\1\46\2\4\1\46\1\26\1\4\2\30\5\53\2\46\2\4\1\46";
+    static final String dfa_10s = "\7\uffff\1\2\27\uffff\1\1\41\uffff";
+    static final String dfa_11s = "\101\uffff}>";
+    static final String[] dfa_12s = {
+            "\1\1\1\2\14\uffff\1\3\1\4\1\5\1\6\3\uffff\2\7",
+            "\1\10",
+            "\1\10\5\uffff\1\11",
+            "\1\10\5\uffff\1\11",
+            "\1\10\5\uffff\1\11",
+            "\1\10\5\uffff\1\11",
+            "\1\10\5\uffff\1\11",
+            "",
+            "\1\21\1\12\1\13\1\22\13\uffff\1\14\1\15\1\16\1\17\1\20\16\uffff\1\23",
+            "\1\24\1\25\14\uffff\1\26\1\27\1\30\1\31",
+            "\1\32\30\uffff\1\23",
+            "\1\32\30\uffff\1\23\4\uffff\1\33",
+            "\1\32\30\uffff\1\23\4\uffff\1\33",
+            "\1\32\30\uffff\1\23\4\uffff\1\33",
+            "\1\32\30\uffff\1\23\4\uffff\1\33",
+            "\1\32\30\uffff\1\23\4\uffff\1\33",
+            "\1\21",
+            "\1\34\1\32\7\uffff\1\35\1\36\17\uffff\1\23",
+            "\1\32\30\uffff\1\23",
+            "\1\7\33\uffff\1\37",
+            "\1\10",
+            "\1\10\5\uffff\1\11",
+            "\1\10\5\uffff\1\11",
+            "\1\10\5\uffff\1\11",
+            "\1\10\5\uffff\1\11",
+            "\1\10\5\uffff\1\11",
+            "\1\47\1\40\1\41\1\50\13\uffff\1\42\1\43\1\44\1\45\1\46",
+            "\1\51\1\52\14\uffff\1\53\1\54\1\55\1\56",
+            "\1\57",
+            "\1\62\22\uffff\1\60\1\61",
+            "\1\62\22\uffff\1\60\1\61",
+            "",
+            "\1\32\30\uffff\1\23",
+            "\1\32\30\uffff\1\23\4\uffff\1\63",
+            "\1\32\30\uffff\1\23\4\uffff\1\63",
+            "\1\32\30\uffff\1\23\4\uffff\1\63",
+            "\1\32\30\uffff\1\23\4\uffff\1\63",
+            "\1\32\30\uffff\1\23\4\uffff\1\63",
+            "\1\47",
+            "\1\64\1\32\7\uffff\1\65\1\66\17\uffff\1\23",
+            "\1\32\30\uffff\1\23",
+            "\1\32\30\uffff\1\23",
+            "\1\32\30\uffff\1\23\4\uffff\1\33",
+            "\1\32\30\uffff\1\23\4\uffff\1\33",
+            "\1\32\30\uffff\1\23\4\uffff\1\33",
+            "\1\32\30\uffff\1\23\4\uffff\1\33",
+            "\1\32\30\uffff\1\23\4\uffff\1\33",
+            "\1\32\7\uffff\1\35\1\36\17\uffff\1\23",
+            "\1\62",
+            "\1\62",
+            "\1\32\30\uffff\1\23",
+            "\1\74\1\67\14\uffff\1\70\1\71\1\72\1\73",
+            "\1\75",
+            "\1\100\22\uffff\1\76\1\77",
+            "\1\100\22\uffff\1\76\1\77",
+            "\1\32\30\uffff\1\23\4\uffff\1\63",
+            "\1\32\30\uffff\1\23\4\uffff\1\63",
+            "\1\32\30\uffff\1\23\4\uffff\1\63",
+            "\1\32\30\uffff\1\23\4\uffff\1\63",
+            "\1\32\30\uffff\1\23\4\uffff\1\63",
+            "\1\32\30\uffff\1\23",
+            "\1\32\7\uffff\1\65\1\66\17\uffff\1\23",
+            "\1\100",
+            "\1\100",
+            "\1\32\30\uffff\1\23"
+    };
+
+    static final short[] dfa_7 = DFA.unpackEncodedString(dfa_7s);
+    static final char[] dfa_8 = DFA.unpackEncodedStringToUnsignedChars(dfa_8s);
+    static final char[] dfa_9 = DFA.unpackEncodedStringToUnsignedChars(dfa_9s);
+    static final short[] dfa_10 = DFA.unpackEncodedString(dfa_10s);
+    static final short[] dfa_11 = DFA.unpackEncodedString(dfa_11s);
+    static final short[][] dfa_12 = unpackEncodedStringArray(dfa_12s);
+
+    class DFA9 extends DFA {
+
+        public DFA9(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 9;
+            this.eot = dfa_7;
+            this.eof = dfa_7;
+            this.min = dfa_8;
+            this.max = dfa_9;
+            this.accept = dfa_10;
+            this.special = dfa_11;
+            this.transition = dfa_12;
+        }
+        public String getDescription() {
+            return "1225: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[]{0x0000052022D90060L});
-    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000052022D90062L});
-    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000180060L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x000052022C790060L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x000052022C790062L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000780060L});
     public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000001000L});
-    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000010002000000L});
-    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x000000000C001000L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000100020000000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x00000000C0001000L});
     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[]{0x0000020010188060L});
-    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000020000188062L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000200100788060L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000200000788062L});
     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_14 = new BitSet(new long[]{0x0000000080001000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000100780060L});
     public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000006000L});
-    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000020000188060L});
-    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_17 = new BitSet(new long[]{0x0000200000788060L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000400780060L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000001000000000L});
     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_21 = new BitSet(new long[]{0x0000000800000000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000004000780060L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000008000001000L});
     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_26 = new BitSet(new long[]{0x0000000004780060L});
     public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000000004002L});
-    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000080200000000L});
-    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[]{0x0000100000020000L});
-    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[]{0x0000008000000000L});
-    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000008000000002L});
-    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000002001000000L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000004000F800F0L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000000F800F0L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000010000000000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000002180000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x000000000C780060L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000000000003000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000800000020000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000040000000000L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000000000040010L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000080000000000L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000080000000002L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000000000800010L});
+    public static final BitSet FOLLOW_43 = new BitSet(new long[]{0x0000000000601000L});
+    public static final BitSet FOLLOW_44 = new BitSet(new long[]{0x0000000001800010L});
 
 }
\ No newline at end of file
diff --git a/language-model/problem.aird b/language-model/problem.aird
index 29e6d68c..1339af12 100644
--- a/language-model/problem.aird
+++ b/language-model/problem.aird
@@ -7,7 +7,7 @@
     <semanticResources>build/resources/main/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="c29543bd-4d24-42d3-8f5b-82d41af742bd">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_CsYa4KA4EeuqkpDnuik1sg" name="problem" repPath="#_CsUwgKA4EeuqkpDnuik1sg" changeId="9e6149a4-5a12-44f9-8e40-b3da58c59eb4">
         <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>
@@ -142,7 +142,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="1644" y="960" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-O-UEqA6EeuqkpDnuik1sg" x="1656" y="1752" 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"/>
@@ -160,7 +160,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="1630" y="720" width="147" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rRhWIqA7EeuqkpDnuik1sg" x="1593" 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"/>
@@ -173,7 +173,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="1644" y="528" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p9wywqA8EeuqkpDnuik1sg" x="1872" 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"/>
@@ -203,7 +203,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="1872" y="720" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BMfjMqA9EeuqkpDnuik1sg" x="1872" y="180" 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"/>
@@ -291,7 +291,7 @@
             <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="1353" y="1476" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwsqwtYPEeuF_d0WEhR3Xw" x="1188" y="1596" width="159" 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"/>
@@ -311,6 +311,108 @@
           <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>
+        <children xmi:type="notation:Node" xmi:id="_IsM5ENd_EeufiOvRR5sVhg" type="2003" element="_IrcrINd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_IsRxkNd_EeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_IsRxkdd_EeufiOvRR5sVhg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_IsRxktd_EeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_IsRxk9d_EeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_IsM5Edd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IsM5Etd_EeufiOvRR5sVhg" x="2016" y="1608" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_KdsE0Nd_EeufiOvRR5sVhg" type="2003" element="_KdTqUNd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_Kdsr4Nd_EeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_Kdsr4dd_EeufiOvRR5sVhg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_bremgNd_EeufiOvRR5sVhg" type="3010" element="_brB6kNd_EeufiOvRR5sVhg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_bremgdd_EeufiOvRR5sVhg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_bremgtd_EeufiOvRR5sVhg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Kdsr4td_EeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Kdsr49d_EeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_KdsE0dd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KdsE0td_EeufiOvRR5sVhg" x="1872" y="1752" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_MAkM0Nd_EeufiOvRR5sVhg" type="2003" element="_MARR4Nd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_MAkM09d_EeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_MAkM1Nd_EeufiOvRR5sVhg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_exbq0Nd_EeufiOvRR5sVhg" type="3010" element="_exQEoNd_EeufiOvRR5sVhg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_exbq0dd_EeufiOvRR5sVhg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_exbq0td_EeufiOvRR5sVhg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_MAkM1dd_EeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_MAkM1td_EeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_MAkM0dd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MAkM0td_EeufiOvRR5sVhg" x="2016" y="1752" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_RwPFYNd_EeufiOvRR5sVhg" type="2003" element="_Rv9_oNd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_RwPFY9d_EeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_RwPFZNd_EeufiOvRR5sVhg" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_g44fgNd_EeufiOvRR5sVhg" type="3010" element="_g4rrMNd_EeufiOvRR5sVhg">
+              <styles xmi:type="notation:FontStyle" xmi:id="_g44fgdd_EeufiOvRR5sVhg" fontColor="2697711" fontName="Noto Sans" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_g44fgtd_EeufiOvRR5sVhg"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_RwPFZdd_EeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_RwPFZtd_EeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_RwPFYdd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RwPFYtd_EeufiOvRR5sVhg" x="2160" y="1752" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_mCh54Nd_EeufiOvRR5sVhg" type="2003" element="_mCSCQNd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_mCh549d_EeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_mCig8Nd_EeufiOvRR5sVhg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_mCig8dd_EeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_mCig8td_EeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_mCh54dd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mCh54td_EeufiOvRR5sVhg" x="1461" y="1596" width="135" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_rwMAQNd_EeufiOvRR5sVhg" type="2003" element="_rwC2UNd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_rwMAQ9d_EeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_rwMARNd_EeufiOvRR5sVhg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_rwMARdd_EeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_rwMARtd_EeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_rwMAQdd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rwMAQtd_EeufiOvRR5sVhg" x="1344" y="1452" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_OWhiINeAEeufiOvRR5sVhg" type="2003" element="_OWYYMNeAEeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_OWhiI9eAEeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_OWhiJNeAEeufiOvRR5sVhg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_OWhiJdeAEeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_OWhiJteAEeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_OWhiIdeAEeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OWhiIteAEeufiOvRR5sVhg" x="1980" y="960" width="156" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_VikSENeAEeufiOvRR5sVhg" type="2003" element="_ViJbUNeAEeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_Vik5INeAEeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_Vik5IdeAEeufiOvRR5sVhg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_Vik5IteAEeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_Vik5I9eAEeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_VikSEdeAEeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VikSEteAEeufiOvRR5sVhg" x="1864" y="708" width="135" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_dZlRoNeAEeufiOvRR5sVhg" type="2003" element="_dZVaANeAEeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_dZl4sNeAEeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_dZl4sdeAEeufiOvRR5sVhg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_dZl4steAEeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_dZl4s9eAEeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_dZlRodeAEeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dZlRoteAEeufiOvRR5sVhg" x="1747" y="960" width="188" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_9Tu6ENeAEeufiOvRR5sVhg" type="2003" element="_9TjT4NeAEeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_9Tu6E9eAEeufiOvRR5sVhg" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_9Tu6FNeAEeufiOvRR5sVhg" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_9Tu6FdeAEeufiOvRR5sVhg"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_9Tu6FteAEeufiOvRR5sVhg"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_9Tu6EdeAEeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Tu6EteAEeufiOvRR5sVhg" x="2136" y="528" width="144" 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">
           <children xmi:type="notation:Node" xmi:id="_ODhSRKA4EeuqkpDnuik1sg" type="6001">
@@ -516,23 +618,23 @@
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_yCqSwaA7EeuqkpDnuik1sg" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_yCqSwqA7EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yCqSw6A7EeuqkpDnuik1sg" points="[0, -3, -86, 515]$[0, -375, -86, 143]$[40, -375, -46, 143]$[40, -469, -46, 49]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yCqSyqA7EeuqkpDnuik1sg" id="(0.576271186440678,0.030612244897959183)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yCqSw6A7EeuqkpDnuik1sg" points="[0, -3, -49, 515]$[0, -375, -49, 143]$[3, -375, -46, 143]$[3, -469, -46, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yCqSyqA7EeuqkpDnuik1sg" id="(0.8983050847457628,0.030612244897959183)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_yCqSy6A7EeuqkpDnuik1sg" id="(0.5,0.5)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_0U2-4KA7EeuqkpDnuik1sg" type="4001" element="_0UtN5qA7EeuqkpDnuik1sg" source="_rRhWIKA7EeuqkpDnuik1sg" target="_-O-UEKA6EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_0U3l8KA7EeuqkpDnuik1sg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0U3l8aA7EeuqkpDnuik1sg" x="-18" y="-65"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0U3l8aA7EeuqkpDnuik1sg" x="-438" y="4"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_0U3l8qA7EeuqkpDnuik1sg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0U3l86A7EeuqkpDnuik1sg" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0U3l86A7EeuqkpDnuik1sg" x="-119" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_0U3l9KA7EeuqkpDnuik1sg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0U3l9aA7EeuqkpDnuik1sg" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0U3l9aA7EeuqkpDnuik1sg" x="-673" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_0U2-4aA7EeuqkpDnuik1sg" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_0U2-4qA7EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0U2-46A7EeuqkpDnuik1sg" points="[-15, 0, -15, -142]$[-15, 142, -15, 0]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0U2-46A7EeuqkpDnuik1sg" points="[20, 0, -29, -934]$[20, 934, -29, 0]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0U3l9qA7EeuqkpDnuik1sg" id="(0.696551724137931,1.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0U3l96A7EeuqkpDnuik1sg" id="(0.7372881355932204,0.0)"/>
         </edges>
@@ -586,17 +688,17 @@
         </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="-221" y="18"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zMlaA8EeuqkpDnuik1sg" x="-107" y="18"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_w-zzoKA8EeuqkpDnuik1sg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zzoaA8EeuqkpDnuik1sg" x="449" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zzoaA8EeuqkpDnuik1sg" x="643" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_w-zzoqA8EeuqkpDnuik1sg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zzo6A8EeuqkpDnuik1sg" x="79" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zzo6A8EeuqkpDnuik1sg" x="113" 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, -25, 902, -25]$[-902, -25, 0, -25]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w-zMk6A8EeuqkpDnuik1sg" points="[0, -13, 1130, -13]$[-1130, -13, 0, -13]"/>
           <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>
@@ -616,22 +718,6 @@
           <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.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="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="-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="-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="[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">
           <children xmi:type="notation:Node" xmi:id="_hU_wtKA9EeuqkpDnuik1sg" type="6001">
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hU_wtaA9EeuqkpDnuik1sg" x="-12" y="64"/>
@@ -650,18 +736,18 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_mQXegKA9EeuqkpDnuik1sg" type="4001" element="_mQFKsqA9EeuqkpDnuik1sg" source="_p9wywKA8EeuqkpDnuik1sg" target="_e73WIKA9EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_mQYFkKA9EeuqkpDnuik1sg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQYFkaA9EeuqkpDnuik1sg" x="-32" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQYFkaA9EeuqkpDnuik1sg" x="-60" y="-10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_mQYFkqA9EeuqkpDnuik1sg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQYFk6A9EeuqkpDnuik1sg" x="-32" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQYFk6A9EeuqkpDnuik1sg" x="-60" y="10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_mQYFlKA9EeuqkpDnuik1sg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQYFlaA9EeuqkpDnuik1sg" x="-32" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mQYFlaA9EeuqkpDnuik1sg" x="-60" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_mQXegaA9EeuqkpDnuik1sg" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_mQXegqA9EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mQXeg6A9EeuqkpDnuik1sg" points="[0, 0, 673, 143]$[0, -48, 673, 95]$[-672, -48, 1, 95]$[-672, -94, 1, 49]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQYFlqA9EeuqkpDnuik1sg" id="(0.6101694915254238,0.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mQXeg6A9EeuqkpDnuik1sg" points="[0, -5, 1059, 143]$[0, -41, 1059, 107]$[-1058, -41, 1, 107]$[-1058, -99, 1, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQYFlqA9EeuqkpDnuik1sg" id="(0.4745762711864407,0.04081632653061224)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mQYFl6A9EeuqkpDnuik1sg" id="(0.5,0.5)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_m0CMQKA9EeuqkpDnuik1sg" type="4001" element="_mzziwKA9EeuqkpDnuik1sg" source="_fit3kKA5EeuqkpDnuik1sg" target="_e73WIKA9EeuqkpDnuik1sg">
@@ -856,36 +942,20 @@
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HUhwGtYBEeuF_d0WEhR3Xw" id="(0.41379310344827586,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HUhwG9YBEeuF_d0WEhR3Xw" id="(0.5,0.5)"/>
         </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="-10"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_KnHZ0tYPEeuF_d0WEhR3Xw" type="6002">
-            <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="-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="[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="_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="-106" y="-140"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_byTTddYPEeuF_d0WEhR3Xw" x="-5" y="-10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_byTTdtYPEeuF_d0WEhR3Xw" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_byTTd9YPEeuF_d0WEhR3Xw" x="-31" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_byTTd9YPEeuF_d0WEhR3Xw" x="32" y="-376"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_byTTeNYPEeuF_d0WEhR3Xw" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_byTTedYPEeuF_d0WEhR3Xw" x="-28" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_byTTedYPEeuF_d0WEhR3Xw" x="-1" 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, -221, 466]$[303, 48, 12, 466]$[303, -418, 12, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_byT6gNYPEeuF_d0WEhR3Xw" id="(0.4067796610169492,0.0)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_byTTc9YPEeuF_d0WEhR3Xw" points="[19, 98, -437, -156]$[19, 192, -437, -62]$[408, 192, -48, -62]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_byT6gNYPEeuF_d0WEhR3Xw" id="(0.3821656050955414,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">
@@ -906,33 +976,33 @@
         </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"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W89dddbFEeuymriYTNxK2g" x="-331" 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"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W8-EgdbFEeuymriYTNxK2g" x="-11" 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"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W8-Eg9bFEeuymriYTNxK2g" x="30" 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]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_W89dc9bFEeuymriYTNxK2g" points="[-75, 50, 517, 414]$[-195, 50, 397, 414]$[-195, -384, 397, -20]$[-581, -384, 11, -20]"/>
           <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"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ev0VxdbFEeuymriYTNxK2g" x="-218" 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"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ev0Vx9bFEeuymriYTNxK2g" x="2" 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"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ev0VydbFEeuymriYTNxK2g" x="-2" 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]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ev0Vw9bFEeuymriYTNxK2g" points="[37, 36, -4, 419]$[156, 36, 115, 419]$[156, -372, 115, 11]$[46, -372, 5, 11]"/>
           <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>
@@ -981,7 +1051,7 @@
           <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)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WYV4CtbGEeuymriYTNxK2g" id="(0.2627118644067797,0.01020408163265306)"/>
           <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">
@@ -1050,20 +1120,260 @@
         </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"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UosbJdbNEeuymriYTNxK2g" x="-606" y="6"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_UotCMNbNEeuymriYTNxK2g" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UotCMdbNEeuymriYTNxK2g" x="21" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UotCMdbNEeuymriYTNxK2g" x="-59" 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"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UotCM9bNEeuymriYTNxK2g" x="-11" 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)"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UosbI9bNEeuymriYTNxK2g" points="[-13, -18, 56, 1329]$[-13, -1336, 56, 11]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UotCNNbNEeuymriYTNxK2g" id="(0.2356687898089172,0.1836734693877551)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UotCNdbNEeuymriYTNxK2g" id="(0.16101694915254236,0.8877551020408163)"/>
         </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_Vs_14Nd_EeufiOvRR5sVhg" type="4001" element="_Vsm0XNd_EeufiOvRR5sVhg" source="_KdsE0Nd_EeufiOvRR5sVhg" target="_IsM5ENd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_VtAc8Nd_EeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VtBEANd_EeufiOvRR5sVhg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_VtBEAdd_EeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VtBEAtd_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_VtBrENd_EeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VtBrEdd_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_Vs_14dd_EeufiOvRR5sVhg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_Vs_14td_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Vs_149d_EeufiOvRR5sVhg" points="[0, 0, -72, 120]$[72, -120, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VtEHUNd_EeufiOvRR5sVhg" id="(0.6101694915254238,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_VtEHUdd_EeufiOvRR5sVhg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_WEehwNd_EeufiOvRR5sVhg" type="4001" element="_WEGuVtd_EeufiOvRR5sVhg" source="_MAkM0Nd_EeufiOvRR5sVhg" target="_IsM5ENd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_WEehxNd_EeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WEehxdd_EeufiOvRR5sVhg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_WEehxtd_EeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WEehx9d_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_WEehyNd_EeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WEehydd_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_WEehwdd_EeufiOvRR5sVhg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_WEehwtd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WEehw9d_EeufiOvRR5sVhg" points="[0, 0, 0, 46]$[0, -46, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WEfI0Nd_EeufiOvRR5sVhg" id="(0.6101694915254238,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WEfI0dd_EeufiOvRR5sVhg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_Wa3BcNd_EeufiOvRR5sVhg" type="4001" element="_Waktldd_EeufiOvRR5sVhg" source="_RwPFYNd_EeufiOvRR5sVhg" target="_IsM5ENd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_Wa3ogNd_EeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wa3ogdd_EeufiOvRR5sVhg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Wa3ogtd_EeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wa3og9d_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_Wa3ohNd_EeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Wa3ohdd_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_Wa3Bcdd_EeufiOvRR5sVhg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_Wa3Bctd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Wa3Bc9d_EeufiOvRR5sVhg" points="[0, 0, 85, 132]$[-85, -132, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Wa3ohtd_EeufiOvRR5sVhg" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Wa3oh9d_EeufiOvRR5sVhg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_tXLzQNd_EeufiOvRR5sVhg" type="4001" element="_KmxbkNYPEeuF_d0WEhR3Xw" source="_6KEUMKA6EeuqkpDnuik1sg" target="_rwMAQNd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_tXMaUNd_EeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tXMaUdd_EeufiOvRR5sVhg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_tXMaUtd_EeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tXMaU9d_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_tXMaVNd_EeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tXMaVdd_EeufiOvRR5sVhg" x="-11" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_tXLzQdd_EeufiOvRR5sVhg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_tXLzQtd_EeufiOvRR5sVhg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tXLzQ9d_EeufiOvRR5sVhg" points="[60, 38, 0, -81]$[60, 108, 0, -11]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tXNocNd_EeufiOvRR5sVhg" id="(0.0,0.6122448979591837)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tXNocdd_EeufiOvRR5sVhg" id="(0.5084745762711864,0.11224489795918367)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_zhTMINd_EeufiOvRR5sVhg" type="4001" element="_zhINQtd_EeufiOvRR5sVhg" source="_mCh54Nd_EeufiOvRR5sVhg" target="_rwMAQNd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_zhTzMNd_EeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zhTzMdd_EeufiOvRR5sVhg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_zhTzMtd_EeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zhTzM9d_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_zhTzNNd_EeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zhTzNdd_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_zhTMIdd_EeufiOvRR5sVhg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_zhTMItd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zhTMI9d_EeufiOvRR5sVhg" points="[0, 0, -133, 58]$[133, -58, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zhTzNtd_EeufiOvRR5sVhg" id="(0.5037593984962406,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zhTzN9d_EeufiOvRR5sVhg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_1HiKINd_EeufiOvRR5sVhg" type="4001" element="_1HYZXNd_EeufiOvRR5sVhg" source="_IwsqwNYPEeuF_d0WEhR3Xw" target="_rwMAQNd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_1HixMNd_EeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1HixMdd_EeufiOvRR5sVhg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_1HixMtd_EeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1HixM9d_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_1HixNNd_EeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1HixNdd_EeufiOvRR5sVhg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_1HiKIdd_EeufiOvRR5sVhg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_1HiKItd_EeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1HiKI9d_EeufiOvRR5sVhg" points="[0, 0, 132, 58]$[-132, -58, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1HixNtd_EeufiOvRR5sVhg" id="(0.6114649681528662,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1HixN9d_EeufiOvRR5sVhg" id="(0.5084745762711864,0.11224489795918367)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_YAyoANeAEeufiOvRR5sVhg" type="4001" element="_YAoQHdeAEeufiOvRR5sVhg" source="_p9wywKA8EeuqkpDnuik1sg" target="_VikSENeAEeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_YAyoBNeAEeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YAyoBdeAEeufiOvRR5sVhg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_YAyoBteAEeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YAyoB9eAEeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_YAyoCNeAEeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YAyoCdeAEeufiOvRR5sVhg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_YAyoAdeAEeufiOvRR5sVhg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_YAyoAteAEeufiOvRR5sVhg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YAyoA9eAEeufiOvRR5sVhg" points="[0, 0, 0, -82]$[0, 82, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YAzPENeAEeufiOvRR5sVhg" id="(0.4406779661016949,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YAzPEdeAEeufiOvRR5sVhg" id="(0.45112781954887216,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_dDz18NeAEeufiOvRR5sVhg" type="4001" element="_dDd3wteAEeufiOvRR5sVhg" source="_OWhiINeAEeufiOvRR5sVhg" target="_VikSENeAEeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_dDz19NeAEeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dDz19deAEeufiOvRR5sVhg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_dDz19teAEeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dDz199eAEeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_dDz1-NeAEeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dDz1-deAEeufiOvRR5sVhg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_dDz18deAEeufiOvRR5sVhg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_dDz18teAEeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dDz189eAEeufiOvRR5sVhg" points="[0, 0, -107, 154]$[107, -154, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dDz1-teAEeufiOvRR5sVhg" id="(0.38961038961038963,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_dDz1-9eAEeufiOvRR5sVhg" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_g_pZYNeAEeufiOvRR5sVhg" type="4001" element="_g_aI1teAEeufiOvRR5sVhg" source="_dZlRoNeAEeufiOvRR5sVhg" target="_VikSENeAEeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_g_qAcNeAEeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_qAcdeAEeufiOvRR5sVhg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_g_qActeAEeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_qAc9eAEeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_g_qAdNeAEeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_qAddeAEeufiOvRR5sVhg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_g_pZYdeAEeufiOvRR5sVhg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_g_pZYteAEeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g_pZY9eAEeufiOvRR5sVhg" points="[0, 0, -132, 154]$[132, -154, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g_qAdteAEeufiOvRR5sVhg" id="(0.27956989247311825,0.05102040816326531)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_g_qAd9eAEeufiOvRR5sVhg" id="(0.45112781954887216,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_nucMoNeAEeufiOvRR5sVhg" type="4001" element="_nuG1dteAEeufiOvRR5sVhg" source="_mCh54Nd_EeufiOvRR5sVhg" target="_IsM5ENd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_nucMpNeAEeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nucMpdeAEeufiOvRR5sVhg" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_nucMpteAEeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nucMp9eAEeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_nucMqNeAEeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nucMqdeAEeufiOvRR5sVhg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_nucModeAEeufiOvRR5sVhg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_nucMoteAEeufiOvRR5sVhg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nucMo9eAEeufiOvRR5sVhg" points="[0, 11, -422, 12]$[422, 11, 0, 12]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nuczsNeAEeufiOvRR5sVhg" id="(1.0,0.6224489795918368)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_nuczsdeAEeufiOvRR5sVhg" id="(0.0,0.4897959183673469)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_pMxL0NeAEeufiOvRR5sVhg" type="4001" element="_pMdCzNeAEeufiOvRR5sVhg" source="_dZlRoNeAEeufiOvRR5sVhg" target="_IsM5ENd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_pMxL1NeAEeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pMxL1deAEeufiOvRR5sVhg" x="-352" y="1"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_pMxL1teAEeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pMxL19eAEeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_pMxL2NeAEeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pMxL2deAEeufiOvRR5sVhg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_pMxL0deAEeufiOvRR5sVhg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_pMxL0teAEeufiOvRR5sVhg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pMxL09eAEeufiOvRR5sVhg" points="[0, 0, -212, -550]$[0, 586, -212, 36]$[176, 586, -36, 36]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pMxy4NeAEeufiOvRR5sVhg" id="(0.5,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pMxy4deAEeufiOvRR5sVhg" id="(0.3050847457627119,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_vRxbMNeAEeufiOvRR5sVhg" type="4001" element="_vRo4VteAEeufiOvRR5sVhg" source="_OWhiINeAEeufiOvRR5sVhg" target="_xsq_MKA8EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_vRxbNNeAEeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vRxbNdeAEeufiOvRR5sVhg" x="-196" y="-535"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_vRyCQNeAEeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vRyCQdeAEeufiOvRR5sVhg" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_vRyCQteAEeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vRyCQ9eAEeufiOvRR5sVhg" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_vRxbMdeAEeufiOvRR5sVhg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_vRxbMteAEeufiOvRR5sVhg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vRxbM9eAEeufiOvRR5sVhg" points="[0, 0, 950, 564]$[0, -564, 950, 0]$[-950, -564, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vRyCRNeAEeufiOvRR5sVhg" id="(0.7012987012987013,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vRyCRdeAEeufiOvRR5sVhg" id="(1.0,0.6122448979591837)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_AmNXcNeBEeufiOvRR5sVhg" type="4001" element="_AmBxQNeBEeufiOvRR5sVhg" source="_9Tu6ENeAEeufiOvRR5sVhg" target="_xsq_MKA8EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_AmN-gNeBEeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AmN-gdeBEeufiOvRR5sVhg" x="-456" y="-139"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_AmN-gteBEeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AmN-g9eBEeufiOvRR5sVhg" x="217" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_AmN-hNeBEeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AmN-hdeBEeufiOvRR5sVhg" x="9" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_AmNXcdeBEeufiOvRR5sVhg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_AmNXcteBEeufiOvRR5sVhg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AmNXc9eBEeufiOvRR5sVhg" points="[70, -12, 1068, 156]$[70, -168, 1068, 0]$[-998, -168, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AmN-hteBEeufiOvRR5sVhg" id="(0.0,0.12244897959183673)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AmN-h9eBEeufiOvRR5sVhg" id="(1.0,0.3673469387755102)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_DlH_oNeBEeufiOvRR5sVhg" type="4001" element="_DkzPhteBEeufiOvRR5sVhg" source="_9Tu6ENeAEeufiOvRR5sVhg" target="_e73WIKA9EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_DlH_pNeBEeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DlH_pdeBEeufiOvRR5sVhg" x="-12" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_DlH_pteBEeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DlH_p9eBEeufiOvRR5sVhg" x="-12" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_DlH_qNeBEeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DlH_qdeBEeufiOvRR5sVhg" x="-12" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_DlH_odeBEeufiOvRR5sVhg" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_DlH_oteBEeufiOvRR5sVhg" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DlH_o9eBEeufiOvRR5sVhg" points="[0, -6, 1293, 192]$[0, -42, 1293, 156]$[-1292, -42, 1, 156]$[-1292, -100, 1, 98]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DlH_qteBEeufiOvRR5sVhg" id="(0.14084507042253522,0.061224489795918366)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DlH_q9eBEeufiOvRR5sVhg" id="(0.5,0.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_WiUCYNeBEeufiOvRR5sVhg" type="4001" element="_WiKRoteBEeufiOvRR5sVhg" source="_9Tu6ENeAEeufiOvRR5sVhg" target="_IsM5ENd_EeufiOvRR5sVhg">
+          <children xmi:type="notation:Node" xmi:id="_WiUCZNeBEeufiOvRR5sVhg" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WiUCZdeBEeufiOvRR5sVhg" x="-523" y="2"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_WiUCZteBEeufiOvRR5sVhg" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WiUCZ9eBEeufiOvRR5sVhg" x="-4" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_WiUCaNeBEeufiOvRR5sVhg" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WiUCadeBEeufiOvRR5sVhg" x="-118" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_WiUCYdeBEeufiOvRR5sVhg" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_WiUCYteBEeufiOvRR5sVhg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WiUCY9eBEeufiOvRR5sVhg" points="[0, 0, 96, -982]$[0, 1030, 96, 48]$[-74, 1030, 22, 48]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WiUCateBEeufiOvRR5sVhg" id="(0.5070422535211268,1.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WiUCa9eBEeufiOvRR5sVhg" id="(0.8135593220338984,0.0)"/>
+        </edges>
       </data>
     </ownedAnnotationEntries>
     <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_Csiy8KA4EeuqkpDnuik1sg" source="DANNOTATION_CUSTOMIZATION_KEY">
@@ -1533,13 +1843,13 @@
       </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="_p9d30KA8EeuqkpDnuik1sg" name="Assertion" tooltipText="" outgoingEdges="_w-iG36A8EeuqkpDnuik1sg _79nqlqA8EeuqkpDnuik1sg _mQFKsqA9EeuqkpDnuik1sg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_p9d30KA8EeuqkpDnuik1sg" name="Assertion" tooltipText="" outgoingEdges="_w-iG36A8EeuqkpDnuik1sg _mQFKsqA9EeuqkpDnuik1sg _YAoQHdeAEeufiOvRR5sVhg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Assertion"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Assertion"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_NgedbaA9EeuqkpDnuik1sg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_ZT0WKteAEeufiOvRR5sVhg" 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']"/>
@@ -1566,7 +1876,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="_QlymotbNEeuymriYTNxK2g" incomingEdges="_4eU5TqA8EeuqkpDnuik1sg _79nqlqA8EeuqkpDnuik1sg _-XLKltawEeuymriYTNxK2g _gRDCgNbGEeuymriYTNxK2g" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_xsYrUKA8EeuqkpDnuik1sg" name="Node" tooltipText="" outgoingEdges="_QlymotbNEeuymriYTNxK2g" incomingEdges="_4eU5TqA8EeuqkpDnuik1sg _-XLKltawEeuymriYTNxK2g _gRDCgNbGEeuymriYTNxK2g _vRo4VteAEeufiOvRR5sVhg _AmBxQNeBEeufiOvRR5sVhg" 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>
@@ -1590,20 +1900,6 @@
       </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="_79nqlqA8EeuqkpDnuik1sg" name="[0..*] arguments" sourceNode="_p9d30KA8EeuqkpDnuik1sg" targetNode="_xsYrUKA8EeuqkpDnuik1sg">
-      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Assertion/arguments"/>
-      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Assertion/arguments"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_79oRoKA8EeuqkpDnuik1sg" 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="_79oRoqA8EeuqkpDnuik1sg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_79oRoaA8EeuqkpDnuik1sg" 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="_BMXnYKA9EeuqkpDnuik1sg" name="LogicValue" tooltipText="" width="12" height="10">
       <target xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//LogicValue"/>
       <semanticElements xmi:type="ecore:EEnum" href="src/main/resources/model/problem.ecore#//LogicValue"/>
@@ -1650,7 +1946,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 _WX_5w9bGEeuymriYTNxK2g" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_e7ydoKA9EeuqkpDnuik1sg" name="Statement" tooltipText="" incomingEdges="_hU64ZqA9EeuqkpDnuik1sg _mQFKsqA9EeuqkpDnuik1sg _mzziwKA9EeuqkpDnuik1sg _plK3JqA9EeuqkpDnuik1sg _vdptgqA9EeuqkpDnuik1sg _WX_5w9bGEeuymriYTNxK2g _DkzPhteBEeufiOvRR5sVhg" 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>
@@ -1678,12 +1974,12 @@
     <ownedDiagramElements xmi:type="diagram:DEdge" uid="_mQFKsqA9EeuqkpDnuik1sg" sourceNode="_p9d30KA8EeuqkpDnuik1sg" targetNode="_e7ydoKA9EeuqkpDnuik1sg">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Assertion"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Assertion"/>
-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_mQFxsKA9EeuqkpDnuik1sg" lineStyle="dash" targetArrow="InputClosedArrow" routingStyle="tree">
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_ZT8SGteAEeufiOvRR5sVhg" 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="_mQFxsaA9EeuqkpDnuik1sg" showIcon="false">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_ZT8SG9eAEeufiOvRR5sVhg" showIcon="false">
           <labelFormat>italic</labelFormat>
         </beginLabelStyle>
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_mQFxsqA9EeuqkpDnuik1sg" showIcon="false"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_ZT8SHNeAEeufiOvRR5sVhg" 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>
@@ -1925,9 +2221,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%20ESupertypes']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_IwJ4MNYPEeuF_d0WEhR3Xw" name="Argument" tooltipText="" outgoingEdges="_T1fN5tYPEeuF_d0WEhR3Xw _bx-jYtYPEeuF_d0WEhR3Xw" incomingEdges="_KmxbkNYPEeuF_d0WEhR3Xw" width="12" height="10">
-      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Argument"/>
-      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Argument"/>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_IwJ4MNYPEeuF_d0WEhR3Xw" name="VariableOrNodeArgument" tooltipText="" outgoingEdges="_T1fN5tYPEeuF_d0WEhR3Xw _bx-jYtYPEeuF_d0WEhR3Xw _1HYZXNd_EeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNodeArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNodeArgument"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
       <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
       <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -1936,18 +2232,22 @@
       </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="_KmxbkNYPEeuF_d0WEhR3Xw" name="[0..*] arguments" sourceNode="_6J_bsKA6EeuqkpDnuik1sg" targetNode="_IwJ4MNYPEeuF_d0WEhR3Xw">
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_KmxbkNYPEeuF_d0WEhR3Xw" name="[0..*] arguments" sourceNode="_6J_bsKA6EeuqkpDnuik1sg" targetNode="_rwC2UNd_EeufiOvRR5sVhg">
       <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Atom/arguments"/>
       <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Atom/arguments"/>
       <ownedStyle xmi:type="diagram:EdgeStyle" uid="_P-mb4NYPEeuF_d0WEhR3Xw" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_P-mb4tYPEeuF_d0WEhR3Xw" showIcon="false"/>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_P-mb4dYPEeuF_d0WEhR3Xw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_P-mb4tYPEeuF_d0WEhR3Xw" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_P-mb4dYPEeuF_d0WEhR3Xw" 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: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"/>
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//VariableOrNodeArgument/variableOrNode"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//VariableOrNodeArgument/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">
@@ -1960,8 +2260,8 @@
       <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="_bx-jYtYPEeuF_d0WEhR3Xw" name="[0..1] singletonVariable" sourceNode="_IwJ4MNYPEeuF_d0WEhR3Xw" targetNode="_-O6CoKA6EeuqkpDnuik1sg">
-      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Argument/singletonVariable"/>
-      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Argument/singletonVariable"/>
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//VariableOrNodeArgument/singletonVariable"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//VariableOrNodeArgument/singletonVariable"/>
       <ownedStyle xmi:type="diagram:EdgeStyle" uid="_dcHJ49YPEeuF_d0WEhR3Xw" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
         <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_dcHJ5dYPEeuF_d0WEhR3Xw" showIcon="false"/>
         <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_dcHJ5NYPEeuF_d0WEhR3Xw" labelSize="6" showIcon="false" labelColor="39,76,114"/>
@@ -2077,6 +2377,319 @@
       </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:DNodeList" uid="_IrcrINd_EeufiOvRR5sVhg" name="Constant" tooltipText="" incomingEdges="_Vsm0XNd_EeufiOvRR5sVhg _WEGuVtd_EeufiOvRR5sVhg _Waktldd_EeufiOvRR5sVhg _nuG1dteAEeufiOvRR5sVhg _pMdCzNeAEeufiOvRR5sVhg _WiKRoteBEeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Constant"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Constant"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_J3H0Fdd_EeufiOvRR5sVhg" 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:DNodeList" uid="_KdTqUNd_EeufiOvRR5sVhg" name="IntConstant" tooltipText="" outgoingEdges="_Vsm0XNd_EeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//IntConstant"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//IntConstant"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_cid45dd_EeufiOvRR5sVhg" 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']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_brB6kNd_EeufiOvRR5sVhg" name="intValue : EInt = 0" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//IntConstant/intValue"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//IntConstant/intValue"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_cig8Mdd_EeufiOvRR5sVhg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_MARR4Nd_EeufiOvRR5sVhg" name="RealConstant" tooltipText="" outgoingEdges="_WEGuVtd_EeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RealConstant"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RealConstant"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_f7dN99d_EeufiOvRR5sVhg" 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']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_exQEoNd_EeufiOvRR5sVhg" name="realValue : EDouble = 0.0" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//RealConstant/realValue"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//RealConstant/realValue"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_f7fqMtd_EeufiOvRR5sVhg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Rv9_oNd_EeufiOvRR5sVhg" name="StringConstant" tooltipText="" outgoingEdges="_Waktldd_EeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//StringConstant"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//StringConstant"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_h2BdN9d_EeufiOvRR5sVhg" 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']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_g4rrMNd_EeufiOvRR5sVhg" name="stringValue : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//StringConstant/stringValue"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="src/main/resources/model/problem.ecore#//StringConstant/stringValue"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_h2Egg9d_EeufiOvRR5sVhg" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Vsm0XNd_EeufiOvRR5sVhg" sourceNode="_KdTqUNd_EeufiOvRR5sVhg" targetNode="_IrcrINd_EeufiOvRR5sVhg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//IntConstant"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//IntConstant"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_cioRGtd_EeufiOvRR5sVhg" 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="_cioRG9d_EeufiOvRR5sVhg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_cioRHNd_EeufiOvRR5sVhg" 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="_WEGuVtd_EeufiOvRR5sVhg" sourceNode="_MARR4Nd_EeufiOvRR5sVhg" targetNode="_IrcrINd_EeufiOvRR5sVhg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RealConstant"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//RealConstant"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_f7lJ9td_EeufiOvRR5sVhg" 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="_f7lJ99d_EeufiOvRR5sVhg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_f7lJ-Nd_EeufiOvRR5sVhg" 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="_Waktldd_EeufiOvRR5sVhg" sourceNode="_Rv9_oNd_EeufiOvRR5sVhg" targetNode="_IrcrINd_EeufiOvRR5sVhg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//StringConstant"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//StringConstant"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_h2LONtd_EeufiOvRR5sVhg" 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="_h2LON9d_EeufiOvRR5sVhg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_h2LOONd_EeufiOvRR5sVhg" 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:DNodeList" uid="_mCSCQNd_EeufiOvRR5sVhg" name="ConstantArgument" tooltipText="" outgoingEdges="_zhINQtd_EeufiOvRR5sVhg _nuG1dteAEeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ConstantArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ConstantArgument"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_mCSCQdd_EeufiOvRR5sVhg" 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:DNodeList" uid="_rwC2UNd_EeufiOvRR5sVhg" name="Argument" tooltipText="" incomingEdges="_KmxbkNYPEeuF_d0WEhR3Xw _zhINQtd_EeufiOvRR5sVhg _1HYZXNd_EeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Argument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Argument"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_uH9wANd_EeufiOvRR5sVhg" 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="_zhINQtd_EeufiOvRR5sVhg" sourceNode="_mCSCQNd_EeufiOvRR5sVhg" targetNode="_rwC2UNd_EeufiOvRR5sVhg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ConstantArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ConstantArgument"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_zhI0ENd_EeufiOvRR5sVhg" 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="_zhI0Edd_EeufiOvRR5sVhg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_zhI0Etd_EeufiOvRR5sVhg" 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="_1HYZXNd_EeufiOvRR5sVhg" sourceNode="_IwJ4MNYPEeuF_d0WEhR3Xw" targetNode="_rwC2UNd_EeufiOvRR5sVhg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNodeArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//VariableOrNodeArgument"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_1HYZXdd_EeufiOvRR5sVhg" 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="_1HYZXtd_EeufiOvRR5sVhg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_1HYZX9d_EeufiOvRR5sVhg" 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:DNodeList" uid="_OWYYMNeAEeufiOvRR5sVhg" name="NodeAssertionArgument" tooltipText="" outgoingEdges="_dDd3wteAEeufiOvRR5sVhg _vRo4VteAEeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NodeAssertionArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NodeAssertionArgument"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_OWY_QNeAEeufiOvRR5sVhg" 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:DNodeList" uid="_ViJbUNeAEeufiOvRR5sVhg" name="AssertionArgument" tooltipText="" incomingEdges="_YAoQHdeAEeufiOvRR5sVhg _dDd3wteAEeufiOvRR5sVhg _g_aI1teAEeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//AssertionArgument"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_XdUurteAEeufiOvRR5sVhg" 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="_YAoQHdeAEeufiOvRR5sVhg" name="[0..*] arguments" sourceNode="_p9d30KA8EeuqkpDnuik1sg" targetNode="_ViJbUNeAEeufiOvRR5sVhg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Assertion/arguments"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Assertion/arguments"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_YAo3ANeAEeufiOvRR5sVhg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_YAo3AteAEeufiOvRR5sVhg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_YAo3AdeAEeufiOvRR5sVhg" 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:DEdge" uid="_dDd3wteAEeufiOvRR5sVhg" sourceNode="_OWYYMNeAEeufiOvRR5sVhg" targetNode="_ViJbUNeAEeufiOvRR5sVhg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NodeAssertionArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NodeAssertionArgument"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_dDeewNeAEeufiOvRR5sVhg" 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="_dDeewdeAEeufiOvRR5sVhg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_dDeewteAEeufiOvRR5sVhg" 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:DNodeList" uid="_dZVaANeAEeufiOvRR5sVhg" name="ConstantAssertionArgument" tooltipText="" outgoingEdges="_g_aI1teAEeufiOvRR5sVhg _pMdCzNeAEeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ConstantAssertionArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ConstantAssertionArgument"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_dZVaAdeAEeufiOvRR5sVhg" 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="_g_aI1teAEeufiOvRR5sVhg" sourceNode="_dZVaANeAEeufiOvRR5sVhg" targetNode="_ViJbUNeAEeufiOvRR5sVhg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ConstantAssertionArgument"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ConstantAssertionArgument"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_g_aI19eAEeufiOvRR5sVhg" 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="_g_aI2NeAEeufiOvRR5sVhg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_g_aI2deAEeufiOvRR5sVhg" 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="_nuG1dteAEeufiOvRR5sVhg" name="[0..1] constant" sourceNode="_mCSCQNd_EeufiOvRR5sVhg" targetNode="_IrcrINd_EeufiOvRR5sVhg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ConstantArgument/constant"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ConstantArgument/constant"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_nuG1d9eAEeufiOvRR5sVhg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_nuG1edeAEeufiOvRR5sVhg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_nuG1eNeAEeufiOvRR5sVhg" 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:DEdge" uid="_pMdCzNeAEeufiOvRR5sVhg" name="[0..1] constant" sourceNode="_dZVaANeAEeufiOvRR5sVhg" targetNode="_IrcrINd_EeufiOvRR5sVhg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ConstantAssertionArgument/constant"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ConstantAssertionArgument/constant"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_pMdp0NeAEeufiOvRR5sVhg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_pMdp0teAEeufiOvRR5sVhg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_pMdp0deAEeufiOvRR5sVhg" 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:DEdge" uid="_vRo4VteAEeufiOvRR5sVhg" name="[0..1] node" sourceNode="_OWYYMNeAEeufiOvRR5sVhg" targetNode="_xsYrUKA8EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NodeAssertionArgument/node"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NodeAssertionArgument/node"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_vRo4V9eAEeufiOvRR5sVhg" 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="_vRo4WdeAEeufiOvRR5sVhg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_vRo4WNeAEeufiOvRR5sVhg" 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="_9TjT4NeAEeufiOvRR5sVhg" name="NodeValueAssertion" tooltipText="" outgoingEdges="_AmBxQNeBEeufiOvRR5sVhg _DkzPhteBEeufiOvRR5sVhg _WiKRoteBEeufiOvRR5sVhg" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NodeValueAssertion"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NodeValueAssertion"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_9Tj68NeAEeufiOvRR5sVhg" 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="_AmBxQNeBEeufiOvRR5sVhg" name="[0..1] node" sourceNode="_9TjT4NeAEeufiOvRR5sVhg" targetNode="_xsYrUKA8EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NodeValueAssertion/node"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NodeValueAssertion/node"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_AmBxQdeBEeufiOvRR5sVhg" 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="_AmBxQ9eBEeufiOvRR5sVhg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_AmBxQteBEeufiOvRR5sVhg" 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:DEdge" uid="_DkzPhteBEeufiOvRR5sVhg" sourceNode="_9TjT4NeAEeufiOvRR5sVhg" targetNode="_e7ydoKA9EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NodeValueAssertion"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NodeValueAssertion"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_DkzPh9eBEeufiOvRR5sVhg" 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="_DkzPiNeBEeufiOvRR5sVhg" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_DkzPideBEeufiOvRR5sVhg" 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="_WiKRoteBEeufiOvRR5sVhg" name="[0..1] value" sourceNode="_9TjT4NeAEeufiOvRR5sVhg" targetNode="_IrcrINd_EeufiOvRR5sVhg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NodeValueAssertion/value"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//NodeValueAssertion/value"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_WiK4cNeBEeufiOvRR5sVhg" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_WiK4cteBEeufiOvRR5sVhg" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_WiK4cdeBEeufiOvRR5sVhg" 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>
     <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/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Argument.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Argument.java
index 4857b38a..a027e914 100644
--- a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Argument.java
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Argument.java
@@ -9,61 +9,11 @@ import org.eclipse.emf.ecore.EObject;
  * A representation of the model object '<em><b>Argument</b></em>'.
  * <!-- end-user-doc -->
  *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <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>
  *
  * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getArgument()
- * @model
+ * @model abstract="true"
  * @generated
  */
 public interface Argument extends EObject {
-        /**
-         * 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 Or Node</em>' reference.
-         * @see #setVariableOrNode(VariableOrNode)
-         * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getArgument_VariableOrNode()
-         * @model
-         * @generated
-         */
-        VariableOrNode getVariableOrNode();
-
-        /**
-         * 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 Or Node</em>' reference.
-         * @see #getVariableOrNode()
-         * @generated
-         */
-        void setVariableOrNode(VariableOrNode value);
-
-        /**
-         * Returns the value of the '<em><b>Singleton Variable</b></em>' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the value of the '<em>Singleton Variable</em>' containment reference.
-         * @see #setSingletonVariable(ImplicitVariable)
-         * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getArgument_SingletonVariable()
-         * @model containment="true"
-         * @generated
-         */
-        ImplicitVariable getSingletonVariable();
-
-        /**
-         * Sets the value of the '{@link org.eclipse.viatra.solver.language.model.problem.Argument#getSingletonVariable <em>Singleton Variable</em>}' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param value the new value of the '<em>Singleton Variable</em>' containment reference.
-         * @see #getSingletonVariable()
-         * @generated
-         */
-        void setSingletonVariable(ImplicitVariable value);
 
 } // Argument
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Assertion.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Assertion.java
index 758212fb..16c7ecff 100644
--- a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Assertion.java
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Assertion.java
@@ -14,8 +14,8 @@ import org.eclipse.emf.common.util.EList;
  * </p>
  * <ul>
  *   <li>{@link org.eclipse.viatra.solver.language.model.problem.Assertion#getRelation <em>Relation</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.model.problem.Assertion#getArguments <em>Arguments</em>}</li>
  *   <li>{@link org.eclipse.viatra.solver.language.model.problem.Assertion#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.Assertion#getArguments <em>Arguments</em>}</li>
  * </ul>
  *
  * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getAssertion()
@@ -46,16 +46,16 @@ public interface Assertion extends Statement {
         void setRelation(Relation value);
 
         /**
-         * Returns the value of the '<em><b>Arguments</b></em>' reference list.
-         * The list contents are of type {@link org.eclipse.viatra.solver.language.model.problem.Node}.
+         * Returns the value of the '<em><b>Arguments</b></em>' containment reference list.
+         * The list contents are of type {@link org.eclipse.viatra.solver.language.model.problem.AssertionArgument}.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @return the value of the '<em>Arguments</em>' reference list.
+         * @return the value of the '<em>Arguments</em>' containment reference list.
          * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getAssertion_Arguments()
-         * @model
+         * @model containment="true"
          * @generated
          */
-        EList<Node> getArguments();
+        EList<AssertionArgument> getArguments();
 
         /**
          * Returns the value of the '<em><b>Value</b></em>' attribute.
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/AssertionArgument.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/AssertionArgument.java
new file mode 100644
index 00000000..054b34a2
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/AssertionArgument.java
@@ -0,0 +1,18 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Assertion Argument</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getAssertionArgument()
+ * @model abstract="true"
+ * @generated
+ */
+public interface AssertionArgument extends EObject {
+} // AssertionArgument
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Constant.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Constant.java
new file mode 100644
index 00000000..89f12830
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Constant.java
@@ -0,0 +1,18 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Constant</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getConstant()
+ * @model abstract="true"
+ * @generated
+ */
+public interface Constant extends EObject {
+} // Constant
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ConstantArgument.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ConstantArgument.java
new file mode 100644
index 00000000..96b631f0
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ConstantArgument.java
@@ -0,0 +1,44 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Constant Argument</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.ConstantArgument#getConstant <em>Constant</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getConstantArgument()
+ * @model
+ * @generated
+ */
+public interface ConstantArgument extends Argument {
+        /**
+         * Returns the value of the '<em><b>Constant</b></em>' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Constant</em>' containment reference.
+         * @see #setConstant(Constant)
+         * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getConstantArgument_Constant()
+         * @model containment="true"
+         * @generated
+         */
+        Constant getConstant();
+
+        /**
+         * Sets the value of the '{@link org.eclipse.viatra.solver.language.model.problem.ConstantArgument#getConstant <em>Constant</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Constant</em>' containment reference.
+         * @see #getConstant()
+         * @generated
+         */
+        void setConstant(Constant value);
+
+} // ConstantArgument
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ConstantAssertionArgument.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ConstantAssertionArgument.java
new file mode 100644
index 00000000..fd40de62
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ConstantAssertionArgument.java
@@ -0,0 +1,44 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Constant Assertion Argument</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.ConstantAssertionArgument#getConstant <em>Constant</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getConstantAssertionArgument()
+ * @model
+ * @generated
+ */
+public interface ConstantAssertionArgument extends AssertionArgument {
+        /**
+         * Returns the value of the '<em><b>Constant</b></em>' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Constant</em>' containment reference.
+         * @see #setConstant(Constant)
+         * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getConstantAssertionArgument_Constant()
+         * @model containment="true"
+         * @generated
+         */
+        Constant getConstant();
+
+        /**
+         * Sets the value of the '{@link org.eclipse.viatra.solver.language.model.problem.ConstantAssertionArgument#getConstant <em>Constant</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Constant</em>' containment reference.
+         * @see #getConstant()
+         * @generated
+         */
+        void setConstant(Constant value);
+
+} // ConstantAssertionArgument
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/IntConstant.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/IntConstant.java
new file mode 100644
index 00000000..8c42d183
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/IntConstant.java
@@ -0,0 +1,45 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Int Constant</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.IntConstant#getIntValue <em>Int Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getIntConstant()
+ * @model
+ * @generated
+ */
+public interface IntConstant extends Constant {
+        /**
+         * Returns the value of the '<em><b>Int Value</b></em>' attribute.
+         * The default value is <code>"0"</code>.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Int Value</em>' attribute.
+         * @see #setIntValue(int)
+         * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getIntConstant_IntValue()
+         * @model default="0"
+         * @generated
+         */
+        int getIntValue();
+
+        /**
+         * Sets the value of the '{@link org.eclipse.viatra.solver.language.model.problem.IntConstant#getIntValue <em>Int Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Int Value</em>' attribute.
+         * @see #getIntValue()
+         * @generated
+         */
+        void setIntValue(int value);
+
+} // IntConstant
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/NodeAssertionArgument.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/NodeAssertionArgument.java
new file mode 100644
index 00000000..fd006405
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/NodeAssertionArgument.java
@@ -0,0 +1,44 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Node Assertion Argument</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.NodeAssertionArgument#getNode <em>Node</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getNodeAssertionArgument()
+ * @model
+ * @generated
+ */
+public interface NodeAssertionArgument extends AssertionArgument {
+        /**
+         * Returns the value of the '<em><b>Node</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Node</em>' reference.
+         * @see #setNode(Node)
+         * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getNodeAssertionArgument_Node()
+         * @model
+         * @generated
+         */
+        Node getNode();
+
+        /**
+         * Sets the value of the '{@link org.eclipse.viatra.solver.language.model.problem.NodeAssertionArgument#getNode <em>Node</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Node</em>' reference.
+         * @see #getNode()
+         * @generated
+         */
+        void setNode(Node value);
+
+} // NodeAssertionArgument
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/NodeValueAssertion.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/NodeValueAssertion.java
new file mode 100644
index 00000000..bfe5901a
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/NodeValueAssertion.java
@@ -0,0 +1,67 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Node Value Assertion</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.NodeValueAssertion#getNode <em>Node</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.NodeValueAssertion#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getNodeValueAssertion()
+ * @model
+ * @generated
+ */
+public interface NodeValueAssertion extends Statement {
+        /**
+         * Returns the value of the '<em><b>Node</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Node</em>' reference.
+         * @see #setNode(Node)
+         * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getNodeValueAssertion_Node()
+         * @model
+         * @generated
+         */
+        Node getNode();
+
+        /**
+         * Sets the value of the '{@link org.eclipse.viatra.solver.language.model.problem.NodeValueAssertion#getNode <em>Node</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Node</em>' reference.
+         * @see #getNode()
+         * @generated
+         */
+        void setNode(Node value);
+
+        /**
+         * Returns the value of the '<em><b>Value</b></em>' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Value</em>' containment reference.
+         * @see #setValue(Constant)
+         * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getNodeValueAssertion_Value()
+         * @model containment="true"
+         * @generated
+         */
+        Constant getValue();
+
+        /**
+         * Sets the value of the '{@link org.eclipse.viatra.solver.language.model.problem.NodeValueAssertion#getValue <em>Value</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Value</em>' containment reference.
+         * @see #getValue()
+         * @generated
+         */
+        void setValue(Constant value);
+
+} // NodeValueAssertion
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemFactory.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemFactory.java
index e4332d19..bb97cbc9 100644
--- a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemFactory.java
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemFactory.java
@@ -166,13 +166,13 @@ public interface ProblemFactory extends EFactory {
         UnboundedMultiplicity createUnboundedMultiplicity();
 
         /**
-         * Returns a new object of class '<em>Argument</em>'.
+         * Returns a new object of class '<em>Variable Or Node Argument</em>'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @return a new object of class '<em>Argument</em>'.
+         * @return a new object of class '<em>Variable Or Node Argument</em>'.
          * @generated
          */
-        Argument createArgument();
+        VariableOrNodeArgument createVariableOrNodeArgument();
 
         /**
          * Returns a new object of class '<em>Enum Declaration</em>'.
@@ -184,6 +184,69 @@ public interface ProblemFactory extends EFactory {
         EnumDeclaration createEnumDeclaration();
 
         /**
+         * Returns a new object of class '<em>Int Constant</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Int Constant</em>'.
+         * @generated
+         */
+        IntConstant createIntConstant();
+
+        /**
+         * Returns a new object of class '<em>Real Constant</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Real Constant</em>'.
+         * @generated
+         */
+        RealConstant createRealConstant();
+
+        /**
+         * Returns a new object of class '<em>String Constant</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>String Constant</em>'.
+         * @generated
+         */
+        StringConstant createStringConstant();
+
+        /**
+         * Returns a new object of class '<em>Constant Argument</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Constant Argument</em>'.
+         * @generated
+         */
+        ConstantArgument createConstantArgument();
+
+        /**
+         * Returns a new object of class '<em>Node Assertion Argument</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Node Assertion Argument</em>'.
+         * @generated
+         */
+        NodeAssertionArgument createNodeAssertionArgument();
+
+        /**
+         * Returns a new object of class '<em>Constant Assertion Argument</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Constant Assertion Argument</em>'.
+         * @generated
+         */
+        ConstantAssertionArgument createConstantAssertionArgument();
+
+        /**
+         * Returns a new object of class '<em>Node Value Assertion</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Node Value Assertion</em>'.
+         * @generated
+         */
+        NodeValueAssertion createNodeValueAssertion();
+
+        /**
          * Returns the package supported by this factory.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemPackage.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemPackage.java
index ec96501d..b711566a 100644
--- a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemPackage.java
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemPackage.java
@@ -813,22 +813,22 @@ public interface ProblemPackage extends EPackage {
         int ASSERTION__RELATION = STATEMENT_FEATURE_COUNT + 0;
 
         /**
-         * The feature id for the '<em><b>Arguments</b></em>' reference list.
+         * The feature id for the '<em><b>Value</b></em>' attribute.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int ASSERTION__ARGUMENTS = STATEMENT_FEATURE_COUNT + 1;
+        int ASSERTION__VALUE = STATEMENT_FEATURE_COUNT + 1;
 
         /**
-         * The feature id for the '<em><b>Value</b></em>' attribute.
+         * The feature id for the '<em><b>Arguments</b></em>' containment reference list.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int ASSERTION__VALUE = STATEMENT_FEATURE_COUNT + 2;
+        int ASSERTION__ARGUMENTS = STATEMENT_FEATURE_COUNT + 2;
 
         /**
          * The number of structural features of the '<em>Assertion</em>' class.
@@ -1124,7 +1124,35 @@ public interface ProblemPackage extends EPackage {
          * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getArgument()
          * @generated
          */
-        int ARGUMENT = 23;
+        int ARGUMENT = 31;
+
+        /**
+         * The number of structural features of the '<em>Argument</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int ARGUMENT_FEATURE_COUNT = 0;
+
+        /**
+         * The number of operations of the '<em>Argument</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int ARGUMENT_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.VariableOrNodeArgumentImpl <em>Variable Or Node Argument</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.VariableOrNodeArgumentImpl
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getVariableOrNodeArgument()
+         * @generated
+         */
+        int VARIABLE_OR_NODE_ARGUMENT = 23;
 
         /**
          * The feature id for the '<em><b>Variable Or Node</b></em>' reference.
@@ -1133,7 +1161,7 @@ public interface ProblemPackage extends EPackage {
          * @generated
          * @ordered
          */
-        int ARGUMENT__VARIABLE_OR_NODE = 0;
+        int VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE = ARGUMENT_FEATURE_COUNT + 0;
 
         /**
          * The feature id for the '<em><b>Singleton Variable</b></em>' containment reference.
@@ -1142,25 +1170,25 @@ public interface ProblemPackage extends EPackage {
          * @generated
          * @ordered
          */
-        int ARGUMENT__SINGLETON_VARIABLE = 1;
+        int VARIABLE_OR_NODE_ARGUMENT__SINGLETON_VARIABLE = ARGUMENT_FEATURE_COUNT + 1;
 
         /**
-         * The number of structural features of the '<em>Argument</em>' class.
+         * The number of structural features of the '<em>Variable Or Node Argument</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int ARGUMENT_FEATURE_COUNT = 2;
+        int VARIABLE_OR_NODE_ARGUMENT_FEATURE_COUNT = ARGUMENT_FEATURE_COUNT + 2;
 
         /**
-         * The number of operations of the '<em>Argument</em>' class.
+         * The number of operations of the '<em>Variable Or Node Argument</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int ARGUMENT_OPERATION_COUNT = 0;
+        int VARIABLE_OR_NODE_ARGUMENT_OPERATION_COUNT = 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.
@@ -1209,6 +1237,330 @@ public interface ProblemPackage extends EPackage {
         int ENUM_DECLARATION_OPERATION_COUNT = RELATION_OPERATION_COUNT + 0;
 
         /**
+         * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.ConstantImpl <em>Constant</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ConstantImpl
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getConstant()
+         * @generated
+         */
+        int CONSTANT = 26;
+
+        /**
+         * The number of structural features of the '<em>Constant</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CONSTANT_FEATURE_COUNT = 0;
+
+        /**
+         * The number of operations of the '<em>Constant</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CONSTANT_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.IntConstantImpl <em>Int Constant</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.IntConstantImpl
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getIntConstant()
+         * @generated
+         */
+        int INT_CONSTANT = 27;
+
+        /**
+         * The feature id for the '<em><b>Int Value</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int INT_CONSTANT__INT_VALUE = CONSTANT_FEATURE_COUNT + 0;
+
+        /**
+         * The number of structural features of the '<em>Int Constant</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int INT_CONSTANT_FEATURE_COUNT = CONSTANT_FEATURE_COUNT + 1;
+
+        /**
+         * The number of operations of the '<em>Int Constant</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int INT_CONSTANT_OPERATION_COUNT = CONSTANT_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.RealConstantImpl <em>Real Constant</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.RealConstantImpl
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getRealConstant()
+         * @generated
+         */
+        int REAL_CONSTANT = 28;
+
+        /**
+         * The feature id for the '<em><b>Real Value</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REAL_CONSTANT__REAL_VALUE = CONSTANT_FEATURE_COUNT + 0;
+
+        /**
+         * The number of structural features of the '<em>Real Constant</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REAL_CONSTANT_FEATURE_COUNT = CONSTANT_FEATURE_COUNT + 1;
+
+        /**
+         * The number of operations of the '<em>Real Constant</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REAL_CONSTANT_OPERATION_COUNT = CONSTANT_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.StringConstantImpl <em>String Constant</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.StringConstantImpl
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getStringConstant()
+         * @generated
+         */
+        int STRING_CONSTANT = 29;
+
+        /**
+         * The feature id for the '<em><b>String Value</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int STRING_CONSTANT__STRING_VALUE = CONSTANT_FEATURE_COUNT + 0;
+
+        /**
+         * The number of structural features of the '<em>String Constant</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int STRING_CONSTANT_FEATURE_COUNT = CONSTANT_FEATURE_COUNT + 1;
+
+        /**
+         * The number of operations of the '<em>String Constant</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int STRING_CONSTANT_OPERATION_COUNT = CONSTANT_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.ConstantArgumentImpl <em>Constant Argument</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ConstantArgumentImpl
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getConstantArgument()
+         * @generated
+         */
+        int CONSTANT_ARGUMENT = 30;
+
+        /**
+         * The feature id for the '<em><b>Constant</b></em>' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CONSTANT_ARGUMENT__CONSTANT = ARGUMENT_FEATURE_COUNT + 0;
+
+        /**
+         * The number of structural features of the '<em>Constant Argument</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CONSTANT_ARGUMENT_FEATURE_COUNT = ARGUMENT_FEATURE_COUNT + 1;
+
+        /**
+         * The number of operations of the '<em>Constant Argument</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CONSTANT_ARGUMENT_OPERATION_COUNT = ARGUMENT_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.AssertionArgumentImpl <em>Assertion Argument</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.AssertionArgumentImpl
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getAssertionArgument()
+         * @generated
+         */
+        int ASSERTION_ARGUMENT = 33;
+
+        /**
+         * The number of structural features of the '<em>Assertion Argument</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int ASSERTION_ARGUMENT_FEATURE_COUNT = 0;
+
+        /**
+         * The number of operations of the '<em>Assertion Argument</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int ASSERTION_ARGUMENT_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.NodeAssertionArgumentImpl <em>Node Assertion Argument</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.NodeAssertionArgumentImpl
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getNodeAssertionArgument()
+         * @generated
+         */
+        int NODE_ASSERTION_ARGUMENT = 32;
+
+        /**
+         * The feature id for the '<em><b>Node</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int NODE_ASSERTION_ARGUMENT__NODE = ASSERTION_ARGUMENT_FEATURE_COUNT + 0;
+
+        /**
+         * The number of structural features of the '<em>Node Assertion Argument</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int NODE_ASSERTION_ARGUMENT_FEATURE_COUNT = ASSERTION_ARGUMENT_FEATURE_COUNT + 1;
+
+        /**
+         * The number of operations of the '<em>Node Assertion Argument</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int NODE_ASSERTION_ARGUMENT_OPERATION_COUNT = ASSERTION_ARGUMENT_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.ConstantAssertionArgumentImpl <em>Constant Assertion Argument</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ConstantAssertionArgumentImpl
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getConstantAssertionArgument()
+         * @generated
+         */
+        int CONSTANT_ASSERTION_ARGUMENT = 34;
+
+        /**
+         * The feature id for the '<em><b>Constant</b></em>' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CONSTANT_ASSERTION_ARGUMENT__CONSTANT = ASSERTION_ARGUMENT_FEATURE_COUNT + 0;
+
+        /**
+         * The number of structural features of the '<em>Constant Assertion Argument</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CONSTANT_ASSERTION_ARGUMENT_FEATURE_COUNT = ASSERTION_ARGUMENT_FEATURE_COUNT + 1;
+
+        /**
+         * The number of operations of the '<em>Constant Assertion Argument</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CONSTANT_ASSERTION_ARGUMENT_OPERATION_COUNT = ASSERTION_ARGUMENT_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.NodeValueAssertionImpl <em>Node Value Assertion</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.NodeValueAssertionImpl
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getNodeValueAssertion()
+         * @generated
+         */
+        int NODE_VALUE_ASSERTION = 35;
+
+        /**
+         * The feature id for the '<em><b>Node</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int NODE_VALUE_ASSERTION__NODE = STATEMENT_FEATURE_COUNT + 0;
+
+        /**
+         * The feature id for the '<em><b>Value</b></em>' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int NODE_VALUE_ASSERTION__VALUE = STATEMENT_FEATURE_COUNT + 1;
+
+        /**
+         * The number of structural features of the '<em>Node Value Assertion</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int NODE_VALUE_ASSERTION_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 2;
+
+        /**
+         * The number of operations of the '<em>Node Value Assertion</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int NODE_VALUE_ASSERTION_OPERATION_COUNT = STATEMENT_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 -->
@@ -1216,7 +1568,7 @@ public interface ProblemPackage extends EPackage {
          * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getLogicValue()
          * @generated
          */
-        int LOGIC_VALUE = 26;
+        int LOGIC_VALUE = 36;
 
         /**
          * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.Problem <em>Problem</em>}'.
@@ -1611,10 +1963,10 @@ public interface ProblemPackage extends EPackage {
         EReference getAssertion_Relation();
 
         /**
-         * Returns the meta object for the reference list '{@link org.eclipse.viatra.solver.language.model.problem.Assertion#getArguments <em>Arguments</em>}'.
+         * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.model.problem.Assertion#getArguments <em>Arguments</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @return the meta object for the reference list '<em>Arguments</em>'.
+         * @return the meta object for the containment reference list '<em>Arguments</em>'.
          * @see org.eclipse.viatra.solver.language.model.problem.Assertion#getArguments()
          * @see #getAssertion()
          * @generated
@@ -1790,6 +2142,38 @@ public interface ProblemPackage extends EPackage {
         EClass getUnboundedMultiplicity();
 
         /**
+         * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument <em>Variable Or Node Argument</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Variable Or Node Argument</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument
+         * @generated
+         */
+        EClass getVariableOrNodeArgument();
+
+        /**
+         * Returns the meta object for the reference '{@link org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument#getVariableOrNode <em>Variable Or Node</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference '<em>Variable Or Node</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument#getVariableOrNode()
+         * @see #getVariableOrNodeArgument()
+         * @generated
+         */
+        EReference getVariableOrNodeArgument_VariableOrNode();
+
+        /**
+         * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument#getSingletonVariable <em>Singleton Variable</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference '<em>Singleton Variable</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument#getSingletonVariable()
+         * @see #getVariableOrNodeArgument()
+         * @generated
+         */
+        EReference getVariableOrNodeArgument_SingletonVariable();
+
+        /**
          * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.Argument <em>Argument</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -1800,26 +2184,88 @@ public interface ProblemPackage extends EPackage {
         EClass getArgument();
 
         /**
-         * Returns the meta object for the reference '{@link org.eclipse.viatra.solver.language.model.problem.Argument#getVariableOrNode <em>Variable Or Node</em>}'.
+         * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.NodeAssertionArgument <em>Node Assertion Argument</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @return the meta object for the reference '<em>Variable Or Node</em>'.
-         * @see org.eclipse.viatra.solver.language.model.problem.Argument#getVariableOrNode()
-         * @see #getArgument()
+         * @return the meta object for class '<em>Node Assertion Argument</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.NodeAssertionArgument
          * @generated
          */
-        EReference getArgument_VariableOrNode();
+        EClass getNodeAssertionArgument();
 
         /**
-         * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.model.problem.Argument#getSingletonVariable <em>Singleton Variable</em>}'.
+         * Returns the meta object for the reference '{@link org.eclipse.viatra.solver.language.model.problem.NodeAssertionArgument#getNode <em>Node</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @return the meta object for the containment reference '<em>Singleton Variable</em>'.
-         * @see org.eclipse.viatra.solver.language.model.problem.Argument#getSingletonVariable()
-         * @see #getArgument()
+         * @return the meta object for the reference '<em>Node</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.NodeAssertionArgument#getNode()
+         * @see #getNodeAssertionArgument()
          * @generated
          */
-        EReference getArgument_SingletonVariable();
+        EReference getNodeAssertionArgument_Node();
+
+        /**
+         * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.AssertionArgument <em>Assertion Argument</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Assertion Argument</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.AssertionArgument
+         * @generated
+         */
+        EClass getAssertionArgument();
+
+        /**
+         * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.ConstantAssertionArgument <em>Constant Assertion Argument</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Constant Assertion Argument</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.ConstantAssertionArgument
+         * @generated
+         */
+        EClass getConstantAssertionArgument();
+
+        /**
+         * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.model.problem.ConstantAssertionArgument#getConstant <em>Constant</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference '<em>Constant</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.ConstantAssertionArgument#getConstant()
+         * @see #getConstantAssertionArgument()
+         * @generated
+         */
+        EReference getConstantAssertionArgument_Constant();
+
+        /**
+         * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.NodeValueAssertion <em>Node Value Assertion</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Node Value Assertion</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.NodeValueAssertion
+         * @generated
+         */
+        EClass getNodeValueAssertion();
+
+        /**
+         * Returns the meta object for the reference '{@link org.eclipse.viatra.solver.language.model.problem.NodeValueAssertion#getNode <em>Node</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference '<em>Node</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.NodeValueAssertion#getNode()
+         * @see #getNodeValueAssertion()
+         * @generated
+         */
+        EReference getNodeValueAssertion_Node();
+
+        /**
+         * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.model.problem.NodeValueAssertion#getValue <em>Value</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference '<em>Value</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.NodeValueAssertion#getValue()
+         * @see #getNodeValueAssertion()
+         * @generated
+         */
+        EReference getNodeValueAssertion_Value();
 
         /**
          * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.EnumDeclaration <em>Enum Declaration</em>}'.
@@ -1853,6 +2299,100 @@ public interface ProblemPackage extends EPackage {
         EClass getVariableOrNode();
 
         /**
+         * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.Constant <em>Constant</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Constant</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.Constant
+         * @generated
+         */
+        EClass getConstant();
+
+        /**
+         * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.IntConstant <em>Int Constant</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Int Constant</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.IntConstant
+         * @generated
+         */
+        EClass getIntConstant();
+
+        /**
+         * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.model.problem.IntConstant#getIntValue <em>Int Value</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Int Value</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.IntConstant#getIntValue()
+         * @see #getIntConstant()
+         * @generated
+         */
+        EAttribute getIntConstant_IntValue();
+
+        /**
+         * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.RealConstant <em>Real Constant</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Real Constant</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.RealConstant
+         * @generated
+         */
+        EClass getRealConstant();
+
+        /**
+         * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.model.problem.RealConstant#getRealValue <em>Real Value</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Real Value</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.RealConstant#getRealValue()
+         * @see #getRealConstant()
+         * @generated
+         */
+        EAttribute getRealConstant_RealValue();
+
+        /**
+         * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.StringConstant <em>String Constant</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>String Constant</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.StringConstant
+         * @generated
+         */
+        EClass getStringConstant();
+
+        /**
+         * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.model.problem.StringConstant#getStringValue <em>String Value</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>String Value</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.StringConstant#getStringValue()
+         * @see #getStringConstant()
+         * @generated
+         */
+        EAttribute getStringConstant_StringValue();
+
+        /**
+         * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.ConstantArgument <em>Constant Argument</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Constant Argument</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.ConstantArgument
+         * @generated
+         */
+        EClass getConstantArgument();
+
+        /**
+         * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.model.problem.ConstantArgument#getConstant <em>Constant</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference '<em>Constant</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.ConstantArgument#getConstant()
+         * @see #getConstantArgument()
+         * @generated
+         */
+        EReference getConstantArgument_Constant();
+
+        /**
          * 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 -->
@@ -2212,7 +2752,7 @@ public interface ProblemPackage extends EPackage {
                 EReference ASSERTION__RELATION = eINSTANCE.getAssertion_Relation();
 
                 /**
-                 * The meta object literal for the '<em><b>Arguments</b></em>' reference list feature.
+                 * The meta object literal for the '<em><b>Arguments</b></em>' containment reference list feature.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
                  * @generated
@@ -2364,6 +2904,33 @@ public interface ProblemPackage extends EPackage {
                 EClass UNBOUNDED_MULTIPLICITY = eINSTANCE.getUnboundedMultiplicity();
 
                 /**
+                 * The meta object literal for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.VariableOrNodeArgumentImpl <em>Variable Or Node Argument</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.VariableOrNodeArgumentImpl
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getVariableOrNodeArgument()
+                 * @generated
+                 */
+                EClass VARIABLE_OR_NODE_ARGUMENT = eINSTANCE.getVariableOrNodeArgument();
+
+                /**
+                 * The meta object literal for the '<em><b>Variable Or Node</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE = eINSTANCE.getVariableOrNodeArgument_VariableOrNode();
+
+                /**
+                 * The meta object literal for the '<em><b>Singleton Variable</b></em>' containment reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference VARIABLE_OR_NODE_ARGUMENT__SINGLETON_VARIABLE = eINSTANCE
+                                .getVariableOrNodeArgument_SingletonVariable();
+
+                /**
                  * The meta object literal for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.ArgumentImpl <em>Argument</em>}' class.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
@@ -2374,20 +2941,76 @@ public interface ProblemPackage extends EPackage {
                 EClass ARGUMENT = eINSTANCE.getArgument();
 
                 /**
-                 * The meta object literal for the '<em><b>Variable Or Node</b></em>' reference feature.
+                 * The meta object literal for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.NodeAssertionArgumentImpl <em>Node Assertion Argument</em>}' class.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.NodeAssertionArgumentImpl
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getNodeAssertionArgument()
                  * @generated
                  */
-                EReference ARGUMENT__VARIABLE_OR_NODE = eINSTANCE.getArgument_VariableOrNode();
+                EClass NODE_ASSERTION_ARGUMENT = eINSTANCE.getNodeAssertionArgument();
 
                 /**
-                 * The meta object literal for the '<em><b>Singleton Variable</b></em>' containment reference feature.
+                 * The meta object literal for the '<em><b>Node</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference NODE_ASSERTION_ARGUMENT__NODE = eINSTANCE.getNodeAssertionArgument_Node();
+
+                /**
+                 * The meta object literal for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.AssertionArgumentImpl <em>Assertion Argument</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.AssertionArgumentImpl
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getAssertionArgument()
+                 * @generated
+                 */
+                EClass ASSERTION_ARGUMENT = eINSTANCE.getAssertionArgument();
+
+                /**
+                 * The meta object literal for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.ConstantAssertionArgumentImpl <em>Constant Assertion Argument</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.ConstantAssertionArgumentImpl
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getConstantAssertionArgument()
+                 * @generated
+                 */
+                EClass CONSTANT_ASSERTION_ARGUMENT = eINSTANCE.getConstantAssertionArgument();
+
+                /**
+                 * The meta object literal for the '<em><b>Constant</b></em>' containment reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference CONSTANT_ASSERTION_ARGUMENT__CONSTANT = eINSTANCE.getConstantAssertionArgument_Constant();
+
+                /**
+                 * The meta object literal for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.NodeValueAssertionImpl <em>Node Value Assertion</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.NodeValueAssertionImpl
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getNodeValueAssertion()
+                 * @generated
+                 */
+                EClass NODE_VALUE_ASSERTION = eINSTANCE.getNodeValueAssertion();
+
+                /**
+                 * The meta object literal for the '<em><b>Node</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference NODE_VALUE_ASSERTION__NODE = eINSTANCE.getNodeValueAssertion_Node();
+
+                /**
+                 * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
                  * @generated
                  */
-                EReference ARGUMENT__SINGLETON_VARIABLE = eINSTANCE.getArgument_SingletonVariable();
+                EReference NODE_VALUE_ASSERTION__VALUE = eINSTANCE.getNodeValueAssertion_Value();
 
                 /**
                  * The meta object literal for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.EnumDeclarationImpl <em>Enum Declaration</em>}' class.
@@ -2418,6 +3041,88 @@ public interface ProblemPackage extends EPackage {
                 EClass VARIABLE_OR_NODE = eINSTANCE.getVariableOrNode();
 
                 /**
+                 * The meta object literal for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.ConstantImpl <em>Constant</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.ConstantImpl
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getConstant()
+                 * @generated
+                 */
+                EClass CONSTANT = eINSTANCE.getConstant();
+
+                /**
+                 * The meta object literal for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.IntConstantImpl <em>Int Constant</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.IntConstantImpl
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getIntConstant()
+                 * @generated
+                 */
+                EClass INT_CONSTANT = eINSTANCE.getIntConstant();
+
+                /**
+                 * The meta object literal for the '<em><b>Int Value</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute INT_CONSTANT__INT_VALUE = eINSTANCE.getIntConstant_IntValue();
+
+                /**
+                 * The meta object literal for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.RealConstantImpl <em>Real Constant</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.RealConstantImpl
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getRealConstant()
+                 * @generated
+                 */
+                EClass REAL_CONSTANT = eINSTANCE.getRealConstant();
+
+                /**
+                 * The meta object literal for the '<em><b>Real Value</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute REAL_CONSTANT__REAL_VALUE = eINSTANCE.getRealConstant_RealValue();
+
+                /**
+                 * The meta object literal for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.StringConstantImpl <em>String Constant</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.StringConstantImpl
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getStringConstant()
+                 * @generated
+                 */
+                EClass STRING_CONSTANT = eINSTANCE.getStringConstant();
+
+                /**
+                 * The meta object literal for the '<em><b>String Value</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute STRING_CONSTANT__STRING_VALUE = eINSTANCE.getStringConstant_StringValue();
+
+                /**
+                 * The meta object literal for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.ConstantArgumentImpl <em>Constant Argument</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.ConstantArgumentImpl
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getConstantArgument()
+                 * @generated
+                 */
+                EClass CONSTANT_ARGUMENT = eINSTANCE.getConstantArgument();
+
+                /**
+                 * The meta object literal for the '<em><b>Constant</b></em>' containment reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference CONSTANT_ARGUMENT__CONSTANT = eINSTANCE.getConstantArgument_Constant();
+
+                /**
                  * 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/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/RealConstant.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/RealConstant.java
new file mode 100644
index 00000000..7ece8fb9
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/RealConstant.java
@@ -0,0 +1,45 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Real Constant</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.RealConstant#getRealValue <em>Real Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getRealConstant()
+ * @model
+ * @generated
+ */
+public interface RealConstant extends Constant {
+        /**
+         * Returns the value of the '<em><b>Real Value</b></em>' attribute.
+         * The default value is <code>"0.0"</code>.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Real Value</em>' attribute.
+         * @see #setRealValue(double)
+         * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getRealConstant_RealValue()
+         * @model default="0.0"
+         * @generated
+         */
+        double getRealValue();
+
+        /**
+         * Sets the value of the '{@link org.eclipse.viatra.solver.language.model.problem.RealConstant#getRealValue <em>Real Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Real Value</em>' attribute.
+         * @see #getRealValue()
+         * @generated
+         */
+        void setRealValue(double value);
+
+} // RealConstant
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/StringConstant.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/StringConstant.java
new file mode 100644
index 00000000..5a6c6ec8
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/StringConstant.java
@@ -0,0 +1,44 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>String Constant</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.StringConstant#getStringValue <em>String Value</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getStringConstant()
+ * @model
+ * @generated
+ */
+public interface StringConstant extends Constant {
+        /**
+         * Returns the value of the '<em><b>String Value</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>String Value</em>' attribute.
+         * @see #setStringValue(String)
+         * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getStringConstant_StringValue()
+         * @model
+         * @generated
+         */
+        String getStringValue();
+
+        /**
+         * Sets the value of the '{@link org.eclipse.viatra.solver.language.model.problem.StringConstant#getStringValue <em>String Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>String Value</em>' attribute.
+         * @see #getStringValue()
+         * @generated
+         */
+        void setStringValue(String value);
+
+} // StringConstant
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/VariableOrNodeArgument.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/VariableOrNodeArgument.java
new file mode 100644
index 00000000..02032585
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/VariableOrNodeArgument.java
@@ -0,0 +1,67 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Variable Or Node Argument</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument#getVariableOrNode <em>Variable Or Node</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument#getSingletonVariable <em>Singleton Variable</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getVariableOrNodeArgument()
+ * @model
+ * @generated
+ */
+public interface VariableOrNodeArgument extends Argument {
+        /**
+         * 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 Or Node</em>' reference.
+         * @see #setVariableOrNode(VariableOrNode)
+         * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getVariableOrNodeArgument_VariableOrNode()
+         * @model
+         * @generated
+         */
+        VariableOrNode getVariableOrNode();
+
+        /**
+         * Sets the value of the '{@link org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument#getVariableOrNode <em>Variable Or Node</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Variable Or Node</em>' reference.
+         * @see #getVariableOrNode()
+         * @generated
+         */
+        void setVariableOrNode(VariableOrNode value);
+
+        /**
+         * Returns the value of the '<em><b>Singleton Variable</b></em>' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Singleton Variable</em>' containment reference.
+         * @see #setSingletonVariable(ImplicitVariable)
+         * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getVariableOrNodeArgument_SingletonVariable()
+         * @model containment="true"
+         * @generated
+         */
+        ImplicitVariable getSingletonVariable();
+
+        /**
+         * Sets the value of the '{@link org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument#getSingletonVariable <em>Singleton Variable</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Singleton Variable</em>' containment reference.
+         * @see #getSingletonVariable()
+         * @generated
+         */
+        void setSingletonVariable(ImplicitVariable value);
+
+} // VariableOrNodeArgument
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ArgumentImpl.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ArgumentImpl.java
index f7d045ca..68b23c09 100644
--- a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ArgumentImpl.java
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ArgumentImpl.java
@@ -2,55 +2,20 @@
  */
 package org.eclipse.viatra.solver.language.model.problem.impl;
 
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
 import org.eclipse.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.VariableOrNode;
 
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Argument</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <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>
  *
  * @generated
  */
-public class ArgumentImpl extends MinimalEObjectImpl.Container implements Argument {
-        /**
-         * The cached value of the '{@link #getVariableOrNode() <em>Variable Or Node</em>}' reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getVariableOrNode()
-         * @generated
-         * @ordered
-         */
-        protected VariableOrNode variableOrNode;
-
-        /**
-         * The cached value of the '{@link #getSingletonVariable() <em>Singleton Variable</em>}' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getSingletonVariable()
-         * @generated
-         * @ordered
-         */
-        protected ImplicitVariable singletonVariable;
-
+public abstract class ArgumentImpl extends MinimalEObjectImpl.Container implements Argument {
         /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -70,178 +35,4 @@ public class ArgumentImpl extends MinimalEObjectImpl.Container implements Argume
                 return ProblemPackage.Literals.ARGUMENT;
         }
 
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        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_OR_NODE,
-                                                        oldVariableOrNode, variableOrNode));
-                        }
-                }
-                return variableOrNode;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public VariableOrNode basicGetVariableOrNode() {
-                return variableOrNode;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public void setVariableOrNode(VariableOrNode newVariableOrNode) {
-                VariableOrNode oldVariableOrNode = variableOrNode;
-                variableOrNode = newVariableOrNode;
-                if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET, ProblemPackage.ARGUMENT__VARIABLE_OR_NODE,
-                                        oldVariableOrNode, variableOrNode));
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public ImplicitVariable getSingletonVariable() {
-                return singletonVariable;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public NotificationChain basicSetSingletonVariable(ImplicitVariable newSingletonVariable, NotificationChain msgs) {
-                ImplicitVariable oldSingletonVariable = singletonVariable;
-                singletonVariable = newSingletonVariable;
-                if (eNotificationRequired()) {
-                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-                                        ProblemPackage.ARGUMENT__SINGLETON_VARIABLE, oldSingletonVariable, newSingletonVariable);
-                        if (msgs == null)
-                                msgs = notification;
-                        else
-                                msgs.add(notification);
-                }
-                return msgs;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public void setSingletonVariable(ImplicitVariable newSingletonVariable) {
-                if (newSingletonVariable != singletonVariable) {
-                        NotificationChain msgs = null;
-                        if (singletonVariable != null)
-                                msgs = ((InternalEObject) singletonVariable).eInverseRemove(this,
-                                                EOPPOSITE_FEATURE_BASE - ProblemPackage.ARGUMENT__SINGLETON_VARIABLE, null, msgs);
-                        if (newSingletonVariable != null)
-                                msgs = ((InternalEObject) newSingletonVariable).eInverseAdd(this,
-                                                EOPPOSITE_FEATURE_BASE - ProblemPackage.ARGUMENT__SINGLETON_VARIABLE, null, msgs);
-                        msgs = basicSetSingletonVariable(newSingletonVariable, msgs);
-                        if (msgs != null)
-                                msgs.dispatch();
-                } else if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET, ProblemPackage.ARGUMENT__SINGLETON_VARIABLE,
-                                        newSingletonVariable, newSingletonVariable));
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-                switch (featureID) {
-                case ProblemPackage.ARGUMENT__SINGLETON_VARIABLE:
-                        return basicSetSingletonVariable(null, msgs);
-                }
-                return super.eInverseRemove(otherEnd, featureID, msgs);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public Object eGet(int featureID, boolean resolve, boolean coreType) {
-                switch (featureID) {
-                case ProblemPackage.ARGUMENT__VARIABLE_OR_NODE:
-                        if (resolve)
-                                return getVariableOrNode();
-                        return basicGetVariableOrNode();
-                case ProblemPackage.ARGUMENT__SINGLETON_VARIABLE:
-                        return getSingletonVariable();
-                }
-                return super.eGet(featureID, resolve, coreType);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void eSet(int featureID, Object newValue) {
-                switch (featureID) {
-                case ProblemPackage.ARGUMENT__VARIABLE_OR_NODE:
-                        setVariableOrNode((VariableOrNode) newValue);
-                        return;
-                case ProblemPackage.ARGUMENT__SINGLETON_VARIABLE:
-                        setSingletonVariable((ImplicitVariable) newValue);
-                        return;
-                }
-                super.eSet(featureID, newValue);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void eUnset(int featureID) {
-                switch (featureID) {
-                case ProblemPackage.ARGUMENT__VARIABLE_OR_NODE:
-                        setVariableOrNode((VariableOrNode) null);
-                        return;
-                case ProblemPackage.ARGUMENT__SINGLETON_VARIABLE:
-                        setSingletonVariable((ImplicitVariable) null);
-                        return;
-                }
-                super.eUnset(featureID);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public boolean eIsSet(int featureID) {
-                switch (featureID) {
-                case ProblemPackage.ARGUMENT__VARIABLE_OR_NODE:
-                        return variableOrNode != null;
-                case ProblemPackage.ARGUMENT__SINGLETON_VARIABLE:
-                        return singletonVariable != null;
-                }
-                return super.eIsSet(featureID);
-        }
-
 } //ArgumentImpl
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/AssertionArgumentImpl.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/AssertionArgumentImpl.java
new file mode 100644
index 00000000..af41b241
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/AssertionArgumentImpl.java
@@ -0,0 +1,39 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.viatra.solver.language.model.problem.AssertionArgument;
+import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Assertion Argument</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class AssertionArgumentImpl extends MinimalEObjectImpl.Container implements AssertionArgument {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected AssertionArgumentImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return ProblemPackage.Literals.ASSERTION_ARGUMENT;
+        }
+
+} //AssertionArgumentImpl
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/AssertionImpl.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/AssertionImpl.java
index 5856a276..2567d57b 100644
--- a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/AssertionImpl.java
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/AssertionImpl.java
@@ -6,6 +6,7 @@ import java.util.Collection;
 
 import org.eclipse.emf.common.notify.Notification;
 
+import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
 
 import org.eclipse.emf.ecore.EClass;
@@ -14,11 +15,11 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.viatra.solver.language.model.problem.Assertion;
+import org.eclipse.viatra.solver.language.model.problem.AssertionArgument;
 import org.eclipse.viatra.solver.language.model.problem.LogicValue;
-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.Relation;
 
@@ -31,8 +32,8 @@ import org.eclipse.viatra.solver.language.model.problem.Relation;
  * </p>
  * <ul>
  *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.AssertionImpl#getRelation <em>Relation</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.AssertionImpl#getArguments <em>Arguments</em>}</li>
  *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.AssertionImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.AssertionImpl#getArguments <em>Arguments</em>}</li>
  * </ul>
  *
  * @generated
@@ -49,34 +50,34 @@ public class AssertionImpl extends MinimalEObjectImpl.Container implements Asser
         protected Relation relation;
 
         /**
-         * The cached value of the '{@link #getArguments() <em>Arguments</em>}' reference list.
+         * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see #getArguments()
+         * @see #getValue()
          * @generated
          * @ordered
          */
-        protected EList<Node> arguments;
+        protected static final LogicValue VALUE_EDEFAULT = LogicValue.TRUE;
 
         /**
-         * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+         * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @see #getValue()
          * @generated
          * @ordered
          */
-        protected static final LogicValue VALUE_EDEFAULT = LogicValue.TRUE;
+        protected LogicValue value = VALUE_EDEFAULT;
 
         /**
-         * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+         * The cached value of the '{@link #getArguments() <em>Arguments</em>}' containment reference list.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see #getValue()
+         * @see #getArguments()
          * @generated
          * @ordered
          */
-        protected LogicValue value = VALUE_EDEFAULT;
+        protected EList<AssertionArgument> arguments;
 
         /**
          * <!-- begin-user-doc -->
@@ -142,9 +143,10 @@ public class AssertionImpl extends MinimalEObjectImpl.Container implements Asser
          * <!-- end-user-doc -->
          * @generated
          */
-        public EList<Node> getArguments() {
+        public EList<AssertionArgument> getArguments() {
                 if (arguments == null) {
-                        arguments = new EObjectResolvingEList<Node>(Node.class, this, ProblemPackage.ASSERTION__ARGUMENTS);
+                        arguments = new EObjectContainmentEList<AssertionArgument>(AssertionArgument.class, this,
+                                        ProblemPackage.ASSERTION__ARGUMENTS);
                 }
                 return arguments;
         }
@@ -154,6 +156,20 @@ public class AssertionImpl extends MinimalEObjectImpl.Container implements Asser
          * <!-- end-user-doc -->
          * @generated
          */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case ProblemPackage.ASSERTION__ARGUMENTS:
+                        return ((InternalEList<?>) getArguments()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         public LogicValue getValue() {
                 return value;
         }
@@ -182,10 +198,10 @@ public class AssertionImpl extends MinimalEObjectImpl.Container implements Asser
                         if (resolve)
                                 return getRelation();
                         return basicGetRelation();
-                case ProblemPackage.ASSERTION__ARGUMENTS:
-                        return getArguments();
                 case ProblemPackage.ASSERTION__VALUE:
                         return getValue();
+                case ProblemPackage.ASSERTION__ARGUMENTS:
+                        return getArguments();
                 }
                 return super.eGet(featureID, resolve, coreType);
         }
@@ -202,13 +218,13 @@ public class AssertionImpl extends MinimalEObjectImpl.Container implements Asser
                 case ProblemPackage.ASSERTION__RELATION:
                         setRelation((Relation) newValue);
                         return;
-                case ProblemPackage.ASSERTION__ARGUMENTS:
-                        getArguments().clear();
-                        getArguments().addAll((Collection<? extends Node>) newValue);
-                        return;
                 case ProblemPackage.ASSERTION__VALUE:
                         setValue((LogicValue) newValue);
                         return;
+                case ProblemPackage.ASSERTION__ARGUMENTS:
+                        getArguments().clear();
+                        getArguments().addAll((Collection<? extends AssertionArgument>) newValue);
+                        return;
                 }
                 super.eSet(featureID, newValue);
         }
@@ -224,12 +240,12 @@ public class AssertionImpl extends MinimalEObjectImpl.Container implements Asser
                 case ProblemPackage.ASSERTION__RELATION:
                         setRelation((Relation) null);
                         return;
-                case ProblemPackage.ASSERTION__ARGUMENTS:
-                        getArguments().clear();
-                        return;
                 case ProblemPackage.ASSERTION__VALUE:
                         setValue(VALUE_EDEFAULT);
                         return;
+                case ProblemPackage.ASSERTION__ARGUMENTS:
+                        getArguments().clear();
+                        return;
                 }
                 super.eUnset(featureID);
         }
@@ -244,10 +260,10 @@ public class AssertionImpl extends MinimalEObjectImpl.Container implements Asser
                 switch (featureID) {
                 case ProblemPackage.ASSERTION__RELATION:
                         return relation != null;
-                case ProblemPackage.ASSERTION__ARGUMENTS:
-                        return arguments != null && !arguments.isEmpty();
                 case ProblemPackage.ASSERTION__VALUE:
                         return value != VALUE_EDEFAULT;
+                case ProblemPackage.ASSERTION__ARGUMENTS:
+                        return arguments != null && !arguments.isEmpty();
                 }
                 return super.eIsSet(featureID);
         }
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ConstantArgumentImpl.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ConstantArgumentImpl.java
new file mode 100644
index 00000000..10798200
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ConstantArgumentImpl.java
@@ -0,0 +1,182 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.viatra.solver.language.model.problem.Constant;
+import org.eclipse.viatra.solver.language.model.problem.ConstantArgument;
+import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Constant Argument</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.ConstantArgumentImpl#getConstant <em>Constant</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ConstantArgumentImpl extends ArgumentImpl implements ConstantArgument {
+        /**
+         * The cached value of the '{@link #getConstant() <em>Constant</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getConstant()
+         * @generated
+         * @ordered
+         */
+        protected Constant constant;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ConstantArgumentImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return ProblemPackage.Literals.CONSTANT_ARGUMENT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Constant getConstant() {
+                return constant;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetConstant(Constant newConstant, NotificationChain msgs) {
+                Constant oldConstant = constant;
+                constant = newConstant;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+                                        ProblemPackage.CONSTANT_ARGUMENT__CONSTANT, oldConstant, newConstant);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setConstant(Constant newConstant) {
+                if (newConstant != constant) {
+                        NotificationChain msgs = null;
+                        if (constant != null)
+                                msgs = ((InternalEObject) constant).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - ProblemPackage.CONSTANT_ARGUMENT__CONSTANT, null, msgs);
+                        if (newConstant != null)
+                                msgs = ((InternalEObject) newConstant).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - ProblemPackage.CONSTANT_ARGUMENT__CONSTANT, null, msgs);
+                        msgs = basicSetConstant(newConstant, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, ProblemPackage.CONSTANT_ARGUMENT__CONSTANT,
+                                        newConstant, newConstant));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case ProblemPackage.CONSTANT_ARGUMENT__CONSTANT:
+                        return basicSetConstant(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case ProblemPackage.CONSTANT_ARGUMENT__CONSTANT:
+                        return getConstant();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                case ProblemPackage.CONSTANT_ARGUMENT__CONSTANT:
+                        setConstant((Constant) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case ProblemPackage.CONSTANT_ARGUMENT__CONSTANT:
+                        setConstant((Constant) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case ProblemPackage.CONSTANT_ARGUMENT__CONSTANT:
+                        return constant != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //ConstantArgumentImpl
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ConstantAssertionArgumentImpl.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ConstantAssertionArgumentImpl.java
new file mode 100644
index 00000000..6b5b3ed2
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ConstantAssertionArgumentImpl.java
@@ -0,0 +1,182 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.viatra.solver.language.model.problem.Constant;
+import org.eclipse.viatra.solver.language.model.problem.ConstantAssertionArgument;
+import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Constant Assertion Argument</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.ConstantAssertionArgumentImpl#getConstant <em>Constant</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ConstantAssertionArgumentImpl extends AssertionArgumentImpl implements ConstantAssertionArgument {
+        /**
+         * The cached value of the '{@link #getConstant() <em>Constant</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getConstant()
+         * @generated
+         * @ordered
+         */
+        protected Constant constant;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ConstantAssertionArgumentImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return ProblemPackage.Literals.CONSTANT_ASSERTION_ARGUMENT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Constant getConstant() {
+                return constant;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetConstant(Constant newConstant, NotificationChain msgs) {
+                Constant oldConstant = constant;
+                constant = newConstant;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+                                        ProblemPackage.CONSTANT_ASSERTION_ARGUMENT__CONSTANT, oldConstant, newConstant);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setConstant(Constant newConstant) {
+                if (newConstant != constant) {
+                        NotificationChain msgs = null;
+                        if (constant != null)
+                                msgs = ((InternalEObject) constant).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - ProblemPackage.CONSTANT_ASSERTION_ARGUMENT__CONSTANT, null, msgs);
+                        if (newConstant != null)
+                                msgs = ((InternalEObject) newConstant).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - ProblemPackage.CONSTANT_ASSERTION_ARGUMENT__CONSTANT, null, msgs);
+                        msgs = basicSetConstant(newConstant, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, ProblemPackage.CONSTANT_ASSERTION_ARGUMENT__CONSTANT,
+                                        newConstant, newConstant));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case ProblemPackage.CONSTANT_ASSERTION_ARGUMENT__CONSTANT:
+                        return basicSetConstant(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case ProblemPackage.CONSTANT_ASSERTION_ARGUMENT__CONSTANT:
+                        return getConstant();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                case ProblemPackage.CONSTANT_ASSERTION_ARGUMENT__CONSTANT:
+                        setConstant((Constant) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case ProblemPackage.CONSTANT_ASSERTION_ARGUMENT__CONSTANT:
+                        setConstant((Constant) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case ProblemPackage.CONSTANT_ASSERTION_ARGUMENT__CONSTANT:
+                        return constant != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //ConstantAssertionArgumentImpl
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ConstantImpl.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ConstantImpl.java
new file mode 100644
index 00000000..14be4fb4
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ConstantImpl.java
@@ -0,0 +1,39 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.viatra.solver.language.model.problem.Constant;
+import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Constant</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class ConstantImpl extends MinimalEObjectImpl.Container implements Constant {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ConstantImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return ProblemPackage.Literals.CONSTANT;
+        }
+
+} //ConstantImpl
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/IntConstantImpl.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/IntConstantImpl.java
new file mode 100644
index 00000000..1a0da417
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/IntConstantImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.viatra.solver.language.model.problem.IntConstant;
+import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Int Constant</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.IntConstantImpl#getIntValue <em>Int Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class IntConstantImpl extends ConstantImpl implements IntConstant {
+        /**
+         * The default value of the '{@link #getIntValue() <em>Int Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getIntValue()
+         * @generated
+         * @ordered
+         */
+        protected static final int INT_VALUE_EDEFAULT = 0;
+
+        /**
+         * The cached value of the '{@link #getIntValue() <em>Int Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getIntValue()
+         * @generated
+         * @ordered
+         */
+        protected int intValue = INT_VALUE_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected IntConstantImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return ProblemPackage.Literals.INT_CONSTANT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public int getIntValue() {
+                return intValue;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setIntValue(int newIntValue) {
+                int oldIntValue = intValue;
+                intValue = newIntValue;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, ProblemPackage.INT_CONSTANT__INT_VALUE, oldIntValue,
+                                        intValue));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case ProblemPackage.INT_CONSTANT__INT_VALUE:
+                        return getIntValue();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                case ProblemPackage.INT_CONSTANT__INT_VALUE:
+                        setIntValue((Integer) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case ProblemPackage.INT_CONSTANT__INT_VALUE:
+                        setIntValue(INT_VALUE_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case ProblemPackage.INT_CONSTANT__INT_VALUE:
+                        return intValue != INT_VALUE_EDEFAULT;
+                }
+                return super.eIsSet(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy())
+                        return super.toString();
+
+                StringBuilder result = new StringBuilder(super.toString());
+                result.append(" (intValue: ");
+                result.append(intValue);
+                result.append(')');
+                return result.toString();
+        }
+
+} //IntConstantImpl
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/NodeAssertionArgumentImpl.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/NodeAssertionArgumentImpl.java
new file mode 100644
index 00000000..27a702fd
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/NodeAssertionArgumentImpl.java
@@ -0,0 +1,159 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+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.Node;
+import org.eclipse.viatra.solver.language.model.problem.NodeAssertionArgument;
+import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Node Assertion Argument</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.NodeAssertionArgumentImpl#getNode <em>Node</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class NodeAssertionArgumentImpl extends AssertionArgumentImpl implements NodeAssertionArgument {
+        /**
+         * The cached value of the '{@link #getNode() <em>Node</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getNode()
+         * @generated
+         * @ordered
+         */
+        protected Node node;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected NodeAssertionArgumentImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return ProblemPackage.Literals.NODE_ASSERTION_ARGUMENT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Node getNode() {
+                if (node != null && node.eIsProxy()) {
+                        InternalEObject oldNode = (InternalEObject) node;
+                        node = (Node) eResolveProxy(oldNode);
+                        if (node != oldNode) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+                                                        ProblemPackage.NODE_ASSERTION_ARGUMENT__NODE, oldNode, node));
+                        }
+                }
+                return node;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Node basicGetNode() {
+                return node;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setNode(Node newNode) {
+                Node oldNode = node;
+                node = newNode;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, ProblemPackage.NODE_ASSERTION_ARGUMENT__NODE, oldNode,
+                                        node));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case ProblemPackage.NODE_ASSERTION_ARGUMENT__NODE:
+                        if (resolve)
+                                return getNode();
+                        return basicGetNode();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                case ProblemPackage.NODE_ASSERTION_ARGUMENT__NODE:
+                        setNode((Node) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case ProblemPackage.NODE_ASSERTION_ARGUMENT__NODE:
+                        setNode((Node) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case ProblemPackage.NODE_ASSERTION_ARGUMENT__NODE:
+                        return node != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //NodeAssertionArgumentImpl
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/NodeValueAssertionImpl.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/NodeValueAssertionImpl.java
new file mode 100644
index 00000000..0078b35e
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/NodeValueAssertionImpl.java
@@ -0,0 +1,247 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.viatra.solver.language.model.problem.Constant;
+import org.eclipse.viatra.solver.language.model.problem.Node;
+import org.eclipse.viatra.solver.language.model.problem.NodeValueAssertion;
+import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Node Value Assertion</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.NodeValueAssertionImpl#getNode <em>Node</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.NodeValueAssertionImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class NodeValueAssertionImpl extends MinimalEObjectImpl.Container implements NodeValueAssertion {
+        /**
+         * The cached value of the '{@link #getNode() <em>Node</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getNode()
+         * @generated
+         * @ordered
+         */
+        protected Node node;
+
+        /**
+         * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected Constant value;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected NodeValueAssertionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return ProblemPackage.Literals.NODE_VALUE_ASSERTION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Node getNode() {
+                if (node != null && node.eIsProxy()) {
+                        InternalEObject oldNode = (InternalEObject) node;
+                        node = (Node) eResolveProxy(oldNode);
+                        if (node != oldNode) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, ProblemPackage.NODE_VALUE_ASSERTION__NODE,
+                                                        oldNode, node));
+                        }
+                }
+                return node;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Node basicGetNode() {
+                return node;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setNode(Node newNode) {
+                Node oldNode = node;
+                node = newNode;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, ProblemPackage.NODE_VALUE_ASSERTION__NODE, oldNode,
+                                        node));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Constant getValue() {
+                return value;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetValue(Constant newValue, NotificationChain msgs) {
+                Constant oldValue = value;
+                value = newValue;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+                                        ProblemPackage.NODE_VALUE_ASSERTION__VALUE, oldValue, newValue);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setValue(Constant newValue) {
+                if (newValue != value) {
+                        NotificationChain msgs = null;
+                        if (value != null)
+                                msgs = ((InternalEObject) value).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - ProblemPackage.NODE_VALUE_ASSERTION__VALUE, null, msgs);
+                        if (newValue != null)
+                                msgs = ((InternalEObject) newValue).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - ProblemPackage.NODE_VALUE_ASSERTION__VALUE, null, msgs);
+                        msgs = basicSetValue(newValue, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, ProblemPackage.NODE_VALUE_ASSERTION__VALUE, newValue,
+                                        newValue));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case ProblemPackage.NODE_VALUE_ASSERTION__VALUE:
+                        return basicSetValue(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case ProblemPackage.NODE_VALUE_ASSERTION__NODE:
+                        if (resolve)
+                                return getNode();
+                        return basicGetNode();
+                case ProblemPackage.NODE_VALUE_ASSERTION__VALUE:
+                        return getValue();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                case ProblemPackage.NODE_VALUE_ASSERTION__NODE:
+                        setNode((Node) newValue);
+                        return;
+                case ProblemPackage.NODE_VALUE_ASSERTION__VALUE:
+                        setValue((Constant) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case ProblemPackage.NODE_VALUE_ASSERTION__NODE:
+                        setNode((Node) null);
+                        return;
+                case ProblemPackage.NODE_VALUE_ASSERTION__VALUE:
+                        setValue((Constant) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case ProblemPackage.NODE_VALUE_ASSERTION__NODE:
+                        return node != null;
+                case ProblemPackage.NODE_VALUE_ASSERTION__VALUE:
+                        return value != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //NodeValueAssertionImpl
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemFactoryImpl.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemFactoryImpl.java
index 2f4144b9..27da13e2 100644
--- a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemFactoryImpl.java
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemFactoryImpl.java
@@ -89,10 +89,24 @@ public class ProblemFactoryImpl extends EFactoryImpl implements ProblemFactory {
                         return createExactMultiplicity();
                 case ProblemPackage.UNBOUNDED_MULTIPLICITY:
                         return createUnboundedMultiplicity();
-                case ProblemPackage.ARGUMENT:
-                        return createArgument();
+                case ProblemPackage.VARIABLE_OR_NODE_ARGUMENT:
+                        return createVariableOrNodeArgument();
                 case ProblemPackage.ENUM_DECLARATION:
                         return createEnumDeclaration();
+                case ProblemPackage.INT_CONSTANT:
+                        return createIntConstant();
+                case ProblemPackage.REAL_CONSTANT:
+                        return createRealConstant();
+                case ProblemPackage.STRING_CONSTANT:
+                        return createStringConstant();
+                case ProblemPackage.CONSTANT_ARGUMENT:
+                        return createConstantArgument();
+                case ProblemPackage.NODE_ASSERTION_ARGUMENT:
+                        return createNodeAssertionArgument();
+                case ProblemPackage.CONSTANT_ASSERTION_ARGUMENT:
+                        return createConstantAssertionArgument();
+                case ProblemPackage.NODE_VALUE_ASSERTION:
+                        return createNodeValueAssertion();
                 default:
                         throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
                 }
@@ -293,9 +307,9 @@ public class ProblemFactoryImpl extends EFactoryImpl implements ProblemFactory {
          * <!-- end-user-doc -->
          * @generated
          */
-        public Argument createArgument() {
-                ArgumentImpl argument = new ArgumentImpl();
-                return argument;
+        public VariableOrNodeArgument createVariableOrNodeArgument() {
+                VariableOrNodeArgumentImpl variableOrNodeArgument = new VariableOrNodeArgumentImpl();
+                return variableOrNodeArgument;
         }
 
         /**
@@ -313,6 +327,76 @@ public class ProblemFactoryImpl extends EFactoryImpl implements ProblemFactory {
          * <!-- end-user-doc -->
          * @generated
          */
+        public IntConstant createIntConstant() {
+                IntConstantImpl intConstant = new IntConstantImpl();
+                return intConstant;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public RealConstant createRealConstant() {
+                RealConstantImpl realConstant = new RealConstantImpl();
+                return realConstant;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public StringConstant createStringConstant() {
+                StringConstantImpl stringConstant = new StringConstantImpl();
+                return stringConstant;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ConstantArgument createConstantArgument() {
+                ConstantArgumentImpl constantArgument = new ConstantArgumentImpl();
+                return constantArgument;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NodeAssertionArgument createNodeAssertionArgument() {
+                NodeAssertionArgumentImpl nodeAssertionArgument = new NodeAssertionArgumentImpl();
+                return nodeAssertionArgument;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ConstantAssertionArgument createConstantAssertionArgument() {
+                ConstantAssertionArgumentImpl constantAssertionArgument = new ConstantAssertionArgumentImpl();
+                return constantAssertionArgument;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NodeValueAssertion createNodeValueAssertion() {
+                NodeValueAssertionImpl nodeValueAssertion = new NodeValueAssertionImpl();
+                return nodeValueAssertion;
+        }
+
+        /**
+         * <!-- 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/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemPackageImpl.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemPackageImpl.java
index d10ff2f0..ee72c538 100644
--- a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemPackageImpl.java
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemPackageImpl.java
@@ -12,33 +12,43 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
 
 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.AssertionArgument;
 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.Constant;
+import org.eclipse.viatra.solver.language.model.problem.ConstantArgument;
+import org.eclipse.viatra.solver.language.model.problem.ConstantAssertionArgument;
 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;
+import org.eclipse.viatra.solver.language.model.problem.IntConstant;
 import org.eclipse.viatra.solver.language.model.problem.Literal;
 import org.eclipse.viatra.solver.language.model.problem.LogicValue;
 import org.eclipse.viatra.solver.language.model.problem.Multiplicity;
 import org.eclipse.viatra.solver.language.model.problem.NamedElement;
 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.NodeAssertionArgument;
+import org.eclipse.viatra.solver.language.model.problem.NodeValueAssertion;
 import org.eclipse.viatra.solver.language.model.problem.Parameter;
 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.ProblemFactory;
 import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
 import org.eclipse.viatra.solver.language.model.problem.RangeMultiplicity;
+import org.eclipse.viatra.solver.language.model.problem.RealConstant;
 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.ScopeDeclaration;
 import org.eclipse.viatra.solver.language.model.problem.Statement;
+import org.eclipse.viatra.solver.language.model.problem.StringConstant;
 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;
+import org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument;
 
 /**
  * <!-- begin-user-doc -->
@@ -213,6 +223,13 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
          * <!-- end-user-doc -->
          * @generated
          */
+        private EClass variableOrNodeArgumentEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         private EClass argumentEClass = null;
 
         /**
@@ -220,6 +237,34 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
          * <!-- end-user-doc -->
          * @generated
          */
+        private EClass nodeAssertionArgumentEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass assertionArgumentEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass constantAssertionArgumentEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass nodeValueAssertionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         private EClass enumDeclarationEClass = null;
 
         /**
@@ -234,6 +279,41 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
          * <!-- end-user-doc -->
          * @generated
          */
+        private EClass constantEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass intConstantEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass realConstantEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass stringConstantEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass constantArgumentEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         private EEnum logicValueEEnum = null;
 
         /**
@@ -639,7 +719,7 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
          * @generated
          */
         public EReference getAssertion_Arguments() {
-                return (EReference) assertionEClass.getEStructuralFeatures().get(1);
+                return (EReference) assertionEClass.getEStructuralFeatures().get(2);
         }
 
         /**
@@ -648,7 +728,7 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
          * @generated
          */
         public EAttribute getAssertion_Value() {
-                return (EAttribute) assertionEClass.getEStructuralFeatures().get(2);
+                return (EAttribute) assertionEClass.getEStructuralFeatures().get(1);
         }
 
         /**
@@ -791,6 +871,33 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
          * <!-- end-user-doc -->
          * @generated
          */
+        public EClass getVariableOrNodeArgument() {
+                return variableOrNodeArgumentEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getVariableOrNodeArgument_VariableOrNode() {
+                return (EReference) variableOrNodeArgumentEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getVariableOrNodeArgument_SingletonVariable() {
+                return (EReference) variableOrNodeArgumentEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         public EClass getArgument() {
                 return argumentEClass;
         }
@@ -800,8 +907,8 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        public EReference getArgument_VariableOrNode() {
-                return (EReference) argumentEClass.getEStructuralFeatures().get(0);
+        public EClass getNodeAssertionArgument() {
+                return nodeAssertionArgumentEClass;
         }
 
         /**
@@ -809,8 +916,62 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
          * <!-- end-user-doc -->
          * @generated
          */
-        public EReference getArgument_SingletonVariable() {
-                return (EReference) argumentEClass.getEStructuralFeatures().get(1);
+        public EReference getNodeAssertionArgument_Node() {
+                return (EReference) nodeAssertionArgumentEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getAssertionArgument() {
+                return assertionArgumentEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getConstantAssertionArgument() {
+                return constantAssertionArgumentEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getConstantAssertionArgument_Constant() {
+                return (EReference) constantAssertionArgumentEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getNodeValueAssertion() {
+                return nodeValueAssertionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getNodeValueAssertion_Node() {
+                return (EReference) nodeValueAssertionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getNodeValueAssertion_Value() {
+                return (EReference) nodeValueAssertionEClass.getEStructuralFeatures().get(1);
         }
 
         /**
@@ -845,6 +1006,87 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
          * <!-- end-user-doc -->
          * @generated
          */
+        public EClass getConstant() {
+                return constantEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getIntConstant() {
+                return intConstantEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getIntConstant_IntValue() {
+                return (EAttribute) intConstantEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getRealConstant() {
+                return realConstantEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getRealConstant_RealValue() {
+                return (EAttribute) realConstantEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getStringConstant() {
+                return stringConstantEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getStringConstant_StringValue() {
+                return (EAttribute) stringConstantEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getConstantArgument() {
+                return constantArgumentEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getConstantArgument_Constant() {
+                return (EReference) constantArgumentEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         public EEnum getLogicValue() {
                 return logicValueEEnum;
         }
@@ -929,8 +1171,8 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
 
                 assertionEClass = createEClass(ASSERTION);
                 createEReference(assertionEClass, ASSERTION__RELATION);
-                createEReference(assertionEClass, ASSERTION__ARGUMENTS);
                 createEAttribute(assertionEClass, ASSERTION__VALUE);
+                createEReference(assertionEClass, ASSERTION__ARGUMENTS);
 
                 nodeEClass = createEClass(NODE);
 
@@ -955,15 +1197,43 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
 
                 unboundedMultiplicityEClass = createEClass(UNBOUNDED_MULTIPLICITY);
 
-                argumentEClass = createEClass(ARGUMENT);
-                createEReference(argumentEClass, ARGUMENT__VARIABLE_OR_NODE);
-                createEReference(argumentEClass, ARGUMENT__SINGLETON_VARIABLE);
+                variableOrNodeArgumentEClass = createEClass(VARIABLE_OR_NODE_ARGUMENT);
+                createEReference(variableOrNodeArgumentEClass, VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE);
+                createEReference(variableOrNodeArgumentEClass, VARIABLE_OR_NODE_ARGUMENT__SINGLETON_VARIABLE);
 
                 enumDeclarationEClass = createEClass(ENUM_DECLARATION);
                 createEReference(enumDeclarationEClass, ENUM_DECLARATION__LITERALS);
 
                 variableOrNodeEClass = createEClass(VARIABLE_OR_NODE);
 
+                constantEClass = createEClass(CONSTANT);
+
+                intConstantEClass = createEClass(INT_CONSTANT);
+                createEAttribute(intConstantEClass, INT_CONSTANT__INT_VALUE);
+
+                realConstantEClass = createEClass(REAL_CONSTANT);
+                createEAttribute(realConstantEClass, REAL_CONSTANT__REAL_VALUE);
+
+                stringConstantEClass = createEClass(STRING_CONSTANT);
+                createEAttribute(stringConstantEClass, STRING_CONSTANT__STRING_VALUE);
+
+                constantArgumentEClass = createEClass(CONSTANT_ARGUMENT);
+                createEReference(constantArgumentEClass, CONSTANT_ARGUMENT__CONSTANT);
+
+                argumentEClass = createEClass(ARGUMENT);
+
+                nodeAssertionArgumentEClass = createEClass(NODE_ASSERTION_ARGUMENT);
+                createEReference(nodeAssertionArgumentEClass, NODE_ASSERTION_ARGUMENT__NODE);
+
+                assertionArgumentEClass = createEClass(ASSERTION_ARGUMENT);
+
+                constantAssertionArgumentEClass = createEClass(CONSTANT_ASSERTION_ARGUMENT);
+                createEReference(constantAssertionArgumentEClass, CONSTANT_ASSERTION_ARGUMENT__CONSTANT);
+
+                nodeValueAssertionEClass = createEClass(NODE_VALUE_ASSERTION);
+                createEReference(nodeValueAssertionEClass, NODE_VALUE_ASSERTION__NODE);
+                createEReference(nodeValueAssertionEClass, NODE_VALUE_ASSERTION__VALUE);
+
                 // Create enums
                 logicValueEEnum = createEEnum(LOGIC_VALUE);
         }
@@ -1017,9 +1287,17 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
                 rangeMultiplicityEClass.getESuperTypes().add(this.getMultiplicity());
                 exactMultiplicityEClass.getESuperTypes().add(this.getMultiplicity());
                 unboundedMultiplicityEClass.getESuperTypes().add(this.getMultiplicity());
+                variableOrNodeArgumentEClass.getESuperTypes().add(this.getArgument());
                 enumDeclarationEClass.getESuperTypes().add(this.getRelation());
                 enumDeclarationEClass.getESuperTypes().add(this.getStatement());
                 variableOrNodeEClass.getESuperTypes().add(this.getNamedElement());
+                intConstantEClass.getESuperTypes().add(this.getConstant());
+                realConstantEClass.getESuperTypes().add(this.getConstant());
+                stringConstantEClass.getESuperTypes().add(this.getConstant());
+                constantArgumentEClass.getESuperTypes().add(this.getArgument());
+                nodeAssertionArgumentEClass.getESuperTypes().add(this.getAssertionArgument());
+                constantAssertionArgumentEClass.getESuperTypes().add(this.getAssertionArgument());
+                nodeValueAssertionEClass.getESuperTypes().add(this.getStatement());
 
                 // Initialize classes, features, and operations; add parameters
                 initEClass(problemEClass, Problem.class, "Problem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1126,11 +1404,11 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
                 initEReference(getAssertion_Relation(), this.getRelation(), null, "relation", null, 0, 1, Assertion.class,
                                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
                                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-                initEReference(getAssertion_Arguments(), this.getNode(), null, "arguments", null, 0, -1, Assertion.class,
-                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEAttribute(getAssertion_Value(), this.getLogicValue(), "value", null, 0, 1, Assertion.class, !IS_TRANSIENT,
                                 !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getAssertion_Arguments(), this.getAssertionArgument(), null, "arguments", null, 0, -1,
+                                Assertion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
                 initEClass(nodeEClass, Node.class, "Node", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
@@ -1175,14 +1453,14 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
                 initEClass(unboundedMultiplicityEClass, UnboundedMultiplicity.class, "UnboundedMultiplicity", !IS_ABSTRACT,
                                 !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-                initEClass(argumentEClass, Argument.class, "Argument", !IS_ABSTRACT, !IS_INTERFACE,
-                                IS_GENERATED_INSTANCE_CLASS);
-                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(variableOrNodeArgumentEClass, VariableOrNodeArgument.class, "VariableOrNodeArgument", !IS_ABSTRACT,
+                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getVariableOrNodeArgument_VariableOrNode(), this.getVariableOrNode(), null, "variableOrNode",
+                                null, 0, 1, VariableOrNodeArgument.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+                                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getVariableOrNodeArgument_SingletonVariable(), this.getImplicitVariable(), null,
+                                "singletonVariable", null, 0, 1, VariableOrNodeArgument.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);
@@ -1193,6 +1471,57 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
                 initEClass(variableOrNodeEClass, VariableOrNode.class, "VariableOrNode", IS_ABSTRACT, !IS_INTERFACE,
                                 IS_GENERATED_INSTANCE_CLASS);
 
+                initEClass(constantEClass, Constant.class, "Constant", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(intConstantEClass, IntConstant.class, "IntConstant", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getIntConstant_IntValue(), ecorePackage.getEInt(), "intValue", "0", 0, 1, IntConstant.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(realConstantEClass, RealConstant.class, "RealConstant", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getRealConstant_RealValue(), ecorePackage.getEDouble(), "realValue", "0.0", 0, 1,
+                                RealConstant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                                !IS_DERIVED, IS_ORDERED);
+
+                initEClass(stringConstantEClass, StringConstant.class, "StringConstant", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getStringConstant_StringValue(), ecorePackage.getEString(), "stringValue", null, 0, 1,
+                                StringConstant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                                !IS_DERIVED, IS_ORDERED);
+
+                initEClass(constantArgumentEClass, ConstantArgument.class, "ConstantArgument", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getConstantArgument_Constant(), this.getConstant(), null, "constant", null, 0, 1,
+                                ConstantArgument.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(argumentEClass, Argument.class, "Argument", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(nodeAssertionArgumentEClass, NodeAssertionArgument.class, "NodeAssertionArgument", !IS_ABSTRACT,
+                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getNodeAssertionArgument_Node(), this.getNode(), null, "node", null, 0, 1,
+                                NodeAssertionArgument.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+                                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(assertionArgumentEClass, AssertionArgument.class, "AssertionArgument", IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(constantAssertionArgumentEClass, ConstantAssertionArgument.class, "ConstantAssertionArgument",
+                                !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getConstantAssertionArgument_Constant(), this.getConstant(), null, "constant", null, 0, 1,
+                                ConstantAssertionArgument.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+                                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(nodeValueAssertionEClass, NodeValueAssertion.class, "NodeValueAssertion", !IS_ABSTRACT,
+                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getNodeValueAssertion_Node(), this.getNode(), null, "node", null, 0, 1, NodeValueAssertion.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getNodeValueAssertion_Value(), this.getConstant(), null, "value", null, 0, 1,
+                                NodeValueAssertion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
                 // Initialize enums and add enum literals
                 initEEnum(logicValueEEnum, LogicValue.class, "LogicValue");
                 addEEnumLiteral(logicValueEEnum, LogicValue.TRUE);
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/RealConstantImpl.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/RealConstantImpl.java
new file mode 100644
index 00000000..f28d7b5f
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/RealConstantImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
+import org.eclipse.viatra.solver.language.model.problem.RealConstant;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Real Constant</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.RealConstantImpl#getRealValue <em>Real Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class RealConstantImpl extends ConstantImpl implements RealConstant {
+        /**
+         * The default value of the '{@link #getRealValue() <em>Real Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRealValue()
+         * @generated
+         * @ordered
+         */
+        protected static final double REAL_VALUE_EDEFAULT = 0.0;
+
+        /**
+         * The cached value of the '{@link #getRealValue() <em>Real Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRealValue()
+         * @generated
+         * @ordered
+         */
+        protected double realValue = REAL_VALUE_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected RealConstantImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return ProblemPackage.Literals.REAL_CONSTANT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public double getRealValue() {
+                return realValue;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setRealValue(double newRealValue) {
+                double oldRealValue = realValue;
+                realValue = newRealValue;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, ProblemPackage.REAL_CONSTANT__REAL_VALUE,
+                                        oldRealValue, realValue));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case ProblemPackage.REAL_CONSTANT__REAL_VALUE:
+                        return getRealValue();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                case ProblemPackage.REAL_CONSTANT__REAL_VALUE:
+                        setRealValue((Double) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case ProblemPackage.REAL_CONSTANT__REAL_VALUE:
+                        setRealValue(REAL_VALUE_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case ProblemPackage.REAL_CONSTANT__REAL_VALUE:
+                        return realValue != REAL_VALUE_EDEFAULT;
+                }
+                return super.eIsSet(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy())
+                        return super.toString();
+
+                StringBuilder result = new StringBuilder(super.toString());
+                result.append(" (realValue: ");
+                result.append(realValue);
+                result.append(')');
+                return result.toString();
+        }
+
+} //RealConstantImpl
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/StringConstantImpl.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/StringConstantImpl.java
new file mode 100644
index 00000000..9eb05cf3
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/StringConstantImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
+import org.eclipse.viatra.solver.language.model.problem.StringConstant;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>String Constant</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.StringConstantImpl#getStringValue <em>String Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class StringConstantImpl extends ConstantImpl implements StringConstant {
+        /**
+         * The default value of the '{@link #getStringValue() <em>String Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getStringValue()
+         * @generated
+         * @ordered
+         */
+        protected static final String STRING_VALUE_EDEFAULT = null;
+
+        /**
+         * The cached value of the '{@link #getStringValue() <em>String Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getStringValue()
+         * @generated
+         * @ordered
+         */
+        protected String stringValue = STRING_VALUE_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected StringConstantImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return ProblemPackage.Literals.STRING_CONSTANT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getStringValue() {
+                return stringValue;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setStringValue(String newStringValue) {
+                String oldStringValue = stringValue;
+                stringValue = newStringValue;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, ProblemPackage.STRING_CONSTANT__STRING_VALUE,
+                                        oldStringValue, stringValue));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case ProblemPackage.STRING_CONSTANT__STRING_VALUE:
+                        return getStringValue();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                case ProblemPackage.STRING_CONSTANT__STRING_VALUE:
+                        setStringValue((String) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case ProblemPackage.STRING_CONSTANT__STRING_VALUE:
+                        setStringValue(STRING_VALUE_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case ProblemPackage.STRING_CONSTANT__STRING_VALUE:
+                        return STRING_VALUE_EDEFAULT == null ? stringValue != null : !STRING_VALUE_EDEFAULT.equals(stringValue);
+                }
+                return super.eIsSet(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy())
+                        return super.toString();
+
+                StringBuilder result = new StringBuilder(super.toString());
+                result.append(" (stringValue: ");
+                result.append(stringValue);
+                result.append(')');
+                return result.toString();
+        }
+
+} //StringConstantImpl
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/VariableOrNodeArgumentImpl.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/VariableOrNodeArgumentImpl.java
new file mode 100644
index 00000000..693d5cdd
--- /dev/null
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/VariableOrNodeArgumentImpl.java
@@ -0,0 +1,251 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.viatra.solver.language.model.problem.ImplicitVariable;
+import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
+import org.eclipse.viatra.solver.language.model.problem.VariableOrNode;
+import org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Variable Or Node Argument</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.VariableOrNodeArgumentImpl#getVariableOrNode <em>Variable Or Node</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.VariableOrNodeArgumentImpl#getSingletonVariable <em>Singleton Variable</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class VariableOrNodeArgumentImpl extends ArgumentImpl implements VariableOrNodeArgument {
+        /**
+         * The cached value of the '{@link #getVariableOrNode() <em>Variable Or Node</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getVariableOrNode()
+         * @generated
+         * @ordered
+         */
+        protected VariableOrNode variableOrNode;
+
+        /**
+         * The cached value of the '{@link #getSingletonVariable() <em>Singleton Variable</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getSingletonVariable()
+         * @generated
+         * @ordered
+         */
+        protected ImplicitVariable singletonVariable;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected VariableOrNodeArgumentImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE, oldVariableOrNode,
+                                                        variableOrNode));
+                        }
+                }
+                return variableOrNode;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public VariableOrNode basicGetVariableOrNode() {
+                return variableOrNode;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setVariableOrNode(VariableOrNode newVariableOrNode) {
+                VariableOrNode oldVariableOrNode = variableOrNode;
+                variableOrNode = newVariableOrNode;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        ProblemPackage.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE, oldVariableOrNode, variableOrNode));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ImplicitVariable getSingletonVariable() {
+                return singletonVariable;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetSingletonVariable(ImplicitVariable newSingletonVariable, NotificationChain msgs) {
+                ImplicitVariable oldSingletonVariable = singletonVariable;
+                singletonVariable = newSingletonVariable;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+                                        ProblemPackage.VARIABLE_OR_NODE_ARGUMENT__SINGLETON_VARIABLE, oldSingletonVariable,
+                                        newSingletonVariable);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setSingletonVariable(ImplicitVariable newSingletonVariable) {
+                if (newSingletonVariable != singletonVariable) {
+                        NotificationChain msgs = null;
+                        if (singletonVariable != null)
+                                msgs = ((InternalEObject) singletonVariable).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - ProblemPackage.VARIABLE_OR_NODE_ARGUMENT__SINGLETON_VARIABLE, null,
+                                                msgs);
+                        if (newSingletonVariable != null)
+                                msgs = ((InternalEObject) newSingletonVariable).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - ProblemPackage.VARIABLE_OR_NODE_ARGUMENT__SINGLETON_VARIABLE, null,
+                                                msgs);
+                        msgs = basicSetSingletonVariable(newSingletonVariable, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        ProblemPackage.VARIABLE_OR_NODE_ARGUMENT__SINGLETON_VARIABLE, newSingletonVariable,
+                                        newSingletonVariable));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case ProblemPackage.VARIABLE_OR_NODE_ARGUMENT__SINGLETON_VARIABLE:
+                        return basicSetSingletonVariable(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case ProblemPackage.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE:
+                        if (resolve)
+                                return getVariableOrNode();
+                        return basicGetVariableOrNode();
+                case ProblemPackage.VARIABLE_OR_NODE_ARGUMENT__SINGLETON_VARIABLE:
+                        return getSingletonVariable();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                case ProblemPackage.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE:
+                        setVariableOrNode((VariableOrNode) newValue);
+                        return;
+                case ProblemPackage.VARIABLE_OR_NODE_ARGUMENT__SINGLETON_VARIABLE:
+                        setSingletonVariable((ImplicitVariable) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case ProblemPackage.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE:
+                        setVariableOrNode((VariableOrNode) null);
+                        return;
+                case ProblemPackage.VARIABLE_OR_NODE_ARGUMENT__SINGLETON_VARIABLE:
+                        setSingletonVariable((ImplicitVariable) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case ProblemPackage.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE:
+                        return variableOrNode != null;
+                case ProblemPackage.VARIABLE_OR_NODE_ARGUMENT__SINGLETON_VARIABLE:
+                        return singletonVariable != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //VariableOrNodeArgumentImpl
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemAdapterFactory.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemAdapterFactory.java
index 3fc3ca75..07246d70 100644
--- a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemAdapterFactory.java
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemAdapterFactory.java
@@ -182,8 +182,8 @@ public class ProblemAdapterFactory extends AdapterFactoryImpl {
                 }
 
                 @Override
-                public Adapter caseArgument(Argument object) {
-                        return createArgumentAdapter();
+                public Adapter caseVariableOrNodeArgument(VariableOrNodeArgument object) {
+                        return createVariableOrNodeArgumentAdapter();
                 }
 
                 @Override
@@ -197,6 +197,56 @@ public class ProblemAdapterFactory extends AdapterFactoryImpl {
                 }
 
                 @Override
+                public Adapter caseConstant(Constant object) {
+                        return createConstantAdapter();
+                }
+
+                @Override
+                public Adapter caseIntConstant(IntConstant object) {
+                        return createIntConstantAdapter();
+                }
+
+                @Override
+                public Adapter caseRealConstant(RealConstant object) {
+                        return createRealConstantAdapter();
+                }
+
+                @Override
+                public Adapter caseStringConstant(StringConstant object) {
+                        return createStringConstantAdapter();
+                }
+
+                @Override
+                public Adapter caseConstantArgument(ConstantArgument object) {
+                        return createConstantArgumentAdapter();
+                }
+
+                @Override
+                public Adapter caseArgument(Argument object) {
+                        return createArgumentAdapter();
+                }
+
+                @Override
+                public Adapter caseNodeAssertionArgument(NodeAssertionArgument object) {
+                        return createNodeAssertionArgumentAdapter();
+                }
+
+                @Override
+                public Adapter caseAssertionArgument(AssertionArgument object) {
+                        return createAssertionArgumentAdapter();
+                }
+
+                @Override
+                public Adapter caseConstantAssertionArgument(ConstantAssertionArgument object) {
+                        return createConstantAssertionArgumentAdapter();
+                }
+
+                @Override
+                public Adapter caseNodeValueAssertion(NodeValueAssertion object) {
+                        return createNodeValueAssertionAdapter();
+                }
+
+                @Override
                 public Adapter defaultCase(EObject object) {
                         return createEObjectAdapter();
                 }
@@ -538,6 +588,20 @@ public class ProblemAdapterFactory extends AdapterFactoryImpl {
         }
 
         /**
+         * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument <em>Variable Or Node Argument</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.VariableOrNodeArgument
+         * @generated
+         */
+        public Adapter createVariableOrNodeArgumentAdapter() {
+                return null;
+        }
+
+        /**
          * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.model.problem.Argument <em>Argument</em>}'.
          * <!-- begin-user-doc -->
          * This default implementation returns null so that we can easily ignore cases;
@@ -552,6 +616,62 @@ public class ProblemAdapterFactory extends AdapterFactoryImpl {
         }
 
         /**
+         * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.model.problem.NodeAssertionArgument <em>Node Assertion Argument</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.NodeAssertionArgument
+         * @generated
+         */
+        public Adapter createNodeAssertionArgumentAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.model.problem.AssertionArgument <em>Assertion Argument</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.AssertionArgument
+         * @generated
+         */
+        public Adapter createAssertionArgumentAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.model.problem.ConstantAssertionArgument <em>Constant Assertion Argument</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.ConstantAssertionArgument
+         * @generated
+         */
+        public Adapter createConstantAssertionArgumentAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.model.problem.NodeValueAssertion <em>Node Value Assertion</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.NodeValueAssertion
+         * @generated
+         */
+        public Adapter createNodeValueAssertionAdapter() {
+                return null;
+        }
+
+        /**
          * 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;
@@ -580,6 +700,76 @@ public class ProblemAdapterFactory extends AdapterFactoryImpl {
         }
 
         /**
+         * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.model.problem.Constant <em>Constant</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.Constant
+         * @generated
+         */
+        public Adapter createConstantAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.model.problem.IntConstant <em>Int Constant</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.IntConstant
+         * @generated
+         */
+        public Adapter createIntConstantAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.model.problem.RealConstant <em>Real Constant</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.RealConstant
+         * @generated
+         */
+        public Adapter createRealConstantAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.model.problem.StringConstant <em>String Constant</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.StringConstant
+         * @generated
+         */
+        public Adapter createStringConstantAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.model.problem.ConstantArgument <em>Constant Argument</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.ConstantArgument
+         * @generated
+         */
+        public Adapter createConstantArgumentAdapter() {
+                return null;
+        }
+
+        /**
          * Creates a new adapter for the default case.
          * <!-- begin-user-doc -->
          * This default implementation returns null.
diff --git a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemSwitch.java b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemSwitch.java
index b74718b5..837d3a03 100644
--- a/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemSwitch.java
+++ b/language-model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemSwitch.java
@@ -285,9 +285,11 @@ public class ProblemSwitch<T> extends Switch<T> {
                                 result = defaultCase(theEObject);
                         return result;
                 }
-                case ProblemPackage.ARGUMENT: {
-                        Argument argument = (Argument) theEObject;
-                        T result = caseArgument(argument);
+                case ProblemPackage.VARIABLE_OR_NODE_ARGUMENT: {
+                        VariableOrNodeArgument variableOrNodeArgument = (VariableOrNodeArgument) theEObject;
+                        T result = caseVariableOrNodeArgument(variableOrNodeArgument);
+                        if (result == null)
+                                result = caseArgument(variableOrNodeArgument);
                         if (result == null)
                                 result = defaultCase(theEObject);
                         return result;
@@ -314,6 +316,90 @@ public class ProblemSwitch<T> extends Switch<T> {
                                 result = defaultCase(theEObject);
                         return result;
                 }
+                case ProblemPackage.CONSTANT: {
+                        Constant constant = (Constant) theEObject;
+                        T result = caseConstant(constant);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case ProblemPackage.INT_CONSTANT: {
+                        IntConstant intConstant = (IntConstant) theEObject;
+                        T result = caseIntConstant(intConstant);
+                        if (result == null)
+                                result = caseConstant(intConstant);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case ProblemPackage.REAL_CONSTANT: {
+                        RealConstant realConstant = (RealConstant) theEObject;
+                        T result = caseRealConstant(realConstant);
+                        if (result == null)
+                                result = caseConstant(realConstant);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case ProblemPackage.STRING_CONSTANT: {
+                        StringConstant stringConstant = (StringConstant) theEObject;
+                        T result = caseStringConstant(stringConstant);
+                        if (result == null)
+                                result = caseConstant(stringConstant);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case ProblemPackage.CONSTANT_ARGUMENT: {
+                        ConstantArgument constantArgument = (ConstantArgument) theEObject;
+                        T result = caseConstantArgument(constantArgument);
+                        if (result == null)
+                                result = caseArgument(constantArgument);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case ProblemPackage.ARGUMENT: {
+                        Argument argument = (Argument) theEObject;
+                        T result = caseArgument(argument);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case ProblemPackage.NODE_ASSERTION_ARGUMENT: {
+                        NodeAssertionArgument nodeAssertionArgument = (NodeAssertionArgument) theEObject;
+                        T result = caseNodeAssertionArgument(nodeAssertionArgument);
+                        if (result == null)
+                                result = caseAssertionArgument(nodeAssertionArgument);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case ProblemPackage.ASSERTION_ARGUMENT: {
+                        AssertionArgument assertionArgument = (AssertionArgument) theEObject;
+                        T result = caseAssertionArgument(assertionArgument);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case ProblemPackage.CONSTANT_ASSERTION_ARGUMENT: {
+                        ConstantAssertionArgument constantAssertionArgument = (ConstantAssertionArgument) theEObject;
+                        T result = caseConstantAssertionArgument(constantAssertionArgument);
+                        if (result == null)
+                                result = caseAssertionArgument(constantAssertionArgument);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case ProblemPackage.NODE_VALUE_ASSERTION: {
+                        NodeValueAssertion nodeValueAssertion = (NodeValueAssertion) theEObject;
+                        T result = caseNodeValueAssertion(nodeValueAssertion);
+                        if (result == null)
+                                result = caseStatement(nodeValueAssertion);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
                 default:
                         return defaultCase(theEObject);
                 }
@@ -665,6 +751,21 @@ public class ProblemSwitch<T> extends Switch<T> {
         }
 
         /**
+         * Returns the result of interpreting the object as an instance of '<em>Variable Or Node Argument</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 Argument</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseVariableOrNodeArgument(VariableOrNodeArgument object) {
+                return null;
+        }
+
+        /**
          * Returns the result of interpreting the object as an instance of '<em>Argument</em>'.
          * <!-- begin-user-doc -->
          * This implementation returns null;
@@ -680,6 +781,66 @@ public class ProblemSwitch<T> extends Switch<T> {
         }
 
         /**
+         * Returns the result of interpreting the object as an instance of '<em>Node Assertion Argument</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>Node Assertion Argument</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseNodeAssertionArgument(NodeAssertionArgument object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Assertion Argument</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>Assertion Argument</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseAssertionArgument(AssertionArgument object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Constant Assertion Argument</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>Constant Assertion Argument</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseConstantAssertionArgument(ConstantAssertionArgument object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Node Value Assertion</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>Node Value Assertion</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseNodeValueAssertion(NodeValueAssertion object) {
+                return null;
+        }
+
+        /**
          * Returns the result of interpreting the object as an instance of '<em>Enum Declaration</em>'.
          * <!-- begin-user-doc -->
          * This implementation returns null;
@@ -710,6 +871,81 @@ public class ProblemSwitch<T> extends Switch<T> {
         }
 
         /**
+         * Returns the result of interpreting the object as an instance of '<em>Constant</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>Constant</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseConstant(Constant object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Int Constant</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>Int Constant</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseIntConstant(IntConstant object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Real Constant</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>Real Constant</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseRealConstant(RealConstant object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>String Constant</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>String Constant</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseStringConstant(StringConstant object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Constant Argument</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>Constant Argument</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseConstantArgument(ConstantArgument 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/language-model/src/main/resources/model/problem.ecore b/language-model/src/main/resources/model/problem.ecore
index 99404f61..43d69a86 100644
--- a/language-model/src/main/resources/model/problem.ecore
+++ b/language-model/src/main/resources/model/problem.ecore
@@ -61,9 +61,9 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Assertion" eSuperTypes="#//Statement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1"
-        eType="#//Node"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="#//LogicValue"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1"
+        eType="#//AssertionArgument" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Node" eSuperTypes="#//VariableOrNode"/>
   <eClassifiers xsi:type="ecore:EEnum" name="LogicValue">
@@ -94,7 +94,7 @@
         defaultValueLiteral="1"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="UnboundedMultiplicity" eSuperTypes="#//Multiplicity"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Argument">
+  <eClassifiers xsi:type="ecore:EClass" name="VariableOrNodeArgument" eSuperTypes="#//Argument">
     <eStructuralFeatures xsi:type="ecore:EReference" name="variableOrNode" eType="#//VariableOrNode"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="singletonVariable" eType="#//ImplicitVariable"
         containment="true"/>
@@ -104,4 +104,34 @@
         eType="#//Node" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="VariableOrNode" abstract="true" eSuperTypes="#//NamedElement"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Constant" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="IntConstant" eSuperTypes="#//Constant">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="intValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
+        defaultValueLiteral="0"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="RealConstant" eSuperTypes="#//Constant">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="realValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"
+        defaultValueLiteral="0.0"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="StringConstant" eSuperTypes="#//Constant">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stringValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ConstantArgument" eSuperTypes="#//Argument">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="constant" eType="#//Constant"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Argument" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="NodeAssertionArgument" eSuperTypes="#//AssertionArgument">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="node" eType="#//Node"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="AssertionArgument" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="ConstantAssertionArgument" eSuperTypes="#//AssertionArgument">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="constant" eType="#//Constant"
+        containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="NodeValueAssertion" eSuperTypes="#//Statement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="node" eType="#//Node"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="value" eType="#//Constant"
+        containment="true"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/language-model/src/main/resources/model/problem.genmodel b/language-model/src/main/resources/model/problem.genmodel
index 8a881ff7..fb93d60e 100644
--- a/language-model/src/main/resources/model/problem.genmodel
+++ b/language-model/src/main/resources/model/problem.genmodel
@@ -62,8 +62,8 @@
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//Assertion">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Assertion/relation"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Assertion/arguments"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Assertion/value"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//Assertion/arguments"/>
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//Node"/>
     <genClasses ecoreClass="problem.ecore#//ScopeDeclaration">
@@ -84,13 +84,38 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ExactMultiplicity/exactValue"/>
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//UnboundedMultiplicity"/>
-    <genClasses ecoreClass="problem.ecore#//Argument">
-      <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 ecoreClass="problem.ecore#//VariableOrNodeArgument">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//VariableOrNodeArgument/variableOrNode"/>
+      <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//VariableOrNodeArgument/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"/>
+    <genClasses ecoreClass="problem.ecore#//Constant"/>
+    <genClasses ecoreClass="problem.ecore#//IntConstant">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//IntConstant/intValue"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//RealConstant">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//RealConstant/realValue"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//StringConstant">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//StringConstant/stringValue"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//ConstantArgument">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ConstantArgument/constant"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//Argument"/>
+    <genClasses ecoreClass="problem.ecore#//NodeAssertionArgument">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//NodeAssertionArgument/node"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//AssertionArgument"/>
+    <genClasses ecoreClass="problem.ecore#//ConstantAssertionArgument">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ConstantAssertionArgument/constant"/>
+    </genClasses>
+    <genClasses ecoreClass="problem.ecore#//NodeValueAssertion">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//NodeValueAssertion/node"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//NodeValueAssertion/value"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/language-mwe2/src/main/java/org/eclipse/viatra/solver/language/mwe2/ProblemWebIntegrationFragment.java b/language-mwe2/src/main/java/org/eclipse/viatra/solver/language/mwe2/ProblemWebIntegrationFragment.java
index c8a2c58c..18e13245 100644
--- a/language-mwe2/src/main/java/org/eclipse/viatra/solver/language/mwe2/ProblemWebIntegrationFragment.java
+++ b/language-mwe2/src/main/java/org/eclipse/viatra/solver/language/mwe2/ProblemWebIntegrationFragment.java
@@ -9,6 +9,8 @@ import com.google.common.collect.Multimap;
 public class ProblemWebIntegrationFragment extends WebIntegrationFragment {
         public ProblemWebIntegrationFragment() {
                 setFramework(Framework.CODEMIRROR.name());
+                // The exponential operators e and E are not keywords
+                setKeywordsFilter("[^eE]|\\w\\w+");
                 // We use our custom token style for single-quoted names
                 addSuppressPattern("string_singleQuote");
                 // Use the CodeMirror default .cm-number instead of .cm-constant.cm-numeric
@@ -47,7 +49,7 @@ public class ProblemWebIntegrationFragment extends WebIntegrationFragment {
                 patterns.put("meta", "lineComment: \"%\"");
                 // Override indentation behavior
                 patterns.put("start", "{token: \"lparen\", indent: true, regex: \"[[({]\"}");
-                patterns.put("start", "{token: \"rparen\", dedent: true, dedentIfLineStart: true, regex: \"[\\\\])}]\"}");
+                patterns.put("start", "{token: \"rparen\", dedent: true, regex: \"[\\\\])}]\"}");
                 patterns.putAll("predicateBody", patterns.get("start"));
                 patterns.put("start", "{indent: true, push: \"predicateBody\", regex: \":-\"}");
                 patterns.put("predicateBody", "{dedent: true, dedentIfLineStart: false, pop: true, regex: \"\\\\.\\\\s*$\"}");
diff --git a/language-web/src/main/webapp/index.html b/language-web/src/main/webapp/index.html
index 97c4dbab..3e068f68 100644
--- a/language-web/src/main/webapp/index.html
+++ b/language-web/src/main/webapp/index.html
@@ -22,8 +22,9 @@
 
 class Person {
   Person[] children opposite parent
-  Person parent opposite children
-  TaxStatus[1] taxStatus
+  Person[0..1] parent opposite children
+  int age
+  TaxStatus taxStatus
 }
 
 enum TaxStatus {
@@ -41,6 +42,10 @@ members('family', ciri).
 children(anne, ciri).
 ?children(bob, ciri).
 taxStatus(anne, adult).
+age(anne, 35).
+bobAge: 27.
+age(bob, bobAge).
+!age(ciri, bobAge).
 
 scope Family = 1, Person += 5..10.
 </pre></div>
diff --git a/language-web/src/main/webapp/xtext-resources/generated/mode-problem.js b/language-web/src/main/webapp/xtext-resources/generated/mode-problem.js
index 92adcff1..ba39dd13 100644
--- a/language-web/src/main/webapp/xtext-resources/generated/mode-problem.js
+++ b/language-web/src/main/webapp/xtext-resources/generated/mode-problem.js
@@ -1,5 +1,6 @@
 define(["codemirror", "codemirror/addon/mode/simple"], function(CodeMirror, SimpleMode) {
         var keywords = "abstract|class|contains|enum|error|extends|false|opposite|pred|problem|refers|scope|true|unknown";
+        var extraKeywords = "!|\\(|\\)|\\*|\\+|,|-|\\.|:|;|=|\\?|\\[|\\]|\\{|\\}";
         CodeMirror.defineSimpleMode("xtext/problem", {
                 start: [
                         {token: "comment", regex: "\\/\\*", next : "comment"},
@@ -10,9 +11,10 @@ define(["codemirror", "codemirror/addon/mode/simple"], function(CodeMirror, Simp
                         {token: "comment", regex: "%.*$"},
                         {token: "comment", regex: "\\/\\/.*$"},
                         {token: "lparen", indent: true, regex: "[[({]"},
-                        {token: "rparen", dedent: true, dedentIfLineStart: true, regex: "[\\])}]"},
+                        {token: "rparen", dedent: true, regex: "[\\])}]"},
                         {indent: true, push: "predicateBody", regex: ":-"},
-                        {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"}
+                        {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"},
+                        {token: "keyword", regex: "(?:^|\\s)(?:" + extraKeywords + ")(?=[\\s.:;,!?+\\-*/&|<>()[\\]{}]|$)"}
                 ],
                 comment: [
                         {token: "comment", regex: ".*?\\*\\/", next : "start"},
@@ -32,7 +34,7 @@ define(["codemirror", "codemirror/addon/mode/simple"], function(CodeMirror, Simp
                         {token: "comment", regex: "%.*$"},
                         {token: "comment", regex: "\\/\\/.*$"},
                         {token: "lparen", indent: true, regex: "[[({]"},
-                        {token: "rparen", dedent: true, dedentIfLineStart: true, regex: "[\\])}]"},
+                        {token: "rparen", dedent: true, regex: "[\\])}]"},
                         {dedent: true, dedentIfLineStart: false, pop: true, regex: "\\.\\s*$"},
                         {indent: true, dedent: true, regex: "[;]"},
                         {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"}
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext b/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext
index 466988d8..7e253ef5 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext
+++ b/language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext
@@ -8,7 +8,7 @@ Problem:
         statements+=Statement*;
 
 Statement:
-        ClassDeclaration | EnumDeclaration | PredicateDefinition | Assertion | ScopeDeclaration;
+        ClassDeclaration | EnumDeclaration | PredicateDefinition | Assertion | NodeValueAssertion | ScopeDeclaration;
 
 ClassDeclaration:
         abstract?="abstract"? "class"
@@ -56,23 +56,53 @@ Atom:
         "(" (arguments+=Argument ("," arguments+=Argument)*)? ")";
 
 Argument:
+        VariableOrNodeArgument | ConstantArgument;
+
+VariableOrNodeArgument:
         variableOrNode=[VariableOrNode|QualifiedName];
 
+ConstantArgument:
+        constant=Constant;
+
 Assertion:
         (relation=[Relation|QualifiedName]
-        "(" (arguments+=[Node|QualifiedName] ("," arguments+=[Node|QualifiedName])*)? ")"
+        "(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")"
         ":" value=LogicValue |
         value=ShortLogicValue?
         relation=[Relation|QualifiedName]
-        "(" (arguments+=[Node|QualifiedName] ("," arguments+=[Node|QualifiedName])*)? ")")
+        "(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")")
         ".";
 
+AssertionArgument:
+        NodeAssertionArgument | ConstantAssertionArgument;
+
+NodeAssertionArgument:
+        node=[Node|QualifiedName];
+
+ConstantAssertionArgument:
+        constant=Constant;
+
 enum LogicValue:
         TRUE="true" | FALSE="false" | UNKNOWN="unknown";
 
 enum ShortLogicValue returns LogicValue:
         FALSE="!" | UNKNOWN="?";
 
+NodeValueAssertion:
+        node=[Node|QualifiedName] ":" value=Constant ".";
+
+Constant:
+        IntConstant | RealConstant | StringConstant;
+
+IntConstant:
+        intValue=Integer;
+
+RealConstant:
+        realValue=Real;
+
+StringConstant:
+        stringValue=STRING;
+
 ScopeDeclaration:
         "scope" typeScopes+=TypeScope ("," typeScopes+=TypeScope)* ".";
 
@@ -102,11 +132,21 @@ UpperBound returns ecore::EInt:
 QuotedOrUnquotedId:
         QUOTED_ID | Identifier;
 
-QualifiedName:
+QualifiedName hidden():
         QUOTED_ID | Identifier ("::" Identifier)* ("::" QUOTED_ID)?;
 
 Identifier:
-        ID | "true" | "false";
+        ID | "true" | "false" | "e" | "E";
+
+Integer returns ecore::EInt hidden():
+        "-"? INT;
+
+Real returns ecore::EDouble hidden():
+        "-"? INT ("." INT | ("." INT)? ("e" | "E") ("-" | "+")? INT);
+
+@Override
+terminal ID:
+        ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
 @Override
 terminal STRING:
@@ -117,4 +157,4 @@ terminal QUOTED_ID:
 
 @Override
 terminal SL_COMMENT:
-        ('%' | '//') !('\n'|'\r')* ('\r'? '\n')?;
+        ('%' | '//') !('\n' | '\r')* ('\r'? '\n')?;
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java b/language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java
index 09f062f5..e0a72687 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java
+++ b/language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java
@@ -38,13 +38,13 @@ public final class ProblemUtil {
         }
 
         public static boolean isSingletonVariable(Variable variable) {
-                return variable.eContainingFeature() == ProblemPackage.Literals.ARGUMENT__SINGLETON_VARIABLE;
+                return variable.eContainingFeature() == ProblemPackage.Literals.VARIABLE_OR_NODE_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();
                 boolean isNameQuoted = name != null && name.startsWith(ENUM_NODE_NAME_QUOTE)
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java b/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java
index b885ce0e..fc03fa87 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java
+++ b/language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java
@@ -11,6 +11,7 @@ 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;
+import org.eclipse.viatra.solver.language.model.problem.AssertionArgument;
 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;
@@ -19,12 +20,15 @@ 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.NodeAssertionArgument;
+import org.eclipse.viatra.solver.language.model.problem.NodeValueAssertion;
 import org.eclipse.viatra.solver.language.model.problem.Parameter;
 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.ProblemFactory;
 import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
 import org.eclipse.viatra.solver.language.model.problem.Statement;
+import org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument;
 import org.eclipse.xtext.linking.impl.LinkingHelper;
 import org.eclipse.xtext.naming.IQualifiedNameConverter;
 import org.eclipse.xtext.naming.QualifiedName;
@@ -97,7 +101,16 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
                 Set<String> nodeNames = new HashSet<>();
                 for (Statement statement : problem.getStatements()) {
                         if (statement instanceof Assertion) {
-                                addNodeNames(nodeNames, nodeScope, statement, ProblemPackage.Literals.ASSERTION__ARGUMENTS,
+                                Assertion assertion = (Assertion) statement;
+                                for (AssertionArgument argument : assertion.getArguments()) {
+                                        if (argument instanceof NodeAssertionArgument) {
+                                                addNodeNames(nodeNames, nodeScope, argument,
+                                                                ProblemPackage.Literals.NODE_ASSERTION_ARGUMENT__NODE,
+                                                                ProblemDerivedStateComputer::validNodeName);
+                                        }
+                                }
+                        } else if (statement instanceof NodeValueAssertion) {
+                                addNodeNames(nodeNames, nodeScope, statement, ProblemPackage.Literals.NODE_VALUE_ASSERTION__NODE,
                                                 ProblemDerivedStateComputer::validNodeName);
                         } else if (statement instanceof PredicateDefinition) {
                                 PredicateDefinition predicateDefinition = (PredicateDefinition) statement;
@@ -114,9 +127,11 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
                                                         continue;
                                                 }
                                                 for (Argument argument : atom.getArguments()) {
-                                                        addNodeNames(nodeNames, nodeScope, argument,
-                                                                        ProblemPackage.Literals.ARGUMENT__VARIABLE_OR_NODE,
-                                                                        ProblemDerivedStateComputer::validQuotedId);
+                                                        if (argument instanceof VariableOrNodeArgument) {
+                                                                addNodeNames(nodeNames, nodeScope, argument,
+                                                                                ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE,
+                                                                                ProblemDerivedStateComputer::validQuotedId);
+                                                        }
                                                 }
                                         }
                                 }
@@ -189,29 +204,31 @@ 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();
-                int argumentsSize = arguments.size();
-                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);
+                for (Argument argument : atom.getArguments()) {
+                        if (argument instanceof VariableOrNodeArgument) {
+                                VariableOrNodeArgument variableOrNodeArgument = (VariableOrNodeArgument) argument;
+                                IScope scope = scopeProvider.getScope(variableOrNodeArgument,
+                                                ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE);
+                                List<INode> nodes = NodeModelUtils.findNodesForFeature(variableOrNodeArgument,
+                                                ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE);
+                                for (INode node : nodes) {
+                                        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)) {
+                                                createSingletonVariable(variableOrNodeArgument, variableName);
+                                                break;
+                                        }
+                                        if (!knownVariables.contains(variableName)) {
+                                                newVariables.add(variableName);
+                                                break;
+                                        }
                                 }
-                                continue;
-                        }
-                        if (!knownVariables.contains(variableName)) {
-                                newVariables.add(variableName);
                         }
                 }
         }
@@ -229,7 +246,7 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
                 }
         }
 
-        protected void createSingletonVariable(Argument argument, String variableName) {
+        protected void createSingletonVariable(VariableOrNodeArgument argument, String variableName) {
                 if (validId(variableName)) {
                         ImplicitVariable variable = createNamedVariable(variableName);
                         argument.setSingletonVariable(variable);
@@ -281,7 +298,10 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
                         return;
                 }
                 for (Argument argument : atom.getArguments()) {
-                        argument.setSingletonVariable(null);
+                        if (argument instanceof VariableOrNodeArgument) {
+                                VariableOrNodeArgument variableOrNodeArgument = (VariableOrNodeArgument) argument;
+                                variableOrNodeArgument.setSingletonVariable(null);
+                        }
                 }
         }
 
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java b/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java
index fc4034ae..3748e81d 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java
+++ b/language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java
@@ -10,7 +10,6 @@ import java.util.List;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.viatra.solver.language.ProblemUtil;
-import org.eclipse.viatra.solver.language.model.problem.Argument;
 import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration;
 import org.eclipse.viatra.solver.language.model.problem.ExistentialQuantifier;
 import org.eclipse.viatra.solver.language.model.problem.PredicateDefinition;
@@ -18,6 +17,7 @@ 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.model.problem.VariableOrNodeArgument;
 import org.eclipse.xtext.EcoreUtil2;
 import org.eclipse.xtext.scoping.IScope;
 import org.eclipse.xtext.scoping.Scopes;
@@ -34,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_OR_NODE) {
+                if (reference == ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE) {
                         return getVariableScope(context, scope);
                 } else if (reference == ProblemPackage.Literals.REFERENCE_DECLARATION__OPPOSITE) {
                         return getOppositeScope(context, scope);
@@ -45,8 +45,8 @@ public class ProblemScopeProvider extends AbstractProblemScopeProvider {
         protected IScope getVariableScope(EObject context, IScope delegateScope) {
                 List<Variable> variables = new ArrayList<>();
                 EObject currentContext = context;
-                if (context instanceof Argument) {
-                        Argument argument = (Argument) context;
+                if (context instanceof VariableOrNodeArgument) {
+                        VariableOrNodeArgument argument = (VariableOrNodeArgument) context;
                         Variable singletonVariable = argument.getSingletonVariable();
                         if (singletonVariable != null) {
                                 variables.add(singletonVariable);
diff --git a/language/src/main/resources/org/eclipse/viatra/solver/language/builtin.problem b/language/src/main/resources/org/eclipse/viatra/solver/language/builtin.problem
index 13398ce8..7ece2db0 100644
--- a/language/src/main/resources/org/eclipse/viatra/solver/language/builtin.problem
+++ b/language/src/main/resources/org/eclipse/viatra/solver/language/builtin.problem
@@ -6,12 +6,16 @@ abstract class node {
 
 pred exists(node node).
 
+abstract class domain extends node.
+
+abstract class data extends node.
+
 enum bool {
         true, false
 }
 
-class double.
+class real extends data.
 
-class int extends double.
+class int extends real.
 
-class string.
+class string extends data.
diff --git a/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/Problem.xtextbin b/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/Problem.xtextbin
index dc21001d..a5b00fe3 100644
--- a/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/Problem.xtextbin
+++ b/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/Problem.xtextbin
diff --git a/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.g b/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.g
index 3a368756..4ef02d71 100644
--- a/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.g
+++ b/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.g
@@ -181,11 +181,20 @@ ruleStatement returns [EObject current=null]
                 }
                     |
                 {
-                        newCompositeNode(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_4());
+                        newCompositeNode(grammarAccess.getStatementAccess().getNodeValueAssertionParserRuleCall_4());
                 }
-                this_ScopeDeclaration_4=ruleScopeDeclaration
+                this_NodeValueAssertion_4=ruleNodeValueAssertion
                 {
-                        $current = $this_ScopeDeclaration_4.current;
+                        $current = $this_NodeValueAssertion_4.current;
+                        afterParserOrEnumRuleCall();
+                }
+                    |
+                {
+                        newCompositeNode(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_5());
+                }
+                this_ScopeDeclaration_5=ruleScopeDeclaration
+                {
+                        $current = $this_ScopeDeclaration_5.current;
                         afterParserOrEnumRuleCall();
                 }
         )
@@ -1102,14 +1111,50 @@ ruleArgument returns [EObject current=null]
         leaveRule();
 }:
         (
+                {
+                        newCompositeNode(grammarAccess.getArgumentAccess().getVariableOrNodeArgumentParserRuleCall_0());
+                }
+                this_VariableOrNodeArgument_0=ruleVariableOrNodeArgument
+                {
+                        $current = $this_VariableOrNodeArgument_0.current;
+                        afterParserOrEnumRuleCall();
+                }
+                    |
+                {
+                        newCompositeNode(grammarAccess.getArgumentAccess().getConstantArgumentParserRuleCall_1());
+                }
+                this_ConstantArgument_1=ruleConstantArgument
+                {
+                        $current = $this_ConstantArgument_1.current;
+                        afterParserOrEnumRuleCall();
+                }
+        )
+;
+
+// Entry rule entryRuleVariableOrNodeArgument
+entryRuleVariableOrNodeArgument returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getVariableOrNodeArgumentRule()); }
+        iv_ruleVariableOrNodeArgument=ruleVariableOrNodeArgument
+        { $current=$iv_ruleVariableOrNodeArgument.current; }
+        EOF;
+
+// Rule VariableOrNodeArgument
+ruleVariableOrNodeArgument returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
                 (
                         {
                                 if ($current==null) {
-                                        $current = createModelElement(grammarAccess.getArgumentRule());
+                                        $current = createModelElement(grammarAccess.getVariableOrNodeArgumentRule());
                                 }
                         }
                         {
-                                newCompositeNode(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0());
+                                newCompositeNode(grammarAccess.getVariableOrNodeArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0());
                         }
                         ruleQualifiedName
                         {
@@ -1119,6 +1164,42 @@ ruleArgument returns [EObject current=null]
         )
 ;
 
+// Entry rule entryRuleConstantArgument
+entryRuleConstantArgument returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getConstantArgumentRule()); }
+        iv_ruleConstantArgument=ruleConstantArgument
+        { $current=$iv_ruleConstantArgument.current; }
+        EOF;
+
+// Rule ConstantArgument
+ruleConstantArgument returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                (
+                        {
+                                newCompositeNode(grammarAccess.getConstantArgumentAccess().getConstantConstantParserRuleCall_0());
+                        }
+                        lv_constant_0_0=ruleConstant
+                        {
+                                if ($current==null) {
+                                        $current = createModelElementForParent(grammarAccess.getConstantArgumentRule());
+                                }
+                                set(
+                                        $current,
+                                        "constant",
+                                        lv_constant_0_0,
+                                        "org.eclipse.viatra.solver.language.Problem.Constant");
+                                afterParserOrEnumRuleCall();
+                        }
+                )
+        )
+;
+
 // Entry rule entryRuleAssertion
 entryRuleAssertion returns [EObject current=null]:
         { newCompositeNode(grammarAccess.getAssertionRule()); }
@@ -1161,15 +1242,18 @@ ruleAssertion returns [EObject current=null]
                                         (
                                                 (
                                                         {
-                                                                if ($current==null) {
-                                                                        $current = createModelElement(grammarAccess.getAssertionRule());
-                                                                }
-                                                        }
-                                                        {
-                                                                newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_0_0());
+                                                                newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_0_2_0_0());
                                                         }
-                                                        ruleQualifiedName
+                                                        lv_arguments_2_0=ruleAssertionArgument
                                                         {
+                                                                if ($current==null) {
+                                                                        $current = createModelElementForParent(grammarAccess.getAssertionRule());
+                                                                }
+                                                                add(
+                                                                        $current,
+                                                                        "arguments",
+                                                                        lv_arguments_2_0,
+                                                                        "org.eclipse.viatra.solver.language.Problem.AssertionArgument");
                                                                 afterParserOrEnumRuleCall();
                                                         }
                                                 )
@@ -1182,15 +1266,18 @@ ruleAssertion returns [EObject current=null]
                                                 (
                                                         (
                                                                 {
-                                                                        if ($current==null) {
-                                                                                $current = createModelElement(grammarAccess.getAssertionRule());
-                                                                        }
+                                                                        newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_0_2_1_1_0());
                                                                 }
+                                                                lv_arguments_4_0=ruleAssertionArgument
                                                                 {
-                                                                        newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_1_1_0());
-                                                                }
-                                                                ruleQualifiedName
-                                                                {
+                                                                        if ($current==null) {
+                                                                                $current = createModelElementForParent(grammarAccess.getAssertionRule());
+                                                                        }
+                                                                        add(
+                                                                                $current,
+                                                                                "arguments",
+                                                                                lv_arguments_4_0,
+                                                                                "org.eclipse.viatra.solver.language.Problem.AssertionArgument");
                                                                         afterParserOrEnumRuleCall();
                                                                 }
                                                         )
@@ -1270,15 +1357,18 @@ ruleAssertion returns [EObject current=null]
                                         (
                                                 (
                                                         {
-                                                                if ($current==null) {
-                                                                        $current = createModelElement(grammarAccess.getAssertionRule());
-                                                                }
-                                                        }
-                                                        {
-                                                                newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_0_0());
+                                                                newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_1_3_0_0());
                                                         }
-                                                        ruleQualifiedName
+                                                        lv_arguments_11_0=ruleAssertionArgument
                                                         {
+                                                                if ($current==null) {
+                                                                        $current = createModelElementForParent(grammarAccess.getAssertionRule());
+                                                                }
+                                                                add(
+                                                                        $current,
+                                                                        "arguments",
+                                                                        lv_arguments_11_0,
+                                                                        "org.eclipse.viatra.solver.language.Problem.AssertionArgument");
                                                                 afterParserOrEnumRuleCall();
                                                         }
                                                 )
@@ -1291,15 +1381,18 @@ ruleAssertion returns [EObject current=null]
                                                 (
                                                         (
                                                                 {
-                                                                        if ($current==null) {
-                                                                                $current = createModelElement(grammarAccess.getAssertionRule());
-                                                                        }
-                                                                }
-                                                                {
-                                                                        newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_1_1_0());
+                                                                        newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_1_3_1_1_0());
                                                                 }
-                                                                ruleQualifiedName
+                                                                lv_arguments_13_0=ruleAssertionArgument
                                                                 {
+                                                                        if ($current==null) {
+                                                                                $current = createModelElementForParent(grammarAccess.getAssertionRule());
+                                                                        }
+                                                                        add(
+                                                                                $current,
+                                                                                "arguments",
+                                                                                lv_arguments_13_0,
+                                                                                "org.eclipse.viatra.solver.language.Problem.AssertionArgument");
                                                                         afterParserOrEnumRuleCall();
                                                                 }
                                                         )
@@ -1319,6 +1412,325 @@ ruleAssertion returns [EObject current=null]
         )
 ;
 
+// Entry rule entryRuleAssertionArgument
+entryRuleAssertionArgument returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getAssertionArgumentRule()); }
+        iv_ruleAssertionArgument=ruleAssertionArgument
+        { $current=$iv_ruleAssertionArgument.current; }
+        EOF;
+
+// Rule AssertionArgument
+ruleAssertionArgument returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                {
+                        newCompositeNode(grammarAccess.getAssertionArgumentAccess().getNodeAssertionArgumentParserRuleCall_0());
+                }
+                this_NodeAssertionArgument_0=ruleNodeAssertionArgument
+                {
+                        $current = $this_NodeAssertionArgument_0.current;
+                        afterParserOrEnumRuleCall();
+                }
+                    |
+                {
+                        newCompositeNode(grammarAccess.getAssertionArgumentAccess().getConstantAssertionArgumentParserRuleCall_1());
+                }
+                this_ConstantAssertionArgument_1=ruleConstantAssertionArgument
+                {
+                        $current = $this_ConstantAssertionArgument_1.current;
+                        afterParserOrEnumRuleCall();
+                }
+        )
+;
+
+// Entry rule entryRuleNodeAssertionArgument
+entryRuleNodeAssertionArgument returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getNodeAssertionArgumentRule()); }
+        iv_ruleNodeAssertionArgument=ruleNodeAssertionArgument
+        { $current=$iv_ruleNodeAssertionArgument.current; }
+        EOF;
+
+// Rule NodeAssertionArgument
+ruleNodeAssertionArgument returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                (
+                        {
+                                if ($current==null) {
+                                        $current = createModelElement(grammarAccess.getNodeAssertionArgumentRule());
+                                }
+                        }
+                        {
+                                newCompositeNode(grammarAccess.getNodeAssertionArgumentAccess().getNodeNodeCrossReference_0());
+                        }
+                        ruleQualifiedName
+                        {
+                                afterParserOrEnumRuleCall();
+                        }
+                )
+        )
+;
+
+// Entry rule entryRuleConstantAssertionArgument
+entryRuleConstantAssertionArgument returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getConstantAssertionArgumentRule()); }
+        iv_ruleConstantAssertionArgument=ruleConstantAssertionArgument
+        { $current=$iv_ruleConstantAssertionArgument.current; }
+        EOF;
+
+// Rule ConstantAssertionArgument
+ruleConstantAssertionArgument returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                (
+                        {
+                                newCompositeNode(grammarAccess.getConstantAssertionArgumentAccess().getConstantConstantParserRuleCall_0());
+                        }
+                        lv_constant_0_0=ruleConstant
+                        {
+                                if ($current==null) {
+                                        $current = createModelElementForParent(grammarAccess.getConstantAssertionArgumentRule());
+                                }
+                                set(
+                                        $current,
+                                        "constant",
+                                        lv_constant_0_0,
+                                        "org.eclipse.viatra.solver.language.Problem.Constant");
+                                afterParserOrEnumRuleCall();
+                        }
+                )
+        )
+;
+
+// Entry rule entryRuleNodeValueAssertion
+entryRuleNodeValueAssertion returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getNodeValueAssertionRule()); }
+        iv_ruleNodeValueAssertion=ruleNodeValueAssertion
+        { $current=$iv_ruleNodeValueAssertion.current; }
+        EOF;
+
+// Rule NodeValueAssertion
+ruleNodeValueAssertion returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                (
+                        (
+                                {
+                                        if ($current==null) {
+                                                $current = createModelElement(grammarAccess.getNodeValueAssertionRule());
+                                        }
+                                }
+                                {
+                                        newCompositeNode(grammarAccess.getNodeValueAssertionAccess().getNodeNodeCrossReference_0_0());
+                                }
+                                ruleQualifiedName
+                                {
+                                        afterParserOrEnumRuleCall();
+                                }
+                        )
+                )
+                otherlv_1=':'
+                {
+                        newLeafNode(otherlv_1, grammarAccess.getNodeValueAssertionAccess().getColonKeyword_1());
+                }
+                (
+                        (
+                                {
+                                        newCompositeNode(grammarAccess.getNodeValueAssertionAccess().getValueConstantParserRuleCall_2_0());
+                                }
+                                lv_value_2_0=ruleConstant
+                                {
+                                        if ($current==null) {
+                                                $current = createModelElementForParent(grammarAccess.getNodeValueAssertionRule());
+                                        }
+                                        set(
+                                                $current,
+                                                "value",
+                                                lv_value_2_0,
+                                                "org.eclipse.viatra.solver.language.Problem.Constant");
+                                        afterParserOrEnumRuleCall();
+                                }
+                        )
+                )
+                otherlv_3='.'
+                {
+                        newLeafNode(otherlv_3, grammarAccess.getNodeValueAssertionAccess().getFullStopKeyword_3());
+                }
+        )
+;
+
+// Entry rule entryRuleConstant
+entryRuleConstant returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getConstantRule()); }
+        iv_ruleConstant=ruleConstant
+        { $current=$iv_ruleConstant.current; }
+        EOF;
+
+// Rule Constant
+ruleConstant returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                {
+                        newCompositeNode(grammarAccess.getConstantAccess().getIntConstantParserRuleCall_0());
+                }
+                this_IntConstant_0=ruleIntConstant
+                {
+                        $current = $this_IntConstant_0.current;
+                        afterParserOrEnumRuleCall();
+                }
+                    |
+                {
+                        newCompositeNode(grammarAccess.getConstantAccess().getRealConstantParserRuleCall_1());
+                }
+                this_RealConstant_1=ruleRealConstant
+                {
+                        $current = $this_RealConstant_1.current;
+                        afterParserOrEnumRuleCall();
+                }
+                    |
+                {
+                        newCompositeNode(grammarAccess.getConstantAccess().getStringConstantParserRuleCall_2());
+                }
+                this_StringConstant_2=ruleStringConstant
+                {
+                        $current = $this_StringConstant_2.current;
+                        afterParserOrEnumRuleCall();
+                }
+        )
+;
+
+// Entry rule entryRuleIntConstant
+entryRuleIntConstant returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getIntConstantRule()); }
+        iv_ruleIntConstant=ruleIntConstant
+        { $current=$iv_ruleIntConstant.current; }
+        EOF;
+
+// Rule IntConstant
+ruleIntConstant returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                (
+                        {
+                                newCompositeNode(grammarAccess.getIntConstantAccess().getIntValueIntegerParserRuleCall_0());
+                        }
+                        lv_intValue_0_0=ruleInteger
+                        {
+                                if ($current==null) {
+                                        $current = createModelElementForParent(grammarAccess.getIntConstantRule());
+                                }
+                                set(
+                                        $current,
+                                        "intValue",
+                                        lv_intValue_0_0,
+                                        "org.eclipse.viatra.solver.language.Problem.Integer");
+                                afterParserOrEnumRuleCall();
+                        }
+                )
+        )
+;
+
+// Entry rule entryRuleRealConstant
+entryRuleRealConstant returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getRealConstantRule()); }
+        iv_ruleRealConstant=ruleRealConstant
+        { $current=$iv_ruleRealConstant.current; }
+        EOF;
+
+// Rule RealConstant
+ruleRealConstant returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                (
+                        {
+                                newCompositeNode(grammarAccess.getRealConstantAccess().getRealValueRealParserRuleCall_0());
+                        }
+                        lv_realValue_0_0=ruleReal
+                        {
+                                if ($current==null) {
+                                        $current = createModelElementForParent(grammarAccess.getRealConstantRule());
+                                }
+                                set(
+                                        $current,
+                                        "realValue",
+                                        lv_realValue_0_0,
+                                        "org.eclipse.viatra.solver.language.Problem.Real");
+                                afterParserOrEnumRuleCall();
+                        }
+                )
+        )
+;
+
+// Entry rule entryRuleStringConstant
+entryRuleStringConstant returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getStringConstantRule()); }
+        iv_ruleStringConstant=ruleStringConstant
+        { $current=$iv_ruleStringConstant.current; }
+        EOF;
+
+// Rule StringConstant
+ruleStringConstant returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                (
+                        lv_stringValue_0_0=RULE_STRING
+                        {
+                                newLeafNode(lv_stringValue_0_0, grammarAccess.getStringConstantAccess().getStringValueSTRINGTerminalRuleCall_0());
+                        }
+                        {
+                                if ($current==null) {
+                                        $current = createModelElement(grammarAccess.getStringConstantRule());
+                                }
+                                setWithLastConsumed(
+                                        $current,
+                                        "stringValue",
+                                        lv_stringValue_0_0,
+                                        "org.eclipse.viatra.solver.language.Problem.STRING");
+                        }
+                )
+        )
+;
+
 // Entry rule entryRuleScopeDeclaration
 entryRuleScopeDeclaration returns [EObject current=null]:
         { newCompositeNode(grammarAccess.getScopeDeclarationRule()); }
@@ -1723,16 +2135,22 @@ ruleQuotedOrUnquotedId returns [AntlrDatatypeRuleToken current=new AntlrDatatype
 ;
 
 // Entry rule entryRuleQualifiedName
-entryRuleQualifiedName returns [String current=null]:
+entryRuleQualifiedName returns [String current=null]@init {
+        HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+}:
         { newCompositeNode(grammarAccess.getQualifiedNameRule()); }
         iv_ruleQualifiedName=ruleQualifiedName
         { $current=$iv_ruleQualifiedName.current.getText(); }
         EOF;
+finally {
+        myHiddenTokenState.restore();
+}
 
 // Rule QualifiedName
 ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()]
 @init {
         enterRule();
+        HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 }
 @after {
         leaveRule();
@@ -1791,6 +2209,9 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT
                 )
         )
 ;
+finally {
+        myHiddenTokenState.restore();
+}
 
 // Entry rule entryRuleIdentifier
 entryRuleIdentifier returns [String current=null]:
@@ -1827,9 +2248,171 @@ ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToke
                         $current.merge(kw);
                         newLeafNode(kw, grammarAccess.getIdentifierAccess().getFalseKeyword_2());
                 }
+                    |
+                kw='e'
+                {
+                        $current.merge(kw);
+                        newLeafNode(kw, grammarAccess.getIdentifierAccess().getEKeyword_3());
+                }
+                    |
+                kw='E'
+                {
+                        $current.merge(kw);
+                        newLeafNode(kw, grammarAccess.getIdentifierAccess().getEKeyword_4());
+                }
         )
 ;
 
+// Entry rule entryRuleInteger
+entryRuleInteger returns [String current=null]@init {
+        HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+}:
+        { newCompositeNode(grammarAccess.getIntegerRule()); }
+        iv_ruleInteger=ruleInteger
+        { $current=$iv_ruleInteger.current.getText(); }
+        EOF;
+finally {
+        myHiddenTokenState.restore();
+}
+
+// Rule Integer
+ruleInteger returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()]
+@init {
+        enterRule();
+        HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+}
+@after {
+        leaveRule();
+}:
+        (
+                (
+                        kw='-'
+                        {
+                                $current.merge(kw);
+                                newLeafNode(kw, grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0());
+                        }
+                )?
+                this_INT_1=RULE_INT
+                {
+                        $current.merge(this_INT_1);
+                }
+                {
+                        newLeafNode(this_INT_1, grammarAccess.getIntegerAccess().getINTTerminalRuleCall_1());
+                }
+        )
+;
+finally {
+        myHiddenTokenState.restore();
+}
+
+// Entry rule entryRuleReal
+entryRuleReal returns [String current=null]@init {
+        HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+}:
+        { newCompositeNode(grammarAccess.getRealRule()); }
+        iv_ruleReal=ruleReal
+        { $current=$iv_ruleReal.current.getText(); }
+        EOF;
+finally {
+        myHiddenTokenState.restore();
+}
+
+// Rule Real
+ruleReal returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()]
+@init {
+        enterRule();
+        HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+}
+@after {
+        leaveRule();
+}:
+        (
+                (
+                        kw='-'
+                        {
+                                $current.merge(kw);
+                                newLeafNode(kw, grammarAccess.getRealAccess().getHyphenMinusKeyword_0());
+                        }
+                )?
+                this_INT_1=RULE_INT
+                {
+                        $current.merge(this_INT_1);
+                }
+                {
+                        newLeafNode(this_INT_1, grammarAccess.getRealAccess().getINTTerminalRuleCall_1());
+                }
+                (
+                        (
+                                kw='.'
+                                {
+                                        $current.merge(kw);
+                                        newLeafNode(kw, grammarAccess.getRealAccess().getFullStopKeyword_2_0_0());
+                                }
+                                this_INT_3=RULE_INT
+                                {
+                                        $current.merge(this_INT_3);
+                                }
+                                {
+                                        newLeafNode(this_INT_3, grammarAccess.getRealAccess().getINTTerminalRuleCall_2_0_1());
+                                }
+                        )
+                            |
+                        (
+                                (
+                                        kw='.'
+                                        {
+                                                $current.merge(kw);
+                                                newLeafNode(kw, grammarAccess.getRealAccess().getFullStopKeyword_2_1_0_0());
+                                        }
+                                        this_INT_5=RULE_INT
+                                        {
+                                                $current.merge(this_INT_5);
+                                        }
+                                        {
+                                                newLeafNode(this_INT_5, grammarAccess.getRealAccess().getINTTerminalRuleCall_2_1_0_1());
+                                        }
+                                )?
+                                (
+                                        kw='e'
+                                        {
+                                                $current.merge(kw);
+                                                newLeafNode(kw, grammarAccess.getRealAccess().getEKeyword_2_1_1_0());
+                                        }
+                                            |
+                                        kw='E'
+                                        {
+                                                $current.merge(kw);
+                                                newLeafNode(kw, grammarAccess.getRealAccess().getEKeyword_2_1_1_1());
+                                        }
+                                )
+                                (
+                                        kw='-'
+                                        {
+                                                $current.merge(kw);
+                                                newLeafNode(kw, grammarAccess.getRealAccess().getHyphenMinusKeyword_2_1_2_0());
+                                        }
+                                            |
+                                        kw='+'
+                                        {
+                                                $current.merge(kw);
+                                                newLeafNode(kw, grammarAccess.getRealAccess().getPlusSignKeyword_2_1_2_1());
+                                        }
+                                )?
+                                this_INT_10=RULE_INT
+                                {
+                                        $current.merge(this_INT_10);
+                                }
+                                {
+                                        newLeafNode(this_INT_10, grammarAccess.getRealAccess().getINTTerminalRuleCall_2_1_3());
+                                }
+                        )
+                )
+        )
+;
+finally {
+        myHiddenTokenState.restore();
+}
+
 // Rule LogicValue
 ruleLogicValue returns [Enumerator current=null]
 @init {
@@ -1892,14 +2475,14 @@ ruleShortLogicValue returns [Enumerator current=null]
         )
 ;
 
+RULE_ID : ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
+
 RULE_STRING : '"' ('\\' .|~(('\\'|'"')))* '"';
 
 RULE_QUOTED_ID : '\'' ('\\' .|~(('\\'|'\'')))* '\'';
 
 RULE_SL_COMMENT : ('%'|'//') ~(('\n'|'\r'))* ('\r'? '\n')?;
 
-RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
-
 RULE_INT : ('0'..'9')+;
 
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
diff --git a/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.tokens b/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.tokens
index 7b308424..763a9cc8 100644
--- a/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.tokens
+++ b/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.tokens
@@ -5,6 +5,7 @@
 '+'=33
 '+='=36
 ','=17
+'-'=45
 '.'=13
 '..'=38
 ':'=34
@@ -12,12 +13,14 @@
 '::'=40
 ';'=19
 '='=37
-'?'=44
+'?'=47
+'E'=44
 '['=24
 ']'=25
 'abstract'=14
 'class'=15
 'contains'=22
+'e'=43
 'enum'=21
 'error'=27
 'extends'=16
@@ -28,16 +31,16 @@
 'refers'=23
 'scope'=35
 'true'=41
-'unknown'=43
+'unknown'=46
 '{'=18
 '}'=20
 RULE_ANY_OTHER=11
-RULE_ID=4
-RULE_INT=5
+RULE_ID=5
+RULE_INT=6
 RULE_ML_COMMENT=9
-RULE_QUOTED_ID=6
+RULE_QUOTED_ID=7
 RULE_SL_COMMENT=8
-RULE_STRING=7
+RULE_STRING=4
 RULE_WS=10
 T__12=12
 T__13=13
@@ -72,3 +75,6 @@ T__41=41
 T__42=42
 T__43=43
 T__44=44
+T__45=45
+T__46=46
+T__47=47
diff --git a/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemLexer.java b/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemLexer.java
index c6298afc..345610ce 100644
--- a/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemLexer.java
+++ b/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemLexer.java
@@ -20,12 +20,12 @@ public class InternalProblemLexer extends Lexer {
     public static final int T__12=12;
     public static final int T__13=13;
     public static final int T__14=14;
-    public static final int RULE_ID=4;
-    public static final int RULE_QUOTED_ID=6;
+    public static final int RULE_ID=5;
+    public static final int RULE_QUOTED_ID=7;
     public static final int T__26=26;
     public static final int T__27=27;
     public static final int T__28=28;
-    public static final int RULE_INT=5;
+    public static final int RULE_INT=6;
     public static final int T__29=29;
     public static final int T__22=22;
     public static final int RULE_ML_COMMENT=9;
@@ -34,7 +34,7 @@ public class InternalProblemLexer extends Lexer {
     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_STRING=4;
     public static final int RULE_SL_COMMENT=8;
     public static final int T__37=37;
     public static final int T__38=38;
@@ -50,6 +50,9 @@ public class InternalProblemLexer extends Lexer {
     public static final int RULE_WS=10;
     public static final int RULE_ANY_OTHER=11;
     public static final int T__44=44;
+    public static final int T__45=45;
+    public static final int T__46=46;
+    public static final int T__47=47;
     public static final int T__40=40;
     public static final int T__41=41;
     public static final int T__42=42;
@@ -710,11 +713,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__43;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:42:7: ( 'unknown' )
-            // InternalProblem.g:42:9: 'unknown'
+            // InternalProblem.g:42:7: ( 'e' )
+            // InternalProblem.g:42:9: 'e'
             {
-            match("unknown"); 
-
+            match('e'); 
 
             }
 
@@ -731,10 +733,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__44;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:43:7: ( '?' )
-            // InternalProblem.g:43:9: '?'
+            // InternalProblem.g:43:7: ( 'E' )
+            // InternalProblem.g:43:9: 'E'
             {
-            match('?'); 
+            match('E'); 
 
             }
 
@@ -746,32 +748,154 @@ public class InternalProblemLexer extends Lexer {
     }
     // $ANTLR end "T__44"
 
+    // $ANTLR start "T__45"
+    public final void mT__45() throws RecognitionException {
+        try {
+            int _type = T__45;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:44:7: ( '-' )
+            // InternalProblem.g:44:9: '-'
+            {
+            match('-'); 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__45"
+
+    // $ANTLR start "T__46"
+    public final void mT__46() throws RecognitionException {
+        try {
+            int _type = T__46;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:45:7: ( 'unknown' )
+            // InternalProblem.g:45:9: 'unknown'
+            {
+            match("unknown"); 
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__46"
+
+    // $ANTLR start "T__47"
+    public final void mT__47() throws RecognitionException {
+        try {
+            int _type = T__47;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:46:7: ( '?' )
+            // InternalProblem.g:46:9: '?'
+            {
+            match('?'); 
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__47"
+
+    // $ANTLR start "RULE_ID"
+    public final void mRULE_ID() throws RecognitionException {
+        try {
+            int _type = RULE_ID;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:2478:9: ( ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalProblem.g:2478:11: ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            {
+            if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
+                input.consume();
+
+            }
+            else {
+                MismatchedSetException mse = new MismatchedSetException(null,input);
+                recover(mse);
+                throw mse;}
+
+            // InternalProblem.g:2478:35: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            loop1:
+            do {
+                int alt1=2;
+                int LA1_0 = input.LA(1);
+
+                if ( ((LA1_0>='0' && LA1_0<='9')||(LA1_0>='A' && LA1_0<='Z')||LA1_0=='_'||(LA1_0>='a' && LA1_0<='z')) ) {
+                    alt1=1;
+                }
+
+
+                switch (alt1) {
+                case 1 :
+                    // InternalProblem.g:
+                    {
+                    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
+                        input.consume();
+
+                    }
+                    else {
+                        MismatchedSetException mse = new MismatchedSetException(null,input);
+                        recover(mse);
+                        throw mse;}
+
+
+                    }
+                    break;
+
+                default :
+                    break loop1;
+                }
+            } while (true);
+
+
+            }
+
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "RULE_ID"
+
     // $ANTLR start "RULE_STRING"
     public final void mRULE_STRING() throws RecognitionException {
         try {
             int _type = RULE_STRING;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1895:13: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
-            // InternalProblem.g:1895:15: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+            // InternalProblem.g:2480:13: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
+            // InternalProblem.g:2480:15: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
             {
             match('\"'); 
-            // InternalProblem.g:1895:19: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
-            loop1:
+            // InternalProblem.g:2480:19: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+            loop2:
             do {
-                int alt1=3;
-                int LA1_0 = input.LA(1);
+                int alt2=3;
+                int LA2_0 = input.LA(1);
 
-                if ( (LA1_0=='\\') ) {
-                    alt1=1;
+                if ( (LA2_0=='\\') ) {
+                    alt2=1;
                 }
-                else if ( ((LA1_0>='\u0000' && LA1_0<='!')||(LA1_0>='#' && LA1_0<='[')||(LA1_0>=']' && LA1_0<='\uFFFF')) ) {
-                    alt1=2;
+                else if ( ((LA2_0>='\u0000' && LA2_0<='!')||(LA2_0>='#' && LA2_0<='[')||(LA2_0>=']' && LA2_0<='\uFFFF')) ) {
+                    alt2=2;
                 }
 
 
-                switch (alt1) {
+                switch (alt2) {
                 case 1 :
-                    // InternalProblem.g:1895:20: '\\\\' .
+                    // InternalProblem.g:2480:20: '\\\\' .
                     {
                     match('\\'); 
                     matchAny(); 
@@ -779,7 +903,7 @@ public class InternalProblemLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1895:27: ~ ( ( '\\\\' | '\"' ) )
+                    // InternalProblem.g:2480:27: ~ ( ( '\\\\' | '\"' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -795,7 +919,7 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    break loop1;
+                    break loop2;
                 }
             } while (true);
 
@@ -816,27 +940,27 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_QUOTED_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1897:16: ( '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
-            // InternalProblem.g:1897:18: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
+            // InternalProblem.g:2482:16: ( '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalProblem.g:2482:18: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
             {
             match('\''); 
-            // InternalProblem.g:1897:23: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
-            loop2:
+            // InternalProblem.g:2482:23: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+            loop3:
             do {
-                int alt2=3;
-                int LA2_0 = input.LA(1);
+                int alt3=3;
+                int LA3_0 = input.LA(1);
 
-                if ( (LA2_0=='\\') ) {
-                    alt2=1;
+                if ( (LA3_0=='\\') ) {
+                    alt3=1;
                 }
-                else if ( ((LA2_0>='\u0000' && LA2_0<='&')||(LA2_0>='(' && LA2_0<='[')||(LA2_0>=']' && LA2_0<='\uFFFF')) ) {
-                    alt2=2;
+                else if ( ((LA3_0>='\u0000' && LA3_0<='&')||(LA3_0>='(' && LA3_0<='[')||(LA3_0>=']' && LA3_0<='\uFFFF')) ) {
+                    alt3=2;
                 }
 
 
-                switch (alt2) {
+                switch (alt3) {
                 case 1 :
-                    // InternalProblem.g:1897:24: '\\\\' .
+                    // InternalProblem.g:2482:24: '\\\\' .
                     {
                     match('\\'); 
                     matchAny(); 
@@ -844,7 +968,7 @@ public class InternalProblemLexer extends Lexer {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1897:31: ~ ( ( '\\\\' | '\\'' ) )
+                    // InternalProblem.g:2482:31: ~ ( ( '\\\\' | '\\'' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -860,7 +984,7 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    break loop2;
+                    break loop3;
                 }
             } while (true);
 
@@ -881,35 +1005,35 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1899:17: ( ( '%' | '//' ) (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // InternalProblem.g:1899:19: ( '%' | '//' ) (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalProblem.g:2484:17: ( ( '%' | '//' ) (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalProblem.g:2484:19: ( '%' | '//' ) (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
-            // InternalProblem.g:1899:19: ( '%' | '//' )
-            int alt3=2;
-            int LA3_0 = input.LA(1);
+            // InternalProblem.g:2484:19: ( '%' | '//' )
+            int alt4=2;
+            int LA4_0 = input.LA(1);
 
-            if ( (LA3_0=='%') ) {
-                alt3=1;
+            if ( (LA4_0=='%') ) {
+                alt4=1;
             }
-            else if ( (LA3_0=='/') ) {
-                alt3=2;
+            else if ( (LA4_0=='/') ) {
+                alt4=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 3, 0, input);
+                    new NoViableAltException("", 4, 0, input);
 
                 throw nvae;
             }
-            switch (alt3) {
+            switch (alt4) {
                 case 1 :
-                    // InternalProblem.g:1899:20: '%'
+                    // InternalProblem.g:2484:20: '%'
                     {
                     match('%'); 
 
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1899:24: '//'
+                    // InternalProblem.g:2484:24: '//'
                     {
                     match("//"); 
 
@@ -919,20 +1043,20 @@ public class InternalProblemLexer extends Lexer {
 
             }
 
-            // InternalProblem.g:1899:30: (~ ( ( '\\n' | '\\r' ) ) )*
-            loop4:
+            // InternalProblem.g:2484:30: (~ ( ( '\\n' | '\\r' ) ) )*
+            loop5:
             do {
-                int alt4=2;
-                int LA4_0 = input.LA(1);
+                int alt5=2;
+                int LA5_0 = input.LA(1);
 
-                if ( ((LA4_0>='\u0000' && LA4_0<='\t')||(LA4_0>='\u000B' && LA4_0<='\f')||(LA4_0>='\u000E' && LA4_0<='\uFFFF')) ) {
-                    alt4=1;
+                if ( ((LA5_0>='\u0000' && LA5_0<='\t')||(LA5_0>='\u000B' && LA5_0<='\f')||(LA5_0>='\u000E' && LA5_0<='\uFFFF')) ) {
+                    alt5=1;
                 }
 
 
-                switch (alt4) {
+                switch (alt5) {
                 case 1 :
-                    // InternalProblem.g:1899:30: ~ ( ( '\\n' | '\\r' ) )
+                    // InternalProblem.g:2484:30: ~ ( ( '\\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();
@@ -948,31 +1072,31 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    break loop4;
+                    break loop5;
                 }
             } while (true);
 
-            // InternalProblem.g:1899:46: ( ( '\\r' )? '\\n' )?
-            int alt6=2;
-            int LA6_0 = input.LA(1);
+            // InternalProblem.g:2484:46: ( ( '\\r' )? '\\n' )?
+            int alt7=2;
+            int LA7_0 = input.LA(1);
 
-            if ( (LA6_0=='\n'||LA6_0=='\r') ) {
-                alt6=1;
+            if ( (LA7_0=='\n'||LA7_0=='\r') ) {
+                alt7=1;
             }
-            switch (alt6) {
+            switch (alt7) {
                 case 1 :
-                    // InternalProblem.g:1899:47: ( '\\r' )? '\\n'
+                    // InternalProblem.g:2484:47: ( '\\r' )? '\\n'
                     {
-                    // InternalProblem.g:1899:47: ( '\\r' )?
-                    int alt5=2;
-                    int LA5_0 = input.LA(1);
+                    // InternalProblem.g:2484:47: ( '\\r' )?
+                    int alt6=2;
+                    int LA6_0 = input.LA(1);
 
-                    if ( (LA5_0=='\r') ) {
-                        alt5=1;
+                    if ( (LA6_0=='\r') ) {
+                        alt6=1;
                     }
-                    switch (alt5) {
+                    switch (alt6) {
                         case 1 :
-                            // InternalProblem.g:1899:47: '\\r'
+                            // InternalProblem.g:2484:47: '\\r'
                             {
                             match('\r'); 
 
@@ -999,108 +1123,29 @@ public class InternalProblemLexer extends Lexer {
     }
     // $ANTLR end "RULE_SL_COMMENT"
 
-    // $ANTLR start "RULE_ID"
-    public final void mRULE_ID() throws RecognitionException {
+    // $ANTLR start "RULE_INT"
+    public final void mRULE_INT() throws RecognitionException {
         try {
-            int _type = RULE_ID;
+            int _type = RULE_INT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1901:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // InternalProblem.g:1901:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalProblem.g:2486:10: ( ( '0' .. '9' )+ )
+            // InternalProblem.g:2486:12: ( '0' .. '9' )+
             {
-            // InternalProblem.g:1901:11: ( '^' )?
-            int alt7=2;
-            int LA7_0 = input.LA(1);
-
-            if ( (LA7_0=='^') ) {
-                alt7=1;
-            }
-            switch (alt7) {
-                case 1 :
-                    // InternalProblem.g:1901:11: '^'
-                    {
-                    match('^'); 
-
-                    }
-                    break;
-
-            }
-
-            if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            // InternalProblem.g:1901:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalProblem.g:2486:12: ( '0' .. '9' )+
+            int cnt8=0;
             loop8:
             do {
                 int alt8=2;
                 int LA8_0 = input.LA(1);
 
-                if ( ((LA8_0>='0' && LA8_0<='9')||(LA8_0>='A' && LA8_0<='Z')||LA8_0=='_'||(LA8_0>='a' && LA8_0<='z')) ) {
+                if ( ((LA8_0>='0' && LA8_0<='9')) ) {
                     alt8=1;
                 }
 
 
                 switch (alt8) {
                 case 1 :
-                    // InternalProblem.g:
-                    {
-                    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
-                        input.consume();
-
-                    }
-                    else {
-                        MismatchedSetException mse = new MismatchedSetException(null,input);
-                        recover(mse);
-                        throw mse;}
-
-
-                    }
-                    break;
-
-                default :
-                    break loop8;
-                }
-            } while (true);
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "RULE_ID"
-
-    // $ANTLR start "RULE_INT"
-    public final void mRULE_INT() throws RecognitionException {
-        try {
-            int _type = RULE_INT;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1903:10: ( ( '0' .. '9' )+ )
-            // InternalProblem.g:1903:12: ( '0' .. '9' )+
-            {
-            // InternalProblem.g:1903:12: ( '0' .. '9' )+
-            int cnt9=0;
-            loop9:
-            do {
-                int alt9=2;
-                int LA9_0 = input.LA(1);
-
-                if ( ((LA9_0>='0' && LA9_0<='9')) ) {
-                    alt9=1;
-                }
-
-
-                switch (alt9) {
-                case 1 :
-                    // InternalProblem.g:1903:13: '0' .. '9'
+                    // InternalProblem.g:2486:13: '0' .. '9'
                     {
                     matchRange('0','9'); 
 
@@ -1108,12 +1153,12 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    if ( cnt9 >= 1 ) break loop9;
+                    if ( cnt8 >= 1 ) break loop8;
                         EarlyExitException eee =
-                            new EarlyExitException(9, input);
+                            new EarlyExitException(8, input);
                         throw eee;
                 }
-                cnt9++;
+                cnt8++;
             } while (true);
 
 
@@ -1132,37 +1177,37 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1905:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // InternalProblem.g:1905:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalProblem.g:2488:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalProblem.g:2488:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // InternalProblem.g:1905:24: ( options {greedy=false; } : . )*
-            loop10:
+            // InternalProblem.g:2488:24: ( options {greedy=false; } : . )*
+            loop9:
             do {
-                int alt10=2;
-                int LA10_0 = input.LA(1);
+                int alt9=2;
+                int LA9_0 = input.LA(1);
 
-                if ( (LA10_0=='*') ) {
-                    int LA10_1 = input.LA(2);
+                if ( (LA9_0=='*') ) {
+                    int LA9_1 = input.LA(2);
 
-                    if ( (LA10_1=='/') ) {
-                        alt10=2;
+                    if ( (LA9_1=='/') ) {
+                        alt9=2;
                     }
-                    else if ( ((LA10_1>='\u0000' && LA10_1<='.')||(LA10_1>='0' && LA10_1<='\uFFFF')) ) {
-                        alt10=1;
+                    else if ( ((LA9_1>='\u0000' && LA9_1<='.')||(LA9_1>='0' && LA9_1<='\uFFFF')) ) {
+                        alt9=1;
                     }
 
 
                 }
-                else if ( ((LA10_0>='\u0000' && LA10_0<=')')||(LA10_0>='+' && LA10_0<='\uFFFF')) ) {
-                    alt10=1;
+                else if ( ((LA9_0>='\u0000' && LA9_0<=')')||(LA9_0>='+' && LA9_0<='\uFFFF')) ) {
+                    alt9=1;
                 }
 
 
-                switch (alt10) {
+                switch (alt9) {
                 case 1 :
-                    // InternalProblem.g:1905:52: .
+                    // InternalProblem.g:2488:52: .
                     {
                     matchAny(); 
 
@@ -1170,7 +1215,7 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    break loop10;
+                    break loop9;
                 }
             } while (true);
 
@@ -1192,22 +1237,22 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1907:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // InternalProblem.g:1907:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalProblem.g:2490:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalProblem.g:2490:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // InternalProblem.g:1907:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
-            int cnt11=0;
-            loop11:
+            // InternalProblem.g:2490:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            int cnt10=0;
+            loop10:
             do {
-                int alt11=2;
-                int LA11_0 = input.LA(1);
+                int alt10=2;
+                int LA10_0 = input.LA(1);
 
-                if ( ((LA11_0>='\t' && LA11_0<='\n')||LA11_0=='\r'||LA11_0==' ') ) {
-                    alt11=1;
+                if ( ((LA10_0>='\t' && LA10_0<='\n')||LA10_0=='\r'||LA10_0==' ') ) {
+                    alt10=1;
                 }
 
 
-                switch (alt11) {
+                switch (alt10) {
                 case 1 :
                     // InternalProblem.g:
                     {
@@ -1225,12 +1270,12 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    if ( cnt11 >= 1 ) break loop11;
+                    if ( cnt10 >= 1 ) break loop10;
                         EarlyExitException eee =
-                            new EarlyExitException(11, input);
+                            new EarlyExitException(10, input);
                         throw eee;
                 }
-                cnt11++;
+                cnt10++;
             } while (true);
 
 
@@ -1249,8 +1294,8 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1909:16: ( . )
-            // InternalProblem.g:1909:18: .
+            // InternalProblem.g:2492:16: ( . )
+            // InternalProblem.g:2492:18: .
             {
             matchAny(); 
 
@@ -1265,10 +1310,10 @@ 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 | T__43 | T__44 | RULE_STRING | RULE_QUOTED_ID | RULE_SL_COMMENT | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt12=41;
-        alt12 = dfa12.predict(input);
-        switch (alt12) {
+        // 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 | T__44 | T__45 | T__46 | T__47 | RULE_ID | RULE_STRING | RULE_QUOTED_ID | RULE_SL_COMMENT | RULE_INT | RULE_ML_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt11=44;
+        alt11 = dfa11.predict(input);
+        switch (alt11) {
             case 1 :
                 // InternalProblem.g:1:10: T__12
                 {
@@ -1501,56 +1546,77 @@ public class InternalProblemLexer extends Lexer {
                 }
                 break;
             case 34 :
-                // InternalProblem.g:1:208: RULE_STRING
+                // InternalProblem.g:1:208: T__45
                 {
-                mRULE_STRING(); 
+                mT__45(); 
 
                 }
                 break;
             case 35 :
-                // InternalProblem.g:1:220: RULE_QUOTED_ID
+                // InternalProblem.g:1:214: T__46
                 {
-                mRULE_QUOTED_ID(); 
+                mT__46(); 
 
                 }
                 break;
             case 36 :
-                // InternalProblem.g:1:235: RULE_SL_COMMENT
+                // InternalProblem.g:1:220: T__47
                 {
-                mRULE_SL_COMMENT(); 
+                mT__47(); 
 
                 }
                 break;
             case 37 :
-                // InternalProblem.g:1:251: RULE_ID
+                // InternalProblem.g:1:226: RULE_ID
                 {
                 mRULE_ID(); 
 
                 }
                 break;
             case 38 :
-                // InternalProblem.g:1:259: RULE_INT
+                // InternalProblem.g:1:234: RULE_STRING
                 {
-                mRULE_INT(); 
+                mRULE_STRING(); 
 
                 }
                 break;
             case 39 :
-                // InternalProblem.g:1:268: RULE_ML_COMMENT
+                // InternalProblem.g:1:246: RULE_QUOTED_ID
                 {
-                mRULE_ML_COMMENT(); 
+                mRULE_QUOTED_ID(); 
 
                 }
                 break;
             case 40 :
-                // InternalProblem.g:1:284: RULE_WS
+                // InternalProblem.g:1:261: RULE_SL_COMMENT
                 {
-                mRULE_WS(); 
+                mRULE_SL_COMMENT(); 
 
                 }
                 break;
             case 41 :
-                // InternalProblem.g:1:292: RULE_ANY_OTHER
+                // InternalProblem.g:1:277: RULE_INT
+                {
+                mRULE_INT(); 
+
+                }
+                break;
+            case 42 :
+                // InternalProblem.g:1:286: RULE_ML_COMMENT
+                {
+                mRULE_ML_COMMENT(); 
+
+                }
+                break;
+            case 43 :
+                // InternalProblem.g:1:302: RULE_WS
+                {
+                mRULE_WS(); 
+
+                }
+                break;
+            case 44 :
+                // InternalProblem.g:1:310: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1562,74 +1628,75 @@ public class InternalProblemLexer extends Lexer {
     }
 
 
-    protected DFA12 dfa12 = new DFA12(this);
-    static final String DFA12_eotS =
-        "\1\uffff\1\44\1\46\3\44\4\uffff\1\44\2\uffff\1\44\2\uffff\1\71\1\uffff\1\74\1\44\2\uffff\3\44\1\uffff\2\42\1\uffff\2\42\4\uffff\1\44\3\uffff\6\44\4\uffff\1\44\2\uffff\1\44\10\uffff\1\44\2\uffff\3\44\7\uffff\17\44\1\147\4\44\1\154\4\44\1\161\3\44\1\uffff\1\44\1\166\2\44\1\uffff\1\171\2\44\1\174\1\uffff\1\175\3\44\1\uffff\2\44\1\uffff\1\u0083\1\44\2\uffff\1\44\1\u0086\2\44\1\u0089\1\uffff\1\44\1\u008b\1\uffff\1\u008c\1\u008d\1\uffff\1\u008e\4\uffff";
-    static final String DFA12_eofS =
-        "\u008f\uffff";
-    static final String DFA12_minS =
-        "\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\uffff\1\52\1\101\4\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\10\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 DFA12_maxS =
-        "\1\uffff\1\162\1\56\1\142\1\157\1\170\4\uffff\1\145\2\uffff\1\160\2\uffff\1\72\1\uffff\1\75\1\143\2\uffff\1\162\1\141\1\156\1\uffff\2\uffff\1\uffff\1\57\1\172\4\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\10\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 DFA12_acceptS =
-        "\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\41\2\uffff\1\44\2\uffff\1\45\1\46\1\50\1\51\1\uffff\1\45\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\35\1\27\1\25\1\31\1\26\1\uffff\1\32\1\34\3\uffff\1\41\1\42\1\43\1\44\1\47\1\46\1\50\35\uffff\1\21\4\uffff\1\12\4\uffff\1\36\4\uffff\1\4\2\uffff\1\20\2\uffff\1\30\1\37\5\uffff\1\14\2\uffff\1\1\2\uffff\1\5\1\uffff\1\40\1\3\1\13\1\17";
-    static final String DFA12_specialS =
-        "\1\0\31\uffff\1\2\1\1\163\uffff}>";
-    static final String[] DFA12_transitionS = {
-            "\11\42\2\41\2\42\1\41\22\42\1\41\1\21\1\32\2\42\1\34\1\42\1\33\1\16\1\17\1\25\1\22\1\6\1\42\1\2\1\35\12\40\1\20\1\10\1\42\1\24\1\42\1\31\1\42\32\37\1\13\1\42\1\14\1\36\1\37\1\42\1\3\1\37\1\4\1\37\1\5\1\27\10\37\1\15\1\1\1\37\1\12\1\23\1\26\1\30\5\37\1\7\1\42\1\11\uff82\42",
-            "\1\43",
-            "\1\45",
-            "\1\47",
-            "\1\50\2\uffff\1\51",
-            "\1\53\3\uffff\1\54\5\uffff\1\52",
+    protected DFA11 dfa11 = new DFA11(this);
+    static final String DFA11_eotS =
+        "\1\uffff\1\45\1\47\2\45\1\56\4\uffff\1\45\2\uffff\1\45\2\uffff\1\73\1\uffff\1\76\1\45\2\uffff\2\45\1\104\1\uffff\1\45\2\uffff\2\43\1\uffff\1\43\3\uffff\1\45\3\uffff\6\45\5\uffff\1\45\2\uffff\1\45\10\uffff\1\45\2\uffff\2\45\2\uffff\1\45\7\uffff\17\45\1\153\4\45\1\160\4\45\1\165\3\45\1\uffff\1\45\1\172\2\45\1\uffff\1\175\2\45\1\u0080\1\uffff\1\u0081\3\45\1\uffff\2\45\1\uffff\1\u0087\1\45\2\uffff\1\45\1\u008a\2\45\1\u008d\1\uffff\1\45\1\u008f\1\uffff\1\u0090\1\u0091\1\uffff\1\u0092\4\uffff";
+    static final String DFA11_eofS =
+        "\u0093\uffff";
+    static final String DFA11_minS =
+        "\1\0\1\162\1\56\1\142\1\154\1\60\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\60\1\uffff\1\156\2\uffff\2\0\1\uffff\1\52\3\uffff\1\145\3\uffff\1\163\1\141\1\156\1\164\1\165\1\162\5\uffff\1\146\2\uffff\1\160\10\uffff\1\157\2\uffff\1\165\1\154\2\uffff\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\172\4\uffff\1\145\2\uffff\1\160\2\uffff\1\72\1\uffff\1\75\1\143\2\uffff\1\162\1\141\1\172\1\uffff\1\156\2\uffff\2\uffff\1\uffff\1\57\3\uffff\1\157\3\uffff\1\163\1\141\1\156\1\164\1\165\1\162\5\uffff\1\146\2\uffff\1\160\10\uffff\1\157\2\uffff\1\165\1\154\2\uffff\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\15\1\16\1\uffff\1\22\1\23\1\uffff\1\25\2\uffff\1\32\1\34\3\uffff\1\42\1\uffff\1\44\1\45\2\uffff\1\50\1\uffff\1\51\1\53\1\54\1\uffff\1\45\1\33\1\2\6\uffff\1\40\1\6\1\7\1\10\1\11\1\uffff\1\15\1\16\1\uffff\1\22\1\23\1\24\1\35\1\27\1\25\1\31\1\26\1\uffff\1\32\1\34\2\uffff\1\41\1\42\1\uffff\1\44\1\46\1\47\1\50\1\52\1\51\1\53\35\uffff\1\21\4\uffff\1\12\4\uffff\1\36\4\uffff\1\4\2\uffff\1\20\2\uffff\1\30\1\37\5\uffff\1\14\2\uffff\1\1\2\uffff\1\5\1\uffff\1\43\1\3\1\13\1\17";
+    static final String DFA11_specialS =
+        "\1\1\34\uffff\1\2\1\0\164\uffff}>";
+    static final String[] DFA11_transitionS = {
+            "\11\43\2\42\2\43\1\42\22\43\1\42\1\21\1\35\2\43\1\37\1\43\1\36\1\16\1\17\1\25\1\22\1\6\1\31\1\2\1\40\12\41\1\20\1\10\1\43\1\24\1\43\1\33\1\43\4\34\1\30\25\34\1\13\1\43\1\14\1\43\1\34\1\43\1\3\1\34\1\4\1\34\1\5\1\27\10\34\1\15\1\1\1\34\1\12\1\23\1\26\1\32\5\34\1\7\1\43\1\11\uff82\43",
+            "\1\44",
+            "\1\46",
+            "\1\50",
+            "\1\51\2\uffff\1\52",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\15\45\1\54\3\45\1\55\5\45\1\53\2\45",
             "",
             "",
             "",
             "",
-            "\1\61",
+            "\1\63",
             "",
             "",
-            "\1\64",
+            "\1\66",
             "",
             "",
-            "\1\67\14\uffff\1\70",
+            "\1\71\14\uffff\1\72",
             "",
-            "\1\73",
             "\1\75",
+            "\1\77",
             "",
             "",
-            "\1\100",
-            "\1\101",
             "\1\102",
+            "\1\103",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
             "",
-            "\0\104",
-            "\0\105",
+            "\1\106",
             "",
-            "\1\107\4\uffff\1\106",
-            "\32\44\4\uffff\1\44\1\uffff\32\44",
             "",
+            "\0\110",
+            "\0\111",
             "",
+            "\1\113\4\uffff\1\112",
             "",
             "",
-            "\1\113\11\uffff\1\112",
+            "",
+            "\1\117\11\uffff\1\116",
             "",
             "",
             "",
-            "\1\114",
-            "\1\115",
-            "\1\116",
-            "\1\117",
             "\1\120",
             "\1\121",
+            "\1\122",
+            "\1\123",
+            "\1\124",
+            "\1\125",
             "",
             "",
             "",
             "",
-            "\1\122",
             "",
+            "\1\126",
             "",
-            "\1\123",
             "",
+            "\1\127",
             "",
             "",
             "",
@@ -1637,12 +1704,15 @@ public class InternalProblemLexer extends Lexer {
             "",
             "",
             "",
-            "\1\124",
             "",
+            "\1\130",
             "",
-            "\1\125",
-            "\1\126",
-            "\1\127",
+            "",
+            "\1\131",
+            "\1\132",
+            "",
+            "",
+            "\1\133",
             "",
             "",
             "",
@@ -1650,10 +1720,6 @@ public class InternalProblemLexer extends Lexer {
             "",
             "",
             "",
-            "\1\130",
-            "\1\131",
-            "\1\132",
-            "\1\133",
             "\1\134",
             "\1\135",
             "\1\136",
@@ -1665,195 +1731,201 @@ public class InternalProblemLexer extends Lexer {
             "\1\144",
             "\1\145",
             "\1\146",
-            "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
+            "\1\147",
             "\1\150",
             "\1\151",
             "\1\152",
-            "\1\153",
-            "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\154",
             "\1\155",
             "\1\156",
             "\1\157",
-            "\1\160",
-            "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\161",
             "\1\162",
             "\1\163",
             "\1\164",
-            "",
-            "\1\165",
-            "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\166",
             "\1\167",
             "\1\170",
             "",
-            "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
-            "\1\172",
+            "\1\171",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
             "\1\173",
-            "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
+            "\1\174",
             "",
-            "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
             "\1\176",
             "\1\177",
-            "\1\u0080",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
             "",
-            "\1\u0081",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
             "\1\u0082",
-            "",
-            "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
+            "\1\u0083",
             "\1\u0084",
             "",
-            "",
             "\1\u0085",
-            "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
-            "\1\u0087",
+            "\1\u0086",
+            "",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
             "\1\u0088",
-            "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
             "",
-            "\1\u008a",
-            "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
             "",
-            "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
-            "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
+            "\1\u0089",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\u008b",
+            "\1\u008c",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "",
+            "\1\u008e",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
             "",
-            "\12\44\7\uffff\32\44\4\uffff\1\44\1\uffff\32\44",
+            "\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",
             "",
             "",
             "",
             ""
     };
 
-    static final short[] DFA12_eot = DFA.unpackEncodedString(DFA12_eotS);
-    static final short[] DFA12_eof = DFA.unpackEncodedString(DFA12_eofS);
-    static final char[] DFA12_min = DFA.unpackEncodedStringToUnsignedChars(DFA12_minS);
-    static final char[] DFA12_max = DFA.unpackEncodedStringToUnsignedChars(DFA12_maxS);
-    static final short[] DFA12_accept = DFA.unpackEncodedString(DFA12_acceptS);
-    static final short[] DFA12_special = DFA.unpackEncodedString(DFA12_specialS);
-    static final short[][] DFA12_transition;
+    static final short[] DFA11_eot = DFA.unpackEncodedString(DFA11_eotS);
+    static final short[] DFA11_eof = DFA.unpackEncodedString(DFA11_eofS);
+    static final char[] DFA11_min = DFA.unpackEncodedStringToUnsignedChars(DFA11_minS);
+    static final char[] DFA11_max = DFA.unpackEncodedStringToUnsignedChars(DFA11_maxS);
+    static final short[] DFA11_accept = DFA.unpackEncodedString(DFA11_acceptS);
+    static final short[] DFA11_special = DFA.unpackEncodedString(DFA11_specialS);
+    static final short[][] DFA11_transition;
 
     static {
-        int numStates = DFA12_transitionS.length;
-        DFA12_transition = new short[numStates][];
+        int numStates = DFA11_transitionS.length;
+        DFA11_transition = new short[numStates][];
         for (int i=0; i<numStates; i++) {
-            DFA12_transition[i] = DFA.unpackEncodedString(DFA12_transitionS[i]);
+            DFA11_transition[i] = DFA.unpackEncodedString(DFA11_transitionS[i]);
         }
     }
 
-    class DFA12 extends DFA {
+    class DFA11 extends DFA {
 
-        public DFA12(BaseRecognizer recognizer) {
+        public DFA11(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 12;
-            this.eot = DFA12_eot;
-            this.eof = DFA12_eof;
-            this.min = DFA12_min;
-            this.max = DFA12_max;
-            this.accept = DFA12_accept;
-            this.special = DFA12_special;
-            this.transition = DFA12_transition;
+            this.decisionNumber = 11;
+            this.eot = DFA11_eot;
+            this.eof = DFA11_eof;
+            this.min = DFA11_min;
+            this.max = DFA11_max;
+            this.accept = DFA11_accept;
+            this.special = DFA11_special;
+            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 | T__43 | T__44 | RULE_STRING | RULE_QUOTED_ID | RULE_SL_COMMENT | RULE_ID | RULE_INT | RULE_ML_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 | T__44 | T__45 | T__46 | T__47 | RULE_ID | RULE_STRING | RULE_QUOTED_ID | RULE_SL_COMMENT | RULE_INT | RULE_ML_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 LA12_0 = input.LA(1);
+                        int LA11_30 = input.LA(1);
 
                         s = -1;
-                        if ( (LA12_0=='p') ) {s = 1;}
+                        if ( ((LA11_30>='\u0000' && LA11_30<='\uFFFF')) ) {s = 73;}
 
-                        else if ( (LA12_0=='.') ) {s = 2;}
+                        else s = 35;
 
-                        else if ( (LA12_0=='a') ) {s = 3;}
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA11_0 = input.LA(1);
 
-                        else if ( (LA12_0=='c') ) {s = 4;}
+                        s = -1;
+                        if ( (LA11_0=='p') ) {s = 1;}
 
-                        else if ( (LA12_0=='e') ) {s = 5;}
+                        else if ( (LA11_0=='.') ) {s = 2;}
 
-                        else if ( (LA12_0==',') ) {s = 6;}
+                        else if ( (LA11_0=='a') ) {s = 3;}
 
-                        else if ( (LA12_0=='{') ) {s = 7;}
+                        else if ( (LA11_0=='c') ) {s = 4;}
 
-                        else if ( (LA12_0==';') ) {s = 8;}
+                        else if ( (LA11_0=='e') ) {s = 5;}
 
-                        else if ( (LA12_0=='}') ) {s = 9;}
+                        else if ( (LA11_0==',') ) {s = 6;}
 
-                        else if ( (LA12_0=='r') ) {s = 10;}
+                        else if ( (LA11_0=='{') ) {s = 7;}
 
-                        else if ( (LA12_0=='[') ) {s = 11;}
+                        else if ( (LA11_0==';') ) {s = 8;}
 
-                        else if ( (LA12_0==']') ) {s = 12;}
+                        else if ( (LA11_0=='}') ) {s = 9;}
 
-                        else if ( (LA12_0=='o') ) {s = 13;}
+                        else if ( (LA11_0=='r') ) {s = 10;}
 
-                        else if ( (LA12_0=='(') ) {s = 14;}
+                        else if ( (LA11_0=='[') ) {s = 11;}
 
-                        else if ( (LA12_0==')') ) {s = 15;}
+                        else if ( (LA11_0==']') ) {s = 12;}
 
-                        else if ( (LA12_0==':') ) {s = 16;}
+                        else if ( (LA11_0=='o') ) {s = 13;}
 
-                        else if ( (LA12_0=='!') ) {s = 17;}
+                        else if ( (LA11_0=='(') ) {s = 14;}
 
-                        else if ( (LA12_0=='+') ) {s = 18;}
+                        else if ( (LA11_0==')') ) {s = 15;}
 
-                        else if ( (LA12_0=='s') ) {s = 19;}
+                        else if ( (LA11_0==':') ) {s = 16;}
 
-                        else if ( (LA12_0=='=') ) {s = 20;}
+                        else if ( (LA11_0=='!') ) {s = 17;}
 
-                        else if ( (LA12_0=='*') ) {s = 21;}
+                        else if ( (LA11_0=='+') ) {s = 18;}
 
-                        else if ( (LA12_0=='t') ) {s = 22;}
+                        else if ( (LA11_0=='s') ) {s = 19;}
 
-                        else if ( (LA12_0=='f') ) {s = 23;}
+                        else if ( (LA11_0=='=') ) {s = 20;}
 
-                        else if ( (LA12_0=='u') ) {s = 24;}
+                        else if ( (LA11_0=='*') ) {s = 21;}
 
-                        else if ( (LA12_0=='?') ) {s = 25;}
+                        else if ( (LA11_0=='t') ) {s = 22;}
 
-                        else if ( (LA12_0=='\"') ) {s = 26;}
+                        else if ( (LA11_0=='f') ) {s = 23;}
 
-                        else if ( (LA12_0=='\'') ) {s = 27;}
+                        else if ( (LA11_0=='E') ) {s = 24;}
 
-                        else if ( (LA12_0=='%') ) {s = 28;}
+                        else if ( (LA11_0=='-') ) {s = 25;}
 
-                        else if ( (LA12_0=='/') ) {s = 29;}
+                        else if ( (LA11_0=='u') ) {s = 26;}
 
-                        else if ( (LA12_0=='^') ) {s = 30;}
+                        else if ( (LA11_0=='?') ) {s = 27;}
 
-                        else if ( ((LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||LA12_0=='b'||LA12_0=='d'||(LA12_0>='g' && LA12_0<='n')||LA12_0=='q'||(LA12_0>='v' && LA12_0<='z')) ) {s = 31;}
+                        else if ( ((LA11_0>='A' && LA11_0<='D')||(LA11_0>='F' && LA11_0<='Z')||LA11_0=='_'||LA11_0=='b'||LA11_0=='d'||(LA11_0>='g' && LA11_0<='n')||LA11_0=='q'||(LA11_0>='v' && LA11_0<='z')) ) {s = 28;}
 
-                        else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 32;}
+                        else if ( (LA11_0=='\"') ) {s = 29;}
 
-                        else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 33;}
+                        else if ( (LA11_0=='\'') ) {s = 30;}
 
-                        else if ( ((LA12_0>='\u0000' && LA12_0<='\b')||(LA12_0>='\u000B' && LA12_0<='\f')||(LA12_0>='\u000E' && LA12_0<='\u001F')||(LA12_0>='#' && LA12_0<='$')||LA12_0=='&'||LA12_0=='-'||LA12_0=='<'||LA12_0=='>'||LA12_0=='@'||LA12_0=='\\'||LA12_0=='`'||LA12_0=='|'||(LA12_0>='~' && LA12_0<='\uFFFF')) ) {s = 34;}
+                        else if ( (LA11_0=='%') ) {s = 31;}
 
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA12_27 = input.LA(1);
+                        else if ( (LA11_0=='/') ) {s = 32;}
 
-                        s = -1;
-                        if ( ((LA12_27>='\u0000' && LA12_27<='\uFFFF')) ) {s = 69;}
+                        else if ( ((LA11_0>='0' && LA11_0<='9')) ) {s = 33;}
+
+                        else if ( ((LA11_0>='\t' && LA11_0<='\n')||LA11_0=='\r'||LA11_0==' ') ) {s = 34;}
 
-                        else s = 34;
+                        else if ( ((LA11_0>='\u0000' && LA11_0<='\b')||(LA11_0>='\u000B' && LA11_0<='\f')||(LA11_0>='\u000E' && LA11_0<='\u001F')||(LA11_0>='#' && LA11_0<='$')||LA11_0=='&'||LA11_0=='<'||LA11_0=='>'||LA11_0=='@'||LA11_0=='\\'||LA11_0=='^'||LA11_0=='`'||LA11_0=='|'||(LA11_0>='~' && LA11_0<='\uFFFF')) ) {s = 35;}
 
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA12_26 = input.LA(1);
+                        int LA11_29 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA12_26>='\u0000' && LA12_26<='\uFFFF')) ) {s = 68;}
+                        if ( ((LA11_29>='\u0000' && LA11_29<='\uFFFF')) ) {s = 72;}
 
-                        else s = 34;
+                        else s = 35;
 
                         if ( s>=0 ) return s;
                         break;
             }
             NoViableAltException nvae =
-                new NoViableAltException(getDescription(), 12, _s, input);
+                new NoViableAltException(getDescription(), 11, _s, input);
             error(nvae);
             throw nvae;
         }
diff --git a/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemParser.java b/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemParser.java
index fa8643aa..cd8f706a 100644
--- a/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemParser.java
+++ b/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemParser.java
@@ -22,7 +22,7 @@ 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_SL_COMMENT", "RULE_ML_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'problem'", "'.'", "'abstract'", "'class'", "'extends'", "','", "'{'", "';'", "'}'", "'enum'", "'contains'", "'refers'", "'['", "']'", "'opposite'", "'error'", "'pred'", "'('", "')'", "':-'", "'!'", "'+'", "':'", "'scope'", "'+='", "'='", "'..'", "'*'", "'::'", "'true'", "'false'", "'unknown'", "'?'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_STRING", "RULE_ID", "RULE_INT", "RULE_QUOTED_ID", "RULE_SL_COMMENT", "RULE_ML_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'problem'", "'.'", "'abstract'", "'class'", "'extends'", "','", "'{'", "';'", "'}'", "'enum'", "'contains'", "'refers'", "'['", "']'", "'opposite'", "'error'", "'pred'", "'('", "')'", "':-'", "'!'", "'+'", "':'", "'scope'", "'+='", "'='", "'..'", "'*'", "'::'", "'true'", "'false'", "'e'", "'E'", "'-'", "'unknown'", "'?'"
     };
     public static final int T__19=19;
     public static final int T__15=15;
@@ -32,12 +32,12 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     public static final int T__12=12;
     public static final int T__13=13;
     public static final int T__14=14;
-    public static final int RULE_ID=4;
-    public static final int RULE_QUOTED_ID=6;
+    public static final int RULE_ID=5;
+    public static final int RULE_QUOTED_ID=7;
     public static final int T__26=26;
     public static final int T__27=27;
     public static final int T__28=28;
-    public static final int RULE_INT=5;
+    public static final int RULE_INT=6;
     public static final int T__29=29;
     public static final int T__22=22;
     public static final int RULE_ML_COMMENT=9;
@@ -46,7 +46,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     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_STRING=4;
     public static final int RULE_SL_COMMENT=8;
     public static final int T__37=37;
     public static final int T__38=38;
@@ -62,6 +62,9 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     public static final int RULE_WS=10;
     public static final int RULE_ANY_OTHER=11;
     public static final int T__44=44;
+    public static final int T__45=45;
+    public static final int T__46=46;
+    public static final int T__47=47;
     public static final int T__40=40;
     public static final int T__41=41;
     public static final int T__42=42;
@@ -226,7 +229,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 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==21||(LA2_0>=27 && LA2_0<=28)||LA2_0==32||LA2_0==35||(LA2_0>=41 && LA2_0<=42)||LA2_0==44) ) {
+                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>=41 && LA2_0<=44)||LA2_0==47) ) {
                     alt2=1;
                 }
 
@@ -328,7 +331,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStatement"
-    // 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 ) ;
+    // 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_NodeValueAssertion_4= ruleNodeValueAssertion | this_ScopeDeclaration_5= ruleScopeDeclaration ) ;
     public final EObject ruleStatement() throws RecognitionException {
         EObject current = null;
 
@@ -340,58 +343,21 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
         EObject this_Assertion_3 = null;
 
-        EObject this_ScopeDeclaration_4 = null;
+        EObject this_NodeValueAssertion_4 = null;
+
+        EObject this_ScopeDeclaration_5 = null;
 
 
 
                 enterRule();
 
         try {
-            // 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_EnumDeclaration_1= ruleEnumDeclaration | this_PredicateDefinition_2= rulePredicateDefinition | this_Assertion_3= ruleAssertion | this_NodeValueAssertion_4= ruleNodeValueAssertion | this_ScopeDeclaration_5= ruleScopeDeclaration ) )
+            // InternalProblem.g:146:2: (this_ClassDeclaration_0= ruleClassDeclaration | this_EnumDeclaration_1= ruleEnumDeclaration | this_PredicateDefinition_2= rulePredicateDefinition | this_Assertion_3= ruleAssertion | this_NodeValueAssertion_4= ruleNodeValueAssertion | this_ScopeDeclaration_5= 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 )
-            int alt3=5;
-            switch ( input.LA(1) ) {
-            case 14:
-            case 15:
-                {
-                alt3=1;
-                }
-                break;
-            case 21:
-                {
-                alt3=2;
-                }
-                break;
-            case 27:
-            case 28:
-                {
-                alt3=3;
-                }
-                break;
-            case RULE_ID:
-            case RULE_QUOTED_ID:
-            case 32:
-            case 41:
-            case 42:
-            case 44:
-                {
-                alt3=4;
-                }
-                break;
-            case 35:
-                {
-                alt3=5;
-                }
-                break;
-            default:
-                NoViableAltException nvae =
-                    new NoViableAltException("", 3, 0, input);
-
-                throw nvae;
-            }
-
+            // InternalProblem.g:146:2: (this_ClassDeclaration_0= ruleClassDeclaration | this_EnumDeclaration_1= ruleEnumDeclaration | this_PredicateDefinition_2= rulePredicateDefinition | this_Assertion_3= ruleAssertion | this_NodeValueAssertion_4= ruleNodeValueAssertion | this_ScopeDeclaration_5= ruleScopeDeclaration )
+            int alt3=6;
+            alt3 = dfa3.predict(input);
             switch (alt3) {
                 case 1 :
                     // InternalProblem.g:147:3: this_ClassDeclaration_0= ruleClassDeclaration
@@ -466,18 +432,36 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 5 :
-                    // InternalProblem.g:183:3: this_ScopeDeclaration_4= ruleScopeDeclaration
+                    // InternalProblem.g:183:3: this_NodeValueAssertion_4= ruleNodeValueAssertion
                     {
 
-                                        newCompositeNode(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_4());
+                                        newCompositeNode(grammarAccess.getStatementAccess().getNodeValueAssertionParserRuleCall_4());
                                 
                     pushFollow(FOLLOW_2);
-                    this_ScopeDeclaration_4=ruleScopeDeclaration();
+                    this_NodeValueAssertion_4=ruleNodeValueAssertion();
 
                     state._fsp--;
 
 
-                                        current = this_ScopeDeclaration_4;
+                                        current = this_NodeValueAssertion_4;
+                                        afterParserOrEnumRuleCall();
+                                
+
+                    }
+                    break;
+                case 6 :
+                    // InternalProblem.g:192:3: this_ScopeDeclaration_5= ruleScopeDeclaration
+                    {
+
+                                        newCompositeNode(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_5());
+                                
+                    pushFollow(FOLLOW_2);
+                    this_ScopeDeclaration_5=ruleScopeDeclaration();
+
+                    state._fsp--;
+
+
+                                        current = this_ScopeDeclaration_5;
                                         afterParserOrEnumRuleCall();
                                 
 
@@ -506,7 +490,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleClassDeclaration"
-    // InternalProblem.g:195:1: entryRuleClassDeclaration returns [EObject current=null] : iv_ruleClassDeclaration= ruleClassDeclaration EOF ;
+    // InternalProblem.g:204:1: entryRuleClassDeclaration returns [EObject current=null] : iv_ruleClassDeclaration= ruleClassDeclaration EOF ;
     public final EObject entryRuleClassDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -514,8 +498,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:195:57: (iv_ruleClassDeclaration= ruleClassDeclaration EOF )
-            // InternalProblem.g:196:2: iv_ruleClassDeclaration= ruleClassDeclaration EOF
+            // InternalProblem.g:204:57: (iv_ruleClassDeclaration= ruleClassDeclaration EOF )
+            // InternalProblem.g:205:2: iv_ruleClassDeclaration= ruleClassDeclaration EOF
             {
              newCompositeNode(grammarAccess.getClassDeclarationRule()); 
             pushFollow(FOLLOW_1);
@@ -542,7 +526,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleClassDeclaration"
-    // 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= '.' ) ) ;
+    // InternalProblem.g:211: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;
 
@@ -563,13 +547,13 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // 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:217: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:218: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: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:218: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:219: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:210:3: ( (lv_abstract_0_0= 'abstract' ) )?
+            // InternalProblem.g:219:3: ( (lv_abstract_0_0= 'abstract' ) )?
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -578,10 +562,10 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             switch (alt4) {
                 case 1 :
-                    // InternalProblem.g:211:4: (lv_abstract_0_0= 'abstract' )
+                    // InternalProblem.g:220:4: (lv_abstract_0_0= 'abstract' )
                     {
-                    // InternalProblem.g:211:4: (lv_abstract_0_0= 'abstract' )
-                    // InternalProblem.g:212:5: lv_abstract_0_0= 'abstract'
+                    // InternalProblem.g:220:4: (lv_abstract_0_0= 'abstract' )
+                    // InternalProblem.g:221:5: lv_abstract_0_0= 'abstract'
                     {
                     lv_abstract_0_0=(Token)match(input,14,FOLLOW_6); 
 
@@ -606,11 +590,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                 newLeafNode(otherlv_1, grammarAccess.getClassDeclarationAccess().getClassKeyword_1());
                         
-            // InternalProblem.g:228:3: ( (lv_name_2_0= ruleIdentifier ) )
-            // InternalProblem.g:229:4: (lv_name_2_0= ruleIdentifier )
+            // InternalProblem.g:237:3: ( (lv_name_2_0= ruleIdentifier ) )
+            // InternalProblem.g:238:4: (lv_name_2_0= ruleIdentifier )
             {
-            // InternalProblem.g:229:4: (lv_name_2_0= ruleIdentifier )
-            // InternalProblem.g:230:5: lv_name_2_0= ruleIdentifier
+            // InternalProblem.g:238:4: (lv_name_2_0= ruleIdentifier )
+            // InternalProblem.g:239:5: lv_name_2_0= ruleIdentifier
             {
 
                                                 newCompositeNode(grammarAccess.getClassDeclarationAccess().getNameIdentifierParserRuleCall_2_0());
@@ -637,7 +621,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:247:3: (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )?
+            // InternalProblem.g:256:3: (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )?
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -646,17 +630,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             switch (alt6) {
                 case 1 :
-                    // InternalProblem.g:248:4: otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )*
+                    // InternalProblem.g:257: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:252:4: ( ( ruleQualifiedName ) )
-                    // InternalProblem.g:253:5: ( ruleQualifiedName )
+                    // InternalProblem.g:261:4: ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:262:5: ( ruleQualifiedName )
                     {
-                    // InternalProblem.g:253:5: ( ruleQualifiedName )
-                    // InternalProblem.g:254:6: ruleQualifiedName
+                    // InternalProblem.g:262:5: ( ruleQualifiedName )
+                    // InternalProblem.g:263:6: ruleQualifiedName
                     {
 
                                                                 if (current==null) {
@@ -680,7 +664,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:268:4: (otherlv_5= ',' ( ( ruleQualifiedName ) ) )*
+                    // InternalProblem.g:277:4: (otherlv_5= ',' ( ( ruleQualifiedName ) ) )*
                     loop5:
                     do {
                         int alt5=2;
@@ -693,17 +677,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                         switch (alt5) {
                         case 1 :
-                            // InternalProblem.g:269:5: otherlv_5= ',' ( ( ruleQualifiedName ) )
+                            // InternalProblem.g:278:5: otherlv_5= ',' ( ( ruleQualifiedName ) )
                             {
                             otherlv_5=(Token)match(input,17,FOLLOW_8); 
 
                                                                 newLeafNode(otherlv_5, grammarAccess.getClassDeclarationAccess().getCommaKeyword_3_2_0());
                                                         
-                            // InternalProblem.g:273:5: ( ( ruleQualifiedName ) )
-                            // InternalProblem.g:274:6: ( ruleQualifiedName )
+                            // InternalProblem.g:282:5: ( ( ruleQualifiedName ) )
+                            // InternalProblem.g:283:6: ( ruleQualifiedName )
                             {
-                            // InternalProblem.g:274:6: ( ruleQualifiedName )
-                            // InternalProblem.g:275:7: ruleQualifiedName
+                            // InternalProblem.g:283:6: ( ruleQualifiedName )
+                            // InternalProblem.g:284:7: ruleQualifiedName
                             {
 
                                                                                 if (current==null) {
@@ -742,7 +726,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:291:3: ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' )
+            // InternalProblem.g:300:3: ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' )
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -760,35 +744,35 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             switch (alt9) {
                 case 1 :
-                    // InternalProblem.g:292:4: (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' )
+                    // InternalProblem.g:301: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:293:5: otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}'
+                    // InternalProblem.g:301:4: (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' )
+                    // InternalProblem.g:302: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:297:5: ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )*
+                    // InternalProblem.g:306:5: ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )*
                     loop8:
                     do {
                         int alt8=2;
                         int LA8_0 = input.LA(1);
 
-                        if ( (LA8_0==RULE_ID||LA8_0==RULE_QUOTED_ID||(LA8_0>=22 && LA8_0<=23)||(LA8_0>=41 && LA8_0<=42)) ) {
+                        if ( (LA8_0==RULE_ID||LA8_0==RULE_QUOTED_ID||(LA8_0>=22 && LA8_0<=23)||(LA8_0>=41 && LA8_0<=44)) ) {
                             alt8=1;
                         }
 
 
                         switch (alt8) {
                         case 1 :
-                            // InternalProblem.g:298:6: ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )?
+                            // InternalProblem.g:307:6: ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )?
                             {
-                            // InternalProblem.g:298:6: ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) )
-                            // InternalProblem.g:299:7: (lv_referenceDeclarations_8_0= ruleReferenceDeclaration )
+                            // InternalProblem.g:307:6: ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) )
+                            // InternalProblem.g:308:7: (lv_referenceDeclarations_8_0= ruleReferenceDeclaration )
                             {
-                            // InternalProblem.g:299:7: (lv_referenceDeclarations_8_0= ruleReferenceDeclaration )
-                            // InternalProblem.g:300:8: lv_referenceDeclarations_8_0= ruleReferenceDeclaration
+                            // InternalProblem.g:308:7: (lv_referenceDeclarations_8_0= ruleReferenceDeclaration )
+                            // InternalProblem.g:309:8: lv_referenceDeclarations_8_0= ruleReferenceDeclaration
                             {
 
                                                                                         newCompositeNode(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_0_1_0_0());
@@ -815,7 +799,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalProblem.g:317:6: (otherlv_9= ';' )?
+                            // InternalProblem.g:326:6: (otherlv_9= ';' )?
                             int alt7=2;
                             int LA7_0 = input.LA(1);
 
@@ -824,7 +808,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                             }
                             switch (alt7) {
                                 case 1 :
-                                    // InternalProblem.g:318:7: otherlv_9= ';'
+                                    // InternalProblem.g:327:7: otherlv_9= ';'
                                     {
                                     otherlv_9=(Token)match(input,19,FOLLOW_10); 
 
@@ -856,7 +840,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:330:4: otherlv_11= '.'
+                    // InternalProblem.g:339:4: otherlv_11= '.'
                     {
                     otherlv_11=(Token)match(input,13,FOLLOW_2); 
 
@@ -891,7 +875,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleEnumDeclaration"
-    // InternalProblem.g:339:1: entryRuleEnumDeclaration returns [EObject current=null] : iv_ruleEnumDeclaration= ruleEnumDeclaration EOF ;
+    // InternalProblem.g:348:1: entryRuleEnumDeclaration returns [EObject current=null] : iv_ruleEnumDeclaration= ruleEnumDeclaration EOF ;
     public final EObject entryRuleEnumDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -899,8 +883,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:339:56: (iv_ruleEnumDeclaration= ruleEnumDeclaration EOF )
-            // InternalProblem.g:340:2: iv_ruleEnumDeclaration= ruleEnumDeclaration EOF
+            // InternalProblem.g:348:56: (iv_ruleEnumDeclaration= ruleEnumDeclaration EOF )
+            // InternalProblem.g:349:2: iv_ruleEnumDeclaration= ruleEnumDeclaration EOF
             {
              newCompositeNode(grammarAccess.getEnumDeclarationRule()); 
             pushFollow(FOLLOW_1);
@@ -927,7 +911,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $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= '.' ) ) ;
+    // InternalProblem.g:355: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;
 
@@ -949,21 +933,21 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 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:361: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:362: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= '.' )
+            // InternalProblem.g:362: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:363: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:367:3: ( (lv_name_1_0= ruleIdentifier ) )
+            // InternalProblem.g:368:4: (lv_name_1_0= ruleIdentifier )
             {
-            // InternalProblem.g:359:4: (lv_name_1_0= ruleIdentifier )
-            // InternalProblem.g:360:5: lv_name_1_0= ruleIdentifier
+            // InternalProblem.g:368:4: (lv_name_1_0= ruleIdentifier )
+            // InternalProblem.g:369:5: lv_name_1_0= ruleIdentifier
             {
 
                                                 newCompositeNode(grammarAccess.getEnumDeclarationAccess().getNameIdentifierParserRuleCall_1_0());
@@ -990,7 +974,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // 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= '.' )
+            // InternalProblem.g:386: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);
 
@@ -1008,31 +992,31 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             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:387: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= '}'
+                    // InternalProblem.g:387:4: (otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}' )
+                    // InternalProblem.g:388: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= ';' )? )?
+                    // InternalProblem.g:392: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>=41 && LA12_0<=42)) ) {
+                    if ( (LA12_0==RULE_ID||LA12_0==RULE_QUOTED_ID||(LA12_0>=41 && LA12_0<=44)) ) {
                         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:393: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:393:6: ( (lv_literals_3_0= ruleEnumLiteral ) )
+                            // InternalProblem.g:394:7: (lv_literals_3_0= ruleEnumLiteral )
                             {
-                            // InternalProblem.g:385:7: (lv_literals_3_0= ruleEnumLiteral )
-                            // InternalProblem.g:386:8: lv_literals_3_0= ruleEnumLiteral
+                            // InternalProblem.g:394:7: (lv_literals_3_0= ruleEnumLiteral )
+                            // InternalProblem.g:395:8: lv_literals_3_0= ruleEnumLiteral
                             {
 
                                                                                         newCompositeNode(grammarAccess.getEnumDeclarationAccess().getLiteralsEnumLiteralParserRuleCall_2_0_1_0_0());
@@ -1059,7 +1043,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalProblem.g:403:6: (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )*
+                            // InternalProblem.g:412:6: (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )*
                             loop10:
                             do {
                                 int alt10=2;
@@ -1068,7 +1052,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                 if ( (LA10_0==17) ) {
                                     int LA10_1 = input.LA(2);
 
-                                    if ( (LA10_1==RULE_ID||LA10_1==RULE_QUOTED_ID||(LA10_1>=41 && LA10_1<=42)) ) {
+                                    if ( (LA10_1==RULE_ID||LA10_1==RULE_QUOTED_ID||(LA10_1>=41 && LA10_1<=44)) ) {
                                         alt10=1;
                                     }
 
@@ -1078,17 +1062,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                 switch (alt10) {
                                 case 1 :
-                                    // InternalProblem.g:404:7: otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) )
+                                    // InternalProblem.g:413: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:417:7: ( (lv_literals_5_0= ruleEnumLiteral ) )
+                                    // InternalProblem.g:418:8: (lv_literals_5_0= ruleEnumLiteral )
                                     {
-                                    // InternalProblem.g:409:8: (lv_literals_5_0= ruleEnumLiteral )
-                                    // InternalProblem.g:410:9: lv_literals_5_0= ruleEnumLiteral
+                                    // InternalProblem.g:418:8: (lv_literals_5_0= ruleEnumLiteral )
+                                    // InternalProblem.g:419:9: lv_literals_5_0= ruleEnumLiteral
                                     {
 
                                                                                                         newCompositeNode(grammarAccess.getEnumDeclarationAccess().getLiteralsEnumLiteralParserRuleCall_2_0_1_1_1_0());
@@ -1124,7 +1108,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                 }
                             } while (true);
 
-                            // InternalProblem.g:428:6: (otherlv_6= ',' | otherlv_7= ';' )?
+                            // InternalProblem.g:437:6: (otherlv_6= ',' | otherlv_7= ';' )?
                             int alt11=3;
                             int LA11_0 = input.LA(1);
 
@@ -1136,7 +1120,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                             }
                             switch (alt11) {
                                 case 1 :
-                                    // InternalProblem.g:429:7: otherlv_6= ','
+                                    // InternalProblem.g:438:7: otherlv_6= ','
                                     {
                                     otherlv_6=(Token)match(input,17,FOLLOW_15); 
 
@@ -1146,7 +1130,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                     }
                                     break;
                                 case 2 :
-                                    // InternalProblem.g:434:7: otherlv_7= ';'
+                                    // InternalProblem.g:443:7: otherlv_7= ';'
                                     {
                                     otherlv_7=(Token)match(input,19,FOLLOW_15); 
 
@@ -1175,7 +1159,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:446:4: otherlv_9= '.'
+                    // InternalProblem.g:455:4: otherlv_9= '.'
                     {
                     otherlv_9=(Token)match(input,13,FOLLOW_2); 
 
@@ -1210,7 +1194,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleEnumLiteral"
-    // InternalProblem.g:455:1: entryRuleEnumLiteral returns [EObject current=null] : iv_ruleEnumLiteral= ruleEnumLiteral EOF ;
+    // InternalProblem.g:464:1: entryRuleEnumLiteral returns [EObject current=null] : iv_ruleEnumLiteral= ruleEnumLiteral EOF ;
     public final EObject entryRuleEnumLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1218,8 +1202,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:455:52: (iv_ruleEnumLiteral= ruleEnumLiteral EOF )
-            // InternalProblem.g:456:2: iv_ruleEnumLiteral= ruleEnumLiteral EOF
+            // InternalProblem.g:464:52: (iv_ruleEnumLiteral= ruleEnumLiteral EOF )
+            // InternalProblem.g:465:2: iv_ruleEnumLiteral= ruleEnumLiteral EOF
             {
              newCompositeNode(grammarAccess.getEnumLiteralRule()); 
             pushFollow(FOLLOW_1);
@@ -1246,7 +1230,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleEnumLiteral"
-    // InternalProblem.g:462:1: ruleEnumLiteral returns [EObject current=null] : ( (lv_name_0_0= ruleQuotedOrUnquotedId ) ) ;
+    // InternalProblem.g:471:1: ruleEnumLiteral returns [EObject current=null] : ( (lv_name_0_0= ruleQuotedOrUnquotedId ) ) ;
     public final EObject ruleEnumLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1257,14 +1241,14 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:468:2: ( ( (lv_name_0_0= ruleQuotedOrUnquotedId ) ) )
-            // InternalProblem.g:469:2: ( (lv_name_0_0= ruleQuotedOrUnquotedId ) )
+            // InternalProblem.g:477:2: ( ( (lv_name_0_0= ruleQuotedOrUnquotedId ) ) )
+            // InternalProblem.g:478: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:478:2: ( (lv_name_0_0= ruleQuotedOrUnquotedId ) )
+            // InternalProblem.g:479:3: (lv_name_0_0= ruleQuotedOrUnquotedId )
             {
-            // InternalProblem.g:470:3: (lv_name_0_0= ruleQuotedOrUnquotedId )
-            // InternalProblem.g:471:4: lv_name_0_0= ruleQuotedOrUnquotedId
+            // InternalProblem.g:479:3: (lv_name_0_0= ruleQuotedOrUnquotedId )
+            // InternalProblem.g:480:4: lv_name_0_0= ruleQuotedOrUnquotedId
             {
 
                                         newCompositeNode(grammarAccess.getEnumLiteralAccess().getNameQuotedOrUnquotedIdParserRuleCall_0());
@@ -1311,7 +1295,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleReferenceDeclaration"
-    // InternalProblem.g:491:1: entryRuleReferenceDeclaration returns [EObject current=null] : iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF ;
+    // InternalProblem.g:500:1: entryRuleReferenceDeclaration returns [EObject current=null] : iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF ;
     public final EObject entryRuleReferenceDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -1319,8 +1303,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:491:61: (iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF )
-            // InternalProblem.g:492:2: iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF
+            // InternalProblem.g:500:61: (iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF )
+            // InternalProblem.g:501:2: iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF
             {
              newCompositeNode(grammarAccess.getReferenceDeclarationRule()); 
             pushFollow(FOLLOW_1);
@@ -1347,7 +1331,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleReferenceDeclaration"
-    // 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 ) ) )? ) ;
+    // InternalProblem.g:507: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;
 
@@ -1365,13 +1349,13 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // 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:513: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:514: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: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:514: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:515: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:506:3: ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' )?
+            // InternalProblem.g:515:3: ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' )?
             int alt14=3;
             int LA14_0 = input.LA(1);
 
@@ -1383,13 +1367,13 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             switch (alt14) {
                 case 1 :
-                    // InternalProblem.g:507:4: ( (lv_containment_0_0= 'contains' ) )
+                    // InternalProblem.g:516:4: ( (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:516:4: ( (lv_containment_0_0= 'contains' ) )
+                    // InternalProblem.g:517:5: (lv_containment_0_0= 'contains' )
                     {
-                    // InternalProblem.g:508:5: (lv_containment_0_0= 'contains' )
-                    // InternalProblem.g:509:6: lv_containment_0_0= 'contains'
+                    // InternalProblem.g:517:5: (lv_containment_0_0= 'contains' )
+                    // InternalProblem.g:518:6: lv_containment_0_0= 'contains'
                     {
                     lv_containment_0_0=(Token)match(input,22,FOLLOW_8); 
 
@@ -1411,7 +1395,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:522:4: otherlv_1= 'refers'
+                    // InternalProblem.g:531:4: otherlv_1= 'refers'
                     {
                     otherlv_1=(Token)match(input,23,FOLLOW_8); 
 
@@ -1423,11 +1407,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:527:3: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:528:4: ( ruleQualifiedName )
+            // InternalProblem.g:536:3: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:537:4: ( ruleQualifiedName )
             {
-            // InternalProblem.g:528:4: ( ruleQualifiedName )
-            // InternalProblem.g:529:5: ruleQualifiedName
+            // InternalProblem.g:537:4: ( ruleQualifiedName )
+            // InternalProblem.g:538:5: ruleQualifiedName
             {
 
                                                 if (current==null) {
@@ -1451,7 +1435,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:543:3: (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )?
+            // InternalProblem.g:552:3: (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )?
             int alt15=2;
             int LA15_0 = input.LA(1);
 
@@ -1460,17 +1444,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             switch (alt15) {
                 case 1 :
-                    // InternalProblem.g:544:4: otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']'
+                    // InternalProblem.g:553:4: otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']'
                     {
                     otherlv_3=(Token)match(input,24,FOLLOW_17); 
 
                                                 newLeafNode(otherlv_3, grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2_0());
                                         
-                    // InternalProblem.g:548:4: ( (lv_multiplicity_4_0= ruleMultiplicity ) )
-                    // InternalProblem.g:549:5: (lv_multiplicity_4_0= ruleMultiplicity )
+                    // InternalProblem.g:557:4: ( (lv_multiplicity_4_0= ruleMultiplicity ) )
+                    // InternalProblem.g:558:5: (lv_multiplicity_4_0= ruleMultiplicity )
                     {
-                    // InternalProblem.g:549:5: (lv_multiplicity_4_0= ruleMultiplicity )
-                    // InternalProblem.g:550:6: lv_multiplicity_4_0= ruleMultiplicity
+                    // InternalProblem.g:558:5: (lv_multiplicity_4_0= ruleMultiplicity )
+                    // InternalProblem.g:559:6: lv_multiplicity_4_0= ruleMultiplicity
                     {
 
                                                                 newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getMultiplicityMultiplicityParserRuleCall_2_1_0());
@@ -1507,11 +1491,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:572:3: ( (lv_name_6_0= ruleIdentifier ) )
-            // InternalProblem.g:573:4: (lv_name_6_0= ruleIdentifier )
+            // InternalProblem.g:581:3: ( (lv_name_6_0= ruleIdentifier ) )
+            // InternalProblem.g:582:4: (lv_name_6_0= ruleIdentifier )
             {
-            // InternalProblem.g:573:4: (lv_name_6_0= ruleIdentifier )
-            // InternalProblem.g:574:5: lv_name_6_0= ruleIdentifier
+            // InternalProblem.g:582:4: (lv_name_6_0= ruleIdentifier )
+            // InternalProblem.g:583:5: lv_name_6_0= ruleIdentifier
             {
 
                                                 newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getNameIdentifierParserRuleCall_3_0());
@@ -1538,7 +1522,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:591:3: (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )?
+            // InternalProblem.g:600:3: (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )?
             int alt16=2;
             int LA16_0 = input.LA(1);
 
@@ -1547,17 +1531,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             switch (alt16) {
                 case 1 :
-                    // InternalProblem.g:592:4: otherlv_7= 'opposite' ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:601:4: otherlv_7= 'opposite' ( ( ruleQualifiedName ) )
                     {
                     otherlv_7=(Token)match(input,26,FOLLOW_8); 
 
                                                 newLeafNode(otherlv_7, grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_4_0());
                                         
-                    // InternalProblem.g:596:4: ( ( ruleQualifiedName ) )
-                    // InternalProblem.g:597:5: ( ruleQualifiedName )
+                    // InternalProblem.g:605:4: ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:606:5: ( ruleQualifiedName )
                     {
-                    // InternalProblem.g:597:5: ( ruleQualifiedName )
-                    // InternalProblem.g:598:6: ruleQualifiedName
+                    // InternalProblem.g:606:5: ( ruleQualifiedName )
+                    // InternalProblem.g:607:6: ruleQualifiedName
                     {
 
                                                                 if (current==null) {
@@ -1610,7 +1594,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePredicateDefinition"
-    // InternalProblem.g:617:1: entryRulePredicateDefinition returns [EObject current=null] : iv_rulePredicateDefinition= rulePredicateDefinition EOF ;
+    // InternalProblem.g:626:1: entryRulePredicateDefinition returns [EObject current=null] : iv_rulePredicateDefinition= rulePredicateDefinition EOF ;
     public final EObject entryRulePredicateDefinition() throws RecognitionException {
         EObject current = null;
 
@@ -1618,8 +1602,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:617:60: (iv_rulePredicateDefinition= rulePredicateDefinition EOF )
-            // InternalProblem.g:618:2: iv_rulePredicateDefinition= rulePredicateDefinition EOF
+            // InternalProblem.g:626:60: (iv_rulePredicateDefinition= rulePredicateDefinition EOF )
+            // InternalProblem.g:627:2: iv_rulePredicateDefinition= rulePredicateDefinition EOF
             {
              newCompositeNode(grammarAccess.getPredicateDefinitionRule()); 
             pushFollow(FOLLOW_1);
@@ -1646,7 +1630,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePredicateDefinition"
-    // 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= '.' ) ;
+    // InternalProblem.g:633: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;
 
@@ -1674,13 +1658,13 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // 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:639: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:640: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: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:640: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:641: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:632:3: ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' )
+            // InternalProblem.g:641:3: ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' )
             int alt18=2;
             int LA18_0 = input.LA(1);
 
@@ -1698,16 +1682,16 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             switch (alt18) {
                 case 1 :
-                    // InternalProblem.g:633:4: ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? )
+                    // InternalProblem.g:642:4: ( ( (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:642:4: ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? )
+                    // InternalProblem.g:643:5: ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )?
                     {
-                    // InternalProblem.g:634:5: ( (lv_error_0_0= 'error' ) )
-                    // InternalProblem.g:635:6: (lv_error_0_0= 'error' )
+                    // InternalProblem.g:643:5: ( (lv_error_0_0= 'error' ) )
+                    // InternalProblem.g:644:6: (lv_error_0_0= 'error' )
                     {
-                    // InternalProblem.g:635:6: (lv_error_0_0= 'error' )
-                    // InternalProblem.g:636:7: lv_error_0_0= 'error'
+                    // InternalProblem.g:644:6: (lv_error_0_0= 'error' )
+                    // InternalProblem.g:645:7: lv_error_0_0= 'error'
                     {
                     lv_error_0_0=(Token)match(input,27,FOLLOW_20); 
 
@@ -1725,7 +1709,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:648:5: (otherlv_1= 'pred' )?
+                    // InternalProblem.g:657:5: (otherlv_1= 'pred' )?
                     int alt17=2;
                     int LA17_0 = input.LA(1);
 
@@ -1734,7 +1718,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     switch (alt17) {
                         case 1 :
-                            // InternalProblem.g:649:6: otherlv_1= 'pred'
+                            // InternalProblem.g:658:6: otherlv_1= 'pred'
                             {
                             otherlv_1=(Token)match(input,28,FOLLOW_3); 
 
@@ -1753,7 +1737,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:656:4: otherlv_2= 'pred'
+                    // InternalProblem.g:665:4: otherlv_2= 'pred'
                     {
                     otherlv_2=(Token)match(input,28,FOLLOW_3); 
 
@@ -1765,11 +1749,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:661:3: ( (lv_name_3_0= ruleIdentifier ) )
-            // InternalProblem.g:662:4: (lv_name_3_0= ruleIdentifier )
+            // InternalProblem.g:670:3: ( (lv_name_3_0= ruleIdentifier ) )
+            // InternalProblem.g:671:4: (lv_name_3_0= ruleIdentifier )
             {
-            // InternalProblem.g:662:4: (lv_name_3_0= ruleIdentifier )
-            // InternalProblem.g:663:5: lv_name_3_0= ruleIdentifier
+            // InternalProblem.g:671:4: (lv_name_3_0= ruleIdentifier )
+            // InternalProblem.g:672:5: lv_name_3_0= ruleIdentifier
             {
 
                                                 newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getNameIdentifierParserRuleCall_1_0());
@@ -1800,22 +1784,22 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                 newLeafNode(otherlv_4, grammarAccess.getPredicateDefinitionAccess().getLeftParenthesisKeyword_2());
                         
-            // InternalProblem.g:684:3: ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )?
+            // InternalProblem.g:693:3: ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )?
             int alt20=2;
             int LA20_0 = input.LA(1);
 
-            if ( (LA20_0==RULE_ID||LA20_0==RULE_QUOTED_ID||(LA20_0>=41 && LA20_0<=42)) ) {
+            if ( (LA20_0==RULE_ID||LA20_0==RULE_QUOTED_ID||(LA20_0>=41 && LA20_0<=44)) ) {
                 alt20=1;
             }
             switch (alt20) {
                 case 1 :
-                    // InternalProblem.g:685:4: ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )*
+                    // InternalProblem.g:694:4: ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )*
                     {
-                    // InternalProblem.g:685:4: ( (lv_parameters_5_0= ruleParameter ) )
-                    // InternalProblem.g:686:5: (lv_parameters_5_0= ruleParameter )
+                    // InternalProblem.g:694:4: ( (lv_parameters_5_0= ruleParameter ) )
+                    // InternalProblem.g:695:5: (lv_parameters_5_0= ruleParameter )
                     {
-                    // InternalProblem.g:686:5: (lv_parameters_5_0= ruleParameter )
-                    // InternalProblem.g:687:6: lv_parameters_5_0= ruleParameter
+                    // InternalProblem.g:695:5: (lv_parameters_5_0= ruleParameter )
+                    // InternalProblem.g:696:6: lv_parameters_5_0= ruleParameter
                     {
 
                                                                 newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getParametersParameterParserRuleCall_3_0_0());
@@ -1842,7 +1826,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:704:4: (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )*
+                    // InternalProblem.g:713:4: (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )*
                     loop19:
                     do {
                         int alt19=2;
@@ -1855,17 +1839,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                         switch (alt19) {
                         case 1 :
-                            // InternalProblem.g:705:5: otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) )
+                            // InternalProblem.g:714:5: otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) )
                             {
                             otherlv_6=(Token)match(input,17,FOLLOW_8); 
 
                                                                 newLeafNode(otherlv_6, grammarAccess.getPredicateDefinitionAccess().getCommaKeyword_3_1_0());
                                                         
-                            // InternalProblem.g:709:5: ( (lv_parameters_7_0= ruleParameter ) )
-                            // InternalProblem.g:710:6: (lv_parameters_7_0= ruleParameter )
+                            // InternalProblem.g:718:5: ( (lv_parameters_7_0= ruleParameter ) )
+                            // InternalProblem.g:719:6: (lv_parameters_7_0= ruleParameter )
                             {
-                            // InternalProblem.g:710:6: (lv_parameters_7_0= ruleParameter )
-                            // InternalProblem.g:711:7: lv_parameters_7_0= ruleParameter
+                            // InternalProblem.g:719:6: (lv_parameters_7_0= ruleParameter )
+                            // InternalProblem.g:720:7: lv_parameters_7_0= ruleParameter
                             {
 
                                                                                 newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getParametersParameterParserRuleCall_3_1_1_0());
@@ -1911,7 +1895,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                 newLeafNode(otherlv_8, grammarAccess.getPredicateDefinitionAccess().getRightParenthesisKeyword_4());
                         
-            // InternalProblem.g:734:3: (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )?
+            // InternalProblem.g:743:3: (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )?
             int alt22=2;
             int LA22_0 = input.LA(1);
 
@@ -1920,17 +1904,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             switch (alt22) {
                 case 1 :
-                    // InternalProblem.g:735:4: otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )*
+                    // InternalProblem.g:744:4: otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )*
                     {
                     otherlv_9=(Token)match(input,31,FOLLOW_25); 
 
                                                 newLeafNode(otherlv_9, grammarAccess.getPredicateDefinitionAccess().getColonHyphenMinusKeyword_5_0());
                                         
-                    // InternalProblem.g:739:4: ( (lv_bodies_10_0= ruleConjunction ) )
-                    // InternalProblem.g:740:5: (lv_bodies_10_0= ruleConjunction )
+                    // InternalProblem.g:748:4: ( (lv_bodies_10_0= ruleConjunction ) )
+                    // InternalProblem.g:749:5: (lv_bodies_10_0= ruleConjunction )
                     {
-                    // InternalProblem.g:740:5: (lv_bodies_10_0= ruleConjunction )
-                    // InternalProblem.g:741:6: lv_bodies_10_0= ruleConjunction
+                    // InternalProblem.g:749:5: (lv_bodies_10_0= ruleConjunction )
+                    // InternalProblem.g:750:6: lv_bodies_10_0= ruleConjunction
                     {
 
                                                                 newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getBodiesConjunctionParserRuleCall_5_1_0());
@@ -1957,7 +1941,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:758:4: (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )*
+                    // InternalProblem.g:767:4: (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )*
                     loop21:
                     do {
                         int alt21=2;
@@ -1970,17 +1954,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                         switch (alt21) {
                         case 1 :
-                            // InternalProblem.g:759:5: otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) )
+                            // InternalProblem.g:768:5: otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) )
                             {
                             otherlv_11=(Token)match(input,19,FOLLOW_25); 
 
                                                                 newLeafNode(otherlv_11, grammarAccess.getPredicateDefinitionAccess().getSemicolonKeyword_5_2_0());
                                                         
-                            // InternalProblem.g:763:5: ( (lv_bodies_12_0= ruleConjunction ) )
-                            // InternalProblem.g:764:6: (lv_bodies_12_0= ruleConjunction )
+                            // InternalProblem.g:772:5: ( (lv_bodies_12_0= ruleConjunction ) )
+                            // InternalProblem.g:773:6: (lv_bodies_12_0= ruleConjunction )
                             {
-                            // InternalProblem.g:764:6: (lv_bodies_12_0= ruleConjunction )
-                            // InternalProblem.g:765:7: lv_bodies_12_0= ruleConjunction
+                            // InternalProblem.g:773:6: (lv_bodies_12_0= ruleConjunction )
+                            // InternalProblem.g:774:7: lv_bodies_12_0= ruleConjunction
                             {
 
                                                                                 newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getBodiesConjunctionParserRuleCall_5_2_1_0());
@@ -2049,7 +2033,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleParameter"
-    // InternalProblem.g:792:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ;
+    // InternalProblem.g:801:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ;
     public final EObject entryRuleParameter() throws RecognitionException {
         EObject current = null;
 
@@ -2057,8 +2041,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:792:50: (iv_ruleParameter= ruleParameter EOF )
-            // InternalProblem.g:793:2: iv_ruleParameter= ruleParameter EOF
+            // InternalProblem.g:801:50: (iv_ruleParameter= ruleParameter EOF )
+            // InternalProblem.g:802:2: iv_ruleParameter= ruleParameter EOF
             {
              newCompositeNode(grammarAccess.getParameterRule()); 
             pushFollow(FOLLOW_1);
@@ -2085,7 +2069,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleParameter"
-    // InternalProblem.g:799:1: ruleParameter returns [EObject current=null] : ( ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) ) ) ;
+    // InternalProblem.g:808:1: ruleParameter returns [EObject current=null] : ( ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) ) ) ;
     public final EObject ruleParameter() throws RecognitionException {
         EObject current = null;
 
@@ -2096,13 +2080,13 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:805:2: ( ( ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) ) ) )
-            // InternalProblem.g:806:2: ( ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) ) )
+            // InternalProblem.g:814:2: ( ( ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) ) ) )
+            // InternalProblem.g:815:2: ( ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) ) )
             {
-            // InternalProblem.g:806:2: ( ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) ) )
-            // InternalProblem.g:807:3: ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) )
+            // InternalProblem.g:815:2: ( ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) ) )
+            // InternalProblem.g:816:3: ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) )
             {
-            // InternalProblem.g:807:3: ( ( ruleQualifiedName ) )?
+            // InternalProblem.g:816:3: ( ( ruleQualifiedName ) )?
             int alt23=2;
             switch ( input.LA(1) ) {
                 case RULE_QUOTED_ID:
@@ -2114,7 +2098,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     {
                     int LA23_2 = input.LA(2);
 
-                    if ( (LA23_2==RULE_ID||(LA23_2>=40 && LA23_2<=42)) ) {
+                    if ( (LA23_2==RULE_ID||(LA23_2>=40 && LA23_2<=44)) ) {
                         alt23=1;
                     }
                     }
@@ -2123,7 +2107,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     {
                     int LA23_3 = input.LA(2);
 
-                    if ( (LA23_3==RULE_ID||(LA23_3>=40 && LA23_3<=42)) ) {
+                    if ( (LA23_3==RULE_ID||(LA23_3>=40 && LA23_3<=44)) ) {
                         alt23=1;
                     }
                     }
@@ -2132,7 +2116,25 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     {
                     int LA23_4 = input.LA(2);
 
-                    if ( (LA23_4==RULE_ID||(LA23_4>=40 && LA23_4<=42)) ) {
+                    if ( (LA23_4==RULE_ID||(LA23_4>=40 && LA23_4<=44)) ) {
+                        alt23=1;
+                    }
+                    }
+                    break;
+                case 43:
+                    {
+                    int LA23_5 = input.LA(2);
+
+                    if ( (LA23_5==RULE_ID||(LA23_5>=40 && LA23_5<=44)) ) {
+                        alt23=1;
+                    }
+                    }
+                    break;
+                case 44:
+                    {
+                    int LA23_6 = input.LA(2);
+
+                    if ( (LA23_6==RULE_ID||(LA23_6>=40 && LA23_6<=44)) ) {
                         alt23=1;
                     }
                     }
@@ -2141,10 +2143,10 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             switch (alt23) {
                 case 1 :
-                    // InternalProblem.g:808:4: ( ruleQualifiedName )
+                    // InternalProblem.g:817:4: ( ruleQualifiedName )
                     {
-                    // InternalProblem.g:808:4: ( ruleQualifiedName )
-                    // InternalProblem.g:809:5: ruleQualifiedName
+                    // InternalProblem.g:817:4: ( ruleQualifiedName )
+                    // InternalProblem.g:818:5: ruleQualifiedName
                     {
 
                                                         if (current==null) {
@@ -2171,11 +2173,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:823:3: ( (lv_name_1_0= ruleIdentifier ) )
-            // InternalProblem.g:824:4: (lv_name_1_0= ruleIdentifier )
+            // InternalProblem.g:832:3: ( (lv_name_1_0= ruleIdentifier ) )
+            // InternalProblem.g:833:4: (lv_name_1_0= ruleIdentifier )
             {
-            // InternalProblem.g:824:4: (lv_name_1_0= ruleIdentifier )
-            // InternalProblem.g:825:5: lv_name_1_0= ruleIdentifier
+            // InternalProblem.g:833:4: (lv_name_1_0= ruleIdentifier )
+            // InternalProblem.g:834:5: lv_name_1_0= ruleIdentifier
             {
 
                                                 newCompositeNode(grammarAccess.getParameterAccess().getNameIdentifierParserRuleCall_1_0());
@@ -2225,7 +2227,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleConjunction"
-    // InternalProblem.g:846:1: entryRuleConjunction returns [EObject current=null] : iv_ruleConjunction= ruleConjunction EOF ;
+    // InternalProblem.g:855:1: entryRuleConjunction returns [EObject current=null] : iv_ruleConjunction= ruleConjunction EOF ;
     public final EObject entryRuleConjunction() throws RecognitionException {
         EObject current = null;
 
@@ -2233,8 +2235,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:846:52: (iv_ruleConjunction= ruleConjunction EOF )
-            // InternalProblem.g:847:2: iv_ruleConjunction= ruleConjunction EOF
+            // InternalProblem.g:855:52: (iv_ruleConjunction= ruleConjunction EOF )
+            // InternalProblem.g:856:2: iv_ruleConjunction= ruleConjunction EOF
             {
              newCompositeNode(grammarAccess.getConjunctionRule()); 
             pushFollow(FOLLOW_1);
@@ -2261,7 +2263,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleConjunction"
-    // InternalProblem.g:853:1: ruleConjunction returns [EObject current=null] : ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* ) ;
+    // InternalProblem.g:862: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;
 
@@ -2275,17 +2277,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // 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:868:2: ( ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* ) )
+            // InternalProblem.g:869: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:861:3: ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )*
+            // InternalProblem.g:869:2: ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* )
+            // InternalProblem.g:870:3: ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )*
             {
-            // InternalProblem.g:861:3: ( (lv_literals_0_0= ruleLiteral ) )
-            // InternalProblem.g:862:4: (lv_literals_0_0= ruleLiteral )
+            // InternalProblem.g:870:3: ( (lv_literals_0_0= ruleLiteral ) )
+            // InternalProblem.g:871:4: (lv_literals_0_0= ruleLiteral )
             {
-            // InternalProblem.g:862:4: (lv_literals_0_0= ruleLiteral )
-            // InternalProblem.g:863:5: lv_literals_0_0= ruleLiteral
+            // InternalProblem.g:871:4: (lv_literals_0_0= ruleLiteral )
+            // InternalProblem.g:872:5: lv_literals_0_0= ruleLiteral
             {
 
                                                 newCompositeNode(grammarAccess.getConjunctionAccess().getLiteralsLiteralParserRuleCall_0_0());
@@ -2312,7 +2314,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:880:3: (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )*
+            // InternalProblem.g:889:3: (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )*
             loop24:
             do {
                 int alt24=2;
@@ -2325,17 +2327,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                 switch (alt24) {
                 case 1 :
-                    // InternalProblem.g:881:4: otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) )
+                    // InternalProblem.g:890:4: otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) )
                     {
                     otherlv_1=(Token)match(input,17,FOLLOW_25); 
 
                                                 newLeafNode(otherlv_1, grammarAccess.getConjunctionAccess().getCommaKeyword_1_0());
                                         
-                    // InternalProblem.g:885:4: ( (lv_literals_2_0= ruleLiteral ) )
-                    // InternalProblem.g:886:5: (lv_literals_2_0= ruleLiteral )
+                    // InternalProblem.g:894:4: ( (lv_literals_2_0= ruleLiteral ) )
+                    // InternalProblem.g:895:5: (lv_literals_2_0= ruleLiteral )
                     {
-                    // InternalProblem.g:886:5: (lv_literals_2_0= ruleLiteral )
-                    // InternalProblem.g:887:6: lv_literals_2_0= ruleLiteral
+                    // InternalProblem.g:895:5: (lv_literals_2_0= ruleLiteral )
+                    // InternalProblem.g:896:6: lv_literals_2_0= ruleLiteral
                     {
 
                                                                 newCompositeNode(grammarAccess.getConjunctionAccess().getLiteralsLiteralParserRuleCall_1_1_0());
@@ -2394,7 +2396,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // InternalProblem.g:909:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
+    // InternalProblem.g:918:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
     public final EObject entryRuleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2402,8 +2404,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:909:48: (iv_ruleLiteral= ruleLiteral EOF )
-            // InternalProblem.g:910:2: iv_ruleLiteral= ruleLiteral EOF
+            // InternalProblem.g:918:48: (iv_ruleLiteral= ruleLiteral EOF )
+            // InternalProblem.g:919:2: iv_ruleLiteral= ruleLiteral EOF
             {
              newCompositeNode(grammarAccess.getLiteralRule()); 
             pushFollow(FOLLOW_1);
@@ -2430,7 +2432,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteral"
-    // InternalProblem.g:916:1: ruleLiteral returns [EObject current=null] : (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral ) ;
+    // InternalProblem.g:925:1: ruleLiteral returns [EObject current=null] : (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral ) ;
     public final EObject ruleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2443,14 +2445,14 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // 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:931:2: ( (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral ) )
+            // InternalProblem.g:932:2: (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral )
             {
-            // InternalProblem.g:923:2: (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral )
+            // InternalProblem.g:932:2: (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral )
             int alt25=2;
             int LA25_0 = input.LA(1);
 
-            if ( (LA25_0==RULE_ID||LA25_0==RULE_QUOTED_ID||(LA25_0>=41 && LA25_0<=42)) ) {
+            if ( (LA25_0==RULE_ID||LA25_0==RULE_QUOTED_ID||(LA25_0>=41 && LA25_0<=44)) ) {
                 alt25=1;
             }
             else if ( (LA25_0==32) ) {
@@ -2464,7 +2466,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             switch (alt25) {
                 case 1 :
-                    // InternalProblem.g:924:3: this_Atom_0= ruleAtom
+                    // InternalProblem.g:933:3: this_Atom_0= ruleAtom
                     {
 
                                         newCompositeNode(grammarAccess.getLiteralAccess().getAtomParserRuleCall_0());
@@ -2482,7 +2484,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:933:3: this_NegativeLiteral_1= ruleNegativeLiteral
+                    // InternalProblem.g:942:3: this_NegativeLiteral_1= ruleNegativeLiteral
                     {
 
                                         newCompositeNode(grammarAccess.getLiteralAccess().getNegativeLiteralParserRuleCall_1());
@@ -2522,7 +2524,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNegativeLiteral"
-    // InternalProblem.g:945:1: entryRuleNegativeLiteral returns [EObject current=null] : iv_ruleNegativeLiteral= ruleNegativeLiteral EOF ;
+    // InternalProblem.g:954:1: entryRuleNegativeLiteral returns [EObject current=null] : iv_ruleNegativeLiteral= ruleNegativeLiteral EOF ;
     public final EObject entryRuleNegativeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2530,8 +2532,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:945:56: (iv_ruleNegativeLiteral= ruleNegativeLiteral EOF )
-            // InternalProblem.g:946:2: iv_ruleNegativeLiteral= ruleNegativeLiteral EOF
+            // InternalProblem.g:954:56: (iv_ruleNegativeLiteral= ruleNegativeLiteral EOF )
+            // InternalProblem.g:955:2: iv_ruleNegativeLiteral= ruleNegativeLiteral EOF
             {
              newCompositeNode(grammarAccess.getNegativeLiteralRule()); 
             pushFollow(FOLLOW_1);
@@ -2558,7 +2560,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNegativeLiteral"
-    // InternalProblem.g:952:1: ruleNegativeLiteral returns [EObject current=null] : (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) ) ;
+    // InternalProblem.g:961:1: ruleNegativeLiteral returns [EObject current=null] : (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) ) ;
     public final EObject ruleNegativeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2570,21 +2572,21 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:958:2: ( (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) ) )
-            // InternalProblem.g:959:2: (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) )
+            // InternalProblem.g:967:2: ( (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) ) )
+            // InternalProblem.g:968:2: (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 ) )
+            // InternalProblem.g:968:2: (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) )
+            // InternalProblem.g:969:3: otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) )
             {
             otherlv_0=(Token)match(input,32,FOLLOW_8); 
 
                                 newLeafNode(otherlv_0, grammarAccess.getNegativeLiteralAccess().getExclamationMarkKeyword_0());
                         
-            // InternalProblem.g:964:3: ( (lv_atom_1_0= ruleAtom ) )
-            // InternalProblem.g:965:4: (lv_atom_1_0= ruleAtom )
+            // InternalProblem.g:973:3: ( (lv_atom_1_0= ruleAtom ) )
+            // InternalProblem.g:974:4: (lv_atom_1_0= ruleAtom )
             {
-            // InternalProblem.g:965:4: (lv_atom_1_0= ruleAtom )
-            // InternalProblem.g:966:5: lv_atom_1_0= ruleAtom
+            // InternalProblem.g:974:4: (lv_atom_1_0= ruleAtom )
+            // InternalProblem.g:975:5: lv_atom_1_0= ruleAtom
             {
 
                                                 newCompositeNode(grammarAccess.getNegativeLiteralAccess().getAtomAtomParserRuleCall_1_0());
@@ -2634,7 +2636,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAtom"
-    // InternalProblem.g:987:1: entryRuleAtom returns [EObject current=null] : iv_ruleAtom= ruleAtom EOF ;
+    // InternalProblem.g:996:1: entryRuleAtom returns [EObject current=null] : iv_ruleAtom= ruleAtom EOF ;
     public final EObject entryRuleAtom() throws RecognitionException {
         EObject current = null;
 
@@ -2642,8 +2644,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:987:45: (iv_ruleAtom= ruleAtom EOF )
-            // InternalProblem.g:988:2: iv_ruleAtom= ruleAtom EOF
+            // InternalProblem.g:996:45: (iv_ruleAtom= ruleAtom EOF )
+            // InternalProblem.g:997:2: iv_ruleAtom= ruleAtom EOF
             {
              newCompositeNode(grammarAccess.getAtomRule()); 
             pushFollow(FOLLOW_1);
@@ -2670,7 +2672,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAtom"
-    // 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= ')' ) ;
+    // InternalProblem.g:1003: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;
 
@@ -2687,17 +2689,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // 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:1009:2: ( ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' ) )
+            // InternalProblem.g:1010: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: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:1010:2: ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' )
+            // InternalProblem.g:1011:3: ( ( 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 ) )
-            // InternalProblem.g:1003:4: ( ruleQualifiedName )
+            // InternalProblem.g:1011:3: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:1012:4: ( ruleQualifiedName )
             {
-            // InternalProblem.g:1003:4: ( ruleQualifiedName )
-            // InternalProblem.g:1004:5: ruleQualifiedName
+            // InternalProblem.g:1012:4: ( ruleQualifiedName )
+            // InternalProblem.g:1013:5: ruleQualifiedName
             {
 
                                                 if (current==null) {
@@ -2721,7 +2723,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:1018:3: ( (lv_transitiveClosure_1_0= '+' ) )?
+            // InternalProblem.g:1027:3: ( (lv_transitiveClosure_1_0= '+' ) )?
             int alt26=2;
             int LA26_0 = input.LA(1);
 
@@ -2730,10 +2732,10 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             switch (alt26) {
                 case 1 :
-                    // InternalProblem.g:1019:4: (lv_transitiveClosure_1_0= '+' )
+                    // InternalProblem.g:1028:4: (lv_transitiveClosure_1_0= '+' )
                     {
-                    // InternalProblem.g:1019:4: (lv_transitiveClosure_1_0= '+' )
-                    // InternalProblem.g:1020:5: lv_transitiveClosure_1_0= '+'
+                    // InternalProblem.g:1028:4: (lv_transitiveClosure_1_0= '+' )
+                    // InternalProblem.g:1029:5: lv_transitiveClosure_1_0= '+'
                     {
                     lv_transitiveClosure_1_0=(Token)match(input,33,FOLLOW_21); 
 
@@ -2754,26 +2756,26 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,29,FOLLOW_22); 
+            otherlv_2=(Token)match(input,29,FOLLOW_29); 
 
                                 newLeafNode(otherlv_2, grammarAccess.getAtomAccess().getLeftParenthesisKeyword_2());
                         
-            // InternalProblem.g:1036:3: ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )?
+            // InternalProblem.g:1045:3: ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )?
             int alt28=2;
             int LA28_0 = input.LA(1);
 
-            if ( (LA28_0==RULE_ID||LA28_0==RULE_QUOTED_ID||(LA28_0>=41 && LA28_0<=42)) ) {
+            if ( ((LA28_0>=RULE_STRING && LA28_0<=RULE_QUOTED_ID)||(LA28_0>=41 && LA28_0<=45)) ) {
                 alt28=1;
             }
             switch (alt28) {
                 case 1 :
-                    // InternalProblem.g:1037:4: ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )*
+                    // InternalProblem.g:1046:4: ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )*
                     {
-                    // InternalProblem.g:1037:4: ( (lv_arguments_3_0= ruleArgument ) )
-                    // InternalProblem.g:1038:5: (lv_arguments_3_0= ruleArgument )
+                    // InternalProblem.g:1046:4: ( (lv_arguments_3_0= ruleArgument ) )
+                    // InternalProblem.g:1047:5: (lv_arguments_3_0= ruleArgument )
                     {
-                    // InternalProblem.g:1038:5: (lv_arguments_3_0= ruleArgument )
-                    // InternalProblem.g:1039:6: lv_arguments_3_0= ruleArgument
+                    // InternalProblem.g:1047:5: (lv_arguments_3_0= ruleArgument )
+                    // InternalProblem.g:1048:6: lv_arguments_3_0= ruleArgument
                     {
 
                                                                 newCompositeNode(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_0_0());
@@ -2800,7 +2802,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:1056:4: (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )*
+                    // InternalProblem.g:1065:4: (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )*
                     loop27:
                     do {
                         int alt27=2;
@@ -2813,17 +2815,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                         switch (alt27) {
                         case 1 :
-                            // InternalProblem.g:1057:5: otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) )
+                            // InternalProblem.g:1066:5: otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) )
                             {
-                            otherlv_4=(Token)match(input,17,FOLLOW_8); 
+                            otherlv_4=(Token)match(input,17,FOLLOW_30); 
 
                                                                 newLeafNode(otherlv_4, grammarAccess.getAtomAccess().getCommaKeyword_3_1_0());
                                                         
-                            // InternalProblem.g:1061:5: ( (lv_arguments_5_0= ruleArgument ) )
-                            // InternalProblem.g:1062:6: (lv_arguments_5_0= ruleArgument )
+                            // InternalProblem.g:1070:5: ( (lv_arguments_5_0= ruleArgument ) )
+                            // InternalProblem.g:1071:6: (lv_arguments_5_0= ruleArgument )
                             {
-                            // InternalProblem.g:1062:6: (lv_arguments_5_0= ruleArgument )
-                            // InternalProblem.g:1063:7: lv_arguments_5_0= ruleArgument
+                            // InternalProblem.g:1071:6: (lv_arguments_5_0= ruleArgument )
+                            // InternalProblem.g:1072:7: lv_arguments_5_0= ruleArgument
                             {
 
                                                                                 newCompositeNode(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_1_1_0());
@@ -2892,7 +2894,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleArgument"
-    // InternalProblem.g:1090:1: entryRuleArgument returns [EObject current=null] : iv_ruleArgument= ruleArgument EOF ;
+    // InternalProblem.g:1099:1: entryRuleArgument returns [EObject current=null] : iv_ruleArgument= ruleArgument EOF ;
     public final EObject entryRuleArgument() throws RecognitionException {
         EObject current = null;
 
@@ -2900,8 +2902,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1090:49: (iv_ruleArgument= ruleArgument EOF )
-            // InternalProblem.g:1091:2: iv_ruleArgument= ruleArgument EOF
+            // InternalProblem.g:1099:49: (iv_ruleArgument= ruleArgument EOF )
+            // InternalProblem.g:1100:2: iv_ruleArgument= ruleArgument EOF
             {
              newCompositeNode(grammarAccess.getArgumentRule()); 
             pushFollow(FOLLOW_1);
@@ -2928,30 +2930,158 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleArgument"
-    // InternalProblem.g:1097:1: ruleArgument returns [EObject current=null] : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:1106:1: ruleArgument returns [EObject current=null] : (this_VariableOrNodeArgument_0= ruleVariableOrNodeArgument | this_ConstantArgument_1= ruleConstantArgument ) ;
     public final EObject ruleArgument() throws RecognitionException {
         EObject current = null;
 
+        EObject this_VariableOrNodeArgument_0 = null;
+
+        EObject this_ConstantArgument_1 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:1112:2: ( (this_VariableOrNodeArgument_0= ruleVariableOrNodeArgument | this_ConstantArgument_1= ruleConstantArgument ) )
+            // InternalProblem.g:1113:2: (this_VariableOrNodeArgument_0= ruleVariableOrNodeArgument | this_ConstantArgument_1= ruleConstantArgument )
+            {
+            // InternalProblem.g:1113:2: (this_VariableOrNodeArgument_0= ruleVariableOrNodeArgument | this_ConstantArgument_1= ruleConstantArgument )
+            int alt29=2;
+            int LA29_0 = input.LA(1);
+
+            if ( (LA29_0==RULE_ID||LA29_0==RULE_QUOTED_ID||(LA29_0>=41 && LA29_0<=44)) ) {
+                alt29=1;
+            }
+            else if ( (LA29_0==RULE_STRING||LA29_0==RULE_INT||LA29_0==45) ) {
+                alt29=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 29, 0, input);
+
+                throw nvae;
+            }
+            switch (alt29) {
+                case 1 :
+                    // InternalProblem.g:1114:3: this_VariableOrNodeArgument_0= ruleVariableOrNodeArgument
+                    {
+
+                                        newCompositeNode(grammarAccess.getArgumentAccess().getVariableOrNodeArgumentParserRuleCall_0());
+                                
+                    pushFollow(FOLLOW_2);
+                    this_VariableOrNodeArgument_0=ruleVariableOrNodeArgument();
+
+                    state._fsp--;
+
+
+                                        current = this_VariableOrNodeArgument_0;
+                                        afterParserOrEnumRuleCall();
+                                
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:1123:3: this_ConstantArgument_1= ruleConstantArgument
+                    {
+
+                                        newCompositeNode(grammarAccess.getArgumentAccess().getConstantArgumentParserRuleCall_1());
+                                
+                    pushFollow(FOLLOW_2);
+                    this_ConstantArgument_1=ruleConstantArgument();
+
+                    state._fsp--;
+
+
+                                        current = this_ConstantArgument_1;
+                                        afterParserOrEnumRuleCall();
+                                
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleArgument"
+
+
+    // $ANTLR start "entryRuleVariableOrNodeArgument"
+    // InternalProblem.g:1135:1: entryRuleVariableOrNodeArgument returns [EObject current=null] : iv_ruleVariableOrNodeArgument= ruleVariableOrNodeArgument EOF ;
+    public final EObject entryRuleVariableOrNodeArgument() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleVariableOrNodeArgument = null;
+
+
+        try {
+            // InternalProblem.g:1135:63: (iv_ruleVariableOrNodeArgument= ruleVariableOrNodeArgument EOF )
+            // InternalProblem.g:1136:2: iv_ruleVariableOrNodeArgument= ruleVariableOrNodeArgument EOF
+            {
+             newCompositeNode(grammarAccess.getVariableOrNodeArgumentRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleVariableOrNodeArgument=ruleVariableOrNodeArgument();
+
+            state._fsp--;
+
+             current =iv_ruleVariableOrNodeArgument; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleVariableOrNodeArgument"
+
+
+    // $ANTLR start "ruleVariableOrNodeArgument"
+    // InternalProblem.g:1142:1: ruleVariableOrNodeArgument returns [EObject current=null] : ( ( ruleQualifiedName ) ) ;
+    public final EObject ruleVariableOrNodeArgument() throws RecognitionException {
+        EObject current = null;
+
 
                 enterRule();
 
         try {
-            // InternalProblem.g:1103:2: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:1104:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:1148:2: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:1149:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:1104:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:1105:3: ( ruleQualifiedName )
+            // InternalProblem.g:1149:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:1150:3: ( ruleQualifiedName )
             {
-            // InternalProblem.g:1105:3: ( ruleQualifiedName )
-            // InternalProblem.g:1106:4: ruleQualifiedName
+            // InternalProblem.g:1150:3: ( ruleQualifiedName )
+            // InternalProblem.g:1151:4: ruleQualifiedName
             {
 
                                         if (current==null) {
-                                                current = createModelElement(grammarAccess.getArgumentRule());
+                                                current = createModelElement(grammarAccess.getVariableOrNodeArgumentRule());
                                         }
                                 
 
-                                        newCompositeNode(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0());
+                                        newCompositeNode(grammarAccess.getVariableOrNodeArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0());
                                 
             pushFollow(FOLLOW_2);
             ruleQualifiedName();
@@ -2983,11 +3113,112 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
         }
         return current;
     }
-    // $ANTLR end "ruleArgument"
+    // $ANTLR end "ruleVariableOrNodeArgument"
+
+
+    // $ANTLR start "entryRuleConstantArgument"
+    // InternalProblem.g:1168:1: entryRuleConstantArgument returns [EObject current=null] : iv_ruleConstantArgument= ruleConstantArgument EOF ;
+    public final EObject entryRuleConstantArgument() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleConstantArgument = null;
+
+
+        try {
+            // InternalProblem.g:1168:57: (iv_ruleConstantArgument= ruleConstantArgument EOF )
+            // InternalProblem.g:1169:2: iv_ruleConstantArgument= ruleConstantArgument EOF
+            {
+             newCompositeNode(grammarAccess.getConstantArgumentRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleConstantArgument=ruleConstantArgument();
+
+            state._fsp--;
+
+             current =iv_ruleConstantArgument; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleConstantArgument"
+
+
+    // $ANTLR start "ruleConstantArgument"
+    // InternalProblem.g:1175:1: ruleConstantArgument returns [EObject current=null] : ( (lv_constant_0_0= ruleConstant ) ) ;
+    public final EObject ruleConstantArgument() throws RecognitionException {
+        EObject current = null;
+
+        EObject lv_constant_0_0 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:1181:2: ( ( (lv_constant_0_0= ruleConstant ) ) )
+            // InternalProblem.g:1182:2: ( (lv_constant_0_0= ruleConstant ) )
+            {
+            // InternalProblem.g:1182:2: ( (lv_constant_0_0= ruleConstant ) )
+            // InternalProblem.g:1183:3: (lv_constant_0_0= ruleConstant )
+            {
+            // InternalProblem.g:1183:3: (lv_constant_0_0= ruleConstant )
+            // InternalProblem.g:1184:4: lv_constant_0_0= ruleConstant
+            {
+
+                                        newCompositeNode(grammarAccess.getConstantArgumentAccess().getConstantConstantParserRuleCall_0());
+                                
+            pushFollow(FOLLOW_2);
+            lv_constant_0_0=ruleConstant();
+
+            state._fsp--;
+
+
+                                        if (current==null) {
+                                                current = createModelElementForParent(grammarAccess.getConstantArgumentRule());
+                                        }
+                                        set(
+                                                current,
+                                                "constant",
+                                                lv_constant_0_0,
+                                                "org.eclipse.viatra.solver.language.Problem.Constant");
+                                        afterParserOrEnumRuleCall();
+                                
+
+            }
+
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleConstantArgument"
 
 
     // $ANTLR start "entryRuleAssertion"
-    // InternalProblem.g:1123:1: entryRuleAssertion returns [EObject current=null] : iv_ruleAssertion= ruleAssertion EOF ;
+    // InternalProblem.g:1204:1: entryRuleAssertion returns [EObject current=null] : iv_ruleAssertion= ruleAssertion EOF ;
     public final EObject entryRuleAssertion() throws RecognitionException {
         EObject current = null;
 
@@ -2995,8 +3226,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1123:50: (iv_ruleAssertion= ruleAssertion EOF )
-            // InternalProblem.g:1124:2: iv_ruleAssertion= ruleAssertion EOF
+            // InternalProblem.g:1204:50: (iv_ruleAssertion= ruleAssertion EOF )
+            // InternalProblem.g:1205:2: iv_ruleAssertion= ruleAssertion EOF
             {
              newCompositeNode(grammarAccess.getAssertionRule()); 
             pushFollow(FOLLOW_1);
@@ -3023,7 +3254,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAssertion"
-    // 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= '.' ) ;
+    // InternalProblem.g:1211:1: ruleAssertion returns [EObject current=null] : ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( (lv_arguments_2_0= ruleAssertionArgument ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleAssertionArgument ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( (lv_arguments_11_0= ruleAssertionArgument ) ) (otherlv_12= ',' ( (lv_arguments_13_0= ruleAssertionArgument ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' ) ;
     public final EObject ruleAssertion() throws RecognitionException {
         EObject current = null;
 
@@ -3035,36 +3266,44 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
         Token otherlv_12=null;
         Token otherlv_14=null;
         Token otherlv_15=null;
+        EObject lv_arguments_2_0 = null;
+
+        EObject lv_arguments_4_0 = null;
+
         Enumerator lv_value_7_0 = null;
 
         Enumerator lv_value_8_0 = null;
 
+        EObject lv_arguments_11_0 = null;
+
+        EObject lv_arguments_13_0 = null;
+
 
 
                 enterRule();
 
         try {
-            // 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:1217:2: ( ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( (lv_arguments_2_0= ruleAssertionArgument ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleAssertionArgument ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( (lv_arguments_11_0= ruleAssertionArgument ) ) (otherlv_12= ',' ( (lv_arguments_13_0= ruleAssertionArgument ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' ) )
+            // InternalProblem.g:1218:2: ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( (lv_arguments_2_0= ruleAssertionArgument ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleAssertionArgument ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( (lv_arguments_11_0= ruleAssertionArgument ) ) (otherlv_12= ',' ( (lv_arguments_13_0= ruleAssertionArgument ) ) )* )? 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:1218:2: ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( (lv_arguments_2_0= ruleAssertionArgument ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleAssertionArgument ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( (lv_arguments_11_0= ruleAssertionArgument ) ) (otherlv_12= ',' ( (lv_arguments_13_0= ruleAssertionArgument ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' )
+            // InternalProblem.g:1219:3: ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( (lv_arguments_2_0= ruleAssertionArgument ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleAssertionArgument ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( (lv_arguments_11_0= ruleAssertionArgument ) ) (otherlv_12= ',' ( (lv_arguments_13_0= ruleAssertionArgument ) ) )* )? 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= ')' ) )
-            int alt34=2;
-            alt34 = dfa34.predict(input);
-            switch (alt34) {
+            // InternalProblem.g:1219:3: ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( (lv_arguments_2_0= ruleAssertionArgument ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleAssertionArgument ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( (lv_arguments_11_0= ruleAssertionArgument ) ) (otherlv_12= ',' ( (lv_arguments_13_0= ruleAssertionArgument ) ) )* )? otherlv_14= ')' ) )
+            int alt35=2;
+            alt35 = dfa35.predict(input);
+            switch (alt35) {
                 case 1 :
-                    // InternalProblem.g:1139:4: ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) )
+                    // InternalProblem.g:1220:4: ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( (lv_arguments_2_0= ruleAssertionArgument ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleAssertionArgument ) ) )* )? 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:1220:4: ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( (lv_arguments_2_0= ruleAssertionArgument ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleAssertionArgument ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) )
+                    // InternalProblem.g:1221:5: ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( (lv_arguments_2_0= ruleAssertionArgument ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleAssertionArgument ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) )
                     {
-                    // InternalProblem.g:1140:5: ( ( ruleQualifiedName ) )
-                    // InternalProblem.g:1141:6: ( ruleQualifiedName )
+                    // InternalProblem.g:1221:5: ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:1222:6: ( ruleQualifiedName )
                     {
-                    // InternalProblem.g:1141:6: ( ruleQualifiedName )
-                    // InternalProblem.g:1142:7: ruleQualifiedName
+                    // InternalProblem.g:1222:6: ( ruleQualifiedName )
+                    // InternalProblem.g:1223:7: ruleQualifiedName
                     {
 
                                                                         if (current==null) {
@@ -3088,41 +3327,44 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_1=(Token)match(input,29,FOLLOW_22); 
+                    otherlv_1=(Token)match(input,29,FOLLOW_29); 
 
                                                         newLeafNode(otherlv_1, grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_0_1());
                                                 
-                    // InternalProblem.g:1160:5: ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )?
-                    int alt30=2;
-                    int LA30_0 = input.LA(1);
+                    // InternalProblem.g:1241:5: ( ( (lv_arguments_2_0= ruleAssertionArgument ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleAssertionArgument ) ) )* )?
+                    int alt31=2;
+                    int LA31_0 = input.LA(1);
 
-                    if ( (LA30_0==RULE_ID||LA30_0==RULE_QUOTED_ID||(LA30_0>=41 && LA30_0<=42)) ) {
-                        alt30=1;
+                    if ( ((LA31_0>=RULE_STRING && LA31_0<=RULE_QUOTED_ID)||(LA31_0>=41 && LA31_0<=45)) ) {
+                        alt31=1;
                     }
-                    switch (alt30) {
+                    switch (alt31) {
                         case 1 :
-                            // InternalProblem.g:1161:6: ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )*
+                            // InternalProblem.g:1242:6: ( (lv_arguments_2_0= ruleAssertionArgument ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleAssertionArgument ) ) )*
                             {
-                            // InternalProblem.g:1161:6: ( ( ruleQualifiedName ) )
-                            // InternalProblem.g:1162:7: ( ruleQualifiedName )
+                            // InternalProblem.g:1242:6: ( (lv_arguments_2_0= ruleAssertionArgument ) )
+                            // InternalProblem.g:1243:7: (lv_arguments_2_0= ruleAssertionArgument )
                             {
-                            // InternalProblem.g:1162:7: ( ruleQualifiedName )
-                            // InternalProblem.g:1163:8: ruleQualifiedName
+                            // InternalProblem.g:1243:7: (lv_arguments_2_0= ruleAssertionArgument )
+                            // InternalProblem.g:1244:8: lv_arguments_2_0= ruleAssertionArgument
                             {
 
-                                                                                        if (current==null) {
-                                                                                                current = createModelElement(grammarAccess.getAssertionRule());
-                                                                                        }
-                                                                                
-
-                                                                                        newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_0_0());
+                                                                                        newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_0_2_0_0());
                                                                                 
                             pushFollow(FOLLOW_23);
-                            ruleQualifiedName();
+                            lv_arguments_2_0=ruleAssertionArgument();
 
                             state._fsp--;
 
 
+                                                                                        if (current==null) {
+                                                                                                current = createModelElementForParent(grammarAccess.getAssertionRule());
+                                                                                        }
+                                                                                        add(
+                                                                                                current,
+                                                                                                "arguments",
+                                                                                                lv_arguments_2_0,
+                                                                                                "org.eclipse.viatra.solver.language.Problem.AssertionArgument");
                                                                                         afterParserOrEnumRuleCall();
                                                                                 
 
@@ -3131,45 +3373,48 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalProblem.g:1177:6: (otherlv_3= ',' ( ( ruleQualifiedName ) ) )*
-                            loop29:
+                            // InternalProblem.g:1261:6: (otherlv_3= ',' ( (lv_arguments_4_0= ruleAssertionArgument ) ) )*
+                            loop30:
                             do {
-                                int alt29=2;
-                                int LA29_0 = input.LA(1);
+                                int alt30=2;
+                                int LA30_0 = input.LA(1);
 
-                                if ( (LA29_0==17) ) {
-                                    alt29=1;
+                                if ( (LA30_0==17) ) {
+                                    alt30=1;
                                 }
 
 
-                                switch (alt29) {
+                                switch (alt30) {
                                 case 1 :
-                                    // InternalProblem.g:1178:7: otherlv_3= ',' ( ( ruleQualifiedName ) )
+                                    // InternalProblem.g:1262:7: otherlv_3= ',' ( (lv_arguments_4_0= ruleAssertionArgument ) )
                                     {
-                                    otherlv_3=(Token)match(input,17,FOLLOW_8); 
+                                    otherlv_3=(Token)match(input,17,FOLLOW_30); 
 
                                                                                         newLeafNode(otherlv_3, grammarAccess.getAssertionAccess().getCommaKeyword_0_0_2_1_0());
                                                                                 
-                                    // InternalProblem.g:1182:7: ( ( ruleQualifiedName ) )
-                                    // InternalProblem.g:1183:8: ( ruleQualifiedName )
+                                    // InternalProblem.g:1266:7: ( (lv_arguments_4_0= ruleAssertionArgument ) )
+                                    // InternalProblem.g:1267:8: (lv_arguments_4_0= ruleAssertionArgument )
                                     {
-                                    // InternalProblem.g:1183:8: ( ruleQualifiedName )
-                                    // InternalProblem.g:1184:9: ruleQualifiedName
+                                    // InternalProblem.g:1267:8: (lv_arguments_4_0= ruleAssertionArgument )
+                                    // InternalProblem.g:1268:9: lv_arguments_4_0= ruleAssertionArgument
                                     {
 
-                                                                                                        if (current==null) {
-                                                                                                                current = createModelElement(grammarAccess.getAssertionRule());
-                                                                                                        }
-                                                                                                
-
-                                                                                                        newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_1_1_0());
+                                                                                                        newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_0_2_1_1_0());
                                                                                                 
                                     pushFollow(FOLLOW_23);
-                                    ruleQualifiedName();
+                                    lv_arguments_4_0=ruleAssertionArgument();
 
                                     state._fsp--;
 
 
+                                                                                                        if (current==null) {
+                                                                                                                current = createModelElementForParent(grammarAccess.getAssertionRule());
+                                                                                                        }
+                                                                                                        add(
+                                                                                                                current,
+                                                                                                                "arguments",
+                                                                                                                lv_arguments_4_0,
+                                                                                                                "org.eclipse.viatra.solver.language.Problem.AssertionArgument");
                                                                                                         afterParserOrEnumRuleCall();
                                                                                                 
 
@@ -3183,7 +3428,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                     break;
 
                                 default :
-                                    break loop29;
+                                    break loop30;
                                 }
                             } while (true);
 
@@ -3193,19 +3438,19 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_5=(Token)match(input,30,FOLLOW_29); 
+                    otherlv_5=(Token)match(input,30,FOLLOW_31); 
 
                                                         newLeafNode(otherlv_5, grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_0_3());
                                                 
-                    otherlv_6=(Token)match(input,34,FOLLOW_30); 
+                    otherlv_6=(Token)match(input,34,FOLLOW_32); 
 
                                                         newLeafNode(otherlv_6, grammarAccess.getAssertionAccess().getColonKeyword_0_0_4());
                                                 
-                    // InternalProblem.g:1208:5: ( (lv_value_7_0= ruleLogicValue ) )
-                    // InternalProblem.g:1209:6: (lv_value_7_0= ruleLogicValue )
+                    // InternalProblem.g:1295:5: ( (lv_value_7_0= ruleLogicValue ) )
+                    // InternalProblem.g:1296:6: (lv_value_7_0= ruleLogicValue )
                     {
-                    // InternalProblem.g:1209:6: (lv_value_7_0= ruleLogicValue )
-                    // InternalProblem.g:1210:7: lv_value_7_0= ruleLogicValue
+                    // InternalProblem.g:1296:6: (lv_value_7_0= ruleLogicValue )
+                    // InternalProblem.g:1297:7: lv_value_7_0= ruleLogicValue
                     {
 
                                                                         newCompositeNode(grammarAccess.getAssertionAccess().getValueLogicValueEnumRuleCall_0_0_5_0());
@@ -3239,24 +3484,24 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1229:4: ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' )
+                    // InternalProblem.g:1316:4: ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( (lv_arguments_11_0= ruleAssertionArgument ) ) (otherlv_12= ',' ( (lv_arguments_13_0= ruleAssertionArgument ) ) )* )? 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:1316:4: ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( (lv_arguments_11_0= ruleAssertionArgument ) ) (otherlv_12= ',' ( (lv_arguments_13_0= ruleAssertionArgument ) ) )* )? otherlv_14= ')' )
+                    // InternalProblem.g:1317:5: ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( (lv_arguments_11_0= ruleAssertionArgument ) ) (otherlv_12= ',' ( (lv_arguments_13_0= ruleAssertionArgument ) ) )* )? otherlv_14= ')'
                     {
-                    // InternalProblem.g:1230:5: ( (lv_value_8_0= ruleShortLogicValue ) )?
-                    int alt31=2;
-                    int LA31_0 = input.LA(1);
+                    // InternalProblem.g:1317:5: ( (lv_value_8_0= ruleShortLogicValue ) )?
+                    int alt32=2;
+                    int LA32_0 = input.LA(1);
 
-                    if ( (LA31_0==32||LA31_0==44) ) {
-                        alt31=1;
+                    if ( (LA32_0==32||LA32_0==47) ) {
+                        alt32=1;
                     }
-                    switch (alt31) {
+                    switch (alt32) {
                         case 1 :
-                            // InternalProblem.g:1231:6: (lv_value_8_0= ruleShortLogicValue )
+                            // InternalProblem.g:1318:6: (lv_value_8_0= ruleShortLogicValue )
                             {
-                            // InternalProblem.g:1231:6: (lv_value_8_0= ruleShortLogicValue )
-                            // InternalProblem.g:1232:7: lv_value_8_0= ruleShortLogicValue
+                            // InternalProblem.g:1318:6: (lv_value_8_0= ruleShortLogicValue )
+                            // InternalProblem.g:1319:7: lv_value_8_0= ruleShortLogicValue
                             {
 
                                                                                 newCompositeNode(grammarAccess.getAssertionAccess().getValueShortLogicValueEnumRuleCall_0_1_0_0());
@@ -3286,11 +3531,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:1249:5: ( ( ruleQualifiedName ) )
-                    // InternalProblem.g:1250:6: ( ruleQualifiedName )
+                    // InternalProblem.g:1336:5: ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:1337:6: ( ruleQualifiedName )
                     {
-                    // InternalProblem.g:1250:6: ( ruleQualifiedName )
-                    // InternalProblem.g:1251:7: ruleQualifiedName
+                    // InternalProblem.g:1337:6: ( ruleQualifiedName )
+                    // InternalProblem.g:1338:7: ruleQualifiedName
                     {
 
                                                                         if (current==null) {
@@ -3314,41 +3559,44 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_10=(Token)match(input,29,FOLLOW_22); 
+                    otherlv_10=(Token)match(input,29,FOLLOW_29); 
 
                                                         newLeafNode(otherlv_10, grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_1_2());
                                                 
-                    // InternalProblem.g:1269:5: ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )?
-                    int alt33=2;
-                    int LA33_0 = input.LA(1);
+                    // InternalProblem.g:1356:5: ( ( (lv_arguments_11_0= ruleAssertionArgument ) ) (otherlv_12= ',' ( (lv_arguments_13_0= ruleAssertionArgument ) ) )* )?
+                    int alt34=2;
+                    int LA34_0 = input.LA(1);
 
-                    if ( (LA33_0==RULE_ID||LA33_0==RULE_QUOTED_ID||(LA33_0>=41 && LA33_0<=42)) ) {
-                        alt33=1;
+                    if ( ((LA34_0>=RULE_STRING && LA34_0<=RULE_QUOTED_ID)||(LA34_0>=41 && LA34_0<=45)) ) {
+                        alt34=1;
                     }
-                    switch (alt33) {
+                    switch (alt34) {
                         case 1 :
-                            // InternalProblem.g:1270:6: ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )*
+                            // InternalProblem.g:1357:6: ( (lv_arguments_11_0= ruleAssertionArgument ) ) (otherlv_12= ',' ( (lv_arguments_13_0= ruleAssertionArgument ) ) )*
                             {
-                            // InternalProblem.g:1270:6: ( ( ruleQualifiedName ) )
-                            // InternalProblem.g:1271:7: ( ruleQualifiedName )
+                            // InternalProblem.g:1357:6: ( (lv_arguments_11_0= ruleAssertionArgument ) )
+                            // InternalProblem.g:1358:7: (lv_arguments_11_0= ruleAssertionArgument )
                             {
-                            // InternalProblem.g:1271:7: ( ruleQualifiedName )
-                            // InternalProblem.g:1272:8: ruleQualifiedName
+                            // InternalProblem.g:1358:7: (lv_arguments_11_0= ruleAssertionArgument )
+                            // InternalProblem.g:1359:8: lv_arguments_11_0= ruleAssertionArgument
                             {
 
-                                                                                        if (current==null) {
-                                                                                                current = createModelElement(grammarAccess.getAssertionRule());
-                                                                                        }
-                                                                                
-
-                                                                                        newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_0_0());
+                                                                                        newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_1_3_0_0());
                                                                                 
                             pushFollow(FOLLOW_23);
-                            ruleQualifiedName();
+                            lv_arguments_11_0=ruleAssertionArgument();
 
                             state._fsp--;
 
 
+                                                                                        if (current==null) {
+                                                                                                current = createModelElementForParent(grammarAccess.getAssertionRule());
+                                                                                        }
+                                                                                        add(
+                                                                                                current,
+                                                                                                "arguments",
+                                                                                                lv_arguments_11_0,
+                                                                                                "org.eclipse.viatra.solver.language.Problem.AssertionArgument");
                                                                                         afterParserOrEnumRuleCall();
                                                                                 
 
@@ -3357,45 +3605,48 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalProblem.g:1286:6: (otherlv_12= ',' ( ( ruleQualifiedName ) ) )*
-                            loop32:
+                            // InternalProblem.g:1376:6: (otherlv_12= ',' ( (lv_arguments_13_0= ruleAssertionArgument ) ) )*
+                            loop33:
                             do {
-                                int alt32=2;
-                                int LA32_0 = input.LA(1);
+                                int alt33=2;
+                                int LA33_0 = input.LA(1);
 
-                                if ( (LA32_0==17) ) {
-                                    alt32=1;
+                                if ( (LA33_0==17) ) {
+                                    alt33=1;
                                 }
 
 
-                                switch (alt32) {
+                                switch (alt33) {
                                 case 1 :
-                                    // InternalProblem.g:1287:7: otherlv_12= ',' ( ( ruleQualifiedName ) )
+                                    // InternalProblem.g:1377:7: otherlv_12= ',' ( (lv_arguments_13_0= ruleAssertionArgument ) )
                                     {
-                                    otherlv_12=(Token)match(input,17,FOLLOW_8); 
+                                    otherlv_12=(Token)match(input,17,FOLLOW_30); 
 
                                                                                         newLeafNode(otherlv_12, grammarAccess.getAssertionAccess().getCommaKeyword_0_1_3_1_0());
                                                                                 
-                                    // InternalProblem.g:1291:7: ( ( ruleQualifiedName ) )
-                                    // InternalProblem.g:1292:8: ( ruleQualifiedName )
+                                    // InternalProblem.g:1381:7: ( (lv_arguments_13_0= ruleAssertionArgument ) )
+                                    // InternalProblem.g:1382:8: (lv_arguments_13_0= ruleAssertionArgument )
                                     {
-                                    // InternalProblem.g:1292:8: ( ruleQualifiedName )
-                                    // InternalProblem.g:1293:9: ruleQualifiedName
+                                    // InternalProblem.g:1382:8: (lv_arguments_13_0= ruleAssertionArgument )
+                                    // InternalProblem.g:1383:9: lv_arguments_13_0= ruleAssertionArgument
                                     {
 
-                                                                                                        if (current==null) {
-                                                                                                                current = createModelElement(grammarAccess.getAssertionRule());
-                                                                                                        }
-                                                                                                
-
-                                                                                                        newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_1_1_0());
+                                                                                                        newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsAssertionArgumentParserRuleCall_0_1_3_1_1_0());
                                                                                                 
                                     pushFollow(FOLLOW_23);
-                                    ruleQualifiedName();
+                                    lv_arguments_13_0=ruleAssertionArgument();
 
                                     state._fsp--;
 
 
+                                                                                                        if (current==null) {
+                                                                                                                current = createModelElementForParent(grammarAccess.getAssertionRule());
+                                                                                                        }
+                                                                                                        add(
+                                                                                                                current,
+                                                                                                                "arguments",
+                                                                                                                lv_arguments_13_0,
+                                                                                                                "org.eclipse.viatra.solver.language.Problem.AssertionArgument");
                                                                                                         afterParserOrEnumRuleCall();
                                                                                                 
 
@@ -3409,7 +3660,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                     break;
 
                                 default :
-                                    break loop32;
+                                    break loop33;
                                 }
                             } while (true);
 
@@ -3458,8 +3709,1017 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     // $ANTLR end "ruleAssertion"
 
 
+    // $ANTLR start "entryRuleAssertionArgument"
+    // InternalProblem.g:1416:1: entryRuleAssertionArgument returns [EObject current=null] : iv_ruleAssertionArgument= ruleAssertionArgument EOF ;
+    public final EObject entryRuleAssertionArgument() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleAssertionArgument = null;
+
+
+        try {
+            // InternalProblem.g:1416:58: (iv_ruleAssertionArgument= ruleAssertionArgument EOF )
+            // InternalProblem.g:1417:2: iv_ruleAssertionArgument= ruleAssertionArgument EOF
+            {
+             newCompositeNode(grammarAccess.getAssertionArgumentRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleAssertionArgument=ruleAssertionArgument();
+
+            state._fsp--;
+
+             current =iv_ruleAssertionArgument; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleAssertionArgument"
+
+
+    // $ANTLR start "ruleAssertionArgument"
+    // InternalProblem.g:1423:1: ruleAssertionArgument returns [EObject current=null] : (this_NodeAssertionArgument_0= ruleNodeAssertionArgument | this_ConstantAssertionArgument_1= ruleConstantAssertionArgument ) ;
+    public final EObject ruleAssertionArgument() throws RecognitionException {
+        EObject current = null;
+
+        EObject this_NodeAssertionArgument_0 = null;
+
+        EObject this_ConstantAssertionArgument_1 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:1429:2: ( (this_NodeAssertionArgument_0= ruleNodeAssertionArgument | this_ConstantAssertionArgument_1= ruleConstantAssertionArgument ) )
+            // InternalProblem.g:1430:2: (this_NodeAssertionArgument_0= ruleNodeAssertionArgument | this_ConstantAssertionArgument_1= ruleConstantAssertionArgument )
+            {
+            // InternalProblem.g:1430:2: (this_NodeAssertionArgument_0= ruleNodeAssertionArgument | this_ConstantAssertionArgument_1= ruleConstantAssertionArgument )
+            int alt36=2;
+            int LA36_0 = input.LA(1);
+
+            if ( (LA36_0==RULE_ID||LA36_0==RULE_QUOTED_ID||(LA36_0>=41 && LA36_0<=44)) ) {
+                alt36=1;
+            }
+            else if ( (LA36_0==RULE_STRING||LA36_0==RULE_INT||LA36_0==45) ) {
+                alt36=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 36, 0, input);
+
+                throw nvae;
+            }
+            switch (alt36) {
+                case 1 :
+                    // InternalProblem.g:1431:3: this_NodeAssertionArgument_0= ruleNodeAssertionArgument
+                    {
+
+                                        newCompositeNode(grammarAccess.getAssertionArgumentAccess().getNodeAssertionArgumentParserRuleCall_0());
+                                
+                    pushFollow(FOLLOW_2);
+                    this_NodeAssertionArgument_0=ruleNodeAssertionArgument();
+
+                    state._fsp--;
+
+
+                                        current = this_NodeAssertionArgument_0;
+                                        afterParserOrEnumRuleCall();
+                                
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:1440:3: this_ConstantAssertionArgument_1= ruleConstantAssertionArgument
+                    {
+
+                                        newCompositeNode(grammarAccess.getAssertionArgumentAccess().getConstantAssertionArgumentParserRuleCall_1());
+                                
+                    pushFollow(FOLLOW_2);
+                    this_ConstantAssertionArgument_1=ruleConstantAssertionArgument();
+
+                    state._fsp--;
+
+
+                                        current = this_ConstantAssertionArgument_1;
+                                        afterParserOrEnumRuleCall();
+                                
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleAssertionArgument"
+
+
+    // $ANTLR start "entryRuleNodeAssertionArgument"
+    // InternalProblem.g:1452:1: entryRuleNodeAssertionArgument returns [EObject current=null] : iv_ruleNodeAssertionArgument= ruleNodeAssertionArgument EOF ;
+    public final EObject entryRuleNodeAssertionArgument() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleNodeAssertionArgument = null;
+
+
+        try {
+            // InternalProblem.g:1452:62: (iv_ruleNodeAssertionArgument= ruleNodeAssertionArgument EOF )
+            // InternalProblem.g:1453:2: iv_ruleNodeAssertionArgument= ruleNodeAssertionArgument EOF
+            {
+             newCompositeNode(grammarAccess.getNodeAssertionArgumentRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleNodeAssertionArgument=ruleNodeAssertionArgument();
+
+            state._fsp--;
+
+             current =iv_ruleNodeAssertionArgument; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleNodeAssertionArgument"
+
+
+    // $ANTLR start "ruleNodeAssertionArgument"
+    // InternalProblem.g:1459:1: ruleNodeAssertionArgument returns [EObject current=null] : ( ( ruleQualifiedName ) ) ;
+    public final EObject ruleNodeAssertionArgument() throws RecognitionException {
+        EObject current = null;
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:1465:2: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:1466:2: ( ( ruleQualifiedName ) )
+            {
+            // InternalProblem.g:1466:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:1467:3: ( ruleQualifiedName )
+            {
+            // InternalProblem.g:1467:3: ( ruleQualifiedName )
+            // InternalProblem.g:1468:4: ruleQualifiedName
+            {
+
+                                        if (current==null) {
+                                                current = createModelElement(grammarAccess.getNodeAssertionArgumentRule());
+                                        }
+                                
+
+                                        newCompositeNode(grammarAccess.getNodeAssertionArgumentAccess().getNodeNodeCrossReference_0());
+                                
+            pushFollow(FOLLOW_2);
+            ruleQualifiedName();
+
+            state._fsp--;
+
+
+                                        afterParserOrEnumRuleCall();
+                                
+
+            }
+
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleNodeAssertionArgument"
+
+
+    // $ANTLR start "entryRuleConstantAssertionArgument"
+    // InternalProblem.g:1485:1: entryRuleConstantAssertionArgument returns [EObject current=null] : iv_ruleConstantAssertionArgument= ruleConstantAssertionArgument EOF ;
+    public final EObject entryRuleConstantAssertionArgument() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleConstantAssertionArgument = null;
+
+
+        try {
+            // InternalProblem.g:1485:66: (iv_ruleConstantAssertionArgument= ruleConstantAssertionArgument EOF )
+            // InternalProblem.g:1486:2: iv_ruleConstantAssertionArgument= ruleConstantAssertionArgument EOF
+            {
+             newCompositeNode(grammarAccess.getConstantAssertionArgumentRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleConstantAssertionArgument=ruleConstantAssertionArgument();
+
+            state._fsp--;
+
+             current =iv_ruleConstantAssertionArgument; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleConstantAssertionArgument"
+
+
+    // $ANTLR start "ruleConstantAssertionArgument"
+    // InternalProblem.g:1492:1: ruleConstantAssertionArgument returns [EObject current=null] : ( (lv_constant_0_0= ruleConstant ) ) ;
+    public final EObject ruleConstantAssertionArgument() throws RecognitionException {
+        EObject current = null;
+
+        EObject lv_constant_0_0 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:1498:2: ( ( (lv_constant_0_0= ruleConstant ) ) )
+            // InternalProblem.g:1499:2: ( (lv_constant_0_0= ruleConstant ) )
+            {
+            // InternalProblem.g:1499:2: ( (lv_constant_0_0= ruleConstant ) )
+            // InternalProblem.g:1500:3: (lv_constant_0_0= ruleConstant )
+            {
+            // InternalProblem.g:1500:3: (lv_constant_0_0= ruleConstant )
+            // InternalProblem.g:1501:4: lv_constant_0_0= ruleConstant
+            {
+
+                                        newCompositeNode(grammarAccess.getConstantAssertionArgumentAccess().getConstantConstantParserRuleCall_0());
+                                
+            pushFollow(FOLLOW_2);
+            lv_constant_0_0=ruleConstant();
+
+            state._fsp--;
+
+
+                                        if (current==null) {
+                                                current = createModelElementForParent(grammarAccess.getConstantAssertionArgumentRule());
+                                        }
+                                        set(
+                                                current,
+                                                "constant",
+                                                lv_constant_0_0,
+                                                "org.eclipse.viatra.solver.language.Problem.Constant");
+                                        afterParserOrEnumRuleCall();
+                                
+
+            }
+
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleConstantAssertionArgument"
+
+
+    // $ANTLR start "entryRuleNodeValueAssertion"
+    // InternalProblem.g:1521:1: entryRuleNodeValueAssertion returns [EObject current=null] : iv_ruleNodeValueAssertion= ruleNodeValueAssertion EOF ;
+    public final EObject entryRuleNodeValueAssertion() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleNodeValueAssertion = null;
+
+
+        try {
+            // InternalProblem.g:1521:59: (iv_ruleNodeValueAssertion= ruleNodeValueAssertion EOF )
+            // InternalProblem.g:1522:2: iv_ruleNodeValueAssertion= ruleNodeValueAssertion EOF
+            {
+             newCompositeNode(grammarAccess.getNodeValueAssertionRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleNodeValueAssertion=ruleNodeValueAssertion();
+
+            state._fsp--;
+
+             current =iv_ruleNodeValueAssertion; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleNodeValueAssertion"
+
+
+    // $ANTLR start "ruleNodeValueAssertion"
+    // InternalProblem.g:1528:1: ruleNodeValueAssertion returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) otherlv_1= ':' ( (lv_value_2_0= ruleConstant ) ) otherlv_3= '.' ) ;
+    public final EObject ruleNodeValueAssertion() throws RecognitionException {
+        EObject current = null;
+
+        Token otherlv_1=null;
+        Token otherlv_3=null;
+        EObject lv_value_2_0 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:1534:2: ( ( ( ( ruleQualifiedName ) ) otherlv_1= ':' ( (lv_value_2_0= ruleConstant ) ) otherlv_3= '.' ) )
+            // InternalProblem.g:1535:2: ( ( ( ruleQualifiedName ) ) otherlv_1= ':' ( (lv_value_2_0= ruleConstant ) ) otherlv_3= '.' )
+            {
+            // InternalProblem.g:1535:2: ( ( ( ruleQualifiedName ) ) otherlv_1= ':' ( (lv_value_2_0= ruleConstant ) ) otherlv_3= '.' )
+            // InternalProblem.g:1536:3: ( ( ruleQualifiedName ) ) otherlv_1= ':' ( (lv_value_2_0= ruleConstant ) ) otherlv_3= '.'
+            {
+            // InternalProblem.g:1536:3: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:1537:4: ( ruleQualifiedName )
+            {
+            // InternalProblem.g:1537:4: ( ruleQualifiedName )
+            // InternalProblem.g:1538:5: ruleQualifiedName
+            {
+
+                                                if (current==null) {
+                                                        current = createModelElement(grammarAccess.getNodeValueAssertionRule());
+                                                }
+                                        
+
+                                                newCompositeNode(grammarAccess.getNodeValueAssertionAccess().getNodeNodeCrossReference_0_0());
+                                        
+            pushFollow(FOLLOW_31);
+            ruleQualifiedName();
+
+            state._fsp--;
+
+
+                                                afterParserOrEnumRuleCall();
+                                        
+
+            }
+
+
+            }
+
+            otherlv_1=(Token)match(input,34,FOLLOW_30); 
+
+                                newLeafNode(otherlv_1, grammarAccess.getNodeValueAssertionAccess().getColonKeyword_1());
+                        
+            // InternalProblem.g:1556:3: ( (lv_value_2_0= ruleConstant ) )
+            // InternalProblem.g:1557:4: (lv_value_2_0= ruleConstant )
+            {
+            // InternalProblem.g:1557:4: (lv_value_2_0= ruleConstant )
+            // InternalProblem.g:1558:5: lv_value_2_0= ruleConstant
+            {
+
+                                                newCompositeNode(grammarAccess.getNodeValueAssertionAccess().getValueConstantParserRuleCall_2_0());
+                                        
+            pushFollow(FOLLOW_4);
+            lv_value_2_0=ruleConstant();
+
+            state._fsp--;
+
+
+                                                if (current==null) {
+                                                        current = createModelElementForParent(grammarAccess.getNodeValueAssertionRule());
+                                                }
+                                                set(
+                                                        current,
+                                                        "value",
+                                                        lv_value_2_0,
+                                                        "org.eclipse.viatra.solver.language.Problem.Constant");
+                                                afterParserOrEnumRuleCall();
+                                        
+
+            }
+
+
+            }
+
+            otherlv_3=(Token)match(input,13,FOLLOW_2); 
+
+                                newLeafNode(otherlv_3, grammarAccess.getNodeValueAssertionAccess().getFullStopKeyword_3());
+                        
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleNodeValueAssertion"
+
+
+    // $ANTLR start "entryRuleConstant"
+    // InternalProblem.g:1583:1: entryRuleConstant returns [EObject current=null] : iv_ruleConstant= ruleConstant EOF ;
+    public final EObject entryRuleConstant() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleConstant = null;
+
+
+        try {
+            // InternalProblem.g:1583:49: (iv_ruleConstant= ruleConstant EOF )
+            // InternalProblem.g:1584:2: iv_ruleConstant= ruleConstant EOF
+            {
+             newCompositeNode(grammarAccess.getConstantRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleConstant=ruleConstant();
+
+            state._fsp--;
+
+             current =iv_ruleConstant; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleConstant"
+
+
+    // $ANTLR start "ruleConstant"
+    // InternalProblem.g:1590:1: ruleConstant returns [EObject current=null] : (this_IntConstant_0= ruleIntConstant | this_RealConstant_1= ruleRealConstant | this_StringConstant_2= ruleStringConstant ) ;
+    public final EObject ruleConstant() throws RecognitionException {
+        EObject current = null;
+
+        EObject this_IntConstant_0 = null;
+
+        EObject this_RealConstant_1 = null;
+
+        EObject this_StringConstant_2 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:1596:2: ( (this_IntConstant_0= ruleIntConstant | this_RealConstant_1= ruleRealConstant | this_StringConstant_2= ruleStringConstant ) )
+            // InternalProblem.g:1597:2: (this_IntConstant_0= ruleIntConstant | this_RealConstant_1= ruleRealConstant | this_StringConstant_2= ruleStringConstant )
+            {
+            // InternalProblem.g:1597:2: (this_IntConstant_0= ruleIntConstant | this_RealConstant_1= ruleRealConstant | this_StringConstant_2= ruleStringConstant )
+            int alt37=3;
+            switch ( input.LA(1) ) {
+            case 45:
+                {
+                int LA37_1 = input.LA(2);
+
+                if ( (LA37_1==RULE_INT) ) {
+                    switch ( input.LA(3) ) {
+                    case 13:
+                        {
+                        int LA37_4 = input.LA(4);
+
+                        if ( (LA37_4==RULE_INT) ) {
+                            alt37=2;
+                        }
+                        else if ( (LA37_4==EOF||LA37_4==RULE_ID||LA37_4==RULE_QUOTED_ID||(LA37_4>=14 && LA37_4<=15)||LA37_4==21||(LA37_4>=27 && LA37_4<=28)||LA37_4==32||LA37_4==35||(LA37_4>=41 && LA37_4<=44)||LA37_4==47) ) {
+                            alt37=1;
+                        }
+                        else {
+                            NoViableAltException nvae =
+                                new NoViableAltException("", 37, 4, input);
+
+                            throw nvae;
+                        }
+                        }
+                        break;
+                    case 43:
+                    case 44:
+                        {
+                        alt37=2;
+                        }
+                        break;
+                    case EOF:
+                    case 17:
+                    case 30:
+                        {
+                        alt37=1;
+                        }
+                        break;
+                    default:
+                        NoViableAltException nvae =
+                            new NoViableAltException("", 37, 2, input);
+
+                        throw nvae;
+                    }
+
+                }
+                else {
+                    NoViableAltException nvae =
+                        new NoViableAltException("", 37, 1, input);
+
+                    throw nvae;
+                }
+                }
+                break;
+            case RULE_INT:
+                {
+                switch ( input.LA(2) ) {
+                case 13:
+                    {
+                    int LA37_4 = input.LA(3);
+
+                    if ( (LA37_4==RULE_INT) ) {
+                        alt37=2;
+                    }
+                    else if ( (LA37_4==EOF||LA37_4==RULE_ID||LA37_4==RULE_QUOTED_ID||(LA37_4>=14 && LA37_4<=15)||LA37_4==21||(LA37_4>=27 && LA37_4<=28)||LA37_4==32||LA37_4==35||(LA37_4>=41 && LA37_4<=44)||LA37_4==47) ) {
+                        alt37=1;
+                    }
+                    else {
+                        NoViableAltException nvae =
+                            new NoViableAltException("", 37, 4, input);
+
+                        throw nvae;
+                    }
+                    }
+                    break;
+                case 43:
+                case 44:
+                    {
+                    alt37=2;
+                    }
+                    break;
+                case EOF:
+                case 17:
+                case 30:
+                    {
+                    alt37=1;
+                    }
+                    break;
+                default:
+                    NoViableAltException nvae =
+                        new NoViableAltException("", 37, 2, input);
+
+                    throw nvae;
+                }
+
+                }
+                break;
+            case RULE_STRING:
+                {
+                alt37=3;
+                }
+                break;
+            default:
+                NoViableAltException nvae =
+                    new NoViableAltException("", 37, 0, input);
+
+                throw nvae;
+            }
+
+            switch (alt37) {
+                case 1 :
+                    // InternalProblem.g:1598:3: this_IntConstant_0= ruleIntConstant
+                    {
+
+                                        newCompositeNode(grammarAccess.getConstantAccess().getIntConstantParserRuleCall_0());
+                                
+                    pushFollow(FOLLOW_2);
+                    this_IntConstant_0=ruleIntConstant();
+
+                    state._fsp--;
+
+
+                                        current = this_IntConstant_0;
+                                        afterParserOrEnumRuleCall();
+                                
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:1607:3: this_RealConstant_1= ruleRealConstant
+                    {
+
+                                        newCompositeNode(grammarAccess.getConstantAccess().getRealConstantParserRuleCall_1());
+                                
+                    pushFollow(FOLLOW_2);
+                    this_RealConstant_1=ruleRealConstant();
+
+                    state._fsp--;
+
+
+                                        current = this_RealConstant_1;
+                                        afterParserOrEnumRuleCall();
+                                
+
+                    }
+                    break;
+                case 3 :
+                    // InternalProblem.g:1616:3: this_StringConstant_2= ruleStringConstant
+                    {
+
+                                        newCompositeNode(grammarAccess.getConstantAccess().getStringConstantParserRuleCall_2());
+                                
+                    pushFollow(FOLLOW_2);
+                    this_StringConstant_2=ruleStringConstant();
+
+                    state._fsp--;
+
+
+                                        current = this_StringConstant_2;
+                                        afterParserOrEnumRuleCall();
+                                
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleConstant"
+
+
+    // $ANTLR start "entryRuleIntConstant"
+    // InternalProblem.g:1628:1: entryRuleIntConstant returns [EObject current=null] : iv_ruleIntConstant= ruleIntConstant EOF ;
+    public final EObject entryRuleIntConstant() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleIntConstant = null;
+
+
+        try {
+            // InternalProblem.g:1628:52: (iv_ruleIntConstant= ruleIntConstant EOF )
+            // InternalProblem.g:1629:2: iv_ruleIntConstant= ruleIntConstant EOF
+            {
+             newCompositeNode(grammarAccess.getIntConstantRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleIntConstant=ruleIntConstant();
+
+            state._fsp--;
+
+             current =iv_ruleIntConstant; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleIntConstant"
+
+
+    // $ANTLR start "ruleIntConstant"
+    // InternalProblem.g:1635:1: ruleIntConstant returns [EObject current=null] : ( (lv_intValue_0_0= ruleInteger ) ) ;
+    public final EObject ruleIntConstant() throws RecognitionException {
+        EObject current = null;
+
+        AntlrDatatypeRuleToken lv_intValue_0_0 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:1641:2: ( ( (lv_intValue_0_0= ruleInteger ) ) )
+            // InternalProblem.g:1642:2: ( (lv_intValue_0_0= ruleInteger ) )
+            {
+            // InternalProblem.g:1642:2: ( (lv_intValue_0_0= ruleInteger ) )
+            // InternalProblem.g:1643:3: (lv_intValue_0_0= ruleInteger )
+            {
+            // InternalProblem.g:1643:3: (lv_intValue_0_0= ruleInteger )
+            // InternalProblem.g:1644:4: lv_intValue_0_0= ruleInteger
+            {
+
+                                        newCompositeNode(grammarAccess.getIntConstantAccess().getIntValueIntegerParserRuleCall_0());
+                                
+            pushFollow(FOLLOW_2);
+            lv_intValue_0_0=ruleInteger();
+
+            state._fsp--;
+
+
+                                        if (current==null) {
+                                                current = createModelElementForParent(grammarAccess.getIntConstantRule());
+                                        }
+                                        set(
+                                                current,
+                                                "intValue",
+                                                lv_intValue_0_0,
+                                                "org.eclipse.viatra.solver.language.Problem.Integer");
+                                        afterParserOrEnumRuleCall();
+                                
+
+            }
+
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleIntConstant"
+
+
+    // $ANTLR start "entryRuleRealConstant"
+    // InternalProblem.g:1664:1: entryRuleRealConstant returns [EObject current=null] : iv_ruleRealConstant= ruleRealConstant EOF ;
+    public final EObject entryRuleRealConstant() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleRealConstant = null;
+
+
+        try {
+            // InternalProblem.g:1664:53: (iv_ruleRealConstant= ruleRealConstant EOF )
+            // InternalProblem.g:1665:2: iv_ruleRealConstant= ruleRealConstant EOF
+            {
+             newCompositeNode(grammarAccess.getRealConstantRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleRealConstant=ruleRealConstant();
+
+            state._fsp--;
+
+             current =iv_ruleRealConstant; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleRealConstant"
+
+
+    // $ANTLR start "ruleRealConstant"
+    // InternalProblem.g:1671:1: ruleRealConstant returns [EObject current=null] : ( (lv_realValue_0_0= ruleReal ) ) ;
+    public final EObject ruleRealConstant() throws RecognitionException {
+        EObject current = null;
+
+        AntlrDatatypeRuleToken lv_realValue_0_0 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:1677:2: ( ( (lv_realValue_0_0= ruleReal ) ) )
+            // InternalProblem.g:1678:2: ( (lv_realValue_0_0= ruleReal ) )
+            {
+            // InternalProblem.g:1678:2: ( (lv_realValue_0_0= ruleReal ) )
+            // InternalProblem.g:1679:3: (lv_realValue_0_0= ruleReal )
+            {
+            // InternalProblem.g:1679:3: (lv_realValue_0_0= ruleReal )
+            // InternalProblem.g:1680:4: lv_realValue_0_0= ruleReal
+            {
+
+                                        newCompositeNode(grammarAccess.getRealConstantAccess().getRealValueRealParserRuleCall_0());
+                                
+            pushFollow(FOLLOW_2);
+            lv_realValue_0_0=ruleReal();
+
+            state._fsp--;
+
+
+                                        if (current==null) {
+                                                current = createModelElementForParent(grammarAccess.getRealConstantRule());
+                                        }
+                                        set(
+                                                current,
+                                                "realValue",
+                                                lv_realValue_0_0,
+                                                "org.eclipse.viatra.solver.language.Problem.Real");
+                                        afterParserOrEnumRuleCall();
+                                
+
+            }
+
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleRealConstant"
+
+
+    // $ANTLR start "entryRuleStringConstant"
+    // InternalProblem.g:1700:1: entryRuleStringConstant returns [EObject current=null] : iv_ruleStringConstant= ruleStringConstant EOF ;
+    public final EObject entryRuleStringConstant() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleStringConstant = null;
+
+
+        try {
+            // InternalProblem.g:1700:55: (iv_ruleStringConstant= ruleStringConstant EOF )
+            // InternalProblem.g:1701:2: iv_ruleStringConstant= ruleStringConstant EOF
+            {
+             newCompositeNode(grammarAccess.getStringConstantRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleStringConstant=ruleStringConstant();
+
+            state._fsp--;
+
+             current =iv_ruleStringConstant; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleStringConstant"
+
+
+    // $ANTLR start "ruleStringConstant"
+    // InternalProblem.g:1707:1: ruleStringConstant returns [EObject current=null] : ( (lv_stringValue_0_0= RULE_STRING ) ) ;
+    public final EObject ruleStringConstant() throws RecognitionException {
+        EObject current = null;
+
+        Token lv_stringValue_0_0=null;
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:1713:2: ( ( (lv_stringValue_0_0= RULE_STRING ) ) )
+            // InternalProblem.g:1714:2: ( (lv_stringValue_0_0= RULE_STRING ) )
+            {
+            // InternalProblem.g:1714:2: ( (lv_stringValue_0_0= RULE_STRING ) )
+            // InternalProblem.g:1715:3: (lv_stringValue_0_0= RULE_STRING )
+            {
+            // InternalProblem.g:1715:3: (lv_stringValue_0_0= RULE_STRING )
+            // InternalProblem.g:1716:4: lv_stringValue_0_0= RULE_STRING
+            {
+            lv_stringValue_0_0=(Token)match(input,RULE_STRING,FOLLOW_2); 
+
+                                        newLeafNode(lv_stringValue_0_0, grammarAccess.getStringConstantAccess().getStringValueSTRINGTerminalRuleCall_0());
+                                
+
+                                        if (current==null) {
+                                                current = createModelElement(grammarAccess.getStringConstantRule());
+                                        }
+                                        setWithLastConsumed(
+                                                current,
+                                                "stringValue",
+                                                lv_stringValue_0_0,
+                                                "org.eclipse.viatra.solver.language.Problem.STRING");
+                                
+
+            }
+
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleStringConstant"
+
+
     // $ANTLR start "entryRuleScopeDeclaration"
-    // InternalProblem.g:1323:1: entryRuleScopeDeclaration returns [EObject current=null] : iv_ruleScopeDeclaration= ruleScopeDeclaration EOF ;
+    // InternalProblem.g:1735:1: entryRuleScopeDeclaration returns [EObject current=null] : iv_ruleScopeDeclaration= ruleScopeDeclaration EOF ;
     public final EObject entryRuleScopeDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -3467,8 +4727,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1323:57: (iv_ruleScopeDeclaration= ruleScopeDeclaration EOF )
-            // InternalProblem.g:1324:2: iv_ruleScopeDeclaration= ruleScopeDeclaration EOF
+            // InternalProblem.g:1735:57: (iv_ruleScopeDeclaration= ruleScopeDeclaration EOF )
+            // InternalProblem.g:1736:2: iv_ruleScopeDeclaration= ruleScopeDeclaration EOF
             {
              newCompositeNode(grammarAccess.getScopeDeclarationRule()); 
             pushFollow(FOLLOW_1);
@@ -3495,7 +4755,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleScopeDeclaration"
-    // 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= '.' ) ;
+    // InternalProblem.g:1742: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;
 
@@ -3511,26 +4771,26 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // 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:1748:2: ( (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' ) )
+            // InternalProblem.g:1749: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:1338:3: otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.'
+            // InternalProblem.g:1749:2: (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' )
+            // InternalProblem.g:1750:3: otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.'
             {
-            otherlv_0=(Token)match(input,35,FOLLOW_31); 
+            otherlv_0=(Token)match(input,35,FOLLOW_33); 
 
                                 newLeafNode(otherlv_0, grammarAccess.getScopeDeclarationAccess().getScopeKeyword_0());
                         
-            // InternalProblem.g:1342:3: ( (lv_typeScopes_1_0= ruleTypeScope ) )
-            // InternalProblem.g:1343:4: (lv_typeScopes_1_0= ruleTypeScope )
+            // InternalProblem.g:1754:3: ( (lv_typeScopes_1_0= ruleTypeScope ) )
+            // InternalProblem.g:1755:4: (lv_typeScopes_1_0= ruleTypeScope )
             {
-            // InternalProblem.g:1343:4: (lv_typeScopes_1_0= ruleTypeScope )
-            // InternalProblem.g:1344:5: lv_typeScopes_1_0= ruleTypeScope
+            // InternalProblem.g:1755:4: (lv_typeScopes_1_0= ruleTypeScope )
+            // InternalProblem.g:1756:5: lv_typeScopes_1_0= ruleTypeScope
             {
 
                                                 newCompositeNode(grammarAccess.getScopeDeclarationAccess().getTypeScopesTypeScopeParserRuleCall_1_0());
                                         
-            pushFollow(FOLLOW_32);
+            pushFollow(FOLLOW_34);
             lv_typeScopes_1_0=ruleTypeScope();
 
             state._fsp--;
@@ -3552,35 +4812,35 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:1361:3: (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )*
-            loop35:
+            // InternalProblem.g:1773:3: (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )*
+            loop38:
             do {
-                int alt35=2;
-                int LA35_0 = input.LA(1);
+                int alt38=2;
+                int LA38_0 = input.LA(1);
 
-                if ( (LA35_0==17) ) {
-                    alt35=1;
+                if ( (LA38_0==17) ) {
+                    alt38=1;
                 }
 
 
-                switch (alt35) {
+                switch (alt38) {
                 case 1 :
-                    // InternalProblem.g:1362:4: otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) )
+                    // InternalProblem.g:1774:4: otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) )
                     {
-                    otherlv_2=(Token)match(input,17,FOLLOW_31); 
+                    otherlv_2=(Token)match(input,17,FOLLOW_33); 
 
                                                 newLeafNode(otherlv_2, grammarAccess.getScopeDeclarationAccess().getCommaKeyword_2_0());
                                         
-                    // InternalProblem.g:1366:4: ( (lv_typeScopes_3_0= ruleTypeScope ) )
-                    // InternalProblem.g:1367:5: (lv_typeScopes_3_0= ruleTypeScope )
+                    // InternalProblem.g:1778:4: ( (lv_typeScopes_3_0= ruleTypeScope ) )
+                    // InternalProblem.g:1779:5: (lv_typeScopes_3_0= ruleTypeScope )
                     {
-                    // InternalProblem.g:1367:5: (lv_typeScopes_3_0= ruleTypeScope )
-                    // InternalProblem.g:1368:6: lv_typeScopes_3_0= ruleTypeScope
+                    // InternalProblem.g:1779:5: (lv_typeScopes_3_0= ruleTypeScope )
+                    // InternalProblem.g:1780:6: lv_typeScopes_3_0= ruleTypeScope
                     {
 
                                                                 newCompositeNode(grammarAccess.getScopeDeclarationAccess().getTypeScopesTypeScopeParserRuleCall_2_1_0());
                                                         
-                    pushFollow(FOLLOW_32);
+                    pushFollow(FOLLOW_34);
                     lv_typeScopes_3_0=ruleTypeScope();
 
                     state._fsp--;
@@ -3607,7 +4867,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     break;
 
                 default :
-                    break loop35;
+                    break loop38;
                 }
             } while (true);
 
@@ -3638,7 +4898,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTypeScope"
-    // InternalProblem.g:1394:1: entryRuleTypeScope returns [EObject current=null] : iv_ruleTypeScope= ruleTypeScope EOF ;
+    // InternalProblem.g:1806:1: entryRuleTypeScope returns [EObject current=null] : iv_ruleTypeScope= ruleTypeScope EOF ;
     public final EObject entryRuleTypeScope() throws RecognitionException {
         EObject current = null;
 
@@ -3646,8 +4906,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1394:50: (iv_ruleTypeScope= ruleTypeScope EOF )
-            // InternalProblem.g:1395:2: iv_ruleTypeScope= ruleTypeScope EOF
+            // InternalProblem.g:1806:50: (iv_ruleTypeScope= ruleTypeScope EOF )
+            // InternalProblem.g:1807:2: iv_ruleTypeScope= ruleTypeScope EOF
             {
              newCompositeNode(grammarAccess.getTypeScopeRule()); 
             pushFollow(FOLLOW_1);
@@ -3674,7 +4934,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTypeScope"
-    // InternalProblem.g:1401:1: ruleTypeScope returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) ) ;
+    // InternalProblem.g:1813: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;
 
@@ -3688,24 +4948,24 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // 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:1819:2: ( ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) ) )
+            // InternalProblem.g:1820: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:1409:3: ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) )
+            // InternalProblem.g:1820:2: ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) )
+            // InternalProblem.g:1821:3: ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) )
             {
-            // InternalProblem.g:1409:3: ( (otherlv_0= RULE_ID ) )
-            // InternalProblem.g:1410:4: (otherlv_0= RULE_ID )
+            // InternalProblem.g:1821:3: ( (otherlv_0= RULE_ID ) )
+            // InternalProblem.g:1822:4: (otherlv_0= RULE_ID )
             {
-            // InternalProblem.g:1410:4: (otherlv_0= RULE_ID )
-            // InternalProblem.g:1411:5: otherlv_0= RULE_ID
+            // InternalProblem.g:1822:4: (otherlv_0= RULE_ID )
+            // InternalProblem.g:1823:5: otherlv_0= RULE_ID
             {
 
                                                 if (current==null) {
                                                         current = createModelElement(grammarAccess.getTypeScopeRule());
                                                 }
                                         
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_33); 
+            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_35); 
 
                                                 newLeafNode(otherlv_0, grammarAccess.getTypeScopeAccess().getTargetTypeClassDeclarationCrossReference_0_0());
                                         
@@ -3715,31 +4975,31 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:1422:3: ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' )
-            int alt36=2;
-            int LA36_0 = input.LA(1);
+            // InternalProblem.g:1834:3: ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' )
+            int alt39=2;
+            int LA39_0 = input.LA(1);
 
-            if ( (LA36_0==36) ) {
-                alt36=1;
+            if ( (LA39_0==36) ) {
+                alt39=1;
             }
-            else if ( (LA36_0==37) ) {
-                alt36=2;
+            else if ( (LA39_0==37) ) {
+                alt39=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 36, 0, input);
+                    new NoViableAltException("", 39, 0, input);
 
                 throw nvae;
             }
-            switch (alt36) {
+            switch (alt39) {
                 case 1 :
-                    // InternalProblem.g:1423:4: ( (lv_increment_1_0= '+=' ) )
+                    // InternalProblem.g:1835:4: ( (lv_increment_1_0= '+=' ) )
                     {
-                    // InternalProblem.g:1423:4: ( (lv_increment_1_0= '+=' ) )
-                    // InternalProblem.g:1424:5: (lv_increment_1_0= '+=' )
+                    // InternalProblem.g:1835:4: ( (lv_increment_1_0= '+=' ) )
+                    // InternalProblem.g:1836:5: (lv_increment_1_0= '+=' )
                     {
-                    // InternalProblem.g:1424:5: (lv_increment_1_0= '+=' )
-                    // InternalProblem.g:1425:6: lv_increment_1_0= '+='
+                    // InternalProblem.g:1836:5: (lv_increment_1_0= '+=' )
+                    // InternalProblem.g:1837:6: lv_increment_1_0= '+='
                     {
                     lv_increment_1_0=(Token)match(input,36,FOLLOW_17); 
 
@@ -3761,7 +5021,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1438:4: otherlv_2= '='
+                    // InternalProblem.g:1850:4: otherlv_2= '='
                     {
                     otherlv_2=(Token)match(input,37,FOLLOW_17); 
 
@@ -3773,11 +5033,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:1443:3: ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) )
-            // InternalProblem.g:1444:4: (lv_multiplicity_3_0= ruleDefiniteMultiplicity )
+            // InternalProblem.g:1855:3: ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) )
+            // InternalProblem.g:1856:4: (lv_multiplicity_3_0= ruleDefiniteMultiplicity )
             {
-            // InternalProblem.g:1444:4: (lv_multiplicity_3_0= ruleDefiniteMultiplicity )
-            // InternalProblem.g:1445:5: lv_multiplicity_3_0= ruleDefiniteMultiplicity
+            // InternalProblem.g:1856:4: (lv_multiplicity_3_0= ruleDefiniteMultiplicity )
+            // InternalProblem.g:1857:5: lv_multiplicity_3_0= ruleDefiniteMultiplicity
             {
 
                                                 newCompositeNode(grammarAccess.getTypeScopeAccess().getMultiplicityDefiniteMultiplicityParserRuleCall_2_0());
@@ -3827,7 +5087,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleMultiplicity"
-    // InternalProblem.g:1466:1: entryRuleMultiplicity returns [EObject current=null] : iv_ruleMultiplicity= ruleMultiplicity EOF ;
+    // InternalProblem.g:1878:1: entryRuleMultiplicity returns [EObject current=null] : iv_ruleMultiplicity= ruleMultiplicity EOF ;
     public final EObject entryRuleMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3835,8 +5095,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1466:53: (iv_ruleMultiplicity= ruleMultiplicity EOF )
-            // InternalProblem.g:1467:2: iv_ruleMultiplicity= ruleMultiplicity EOF
+            // InternalProblem.g:1878:53: (iv_ruleMultiplicity= ruleMultiplicity EOF )
+            // InternalProblem.g:1879:2: iv_ruleMultiplicity= ruleMultiplicity EOF
             {
              newCompositeNode(grammarAccess.getMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -3863,7 +5123,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleMultiplicity"
-    // InternalProblem.g:1473:1: ruleMultiplicity returns [EObject current=null] : (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity ) ;
+    // InternalProblem.g:1885:1: ruleMultiplicity returns [EObject current=null] : (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity ) ;
     public final EObject ruleMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3876,28 +5136,28 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // 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:1891:2: ( (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity ) )
+            // InternalProblem.g:1892:2: (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity )
             {
-            // InternalProblem.g:1480:2: (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity )
-            int alt37=2;
-            int LA37_0 = input.LA(1);
+            // InternalProblem.g:1892:2: (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity )
+            int alt40=2;
+            int LA40_0 = input.LA(1);
 
-            if ( (LA37_0==EOF||LA37_0==25) ) {
-                alt37=1;
+            if ( (LA40_0==EOF||LA40_0==25) ) {
+                alt40=1;
             }
-            else if ( (LA37_0==RULE_INT) ) {
-                alt37=2;
+            else if ( (LA40_0==RULE_INT) ) {
+                alt40=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 37, 0, input);
+                    new NoViableAltException("", 40, 0, input);
 
                 throw nvae;
             }
-            switch (alt37) {
+            switch (alt40) {
                 case 1 :
-                    // InternalProblem.g:1481:3: this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity
+                    // InternalProblem.g:1893:3: this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity
                     {
 
                                         newCompositeNode(grammarAccess.getMultiplicityAccess().getUnboundedMultiplicityParserRuleCall_0());
@@ -3915,7 +5175,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1490:3: this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity
+                    // InternalProblem.g:1902:3: this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity
                     {
 
                                         newCompositeNode(grammarAccess.getMultiplicityAccess().getDefiniteMultiplicityParserRuleCall_1());
@@ -3955,7 +5215,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDefiniteMultiplicity"
-    // InternalProblem.g:1502:1: entryRuleDefiniteMultiplicity returns [EObject current=null] : iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF ;
+    // InternalProblem.g:1914:1: entryRuleDefiniteMultiplicity returns [EObject current=null] : iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF ;
     public final EObject entryRuleDefiniteMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3963,8 +5223,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1502:61: (iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF )
-            // InternalProblem.g:1503:2: iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF
+            // InternalProblem.g:1914:61: (iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF )
+            // InternalProblem.g:1915:2: iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF
             {
              newCompositeNode(grammarAccess.getDefiniteMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -3991,7 +5251,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDefiniteMultiplicity"
-    // InternalProblem.g:1509:1: ruleDefiniteMultiplicity returns [EObject current=null] : (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity ) ;
+    // InternalProblem.g:1921:1: ruleDefiniteMultiplicity returns [EObject current=null] : (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity ) ;
     public final EObject ruleDefiniteMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -4004,38 +5264,38 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // 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:1927:2: ( (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity ) )
+            // InternalProblem.g:1928:2: (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity )
             {
-            // InternalProblem.g:1516:2: (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity )
-            int alt38=2;
-            int LA38_0 = input.LA(1);
+            // InternalProblem.g:1928:2: (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity )
+            int alt41=2;
+            int LA41_0 = input.LA(1);
 
-            if ( (LA38_0==RULE_INT) ) {
-                int LA38_1 = input.LA(2);
+            if ( (LA41_0==RULE_INT) ) {
+                int LA41_1 = input.LA(2);
 
-                if ( (LA38_1==38) ) {
-                    alt38=1;
+                if ( (LA41_1==38) ) {
+                    alt41=1;
                 }
-                else if ( (LA38_1==EOF||LA38_1==13||LA38_1==17||LA38_1==25) ) {
-                    alt38=2;
+                else if ( (LA41_1==EOF||LA41_1==13||LA41_1==17||LA41_1==25) ) {
+                    alt41=2;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("", 38, 1, input);
+                        new NoViableAltException("", 41, 1, input);
 
                     throw nvae;
                 }
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 38, 0, input);
+                    new NoViableAltException("", 41, 0, input);
 
                 throw nvae;
             }
-            switch (alt38) {
+            switch (alt41) {
                 case 1 :
-                    // InternalProblem.g:1517:3: this_RangeMultiplicity_0= ruleRangeMultiplicity
+                    // InternalProblem.g:1929:3: this_RangeMultiplicity_0= ruleRangeMultiplicity
                     {
 
                                         newCompositeNode(grammarAccess.getDefiniteMultiplicityAccess().getRangeMultiplicityParserRuleCall_0());
@@ -4053,7 +5313,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1526:3: this_ExactMultiplicity_1= ruleExactMultiplicity
+                    // InternalProblem.g:1938:3: this_ExactMultiplicity_1= ruleExactMultiplicity
                     {
 
                                         newCompositeNode(grammarAccess.getDefiniteMultiplicityAccess().getExactMultiplicityParserRuleCall_1());
@@ -4093,7 +5353,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleUnboundedMultiplicity"
-    // InternalProblem.g:1538:1: entryRuleUnboundedMultiplicity returns [EObject current=null] : iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF ;
+    // InternalProblem.g:1950:1: entryRuleUnboundedMultiplicity returns [EObject current=null] : iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF ;
     public final EObject entryRuleUnboundedMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -4101,8 +5361,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1538:62: (iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF )
-            // InternalProblem.g:1539:2: iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF
+            // InternalProblem.g:1950:62: (iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF )
+            // InternalProblem.g:1951:2: iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF
             {
              newCompositeNode(grammarAccess.getUnboundedMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -4129,7 +5389,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleUnboundedMultiplicity"
-    // InternalProblem.g:1545:1: ruleUnboundedMultiplicity returns [EObject current=null] : () ;
+    // InternalProblem.g:1957:1: ruleUnboundedMultiplicity returns [EObject current=null] : () ;
     public final EObject ruleUnboundedMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -4137,11 +5397,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1551:2: ( () )
-            // InternalProblem.g:1552:2: ()
+            // InternalProblem.g:1963:2: ( () )
+            // InternalProblem.g:1964:2: ()
             {
-            // InternalProblem.g:1552:2: ()
-            // InternalProblem.g:1553:3: 
+            // InternalProblem.g:1964:2: ()
+            // InternalProblem.g:1965:3: 
             {
 
                                 current = forceCreateModelElement(
@@ -4166,7 +5426,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRangeMultiplicity"
-    // InternalProblem.g:1562:1: entryRuleRangeMultiplicity returns [EObject current=null] : iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF ;
+    // InternalProblem.g:1974:1: entryRuleRangeMultiplicity returns [EObject current=null] : iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF ;
     public final EObject entryRuleRangeMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -4174,8 +5434,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1562:58: (iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF )
-            // InternalProblem.g:1563:2: iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF
+            // InternalProblem.g:1974:58: (iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF )
+            // InternalProblem.g:1975:2: iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF
             {
              newCompositeNode(grammarAccess.getRangeMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -4202,7 +5462,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRangeMultiplicity"
-    // InternalProblem.g:1569:1: ruleRangeMultiplicity returns [EObject current=null] : ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) ) ;
+    // InternalProblem.g:1981: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;
 
@@ -4215,19 +5475,19 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // 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:1987:2: ( ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) ) )
+            // InternalProblem.g:1988: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:1577:3: ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) )
+            // InternalProblem.g:1988:2: ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) )
+            // InternalProblem.g:1989:3: ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) )
             {
-            // InternalProblem.g:1577:3: ( (lv_lowerBound_0_0= RULE_INT ) )
-            // InternalProblem.g:1578:4: (lv_lowerBound_0_0= RULE_INT )
+            // InternalProblem.g:1989:3: ( (lv_lowerBound_0_0= RULE_INT ) )
+            // InternalProblem.g:1990:4: (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
+            // InternalProblem.g:1990:4: (lv_lowerBound_0_0= RULE_INT )
+            // InternalProblem.g:1991:5: lv_lowerBound_0_0= RULE_INT
             {
-            lv_lowerBound_0_0=(Token)match(input,RULE_INT,FOLLOW_34); 
+            lv_lowerBound_0_0=(Token)match(input,RULE_INT,FOLLOW_36); 
 
                                                 newLeafNode(lv_lowerBound_0_0, grammarAccess.getRangeMultiplicityAccess().getLowerBoundINTTerminalRuleCall_0_0());
                                         
@@ -4247,15 +5507,15 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,38,FOLLOW_35); 
+            otherlv_1=(Token)match(input,38,FOLLOW_37); 
 
                                 newLeafNode(otherlv_1, grammarAccess.getRangeMultiplicityAccess().getFullStopFullStopKeyword_1());
                         
-            // InternalProblem.g:1599:3: ( (lv_upperBound_2_0= ruleUpperBound ) )
-            // InternalProblem.g:1600:4: (lv_upperBound_2_0= ruleUpperBound )
+            // InternalProblem.g:2011:3: ( (lv_upperBound_2_0= ruleUpperBound ) )
+            // InternalProblem.g:2012:4: (lv_upperBound_2_0= ruleUpperBound )
             {
-            // InternalProblem.g:1600:4: (lv_upperBound_2_0= ruleUpperBound )
-            // InternalProblem.g:1601:5: lv_upperBound_2_0= ruleUpperBound
+            // InternalProblem.g:2012:4: (lv_upperBound_2_0= ruleUpperBound )
+            // InternalProblem.g:2013:5: lv_upperBound_2_0= ruleUpperBound
             {
 
                                                 newCompositeNode(grammarAccess.getRangeMultiplicityAccess().getUpperBoundUpperBoundParserRuleCall_2_0());
@@ -4305,7 +5565,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleExactMultiplicity"
-    // InternalProblem.g:1622:1: entryRuleExactMultiplicity returns [EObject current=null] : iv_ruleExactMultiplicity= ruleExactMultiplicity EOF ;
+    // InternalProblem.g:2034:1: entryRuleExactMultiplicity returns [EObject current=null] : iv_ruleExactMultiplicity= ruleExactMultiplicity EOF ;
     public final EObject entryRuleExactMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -4313,8 +5573,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1622:58: (iv_ruleExactMultiplicity= ruleExactMultiplicity EOF )
-            // InternalProblem.g:1623:2: iv_ruleExactMultiplicity= ruleExactMultiplicity EOF
+            // InternalProblem.g:2034:58: (iv_ruleExactMultiplicity= ruleExactMultiplicity EOF )
+            // InternalProblem.g:2035:2: iv_ruleExactMultiplicity= ruleExactMultiplicity EOF
             {
              newCompositeNode(grammarAccess.getExactMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -4341,7 +5601,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleExactMultiplicity"
-    // InternalProblem.g:1629:1: ruleExactMultiplicity returns [EObject current=null] : ( (lv_exactValue_0_0= RULE_INT ) ) ;
+    // InternalProblem.g:2041:1: ruleExactMultiplicity returns [EObject current=null] : ( (lv_exactValue_0_0= RULE_INT ) ) ;
     public final EObject ruleExactMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -4351,14 +5611,14 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1635:2: ( ( (lv_exactValue_0_0= RULE_INT ) ) )
-            // InternalProblem.g:1636:2: ( (lv_exactValue_0_0= RULE_INT ) )
+            // InternalProblem.g:2047:2: ( ( (lv_exactValue_0_0= RULE_INT ) ) )
+            // InternalProblem.g:2048:2: ( (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:2048:2: ( (lv_exactValue_0_0= RULE_INT ) )
+            // InternalProblem.g:2049:3: (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
+            // InternalProblem.g:2049:3: (lv_exactValue_0_0= RULE_INT )
+            // InternalProblem.g:2050:4: lv_exactValue_0_0= RULE_INT
             {
             lv_exactValue_0_0=(Token)match(input,RULE_INT,FOLLOW_2); 
 
@@ -4400,7 +5660,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleUpperBound"
-    // InternalProblem.g:1657:1: entryRuleUpperBound returns [String current=null] : iv_ruleUpperBound= ruleUpperBound EOF ;
+    // InternalProblem.g:2069:1: entryRuleUpperBound returns [String current=null] : iv_ruleUpperBound= ruleUpperBound EOF ;
     public final String entryRuleUpperBound() throws RecognitionException {
         String current = null;
 
@@ -4408,8 +5668,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1657:50: (iv_ruleUpperBound= ruleUpperBound EOF )
-            // InternalProblem.g:1658:2: iv_ruleUpperBound= ruleUpperBound EOF
+            // InternalProblem.g:2069:50: (iv_ruleUpperBound= ruleUpperBound EOF )
+            // InternalProblem.g:2070:2: iv_ruleUpperBound= ruleUpperBound EOF
             {
              newCompositeNode(grammarAccess.getUpperBoundRule()); 
             pushFollow(FOLLOW_1);
@@ -4436,7 +5696,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleUpperBound"
-    // InternalProblem.g:1664:1: ruleUpperBound returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_INT_0= RULE_INT | kw= '*' ) ;
+    // InternalProblem.g:2076:1: ruleUpperBound returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_INT_0= RULE_INT | kw= '*' ) ;
     public final AntlrDatatypeRuleToken ruleUpperBound() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -4447,28 +5707,28 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1670:2: ( (this_INT_0= RULE_INT | kw= '*' ) )
-            // InternalProblem.g:1671:2: (this_INT_0= RULE_INT | kw= '*' )
+            // InternalProblem.g:2082:2: ( (this_INT_0= RULE_INT | kw= '*' ) )
+            // InternalProblem.g:2083:2: (this_INT_0= RULE_INT | kw= '*' )
             {
-            // InternalProblem.g:1671:2: (this_INT_0= RULE_INT | kw= '*' )
-            int alt39=2;
-            int LA39_0 = input.LA(1);
+            // InternalProblem.g:2083:2: (this_INT_0= RULE_INT | kw= '*' )
+            int alt42=2;
+            int LA42_0 = input.LA(1);
 
-            if ( (LA39_0==RULE_INT) ) {
-                alt39=1;
+            if ( (LA42_0==RULE_INT) ) {
+                alt42=1;
             }
-            else if ( (LA39_0==39) ) {
-                alt39=2;
+            else if ( (LA42_0==39) ) {
+                alt42=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 39, 0, input);
+                    new NoViableAltException("", 42, 0, input);
 
                 throw nvae;
             }
-            switch (alt39) {
+            switch (alt42) {
                 case 1 :
-                    // InternalProblem.g:1672:3: this_INT_0= RULE_INT
+                    // InternalProblem.g:2084:3: this_INT_0= RULE_INT
                     {
                     this_INT_0=(Token)match(input,RULE_INT,FOLLOW_2); 
 
@@ -4481,7 +5741,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1680:3: kw= '*'
+                    // InternalProblem.g:2092:3: kw= '*'
                     {
                     kw=(Token)match(input,39,FOLLOW_2); 
 
@@ -4514,7 +5774,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleQuotedOrUnquotedId"
-    // InternalProblem.g:1689:1: entryRuleQuotedOrUnquotedId returns [String current=null] : iv_ruleQuotedOrUnquotedId= ruleQuotedOrUnquotedId EOF ;
+    // InternalProblem.g:2101:1: entryRuleQuotedOrUnquotedId returns [String current=null] : iv_ruleQuotedOrUnquotedId= ruleQuotedOrUnquotedId EOF ;
     public final String entryRuleQuotedOrUnquotedId() throws RecognitionException {
         String current = null;
 
@@ -4522,8 +5782,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1689:58: (iv_ruleQuotedOrUnquotedId= ruleQuotedOrUnquotedId EOF )
-            // InternalProblem.g:1690:2: iv_ruleQuotedOrUnquotedId= ruleQuotedOrUnquotedId EOF
+            // InternalProblem.g:2101:58: (iv_ruleQuotedOrUnquotedId= ruleQuotedOrUnquotedId EOF )
+            // InternalProblem.g:2102:2: iv_ruleQuotedOrUnquotedId= ruleQuotedOrUnquotedId EOF
             {
              newCompositeNode(grammarAccess.getQuotedOrUnquotedIdRule()); 
             pushFollow(FOLLOW_1);
@@ -4550,7 +5810,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleQuotedOrUnquotedId"
-    // InternalProblem.g:1696:1: ruleQuotedOrUnquotedId returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QUOTED_ID_0= RULE_QUOTED_ID | this_Identifier_1= ruleIdentifier ) ;
+    // InternalProblem.g:2108: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();
 
@@ -4562,28 +5822,28 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 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:2114:2: ( (this_QUOTED_ID_0= RULE_QUOTED_ID | this_Identifier_1= ruleIdentifier ) )
+            // InternalProblem.g:2115: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);
+            // InternalProblem.g:2115:2: (this_QUOTED_ID_0= RULE_QUOTED_ID | this_Identifier_1= ruleIdentifier )
+            int alt43=2;
+            int LA43_0 = input.LA(1);
 
-            if ( (LA40_0==RULE_QUOTED_ID) ) {
-                alt40=1;
+            if ( (LA43_0==RULE_QUOTED_ID) ) {
+                alt43=1;
             }
-            else if ( (LA40_0==RULE_ID||(LA40_0>=41 && LA40_0<=42)) ) {
-                alt40=2;
+            else if ( (LA43_0==RULE_ID||(LA43_0>=41 && LA43_0<=44)) ) {
+                alt43=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 40, 0, input);
+                    new NoViableAltException("", 43, 0, input);
 
                 throw nvae;
             }
-            switch (alt40) {
+            switch (alt43) {
                 case 1 :
-                    // InternalProblem.g:1704:3: this_QUOTED_ID_0= RULE_QUOTED_ID
+                    // InternalProblem.g:2116:3: this_QUOTED_ID_0= RULE_QUOTED_ID
                     {
                     this_QUOTED_ID_0=(Token)match(input,RULE_QUOTED_ID,FOLLOW_2); 
 
@@ -4596,7 +5856,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1712:3: this_Identifier_1= ruleIdentifier
+                    // InternalProblem.g:2124:3: this_Identifier_1= ruleIdentifier
                     {
 
                                         newCompositeNode(grammarAccess.getQuotedOrUnquotedIdAccess().getIdentifierParserRuleCall_1());
@@ -4638,16 +5898,19 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleQualifiedName"
-    // InternalProblem.g:1726:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
+    // InternalProblem.g:2138:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
     public final String entryRuleQualifiedName() throws RecognitionException {
         String current = null;
 
         AntlrDatatypeRuleToken iv_ruleQualifiedName = null;
 
 
+
+                HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+
         try {
-            // InternalProblem.g:1726:53: (iv_ruleQualifiedName= ruleQualifiedName EOF )
-            // InternalProblem.g:1727:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+            // InternalProblem.g:2140:2: (iv_ruleQualifiedName= ruleQualifiedName EOF )
+            // InternalProblem.g:2141:2: iv_ruleQualifiedName= ruleQualifiedName EOF
             {
              newCompositeNode(grammarAccess.getQualifiedNameRule()); 
             pushFollow(FOLLOW_1);
@@ -4667,6 +5930,9 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 appendSkippedTokens();
             }
         finally {
+
+                myHiddenTokenState.restore();
+
         }
         return current;
     }
@@ -4674,7 +5940,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // 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 )? ) ) ;
+    // InternalProblem.g:2150: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();
 
@@ -4688,30 +5954,31 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
                 enterRule();
+                HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
 
         try {
-            // 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:2157: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:2158: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 )? ) )
-            int alt43=2;
-            int LA43_0 = input.LA(1);
+            // InternalProblem.g:2158: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 alt46=2;
+            int LA46_0 = input.LA(1);
 
-            if ( (LA43_0==RULE_QUOTED_ID) ) {
-                alt43=1;
+            if ( (LA46_0==RULE_QUOTED_ID) ) {
+                alt46=1;
             }
-            else if ( (LA43_0==RULE_ID||(LA43_0>=41 && LA43_0<=42)) ) {
-                alt43=2;
+            else if ( (LA46_0==RULE_ID||(LA46_0>=41 && LA46_0<=44)) ) {
+                alt46=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 43, 0, input);
+                    new NoViableAltException("", 46, 0, input);
 
                 throw nvae;
             }
-            switch (alt43) {
+            switch (alt46) {
                 case 1 :
-                    // InternalProblem.g:1741:3: this_QUOTED_ID_0= RULE_QUOTED_ID
+                    // InternalProblem.g:2159:3: this_QUOTED_ID_0= RULE_QUOTED_ID
                     {
                     this_QUOTED_ID_0=(Token)match(input,RULE_QUOTED_ID,FOLLOW_2); 
 
@@ -4724,15 +5991,15 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1749:3: (this_Identifier_1= ruleIdentifier (kw= '::' this_Identifier_3= ruleIdentifier )* (kw= '::' this_QUOTED_ID_5= RULE_QUOTED_ID )? )
+                    // InternalProblem.g:2167:3: (this_Identifier_1= ruleIdentifier (kw= '::' this_Identifier_3= ruleIdentifier )* (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 )?
+                    // InternalProblem.g:2167:3: (this_Identifier_1= ruleIdentifier (kw= '::' this_Identifier_3= ruleIdentifier )* (kw= '::' this_QUOTED_ID_5= RULE_QUOTED_ID )? )
+                    // InternalProblem.g:2168:4: this_Identifier_1= ruleIdentifier (kw= '::' this_Identifier_3= ruleIdentifier )* (kw= '::' this_QUOTED_ID_5= RULE_QUOTED_ID )?
                     {
 
                                                 newCompositeNode(grammarAccess.getQualifiedNameAccess().getIdentifierParserRuleCall_1_0());
                                         
-                    pushFollow(FOLLOW_36);
+                    pushFollow(FOLLOW_38);
                     this_Identifier_1=ruleIdentifier();
 
                     state._fsp--;
@@ -4743,26 +6010,26 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                                 afterParserOrEnumRuleCall();
                                         
-                    // InternalProblem.g:1760:4: (kw= '::' this_Identifier_3= ruleIdentifier )*
-                    loop41:
+                    // InternalProblem.g:2178:4: (kw= '::' this_Identifier_3= ruleIdentifier )*
+                    loop44:
                     do {
-                        int alt41=2;
-                        int LA41_0 = input.LA(1);
+                        int alt44=2;
+                        int LA44_0 = input.LA(1);
 
-                        if ( (LA41_0==40) ) {
-                            int LA41_1 = input.LA(2);
+                        if ( (LA44_0==40) ) {
+                            int LA44_1 = input.LA(2);
 
-                            if ( (LA41_1==RULE_ID||(LA41_1>=41 && LA41_1<=42)) ) {
-                                alt41=1;
+                            if ( (LA44_1==RULE_ID||(LA44_1>=41 && LA44_1<=44)) ) {
+                                alt44=1;
                             }
 
 
                         }
 
 
-                        switch (alt41) {
+                        switch (alt44) {
                         case 1 :
-                            // InternalProblem.g:1761:5: kw= '::' this_Identifier_3= ruleIdentifier
+                            // InternalProblem.g:2179:5: kw= '::' this_Identifier_3= ruleIdentifier
                             {
                             kw=(Token)match(input,40,FOLLOW_3); 
 
@@ -4772,7 +6039,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                                                 newCompositeNode(grammarAccess.getQualifiedNameAccess().getIdentifierParserRuleCall_1_1_1());
                                                         
-                            pushFollow(FOLLOW_36);
+                            pushFollow(FOLLOW_38);
                             this_Identifier_3=ruleIdentifier();
 
                             state._fsp--;
@@ -4788,22 +6055,22 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                             break;
 
                         default :
-                            break loop41;
+                            break loop44;
                         }
                     } while (true);
 
-                    // InternalProblem.g:1777:4: (kw= '::' this_QUOTED_ID_5= RULE_QUOTED_ID )?
-                    int alt42=2;
-                    int LA42_0 = input.LA(1);
+                    // InternalProblem.g:2195:4: (kw= '::' this_QUOTED_ID_5= RULE_QUOTED_ID )?
+                    int alt45=2;
+                    int LA45_0 = input.LA(1);
 
-                    if ( (LA42_0==40) ) {
-                        alt42=1;
+                    if ( (LA45_0==40) ) {
+                        alt45=1;
                     }
-                    switch (alt42) {
+                    switch (alt45) {
                         case 1 :
-                            // InternalProblem.g:1778:5: kw= '::' this_QUOTED_ID_5= RULE_QUOTED_ID
+                            // InternalProblem.g:2196:5: kw= '::' this_QUOTED_ID_5= RULE_QUOTED_ID
                             {
-                            kw=(Token)match(input,40,FOLLOW_37); 
+                            kw=(Token)match(input,40,FOLLOW_39); 
 
                                                                 current.merge(kw);
                                                                 newLeafNode(kw, grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1_2_0());
@@ -4843,6 +6110,9 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 appendSkippedTokens();
             }
         finally {
+
+                myHiddenTokenState.restore();
+
         }
         return current;
     }
@@ -4850,7 +6120,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleIdentifier"
-    // InternalProblem.g:1796:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ;
+    // InternalProblem.g:2217:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ;
     public final String entryRuleIdentifier() throws RecognitionException {
         String current = null;
 
@@ -4858,8 +6128,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1796:50: (iv_ruleIdentifier= ruleIdentifier EOF )
-            // InternalProblem.g:1797:2: iv_ruleIdentifier= ruleIdentifier EOF
+            // InternalProblem.g:2217:50: (iv_ruleIdentifier= ruleIdentifier EOF )
+            // InternalProblem.g:2218:2: iv_ruleIdentifier= ruleIdentifier EOF
             {
              newCompositeNode(grammarAccess.getIdentifierRule()); 
             pushFollow(FOLLOW_1);
@@ -4886,7 +6156,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleIdentifier"
-    // InternalProblem.g:1803:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID | kw= 'true' | kw= 'false' ) ;
+    // InternalProblem.g:2224:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID | kw= 'true' | kw= 'false' | kw= 'e' | kw= 'E' ) ;
     public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -4897,37 +6167,47 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 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:2230:2: ( (this_ID_0= RULE_ID | kw= 'true' | kw= 'false' | kw= 'e' | kw= 'E' ) )
+            // InternalProblem.g:2231:2: (this_ID_0= RULE_ID | kw= 'true' | kw= 'false' | kw= 'e' | kw= 'E' )
             {
-            // InternalProblem.g:1810:2: (this_ID_0= RULE_ID | kw= 'true' | kw= 'false' )
-            int alt44=3;
+            // InternalProblem.g:2231:2: (this_ID_0= RULE_ID | kw= 'true' | kw= 'false' | kw= 'e' | kw= 'E' )
+            int alt47=5;
             switch ( input.LA(1) ) {
             case RULE_ID:
                 {
-                alt44=1;
+                alt47=1;
                 }
                 break;
             case 41:
                 {
-                alt44=2;
+                alt47=2;
                 }
                 break;
             case 42:
                 {
-                alt44=3;
+                alt47=3;
+                }
+                break;
+            case 43:
+                {
+                alt47=4;
+                }
+                break;
+            case 44:
+                {
+                alt47=5;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("", 44, 0, input);
+                    new NoViableAltException("", 47, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt44) {
+            switch (alt47) {
                 case 1 :
-                    // InternalProblem.g:1811:3: this_ID_0= RULE_ID
+                    // InternalProblem.g:2232:3: this_ID_0= RULE_ID
                     {
                     this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
@@ -4940,7 +6220,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1819:3: kw= 'true'
+                    // InternalProblem.g:2240:3: kw= 'true'
                     {
                     kw=(Token)match(input,41,FOLLOW_2); 
 
@@ -4951,7 +6231,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalProblem.g:1825:3: kw= 'false'
+                    // InternalProblem.g:2246:3: kw= 'false'
                     {
                     kw=(Token)match(input,42,FOLLOW_2); 
 
@@ -4961,6 +6241,28 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
                     break;
+                case 4 :
+                    // InternalProblem.g:2252:3: kw= 'e'
+                    {
+                    kw=(Token)match(input,43,FOLLOW_2); 
+
+                                        current.merge(kw);
+                                        newLeafNode(kw, grammarAccess.getIdentifierAccess().getEKeyword_3());
+                                
+
+                    }
+                    break;
+                case 5 :
+                    // InternalProblem.g:2258:3: kw= 'E'
+                    {
+                    kw=(Token)match(input,44,FOLLOW_2); 
+
+                                        current.merge(kw);
+                                        newLeafNode(kw, grammarAccess.getIdentifierAccess().getEKeyword_4());
+                                
+
+                    }
+                    break;
 
             }
 
@@ -4983,8 +6285,434 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     // $ANTLR end "ruleIdentifier"
 
 
+    // $ANTLR start "entryRuleInteger"
+    // InternalProblem.g:2267:1: entryRuleInteger returns [String current=null] : iv_ruleInteger= ruleInteger EOF ;
+    public final String entryRuleInteger() throws RecognitionException {
+        String current = null;
+
+        AntlrDatatypeRuleToken iv_ruleInteger = null;
+
+
+
+                HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+
+        try {
+            // InternalProblem.g:2269:2: (iv_ruleInteger= ruleInteger EOF )
+            // InternalProblem.g:2270:2: iv_ruleInteger= ruleInteger EOF
+            {
+             newCompositeNode(grammarAccess.getIntegerRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleInteger=ruleInteger();
+
+            state._fsp--;
+
+             current =iv_ruleInteger.getText(); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+
+                myHiddenTokenState.restore();
+
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleInteger"
+
+
+    // $ANTLR start "ruleInteger"
+    // InternalProblem.g:2279:1: ruleInteger returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '-' )? this_INT_1= RULE_INT ) ;
+    public final AntlrDatatypeRuleToken ruleInteger() throws RecognitionException {
+        AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+        Token kw=null;
+        Token this_INT_1=null;
+
+
+                enterRule();
+                HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+
+        try {
+            // InternalProblem.g:2286:2: ( ( (kw= '-' )? this_INT_1= RULE_INT ) )
+            // InternalProblem.g:2287:2: ( (kw= '-' )? this_INT_1= RULE_INT )
+            {
+            // InternalProblem.g:2287:2: ( (kw= '-' )? this_INT_1= RULE_INT )
+            // InternalProblem.g:2288:3: (kw= '-' )? this_INT_1= RULE_INT
+            {
+            // InternalProblem.g:2288:3: (kw= '-' )?
+            int alt48=2;
+            int LA48_0 = input.LA(1);
+
+            if ( (LA48_0==45) ) {
+                alt48=1;
+            }
+            switch (alt48) {
+                case 1 :
+                    // InternalProblem.g:2289:4: kw= '-'
+                    {
+                    kw=(Token)match(input,45,FOLLOW_17); 
+
+                                                current.merge(kw);
+                                                newLeafNode(kw, grammarAccess.getIntegerAccess().getHyphenMinusKeyword_0());
+                                        
+
+                    }
+                    break;
+
+            }
+
+            this_INT_1=(Token)match(input,RULE_INT,FOLLOW_2); 
+
+                                current.merge(this_INT_1);
+                        
+
+                                newLeafNode(this_INT_1, grammarAccess.getIntegerAccess().getINTTerminalRuleCall_1());
+                        
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+
+                myHiddenTokenState.restore();
+
+        }
+        return current;
+    }
+    // $ANTLR end "ruleInteger"
+
+
+    // $ANTLR start "entryRuleReal"
+    // InternalProblem.g:2309:1: entryRuleReal returns [String current=null] : iv_ruleReal= ruleReal EOF ;
+    public final String entryRuleReal() throws RecognitionException {
+        String current = null;
+
+        AntlrDatatypeRuleToken iv_ruleReal = null;
+
+
+
+                HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+
+        try {
+            // InternalProblem.g:2311:2: (iv_ruleReal= ruleReal EOF )
+            // InternalProblem.g:2312:2: iv_ruleReal= ruleReal EOF
+            {
+             newCompositeNode(grammarAccess.getRealRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleReal=ruleReal();
+
+            state._fsp--;
+
+             current =iv_ruleReal.getText(); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+
+                myHiddenTokenState.restore();
+
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleReal"
+
+
+    // $ANTLR start "ruleReal"
+    // InternalProblem.g:2321:1: ruleReal returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : ( (kw= '-' )? this_INT_1= RULE_INT ( (kw= '.' this_INT_3= RULE_INT ) | ( (kw= '.' this_INT_5= RULE_INT )? (kw= 'e' | kw= 'E' ) (kw= '-' | kw= '+' )? this_INT_10= RULE_INT ) ) ) ;
+    public final AntlrDatatypeRuleToken ruleReal() throws RecognitionException {
+        AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+        Token kw=null;
+        Token this_INT_1=null;
+        Token this_INT_3=null;
+        Token this_INT_5=null;
+        Token this_INT_10=null;
+
+
+                enterRule();
+                HiddenTokens myHiddenTokenState = ((XtextTokenStream)input).setHiddenTokens();
+
+        try {
+            // InternalProblem.g:2328:2: ( ( (kw= '-' )? this_INT_1= RULE_INT ( (kw= '.' this_INT_3= RULE_INT ) | ( (kw= '.' this_INT_5= RULE_INT )? (kw= 'e' | kw= 'E' ) (kw= '-' | kw= '+' )? this_INT_10= RULE_INT ) ) ) )
+            // InternalProblem.g:2329:2: ( (kw= '-' )? this_INT_1= RULE_INT ( (kw= '.' this_INT_3= RULE_INT ) | ( (kw= '.' this_INT_5= RULE_INT )? (kw= 'e' | kw= 'E' ) (kw= '-' | kw= '+' )? this_INT_10= RULE_INT ) ) )
+            {
+            // InternalProblem.g:2329:2: ( (kw= '-' )? this_INT_1= RULE_INT ( (kw= '.' this_INT_3= RULE_INT ) | ( (kw= '.' this_INT_5= RULE_INT )? (kw= 'e' | kw= 'E' ) (kw= '-' | kw= '+' )? this_INT_10= RULE_INT ) ) )
+            // InternalProblem.g:2330:3: (kw= '-' )? this_INT_1= RULE_INT ( (kw= '.' this_INT_3= RULE_INT ) | ( (kw= '.' this_INT_5= RULE_INT )? (kw= 'e' | kw= 'E' ) (kw= '-' | kw= '+' )? this_INT_10= RULE_INT ) )
+            {
+            // InternalProblem.g:2330:3: (kw= '-' )?
+            int alt49=2;
+            int LA49_0 = input.LA(1);
+
+            if ( (LA49_0==45) ) {
+                alt49=1;
+            }
+            switch (alt49) {
+                case 1 :
+                    // InternalProblem.g:2331:4: kw= '-'
+                    {
+                    kw=(Token)match(input,45,FOLLOW_17); 
+
+                                                current.merge(kw);
+                                                newLeafNode(kw, grammarAccess.getRealAccess().getHyphenMinusKeyword_0());
+                                        
+
+                    }
+                    break;
+
+            }
+
+            this_INT_1=(Token)match(input,RULE_INT,FOLLOW_40); 
+
+                                current.merge(this_INT_1);
+                        
+
+                                newLeafNode(this_INT_1, grammarAccess.getRealAccess().getINTTerminalRuleCall_1());
+                        
+            // InternalProblem.g:2344:3: ( (kw= '.' this_INT_3= RULE_INT ) | ( (kw= '.' this_INT_5= RULE_INT )? (kw= 'e' | kw= 'E' ) (kw= '-' | kw= '+' )? this_INT_10= RULE_INT ) )
+            int alt53=2;
+            int LA53_0 = input.LA(1);
+
+            if ( (LA53_0==13) ) {
+                int LA53_1 = input.LA(2);
+
+                if ( (LA53_1==RULE_INT) ) {
+                    int LA53_3 = input.LA(3);
+
+                    if ( ((LA53_3>=43 && LA53_3<=44)) ) {
+                        alt53=2;
+                    }
+                    else if ( (LA53_3==EOF||LA53_3==13||LA53_3==17||LA53_3==30) ) {
+                        alt53=1;
+                    }
+                    else {
+                        NoViableAltException nvae =
+                            new NoViableAltException("", 53, 3, input);
+
+                        throw nvae;
+                    }
+                }
+                else {
+                    NoViableAltException nvae =
+                        new NoViableAltException("", 53, 1, input);
+
+                    throw nvae;
+                }
+            }
+            else if ( ((LA53_0>=43 && LA53_0<=44)) ) {
+                alt53=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 53, 0, input);
+
+                throw nvae;
+            }
+            switch (alt53) {
+                case 1 :
+                    // InternalProblem.g:2345:4: (kw= '.' this_INT_3= RULE_INT )
+                    {
+                    // InternalProblem.g:2345:4: (kw= '.' this_INT_3= RULE_INT )
+                    // InternalProblem.g:2346:5: kw= '.' this_INT_3= RULE_INT
+                    {
+                    kw=(Token)match(input,13,FOLLOW_17); 
+
+                                                        current.merge(kw);
+                                                        newLeafNode(kw, grammarAccess.getRealAccess().getFullStopKeyword_2_0_0());
+                                                
+                    this_INT_3=(Token)match(input,RULE_INT,FOLLOW_2); 
+
+                                                        current.merge(this_INT_3);
+                                                
+
+                                                        newLeafNode(this_INT_3, grammarAccess.getRealAccess().getINTTerminalRuleCall_2_0_1());
+                                                
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:2360:4: ( (kw= '.' this_INT_5= RULE_INT )? (kw= 'e' | kw= 'E' ) (kw= '-' | kw= '+' )? this_INT_10= RULE_INT )
+                    {
+                    // InternalProblem.g:2360:4: ( (kw= '.' this_INT_5= RULE_INT )? (kw= 'e' | kw= 'E' ) (kw= '-' | kw= '+' )? this_INT_10= RULE_INT )
+                    // InternalProblem.g:2361:5: (kw= '.' this_INT_5= RULE_INT )? (kw= 'e' | kw= 'E' ) (kw= '-' | kw= '+' )? this_INT_10= RULE_INT
+                    {
+                    // InternalProblem.g:2361:5: (kw= '.' this_INT_5= RULE_INT )?
+                    int alt50=2;
+                    int LA50_0 = input.LA(1);
+
+                    if ( (LA50_0==13) ) {
+                        alt50=1;
+                    }
+                    switch (alt50) {
+                        case 1 :
+                            // InternalProblem.g:2362:6: kw= '.' this_INT_5= RULE_INT
+                            {
+                            kw=(Token)match(input,13,FOLLOW_17); 
+
+                                                                        current.merge(kw);
+                                                                        newLeafNode(kw, grammarAccess.getRealAccess().getFullStopKeyword_2_1_0_0());
+                                                                
+                            this_INT_5=(Token)match(input,RULE_INT,FOLLOW_41); 
+
+                                                                        current.merge(this_INT_5);
+                                                                
+
+                                                                        newLeafNode(this_INT_5, grammarAccess.getRealAccess().getINTTerminalRuleCall_2_1_0_1());
+                                                                
+
+                            }
+                            break;
+
+                    }
+
+                    // InternalProblem.g:2375:5: (kw= 'e' | kw= 'E' )
+                    int alt51=2;
+                    int LA51_0 = input.LA(1);
+
+                    if ( (LA51_0==43) ) {
+                        alt51=1;
+                    }
+                    else if ( (LA51_0==44) ) {
+                        alt51=2;
+                    }
+                    else {
+                        NoViableAltException nvae =
+                            new NoViableAltException("", 51, 0, input);
+
+                        throw nvae;
+                    }
+                    switch (alt51) {
+                        case 1 :
+                            // InternalProblem.g:2376:6: kw= 'e'
+                            {
+                            kw=(Token)match(input,43,FOLLOW_42); 
+
+                                                                        current.merge(kw);
+                                                                        newLeafNode(kw, grammarAccess.getRealAccess().getEKeyword_2_1_1_0());
+                                                                
+
+                            }
+                            break;
+                        case 2 :
+                            // InternalProblem.g:2382:6: kw= 'E'
+                            {
+                            kw=(Token)match(input,44,FOLLOW_42); 
+
+                                                                        current.merge(kw);
+                                                                        newLeafNode(kw, grammarAccess.getRealAccess().getEKeyword_2_1_1_1());
+                                                                
+
+                            }
+                            break;
+
+                    }
+
+                    // InternalProblem.g:2388:5: (kw= '-' | kw= '+' )?
+                    int alt52=3;
+                    int LA52_0 = input.LA(1);
+
+                    if ( (LA52_0==45) ) {
+                        alt52=1;
+                    }
+                    else if ( (LA52_0==33) ) {
+                        alt52=2;
+                    }
+                    switch (alt52) {
+                        case 1 :
+                            // InternalProblem.g:2389:6: kw= '-'
+                            {
+                            kw=(Token)match(input,45,FOLLOW_17); 
+
+                                                                        current.merge(kw);
+                                                                        newLeafNode(kw, grammarAccess.getRealAccess().getHyphenMinusKeyword_2_1_2_0());
+                                                                
+
+                            }
+                            break;
+                        case 2 :
+                            // InternalProblem.g:2395:6: kw= '+'
+                            {
+                            kw=(Token)match(input,33,FOLLOW_17); 
+
+                                                                        current.merge(kw);
+                                                                        newLeafNode(kw, grammarAccess.getRealAccess().getPlusSignKeyword_2_1_2_1());
+                                                                
+
+                            }
+                            break;
+
+                    }
+
+                    this_INT_10=(Token)match(input,RULE_INT,FOLLOW_2); 
+
+                                                        current.merge(this_INT_10);
+                                                
+
+                                                        newLeafNode(this_INT_10, grammarAccess.getRealAccess().getINTTerminalRuleCall_2_1_3());
+                                                
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+
+                myHiddenTokenState.restore();
+
+        }
+        return current;
+    }
+    // $ANTLR end "ruleReal"
+
+
     // $ANTLR start "ruleLogicValue"
-    // InternalProblem.g:1834:1: ruleLogicValue returns [Enumerator current=null] : ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) ) ;
+    // InternalProblem.g:2417:1: ruleLogicValue returns [Enumerator current=null] : ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) ) ;
     public final Enumerator ruleLogicValue() throws RecognitionException {
         Enumerator current = null;
 
@@ -4996,40 +6724,40 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // 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:2423:2: ( ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) ) )
+            // InternalProblem.g:2424:2: ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) )
             {
-            // InternalProblem.g:1841:2: ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) )
-            int alt45=3;
+            // InternalProblem.g:2424:2: ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) )
+            int alt54=3;
             switch ( input.LA(1) ) {
             case 41:
                 {
-                alt45=1;
+                alt54=1;
                 }
                 break;
             case 42:
                 {
-                alt45=2;
+                alt54=2;
                 }
                 break;
-            case 43:
+            case 46:
                 {
-                alt45=3;
+                alt54=3;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("", 45, 0, input);
+                    new NoViableAltException("", 54, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt45) {
+            switch (alt54) {
                 case 1 :
-                    // InternalProblem.g:1842:3: (enumLiteral_0= 'true' )
+                    // InternalProblem.g:2425:3: (enumLiteral_0= 'true' )
                     {
-                    // InternalProblem.g:1842:3: (enumLiteral_0= 'true' )
-                    // InternalProblem.g:1843:4: enumLiteral_0= 'true'
+                    // InternalProblem.g:2425:3: (enumLiteral_0= 'true' )
+                    // InternalProblem.g:2426:4: enumLiteral_0= 'true'
                     {
                     enumLiteral_0=(Token)match(input,41,FOLLOW_2); 
 
@@ -5043,10 +6771,10 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1850:3: (enumLiteral_1= 'false' )
+                    // InternalProblem.g:2433:3: (enumLiteral_1= 'false' )
                     {
-                    // InternalProblem.g:1850:3: (enumLiteral_1= 'false' )
-                    // InternalProblem.g:1851:4: enumLiteral_1= 'false'
+                    // InternalProblem.g:2433:3: (enumLiteral_1= 'false' )
+                    // InternalProblem.g:2434:4: enumLiteral_1= 'false'
                     {
                     enumLiteral_1=(Token)match(input,42,FOLLOW_2); 
 
@@ -5060,12 +6788,12 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalProblem.g:1858:3: (enumLiteral_2= 'unknown' )
+                    // InternalProblem.g:2441:3: (enumLiteral_2= 'unknown' )
                     {
-                    // InternalProblem.g:1858:3: (enumLiteral_2= 'unknown' )
-                    // InternalProblem.g:1859:4: enumLiteral_2= 'unknown'
+                    // InternalProblem.g:2441:3: (enumLiteral_2= 'unknown' )
+                    // InternalProblem.g:2442:4: enumLiteral_2= 'unknown'
                     {
-                    enumLiteral_2=(Token)match(input,43,FOLLOW_2); 
+                    enumLiteral_2=(Token)match(input,46,FOLLOW_2); 
 
                                                 current = grammarAccess.getLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
                                                 newLeafNode(enumLiteral_2, grammarAccess.getLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_2());
@@ -5099,7 +6827,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleShortLogicValue"
-    // InternalProblem.g:1869:1: ruleShortLogicValue returns [Enumerator current=null] : ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) ) ;
+    // InternalProblem.g:2452:1: ruleShortLogicValue returns [Enumerator current=null] : ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) ) ;
     public final Enumerator ruleShortLogicValue() throws RecognitionException {
         Enumerator current = null;
 
@@ -5110,31 +6838,31 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1875:2: ( ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) ) )
-            // InternalProblem.g:1876:2: ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) )
+            // InternalProblem.g:2458:2: ( ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) ) )
+            // InternalProblem.g:2459:2: ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) )
             {
-            // InternalProblem.g:1876:2: ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) )
-            int alt46=2;
-            int LA46_0 = input.LA(1);
+            // InternalProblem.g:2459:2: ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) )
+            int alt55=2;
+            int LA55_0 = input.LA(1);
 
-            if ( (LA46_0==32) ) {
-                alt46=1;
+            if ( (LA55_0==32) ) {
+                alt55=1;
             }
-            else if ( (LA46_0==44) ) {
-                alt46=2;
+            else if ( (LA55_0==47) ) {
+                alt55=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 46, 0, input);
+                    new NoViableAltException("", 55, 0, input);
 
                 throw nvae;
             }
-            switch (alt46) {
+            switch (alt55) {
                 case 1 :
-                    // InternalProblem.g:1877:3: (enumLiteral_0= '!' )
+                    // InternalProblem.g:2460:3: (enumLiteral_0= '!' )
                     {
-                    // InternalProblem.g:1877:3: (enumLiteral_0= '!' )
-                    // InternalProblem.g:1878:4: enumLiteral_0= '!'
+                    // InternalProblem.g:2460:3: (enumLiteral_0= '!' )
+                    // InternalProblem.g:2461:4: enumLiteral_0= '!'
                     {
                     enumLiteral_0=(Token)match(input,32,FOLLOW_2); 
 
@@ -5148,12 +6876,12 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1885:3: (enumLiteral_1= '?' )
+                    // InternalProblem.g:2468:3: (enumLiteral_1= '?' )
                     {
-                    // InternalProblem.g:1885:3: (enumLiteral_1= '?' )
-                    // InternalProblem.g:1886:4: enumLiteral_1= '?'
+                    // InternalProblem.g:2468:3: (enumLiteral_1= '?' )
+                    // InternalProblem.g:2469:4: enumLiteral_1= '?'
                     {
-                    enumLiteral_1=(Token)match(input,44,FOLLOW_2); 
+                    enumLiteral_1=(Token)match(input,47,FOLLOW_2); 
 
                                                 current = grammarAccess.getShortLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                                                 newLeafNode(enumLiteral_1, grammarAccess.getShortLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_1());
@@ -5188,46 +6916,34 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     // Delegated rules
 
 
-    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\54\1\35\3\50\1\uffff\2\52\1\36\3\50\1\42\3\50\1\35\2\52\1\uffff\1\36\6\50\1\36\1\52\3\50\1\36";
-    static final String dfa_4s = "\5\uffff\1\2\15\uffff\1\1\15\uffff";
-    static final String dfa_5s = "\41\uffff}>";
+    protected DFA3 dfa3 = new DFA3(this);
+    protected DFA35 dfa35 = new DFA35(this);
+    static final String dfa_1s = "\24\uffff";
+    static final String dfa_2s = "\1\5\3\uffff\6\35\3\uffff\1\5\6\35";
+    static final String dfa_3s = "\1\57\3\uffff\1\42\5\50\3\uffff\1\54\5\50\1\42";
+    static final String dfa_4s = "\1\uffff\1\1\1\2\1\3\6\uffff\1\4\1\6\1\5\7\uffff";
+    static final String dfa_5s = "\24\uffff}>";
     static final String[] dfa_6s = {
-            "\1\2\1\uffff\1\1\31\uffff\1\5\10\uffff\1\3\1\4\1\uffff\1\5",
-            "\1\6",
-            "\1\6\12\uffff\1\7",
-            "\1\6\12\uffff\1\7",
-            "\1\6\12\uffff\1\7",
+            "\1\5\1\uffff\1\4\6\uffff\2\1\5\uffff\1\2\5\uffff\2\3\3\uffff\1\12\2\uffff\1\13\5\uffff\1\6\1\7\1\10\1\11\2\uffff\1\12",
             "",
-            "\1\11\1\uffff\1\10\27\uffff\1\14\12\uffff\1\12\1\13",
-            "\1\15\1\uffff\1\20\42\uffff\1\16\1\17",
-            "\1\21\14\uffff\1\14",
-            "\1\21\14\uffff\1\14\11\uffff\1\22",
-            "\1\21\14\uffff\1\14\11\uffff\1\22",
-            "\1\21\14\uffff\1\14\11\uffff\1\22",
-            "\1\5\24\uffff\1\23",
-            "\1\6\12\uffff\1\7",
-            "\1\6\12\uffff\1\7",
-            "\1\6\12\uffff\1\7",
-            "\1\6",
-            "\1\25\1\uffff\1\24\42\uffff\1\26\1\27",
-            "\1\30\1\uffff\1\33\42\uffff\1\31\1\32",
             "",
-            "\1\21\14\uffff\1\14",
-            "\1\21\14\uffff\1\14\11\uffff\1\34",
-            "\1\21\14\uffff\1\14\11\uffff\1\34",
-            "\1\21\14\uffff\1\14\11\uffff\1\34",
-            "\1\21\14\uffff\1\14\11\uffff\1\22",
-            "\1\21\14\uffff\1\14\11\uffff\1\22",
-            "\1\21\14\uffff\1\14\11\uffff\1\22",
-            "\1\21\14\uffff\1\14",
-            "\1\35\1\uffff\1\40\42\uffff\1\36\1\37",
-            "\1\21\14\uffff\1\14\11\uffff\1\34",
-            "\1\21\14\uffff\1\14\11\uffff\1\34",
-            "\1\21\14\uffff\1\14\11\uffff\1\34",
-            "\1\21\14\uffff\1\14"
+            "",
+            "\1\12\4\uffff\1\14",
+            "\1\12\4\uffff\1\14\5\uffff\1\15",
+            "\1\12\4\uffff\1\14\5\uffff\1\15",
+            "\1\12\4\uffff\1\14\5\uffff\1\15",
+            "\1\12\4\uffff\1\14\5\uffff\1\15",
+            "\1\12\4\uffff\1\14\5\uffff\1\15",
+            "",
+            "",
+            "",
+            "\1\16\1\uffff\1\23\41\uffff\1\17\1\20\1\21\1\22",
+            "\1\12\4\uffff\1\14\5\uffff\1\15",
+            "\1\12\4\uffff\1\14\5\uffff\1\15",
+            "\1\12\4\uffff\1\14\5\uffff\1\15",
+            "\1\12\4\uffff\1\14\5\uffff\1\15",
+            "\1\12\4\uffff\1\14\5\uffff\1\15",
+            "\1\12\4\uffff\1\14"
     };
 
     static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
@@ -5237,11 +6953,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
     static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
 
-    class DFA34 extends DFA {
+    class DFA3 extends DFA {
 
-        public DFA34(BaseRecognizer recognizer) {
+        public DFA3(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 34;
+            this.decisionNumber = 3;
             this.eot = dfa_1;
             this.eof = dfa_1;
             this.min = dfa_2;
@@ -5251,47 +6967,149 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             this.transition = dfa_6;
         }
         public String getDescription() {
-            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= ')' ) )";
+            return "146:2: (this_ClassDeclaration_0= ruleClassDeclaration | this_EnumDeclaration_1= ruleEnumDeclaration | this_PredicateDefinition_2= rulePredicateDefinition | this_Assertion_3= ruleAssertion | this_NodeValueAssertion_4= ruleNodeValueAssertion | this_ScopeDeclaration_5= ruleScopeDeclaration )";
+        }
+    }
+    static final String dfa_7s = "\101\uffff";
+    static final String dfa_8s = "\1\5\6\35\1\uffff\1\4\1\5\6\21\1\6\1\15\1\21\1\15\6\35\1\4\1\5\3\6\1\uffff\6\21\1\6\1\15\10\21\2\6\1\21\1\5\3\6\7\21\2\6\1\21";
+    static final String dfa_9s = "\1\57\1\35\5\50\1\uffff\1\55\1\54\1\36\5\50\1\6\1\54\1\36\1\42\5\50\1\35\1\55\1\54\1\6\2\55\1\uffff\1\36\5\50\1\6\1\54\1\36\5\50\1\36\1\54\2\6\1\36\1\54\1\6\2\55\5\50\1\36\1\54\2\6\1\36";
+    static final String dfa_10s = "\7\uffff\1\2\27\uffff\1\1\41\uffff";
+    static final String dfa_11s = "\101\uffff}>";
+    static final String[] dfa_12s = {
+            "\1\2\1\uffff\1\1\30\uffff\1\7\10\uffff\1\3\1\4\1\5\1\6\2\uffff\1\7",
+            "\1\10",
+            "\1\10\12\uffff\1\11",
+            "\1\10\12\uffff\1\11",
+            "\1\10\12\uffff\1\11",
+            "\1\10\12\uffff\1\11",
+            "\1\10\12\uffff\1\11",
+            "",
+            "\1\22\1\13\1\21\1\12\26\uffff\1\23\12\uffff\1\14\1\15\1\16\1\17\1\20",
+            "\1\24\1\uffff\1\31\41\uffff\1\25\1\26\1\27\1\30",
+            "\1\32\14\uffff\1\23",
+            "\1\32\14\uffff\1\23\11\uffff\1\33",
+            "\1\32\14\uffff\1\23\11\uffff\1\33",
+            "\1\32\14\uffff\1\23\11\uffff\1\33",
+            "\1\32\14\uffff\1\23\11\uffff\1\33",
+            "\1\32\14\uffff\1\23\11\uffff\1\33",
+            "\1\21",
+            "\1\34\3\uffff\1\32\14\uffff\1\23\14\uffff\1\35\1\36",
+            "\1\32\14\uffff\1\23",
+            "\1\7\24\uffff\1\37",
+            "\1\10\12\uffff\1\11",
+            "\1\10\12\uffff\1\11",
+            "\1\10\12\uffff\1\11",
+            "\1\10\12\uffff\1\11",
+            "\1\10\12\uffff\1\11",
+            "\1\10",
+            "\1\50\1\41\1\47\1\40\41\uffff\1\42\1\43\1\44\1\45\1\46",
+            "\1\51\1\uffff\1\56\41\uffff\1\52\1\53\1\54\1\55",
+            "\1\57",
+            "\1\62\32\uffff\1\61\13\uffff\1\60",
+            "\1\62\32\uffff\1\61\13\uffff\1\60",
+            "",
+            "\1\32\14\uffff\1\23",
+            "\1\32\14\uffff\1\23\11\uffff\1\63",
+            "\1\32\14\uffff\1\23\11\uffff\1\63",
+            "\1\32\14\uffff\1\23\11\uffff\1\63",
+            "\1\32\14\uffff\1\23\11\uffff\1\63",
+            "\1\32\14\uffff\1\23\11\uffff\1\63",
+            "\1\47",
+            "\1\64\3\uffff\1\32\14\uffff\1\23\14\uffff\1\65\1\66",
+            "\1\32\14\uffff\1\23",
+            "\1\32\14\uffff\1\23\11\uffff\1\33",
+            "\1\32\14\uffff\1\23\11\uffff\1\33",
+            "\1\32\14\uffff\1\23\11\uffff\1\33",
+            "\1\32\14\uffff\1\23\11\uffff\1\33",
+            "\1\32\14\uffff\1\23\11\uffff\1\33",
+            "\1\32\14\uffff\1\23",
+            "\1\32\14\uffff\1\23\14\uffff\1\35\1\36",
+            "\1\62",
+            "\1\62",
+            "\1\32\14\uffff\1\23",
+            "\1\67\1\uffff\1\74\41\uffff\1\70\1\71\1\72\1\73",
+            "\1\75",
+            "\1\100\32\uffff\1\77\13\uffff\1\76",
+            "\1\100\32\uffff\1\77\13\uffff\1\76",
+            "\1\32\14\uffff\1\23\11\uffff\1\63",
+            "\1\32\14\uffff\1\23\11\uffff\1\63",
+            "\1\32\14\uffff\1\23\11\uffff\1\63",
+            "\1\32\14\uffff\1\23\11\uffff\1\63",
+            "\1\32\14\uffff\1\23\11\uffff\1\63",
+            "\1\32\14\uffff\1\23",
+            "\1\32\14\uffff\1\23\14\uffff\1\65\1\66",
+            "\1\100",
+            "\1\100",
+            "\1\32\14\uffff\1\23"
+    };
+
+    static final short[] dfa_7 = DFA.unpackEncodedString(dfa_7s);
+    static final char[] dfa_8 = DFA.unpackEncodedStringToUnsignedChars(dfa_8s);
+    static final char[] dfa_9 = DFA.unpackEncodedStringToUnsignedChars(dfa_9s);
+    static final short[] dfa_10 = DFA.unpackEncodedString(dfa_10s);
+    static final short[] dfa_11 = DFA.unpackEncodedString(dfa_11s);
+    static final short[][] dfa_12 = unpackEncodedStringArray(dfa_12s);
+
+    class DFA35 extends DFA {
+
+        public DFA35(BaseRecognizer recognizer) {
+            this.recognizer = recognizer;
+            this.decisionNumber = 35;
+            this.eot = dfa_7;
+            this.eof = dfa_7;
+            this.min = dfa_8;
+            this.max = dfa_9;
+            this.accept = dfa_10;
+            this.special = dfa_11;
+            this.transition = dfa_12;
+        }
+        public String getDescription() {
+            return "1219:3: ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( (lv_arguments_2_0= ruleAssertionArgument ) ) (otherlv_3= ',' ( (lv_arguments_4_0= ruleAssertionArgument ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( (lv_arguments_11_0= ruleAssertionArgument ) ) (otherlv_12= ',' ( (lv_arguments_13_0= ruleAssertionArgument ) ) )* )? 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[]{0x0000060000000010L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x00001E0000000020L});
     public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x000016091820C052L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x00009E091820C0A2L});
     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[]{0x0000060000000050L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x00001E00000000A0L});
     public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000062000L});
-    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000060000D00050L});
-    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000060000D80050L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x00001E0000D000A0L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x00001E0000D800A0L});
     public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000042000L});
-    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000060000100050L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x00001E00001000A0L});
     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[]{0x0000060001000010L});
-    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x00001E0001000020L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000000040L});
     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[]{0x0000060010000010L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x00001E0010000020L});
     public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000060040000050L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x00001E00400000A0L});
     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[]{0x0000060100000050L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x00001E01000000A0L});
     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[]{0x00000E0000000000L});
-    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[]{0x0000010000000002L});
-    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x00003E00400000F0L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x00003E00000000F0L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000460000000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000000022000L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000003000000000L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000004000000000L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000008000000040L});
+    public static final BitSet FOLLOW_38 = new BitSet(new long[]{0x0000010000000002L});
+    public static final BitSet FOLLOW_39 = new BitSet(new long[]{0x0000000000000080L});
+    public static final BitSet FOLLOW_40 = new BitSet(new long[]{0x0000180000002000L});
+    public static final BitSet FOLLOW_41 = new BitSet(new long[]{0x0000180000000000L});
+    public static final BitSet FOLLOW_42 = new BitSet(new long[]{0x0000200200000040L});
 
 }
\ No newline at end of file
diff --git a/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSemanticSequencer.java b/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSemanticSequencer.java
index cb44c31f..012363db 100644
--- a/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSemanticSequencer.java
+++ b/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSemanticSequencer.java
@@ -7,23 +7,30 @@ import com.google.inject.Inject;
 import java.util.Set;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
-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.ClassDeclaration;
 import org.eclipse.viatra.solver.language.model.problem.Conjunction;
+import org.eclipse.viatra.solver.language.model.problem.ConstantArgument;
+import org.eclipse.viatra.solver.language.model.problem.ConstantAssertionArgument;
 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.IntConstant;
 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.NodeAssertionArgument;
+import org.eclipse.viatra.solver.language.model.problem.NodeValueAssertion;
 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;
 import org.eclipse.viatra.solver.language.model.problem.RangeMultiplicity;
+import org.eclipse.viatra.solver.language.model.problem.RealConstant;
 import org.eclipse.viatra.solver.language.model.problem.ReferenceDeclaration;
 import org.eclipse.viatra.solver.language.model.problem.ScopeDeclaration;
+import org.eclipse.viatra.solver.language.model.problem.StringConstant;
 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.VariableOrNodeArgument;
 import org.eclipse.viatra.solver.language.services.ProblemGrammarAccess;
 import org.eclipse.xtext.Action;
 import org.eclipse.xtext.Parameter;
@@ -47,9 +54,6 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
                 Set<Parameter> parameters = context.getEnabledBooleanParameters();
                 if (epackage == ProblemPackage.eINSTANCE)
                         switch (semanticObject.eClass().getClassifierID()) {
-                        case ProblemPackage.ARGUMENT:
-                                sequence_Argument(context, (Argument) semanticObject); 
-                                return; 
                         case ProblemPackage.ASSERTION:
                                 sequence_Assertion(context, (Assertion) semanticObject); 
                                 return; 
@@ -62,18 +66,33 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
                         case ProblemPackage.CONJUNCTION:
                                 sequence_Conjunction(context, (Conjunction) semanticObject); 
                                 return; 
+                        case ProblemPackage.CONSTANT_ARGUMENT:
+                                sequence_ConstantArgument(context, (ConstantArgument) semanticObject); 
+                                return; 
+                        case ProblemPackage.CONSTANT_ASSERTION_ARGUMENT:
+                                sequence_ConstantAssertionArgument(context, (ConstantAssertionArgument) semanticObject); 
+                                return; 
                         case ProblemPackage.ENUM_DECLARATION:
                                 sequence_EnumDeclaration(context, (EnumDeclaration) semanticObject); 
                                 return; 
                         case ProblemPackage.EXACT_MULTIPLICITY:
                                 sequence_ExactMultiplicity(context, (ExactMultiplicity) semanticObject); 
                                 return; 
+                        case ProblemPackage.INT_CONSTANT:
+                                sequence_IntConstant(context, (IntConstant) semanticObject); 
+                                return; 
                         case ProblemPackage.NEGATIVE_LITERAL:
                                 sequence_NegativeLiteral(context, (NegativeLiteral) semanticObject); 
                                 return; 
                         case ProblemPackage.NODE:
                                 sequence_EnumLiteral(context, (Node) semanticObject); 
                                 return; 
+                        case ProblemPackage.NODE_ASSERTION_ARGUMENT:
+                                sequence_NodeAssertionArgument(context, (NodeAssertionArgument) semanticObject); 
+                                return; 
+                        case ProblemPackage.NODE_VALUE_ASSERTION:
+                                sequence_NodeValueAssertion(context, (NodeValueAssertion) semanticObject); 
+                                return; 
                         case ProblemPackage.PARAMETER:
                                 sequence_Parameter(context, (org.eclipse.viatra.solver.language.model.problem.Parameter) semanticObject); 
                                 return; 
@@ -86,18 +105,27 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
                         case ProblemPackage.RANGE_MULTIPLICITY:
                                 sequence_RangeMultiplicity(context, (RangeMultiplicity) semanticObject); 
                                 return; 
+                        case ProblemPackage.REAL_CONSTANT:
+                                sequence_RealConstant(context, (RealConstant) semanticObject); 
+                                return; 
                         case ProblemPackage.REFERENCE_DECLARATION:
                                 sequence_ReferenceDeclaration(context, (ReferenceDeclaration) semanticObject); 
                                 return; 
                         case ProblemPackage.SCOPE_DECLARATION:
                                 sequence_ScopeDeclaration(context, (ScopeDeclaration) semanticObject); 
                                 return; 
+                        case ProblemPackage.STRING_CONSTANT:
+                                sequence_StringConstant(context, (StringConstant) semanticObject); 
+                                return; 
                         case ProblemPackage.TYPE_SCOPE:
                                 sequence_TypeScope(context, (TypeScope) semanticObject); 
                                 return; 
                         case ProblemPackage.UNBOUNDED_MULTIPLICITY:
                                 sequence_UnboundedMultiplicity(context, (UnboundedMultiplicity) semanticObject); 
                                 return; 
+                        case ProblemPackage.VARIABLE_OR_NODE_ARGUMENT:
+                                sequence_VariableOrNodeArgument(context, (VariableOrNodeArgument) semanticObject); 
+                                return; 
                         }
                 if (errorAcceptor != null)
                         errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
@@ -105,31 +133,13 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
         
         /**
          * Contexts:
-         *     Argument returns Argument
-         *
-         * Constraint:
-         *     variableOrNode=[VariableOrNode|QualifiedName]
-         */
-        protected void sequence_Argument(ISerializationContext context, Argument semanticObject) {
-                if (errorAcceptor != null) {
-                        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().getVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1(), semanticObject.eGet(ProblemPackage.Literals.ARGUMENT__VARIABLE_OR_NODE, false));
-                feeder.finish();
-        }
-        
-        
-        /**
-         * Contexts:
          *     Statement returns Assertion
          *     Assertion returns Assertion
          *
          * Constraint:
          *     (
-         *         (relation=[Relation|QualifiedName] (arguments+=[Node|QualifiedName] arguments+=[Node|QualifiedName]*)? value=LogicValue) | 
-         *         (value=ShortLogicValue? relation=[Relation|QualifiedName] (arguments+=[Node|QualifiedName] arguments+=[Node|QualifiedName]*)?)
+         *         (relation=[Relation|QualifiedName] (arguments+=AssertionArgument arguments+=AssertionArgument*)? value=LogicValue) | 
+         *         (value=ShortLogicValue? relation=[Relation|QualifiedName] (arguments+=AssertionArgument arguments+=AssertionArgument*)?)
          *     )
          */
         protected void sequence_Assertion(ISerializationContext context, Assertion semanticObject) {
@@ -182,6 +192,44 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
         
         /**
          * Contexts:
+         *     Argument returns ConstantArgument
+         *     ConstantArgument returns ConstantArgument
+         *
+         * Constraint:
+         *     constant=Constant
+         */
+        protected void sequence_ConstantArgument(ISerializationContext context, ConstantArgument semanticObject) {
+                if (errorAcceptor != null) {
+                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.CONSTANT_ARGUMENT__CONSTANT) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.CONSTANT_ARGUMENT__CONSTANT));
+                }
+                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+                feeder.accept(grammarAccess.getConstantArgumentAccess().getConstantConstantParserRuleCall_0(), semanticObject.getConstant());
+                feeder.finish();
+        }
+        
+        
+        /**
+         * Contexts:
+         *     AssertionArgument returns ConstantAssertionArgument
+         *     ConstantAssertionArgument returns ConstantAssertionArgument
+         *
+         * Constraint:
+         *     constant=Constant
+         */
+        protected void sequence_ConstantAssertionArgument(ISerializationContext context, ConstantAssertionArgument semanticObject) {
+                if (errorAcceptor != null) {
+                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.CONSTANT_ASSERTION_ARGUMENT__CONSTANT) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.CONSTANT_ASSERTION_ARGUMENT__CONSTANT));
+                }
+                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+                feeder.accept(grammarAccess.getConstantAssertionArgumentAccess().getConstantConstantParserRuleCall_0(), semanticObject.getConstant());
+                feeder.finish();
+        }
+        
+        
+        /**
+         * Contexts:
          *     Statement returns EnumDeclaration
          *     EnumDeclaration returns EnumDeclaration
          *
@@ -233,6 +281,25 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
         
         /**
          * Contexts:
+         *     Constant returns IntConstant
+         *     IntConstant returns IntConstant
+         *
+         * Constraint:
+         *     intValue=Integer
+         */
+        protected void sequence_IntConstant(ISerializationContext context, IntConstant semanticObject) {
+                if (errorAcceptor != null) {
+                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.INT_CONSTANT__INT_VALUE) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.INT_CONSTANT__INT_VALUE));
+                }
+                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+                feeder.accept(grammarAccess.getIntConstantAccess().getIntValueIntegerParserRuleCall_0(), semanticObject.getIntValue());
+                feeder.finish();
+        }
+        
+        
+        /**
+         * Contexts:
          *     Literal returns NegativeLiteral
          *     NegativeLiteral returns NegativeLiteral
          *
@@ -252,6 +319,47 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
         
         /**
          * Contexts:
+         *     AssertionArgument returns NodeAssertionArgument
+         *     NodeAssertionArgument returns NodeAssertionArgument
+         *
+         * Constraint:
+         *     node=[Node|QualifiedName]
+         */
+        protected void sequence_NodeAssertionArgument(ISerializationContext context, NodeAssertionArgument semanticObject) {
+                if (errorAcceptor != null) {
+                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.NODE_ASSERTION_ARGUMENT__NODE) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.NODE_ASSERTION_ARGUMENT__NODE));
+                }
+                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+                feeder.accept(grammarAccess.getNodeAssertionArgumentAccess().getNodeNodeQualifiedNameParserRuleCall_0_1(), semanticObject.eGet(ProblemPackage.Literals.NODE_ASSERTION_ARGUMENT__NODE, false));
+                feeder.finish();
+        }
+        
+        
+        /**
+         * Contexts:
+         *     Statement returns NodeValueAssertion
+         *     NodeValueAssertion returns NodeValueAssertion
+         *
+         * Constraint:
+         *     (node=[Node|QualifiedName] value=Constant)
+         */
+        protected void sequence_NodeValueAssertion(ISerializationContext context, NodeValueAssertion semanticObject) {
+                if (errorAcceptor != null) {
+                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.NODE_VALUE_ASSERTION__NODE) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.NODE_VALUE_ASSERTION__NODE));
+                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.NODE_VALUE_ASSERTION__VALUE) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.NODE_VALUE_ASSERTION__VALUE));
+                }
+                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+                feeder.accept(grammarAccess.getNodeValueAssertionAccess().getNodeNodeQualifiedNameParserRuleCall_0_0_1(), semanticObject.eGet(ProblemPackage.Literals.NODE_VALUE_ASSERTION__NODE, false));
+                feeder.accept(grammarAccess.getNodeValueAssertionAccess().getValueConstantParserRuleCall_2_0(), semanticObject.getValue());
+                feeder.finish();
+        }
+        
+        
+        /**
+         * Contexts:
          *     Parameter returns Parameter
          *
          * Constraint:
@@ -312,6 +420,25 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
         
         /**
          * Contexts:
+         *     Constant returns RealConstant
+         *     RealConstant returns RealConstant
+         *
+         * Constraint:
+         *     realValue=Real
+         */
+        protected void sequence_RealConstant(ISerializationContext context, RealConstant semanticObject) {
+                if (errorAcceptor != null) {
+                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.REAL_CONSTANT__REAL_VALUE) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.REAL_CONSTANT__REAL_VALUE));
+                }
+                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+                feeder.accept(grammarAccess.getRealConstantAccess().getRealValueRealParserRuleCall_0(), semanticObject.getRealValue());
+                feeder.finish();
+        }
+        
+        
+        /**
+         * Contexts:
          *     ReferenceDeclaration returns ReferenceDeclaration
          *
          * Constraint:
@@ -343,6 +470,25 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
         
         /**
          * Contexts:
+         *     Constant returns StringConstant
+         *     StringConstant returns StringConstant
+         *
+         * Constraint:
+         *     stringValue=STRING
+         */
+        protected void sequence_StringConstant(ISerializationContext context, StringConstant semanticObject) {
+                if (errorAcceptor != null) {
+                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.STRING_CONSTANT__STRING_VALUE) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.STRING_CONSTANT__STRING_VALUE));
+                }
+                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+                feeder.accept(grammarAccess.getStringConstantAccess().getStringValueSTRINGTerminalRuleCall_0(), semanticObject.getStringValue());
+                feeder.finish();
+        }
+        
+        
+        /**
+         * Contexts:
          *     TypeScope returns TypeScope
          *
          * Constraint:
@@ -366,4 +512,23 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
         }
         
         
+        /**
+         * Contexts:
+         *     Argument returns VariableOrNodeArgument
+         *     VariableOrNodeArgument returns VariableOrNodeArgument
+         *
+         * Constraint:
+         *     variableOrNode=[VariableOrNode|QualifiedName]
+         */
+        protected void sequence_VariableOrNodeArgument(ISerializationContext context, VariableOrNodeArgument semanticObject) {
+                if (errorAcceptor != null) {
+                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE));
+                }
+                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+                feeder.accept(grammarAccess.getVariableOrNodeArgumentAccess().getVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1(), semanticObject.eGet(ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE, false));
+                feeder.finish();
+        }
+        
+        
 }
diff --git a/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/services/ProblemGrammarAccess.java b/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/services/ProblemGrammarAccess.java
index 13f92444..2cb37dbc 100644
--- a/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/services/ProblemGrammarAccess.java
+++ b/language/src/main/xtext-gen/org/eclipse/viatra/solver/language/services/ProblemGrammarAccess.java
@@ -74,13 +74,14 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 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);
+                private final RuleCall cNodeValueAssertionParserRuleCall_4 = (RuleCall)cAlternatives.eContents().get(4);
+                private final RuleCall cScopeDeclarationParserRuleCall_5 = (RuleCall)cAlternatives.eContents().get(5);
                 
                 //Statement:
-                //    ClassDeclaration | EnumDeclaration | PredicateDefinition | Assertion | ScopeDeclaration;
+                //    ClassDeclaration | EnumDeclaration | PredicateDefinition | Assertion | NodeValueAssertion | ScopeDeclaration;
                 @Override public ParserRule getRule() { return rule; }
                 
-                //ClassDeclaration | EnumDeclaration | PredicateDefinition | Assertion | ScopeDeclaration
+                //ClassDeclaration | EnumDeclaration | PredicateDefinition | Assertion | NodeValueAssertion | ScopeDeclaration
                 public Alternatives getAlternatives() { return cAlternatives; }
                 
                 //ClassDeclaration
@@ -95,8 +96,11 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //Assertion
                 public RuleCall getAssertionParserRuleCall_3() { return cAssertionParserRuleCall_3; }
                 
+                //NodeValueAssertion
+                public RuleCall getNodeValueAssertionParserRuleCall_4() { return cNodeValueAssertionParserRuleCall_4; }
+                
                 //ScopeDeclaration
-                public RuleCall getScopeDeclarationParserRuleCall_4() { return cScopeDeclarationParserRuleCall_4; }
+                public RuleCall getScopeDeclarationParserRuleCall_5() { return cScopeDeclarationParserRuleCall_5; }
         }
         public class ClassDeclarationElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.ClassDeclaration");
@@ -712,11 +716,30 @@ 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 Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final RuleCall cVariableOrNodeArgumentParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final RuleCall cConstantArgumentParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                
+                //Argument:
+                //    VariableOrNodeArgument | ConstantArgument;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //VariableOrNodeArgument | ConstantArgument
+                public Alternatives getAlternatives() { return cAlternatives; }
+                
+                //VariableOrNodeArgument
+                public RuleCall getVariableOrNodeArgumentParserRuleCall_0() { return cVariableOrNodeArgumentParserRuleCall_0; }
+                
+                //ConstantArgument
+                public RuleCall getConstantArgumentParserRuleCall_1() { return cConstantArgumentParserRuleCall_1; }
+        }
+        public class VariableOrNodeArgumentElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.VariableOrNodeArgument");
                 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:
+                //VariableOrNodeArgument:
                 //    variableOrNode=[VariableOrNode|QualifiedName];
                 @Override public ParserRule getRule() { return rule; }
                 
@@ -729,6 +752,21 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //QualifiedName
                 public RuleCall getVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1() { return cVariableOrNodeVariableOrNodeQualifiedNameParserRuleCall_0_1; }
         }
+        public class ConstantArgumentElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.ConstantArgument");
+                private final Assignment cConstantAssignment = (Assignment)rule.eContents().get(1);
+                private final RuleCall cConstantConstantParserRuleCall_0 = (RuleCall)cConstantAssignment.eContents().get(0);
+                
+                //ConstantArgument:
+                //    constant=Constant;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //constant=Constant
+                public Assignment getConstantAssignment() { return cConstantAssignment; }
+                
+                //Constant
+                public RuleCall getConstantConstantParserRuleCall_0() { return cConstantConstantParserRuleCall_0; }
+        }
         public class AssertionElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.Assertion");
                 private final Group cGroup = (Group)rule.eContents().get(1);
@@ -740,13 +778,11 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 private final Keyword cLeftParenthesisKeyword_0_0_1 = (Keyword)cGroup_0_0.eContents().get(1);
                 private final Group cGroup_0_0_2 = (Group)cGroup_0_0.eContents().get(2);
                 private final Assignment cArgumentsAssignment_0_0_2_0 = (Assignment)cGroup_0_0_2.eContents().get(0);
-                private final CrossReference cArgumentsNodeCrossReference_0_0_2_0_0 = (CrossReference)cArgumentsAssignment_0_0_2_0.eContents().get(0);
-                private final RuleCall cArgumentsNodeQualifiedNameParserRuleCall_0_0_2_0_0_1 = (RuleCall)cArgumentsNodeCrossReference_0_0_2_0_0.eContents().get(1);
+                private final RuleCall cArgumentsAssertionArgumentParserRuleCall_0_0_2_0_0 = (RuleCall)cArgumentsAssignment_0_0_2_0.eContents().get(0);
                 private final Group cGroup_0_0_2_1 = (Group)cGroup_0_0_2.eContents().get(1);
                 private final Keyword cCommaKeyword_0_0_2_1_0 = (Keyword)cGroup_0_0_2_1.eContents().get(0);
                 private final Assignment cArgumentsAssignment_0_0_2_1_1 = (Assignment)cGroup_0_0_2_1.eContents().get(1);
-                private final CrossReference cArgumentsNodeCrossReference_0_0_2_1_1_0 = (CrossReference)cArgumentsAssignment_0_0_2_1_1.eContents().get(0);
-                private final RuleCall cArgumentsNodeQualifiedNameParserRuleCall_0_0_2_1_1_0_1 = (RuleCall)cArgumentsNodeCrossReference_0_0_2_1_1_0.eContents().get(1);
+                private final RuleCall cArgumentsAssertionArgumentParserRuleCall_0_0_2_1_1_0 = (RuleCall)cArgumentsAssignment_0_0_2_1_1.eContents().get(0);
                 private final Keyword cRightParenthesisKeyword_0_0_3 = (Keyword)cGroup_0_0.eContents().get(3);
                 private final Keyword cColonKeyword_0_0_4 = (Keyword)cGroup_0_0.eContents().get(4);
                 private final Assignment cValueAssignment_0_0_5 = (Assignment)cGroup_0_0.eContents().get(5);
@@ -760,45 +796,43 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 private final Keyword cLeftParenthesisKeyword_0_1_2 = (Keyword)cGroup_0_1.eContents().get(2);
                 private final Group cGroup_0_1_3 = (Group)cGroup_0_1.eContents().get(3);
                 private final Assignment cArgumentsAssignment_0_1_3_0 = (Assignment)cGroup_0_1_3.eContents().get(0);
-                private final CrossReference cArgumentsNodeCrossReference_0_1_3_0_0 = (CrossReference)cArgumentsAssignment_0_1_3_0.eContents().get(0);
-                private final RuleCall cArgumentsNodeQualifiedNameParserRuleCall_0_1_3_0_0_1 = (RuleCall)cArgumentsNodeCrossReference_0_1_3_0_0.eContents().get(1);
+                private final RuleCall cArgumentsAssertionArgumentParserRuleCall_0_1_3_0_0 = (RuleCall)cArgumentsAssignment_0_1_3_0.eContents().get(0);
                 private final Group cGroup_0_1_3_1 = (Group)cGroup_0_1_3.eContents().get(1);
                 private final Keyword cCommaKeyword_0_1_3_1_0 = (Keyword)cGroup_0_1_3_1.eContents().get(0);
                 private final Assignment cArgumentsAssignment_0_1_3_1_1 = (Assignment)cGroup_0_1_3_1.eContents().get(1);
-                private final CrossReference cArgumentsNodeCrossReference_0_1_3_1_1_0 = (CrossReference)cArgumentsAssignment_0_1_3_1_1.eContents().get(0);
-                private final RuleCall cArgumentsNodeQualifiedNameParserRuleCall_0_1_3_1_1_0_1 = (RuleCall)cArgumentsNodeCrossReference_0_1_3_1_1_0.eContents().get(1);
+                private final RuleCall cArgumentsAssertionArgumentParserRuleCall_0_1_3_1_1_0 = (RuleCall)cArgumentsAssignment_0_1_3_1_1.eContents().get(0);
                 private final Keyword cRightParenthesisKeyword_0_1_4 = (Keyword)cGroup_0_1.eContents().get(4);
                 private final Keyword cFullStopKeyword_1 = (Keyword)cGroup.eContents().get(1);
                 
                 //Assertion:
                 //    (relation=[Relation|QualifiedName]
-                //    "(" (arguments+=[Node|QualifiedName] ("," arguments+=[Node|QualifiedName])*)? ")"
+                //    "(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")"
                 //    ":" value=LogicValue |
                 //    value=ShortLogicValue?
                 //    relation=[Relation|QualifiedName]
-                //    "(" (arguments+=[Node|QualifiedName] ("," arguments+=[Node|QualifiedName])*)? ")")
+                //    "(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")")
                 //    ".";
                 @Override public ParserRule getRule() { return rule; }
                 
                 //(relation=[Relation|QualifiedName]
-                //"(" (arguments+=[Node|QualifiedName] ("," arguments+=[Node|QualifiedName])*)? ")"
+                //"(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")"
                 //":" value=LogicValue |
                 //value=ShortLogicValue?
                 //relation=[Relation|QualifiedName]
-                //"(" (arguments+=[Node|QualifiedName] ("," arguments+=[Node|QualifiedName])*)? ")")
+                //"(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")")
                 //"."
                 public Group getGroup() { return cGroup; }
                 
                 //(relation=[Relation|QualifiedName]
-                //"(" (arguments+=[Node|QualifiedName] ("," arguments+=[Node|QualifiedName])*)? ")"
+                //"(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")"
                 //":" value=LogicValue |
                 //value=ShortLogicValue?
                 //relation=[Relation|QualifiedName]
-                //"(" (arguments+=[Node|QualifiedName] ("," arguments+=[Node|QualifiedName])*)? ")")
+                //"(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")")
                 public Alternatives getAlternatives_0() { return cAlternatives_0; }
                 
                 //relation=[Relation|QualifiedName]
-                //    "(" (arguments+=[Node|QualifiedName] ("," arguments+=[Node|QualifiedName])*)? ")"
+                //    "(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")"
                 //    ":" value=LogicValue
                 public Group getGroup_0_0() { return cGroup_0_0; }
                 
@@ -814,32 +848,26 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //"("
                 public Keyword getLeftParenthesisKeyword_0_0_1() { return cLeftParenthesisKeyword_0_0_1; }
                 
-                //(arguments+=[Node|QualifiedName] ("," arguments+=[Node|QualifiedName])*)?
+                //(arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)?
                 public Group getGroup_0_0_2() { return cGroup_0_0_2; }
                 
-                //arguments+=[Node|QualifiedName]
+                //arguments+=AssertionArgument
                 public Assignment getArgumentsAssignment_0_0_2_0() { return cArgumentsAssignment_0_0_2_0; }
                 
-                //[Node|QualifiedName]
-                public CrossReference getArgumentsNodeCrossReference_0_0_2_0_0() { return cArgumentsNodeCrossReference_0_0_2_0_0; }
-                
-                //QualifiedName
-                public RuleCall getArgumentsNodeQualifiedNameParserRuleCall_0_0_2_0_0_1() { return cArgumentsNodeQualifiedNameParserRuleCall_0_0_2_0_0_1; }
+                //AssertionArgument
+                public RuleCall getArgumentsAssertionArgumentParserRuleCall_0_0_2_0_0() { return cArgumentsAssertionArgumentParserRuleCall_0_0_2_0_0; }
                 
-                //("," arguments+=[Node|QualifiedName])*
+                //("," arguments+=AssertionArgument)*
                 public Group getGroup_0_0_2_1() { return cGroup_0_0_2_1; }
                 
                 //","
                 public Keyword getCommaKeyword_0_0_2_1_0() { return cCommaKeyword_0_0_2_1_0; }
                 
-                //arguments+=[Node|QualifiedName]
+                //arguments+=AssertionArgument
                 public Assignment getArgumentsAssignment_0_0_2_1_1() { return cArgumentsAssignment_0_0_2_1_1; }
                 
-                //[Node|QualifiedName]
-                public CrossReference getArgumentsNodeCrossReference_0_0_2_1_1_0() { return cArgumentsNodeCrossReference_0_0_2_1_1_0; }
-                
-                //QualifiedName
-                public RuleCall getArgumentsNodeQualifiedNameParserRuleCall_0_0_2_1_1_0_1() { return cArgumentsNodeQualifiedNameParserRuleCall_0_0_2_1_1_0_1; }
+                //AssertionArgument
+                public RuleCall getArgumentsAssertionArgumentParserRuleCall_0_0_2_1_1_0() { return cArgumentsAssertionArgumentParserRuleCall_0_0_2_1_1_0; }
                 
                 //")"
                 public Keyword getRightParenthesisKeyword_0_0_3() { return cRightParenthesisKeyword_0_0_3; }
@@ -855,7 +883,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 
                 //value=ShortLogicValue?
                 //relation=[Relation|QualifiedName]
-                //"(" (arguments+=[Node|QualifiedName] ("," arguments+=[Node|QualifiedName])*)? ")"
+                //"(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")"
                 public Group getGroup_0_1() { return cGroup_0_1; }
                 
                 //value=ShortLogicValue?
@@ -876,32 +904,26 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //"("
                 public Keyword getLeftParenthesisKeyword_0_1_2() { return cLeftParenthesisKeyword_0_1_2; }
                 
-                //(arguments+=[Node|QualifiedName] ("," arguments+=[Node|QualifiedName])*)?
+                //(arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)?
                 public Group getGroup_0_1_3() { return cGroup_0_1_3; }
                 
-                //arguments+=[Node|QualifiedName]
+                //arguments+=AssertionArgument
                 public Assignment getArgumentsAssignment_0_1_3_0() { return cArgumentsAssignment_0_1_3_0; }
                 
-                //[Node|QualifiedName]
-                public CrossReference getArgumentsNodeCrossReference_0_1_3_0_0() { return cArgumentsNodeCrossReference_0_1_3_0_0; }
-                
-                //QualifiedName
-                public RuleCall getArgumentsNodeQualifiedNameParserRuleCall_0_1_3_0_0_1() { return cArgumentsNodeQualifiedNameParserRuleCall_0_1_3_0_0_1; }
+                //AssertionArgument
+                public RuleCall getArgumentsAssertionArgumentParserRuleCall_0_1_3_0_0() { return cArgumentsAssertionArgumentParserRuleCall_0_1_3_0_0; }
                 
-                //("," arguments+=[Node|QualifiedName])*
+                //("," arguments+=AssertionArgument)*
                 public Group getGroup_0_1_3_1() { return cGroup_0_1_3_1; }
                 
                 //","
                 public Keyword getCommaKeyword_0_1_3_1_0() { return cCommaKeyword_0_1_3_1_0; }
                 
-                //arguments+=[Node|QualifiedName]
+                //arguments+=AssertionArgument
                 public Assignment getArgumentsAssignment_0_1_3_1_1() { return cArgumentsAssignment_0_1_3_1_1; }
                 
-                //[Node|QualifiedName]
-                public CrossReference getArgumentsNodeCrossReference_0_1_3_1_1_0() { return cArgumentsNodeCrossReference_0_1_3_1_1_0; }
-                
-                //QualifiedName
-                public RuleCall getArgumentsNodeQualifiedNameParserRuleCall_0_1_3_1_1_0_1() { return cArgumentsNodeQualifiedNameParserRuleCall_0_1_3_1_1_0_1; }
+                //AssertionArgument
+                public RuleCall getArgumentsAssertionArgumentParserRuleCall_0_1_3_1_1_0() { return cArgumentsAssertionArgumentParserRuleCall_0_1_3_1_1_0; }
                 
                 //")"
                 public Keyword getRightParenthesisKeyword_0_1_4() { return cRightParenthesisKeyword_0_1_4; }
@@ -909,6 +931,166 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //"."
                 public Keyword getFullStopKeyword_1() { return cFullStopKeyword_1; }
         }
+        public class AssertionArgumentElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.AssertionArgument");
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final RuleCall cNodeAssertionArgumentParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final RuleCall cConstantAssertionArgumentParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                
+                //AssertionArgument:
+                //    NodeAssertionArgument | ConstantAssertionArgument;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //NodeAssertionArgument | ConstantAssertionArgument
+                public Alternatives getAlternatives() { return cAlternatives; }
+                
+                //NodeAssertionArgument
+                public RuleCall getNodeAssertionArgumentParserRuleCall_0() { return cNodeAssertionArgumentParserRuleCall_0; }
+                
+                //ConstantAssertionArgument
+                public RuleCall getConstantAssertionArgumentParserRuleCall_1() { return cConstantAssertionArgumentParserRuleCall_1; }
+        }
+        public class NodeAssertionArgumentElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.NodeAssertionArgument");
+                private final Assignment cNodeAssignment = (Assignment)rule.eContents().get(1);
+                private final CrossReference cNodeNodeCrossReference_0 = (CrossReference)cNodeAssignment.eContents().get(0);
+                private final RuleCall cNodeNodeQualifiedNameParserRuleCall_0_1 = (RuleCall)cNodeNodeCrossReference_0.eContents().get(1);
+                
+                //NodeAssertionArgument:
+                //    node=[Node|QualifiedName];
+                @Override public ParserRule getRule() { return rule; }
+                
+                //node=[Node|QualifiedName]
+                public Assignment getNodeAssignment() { return cNodeAssignment; }
+                
+                //[Node|QualifiedName]
+                public CrossReference getNodeNodeCrossReference_0() { return cNodeNodeCrossReference_0; }
+                
+                //QualifiedName
+                public RuleCall getNodeNodeQualifiedNameParserRuleCall_0_1() { return cNodeNodeQualifiedNameParserRuleCall_0_1; }
+        }
+        public class ConstantAssertionArgumentElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.ConstantAssertionArgument");
+                private final Assignment cConstantAssignment = (Assignment)rule.eContents().get(1);
+                private final RuleCall cConstantConstantParserRuleCall_0 = (RuleCall)cConstantAssignment.eContents().get(0);
+                
+                //ConstantAssertionArgument:
+                //    constant=Constant;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //constant=Constant
+                public Assignment getConstantAssignment() { return cConstantAssignment; }
+                
+                //Constant
+                public RuleCall getConstantConstantParserRuleCall_0() { return cConstantConstantParserRuleCall_0; }
+        }
+        public class NodeValueAssertionElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.NodeValueAssertion");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Assignment cNodeAssignment_0 = (Assignment)cGroup.eContents().get(0);
+                private final CrossReference cNodeNodeCrossReference_0_0 = (CrossReference)cNodeAssignment_0.eContents().get(0);
+                private final RuleCall cNodeNodeQualifiedNameParserRuleCall_0_0_1 = (RuleCall)cNodeNodeCrossReference_0_0.eContents().get(1);
+                private final Keyword cColonKeyword_1 = (Keyword)cGroup.eContents().get(1);
+                private final Assignment cValueAssignment_2 = (Assignment)cGroup.eContents().get(2);
+                private final RuleCall cValueConstantParserRuleCall_2_0 = (RuleCall)cValueAssignment_2.eContents().get(0);
+                private final Keyword cFullStopKeyword_3 = (Keyword)cGroup.eContents().get(3);
+                
+                //NodeValueAssertion:
+                //    node=[Node|QualifiedName] ":" value=Constant ".";
+                @Override public ParserRule getRule() { return rule; }
+                
+                //node=[Node|QualifiedName] ":" value=Constant "."
+                public Group getGroup() { return cGroup; }
+                
+                //node=[Node|QualifiedName]
+                public Assignment getNodeAssignment_0() { return cNodeAssignment_0; }
+                
+                //[Node|QualifiedName]
+                public CrossReference getNodeNodeCrossReference_0_0() { return cNodeNodeCrossReference_0_0; }
+                
+                //QualifiedName
+                public RuleCall getNodeNodeQualifiedNameParserRuleCall_0_0_1() { return cNodeNodeQualifiedNameParserRuleCall_0_0_1; }
+                
+                //":"
+                public Keyword getColonKeyword_1() { return cColonKeyword_1; }
+                
+                //value=Constant
+                public Assignment getValueAssignment_2() { return cValueAssignment_2; }
+                
+                //Constant
+                public RuleCall getValueConstantParserRuleCall_2_0() { return cValueConstantParserRuleCall_2_0; }
+                
+                //"."
+                public Keyword getFullStopKeyword_3() { return cFullStopKeyword_3; }
+        }
+        public class ConstantElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.Constant");
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final RuleCall cIntConstantParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final RuleCall cRealConstantParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                private final RuleCall cStringConstantParserRuleCall_2 = (RuleCall)cAlternatives.eContents().get(2);
+                
+                //Constant:
+                //    IntConstant | RealConstant | StringConstant;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //IntConstant | RealConstant | StringConstant
+                public Alternatives getAlternatives() { return cAlternatives; }
+                
+                //IntConstant
+                public RuleCall getIntConstantParserRuleCall_0() { return cIntConstantParserRuleCall_0; }
+                
+                //RealConstant
+                public RuleCall getRealConstantParserRuleCall_1() { return cRealConstantParserRuleCall_1; }
+                
+                //StringConstant
+                public RuleCall getStringConstantParserRuleCall_2() { return cStringConstantParserRuleCall_2; }
+        }
+        public class IntConstantElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.IntConstant");
+                private final Assignment cIntValueAssignment = (Assignment)rule.eContents().get(1);
+                private final RuleCall cIntValueIntegerParserRuleCall_0 = (RuleCall)cIntValueAssignment.eContents().get(0);
+                
+                //IntConstant:
+                //    intValue=Integer;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //intValue=Integer
+                public Assignment getIntValueAssignment() { return cIntValueAssignment; }
+                
+                //Integer
+                public RuleCall getIntValueIntegerParserRuleCall_0() { return cIntValueIntegerParserRuleCall_0; }
+        }
+        public class RealConstantElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.RealConstant");
+                private final Assignment cRealValueAssignment = (Assignment)rule.eContents().get(1);
+                private final RuleCall cRealValueRealParserRuleCall_0 = (RuleCall)cRealValueAssignment.eContents().get(0);
+                
+                //RealConstant:
+                //    realValue=Real;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //realValue=Real
+                public Assignment getRealValueAssignment() { return cRealValueAssignment; }
+                
+                //Real
+                public RuleCall getRealValueRealParserRuleCall_0() { return cRealValueRealParserRuleCall_0; }
+        }
+        public class StringConstantElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.StringConstant");
+                private final Assignment cStringValueAssignment = (Assignment)rule.eContents().get(1);
+                private final RuleCall cStringValueSTRINGTerminalRuleCall_0 = (RuleCall)cStringValueAssignment.eContents().get(0);
+                
+                //StringConstant:
+                //    stringValue=STRING;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //stringValue=STRING
+                public Assignment getStringValueAssignment() { return cStringValueAssignment; }
+                
+                //STRING
+                public RuleCall getStringValueSTRINGTerminalRuleCall_0() { return cStringValueSTRINGTerminalRuleCall_0; }
+        }
         public class ScopeDeclarationElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.ScopeDeclaration");
                 private final Group cGroup = (Group)rule.eContents().get(1);
@@ -1149,7 +1331,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 private final Keyword cColonColonKeyword_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:
+                //QualifiedName hidden():
                 //    QUOTED_ID | Identifier ("::" Identifier)* ("::" QUOTED_ID)?;
                 @Override public ParserRule getRule() { return rule; }
                 
@@ -1189,12 +1371,14 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 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);
+                private final Keyword cEKeyword_3 = (Keyword)cAlternatives.eContents().get(3);
+                private final Keyword cEKeyword_4 = (Keyword)cAlternatives.eContents().get(4);
                 
                 //Identifier:
-                //    ID | "true" | "false";
+                //    ID | "true" | "false" | "e" | "E";
                 @Override public ParserRule getRule() { return rule; }
                 
-                //ID | "true" | "false"
+                //ID | "true" | "false" | "e" | "E"
                 public Alternatives getAlternatives() { return cAlternatives; }
                 
                 //ID
@@ -1205,6 +1389,110 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 
                 //"false"
                 public Keyword getFalseKeyword_2() { return cFalseKeyword_2; }
+                
+                //"e"
+                public Keyword getEKeyword_3() { return cEKeyword_3; }
+                
+                //"E"
+                public Keyword getEKeyword_4() { return cEKeyword_4; }
+        }
+        public class IntegerElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.Integer");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Keyword cHyphenMinusKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final RuleCall cINTTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);
+                
+                //Integer returns ecore::EInt hidden():
+                //    "-"? INT;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //"-"? INT
+                public Group getGroup() { return cGroup; }
+                
+                //"-"?
+                public Keyword getHyphenMinusKeyword_0() { return cHyphenMinusKeyword_0; }
+                
+                //INT
+                public RuleCall getINTTerminalRuleCall_1() { return cINTTerminalRuleCall_1; }
+        }
+        public class RealElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.Real");
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Keyword cHyphenMinusKeyword_0 = (Keyword)cGroup.eContents().get(0);
+                private final RuleCall cINTTerminalRuleCall_1 = (RuleCall)cGroup.eContents().get(1);
+                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 cFullStopKeyword_2_0_0 = (Keyword)cGroup_2_0.eContents().get(0);
+                private final RuleCall cINTTerminalRuleCall_2_0_1 = (RuleCall)cGroup_2_0.eContents().get(1);
+                private final Group cGroup_2_1 = (Group)cAlternatives_2.eContents().get(1);
+                private final Group cGroup_2_1_0 = (Group)cGroup_2_1.eContents().get(0);
+                private final Keyword cFullStopKeyword_2_1_0_0 = (Keyword)cGroup_2_1_0.eContents().get(0);
+                private final RuleCall cINTTerminalRuleCall_2_1_0_1 = (RuleCall)cGroup_2_1_0.eContents().get(1);
+                private final Alternatives cAlternatives_2_1_1 = (Alternatives)cGroup_2_1.eContents().get(1);
+                private final Keyword cEKeyword_2_1_1_0 = (Keyword)cAlternatives_2_1_1.eContents().get(0);
+                private final Keyword cEKeyword_2_1_1_1 = (Keyword)cAlternatives_2_1_1.eContents().get(1);
+                private final Alternatives cAlternatives_2_1_2 = (Alternatives)cGroup_2_1.eContents().get(2);
+                private final Keyword cHyphenMinusKeyword_2_1_2_0 = (Keyword)cAlternatives_2_1_2.eContents().get(0);
+                private final Keyword cPlusSignKeyword_2_1_2_1 = (Keyword)cAlternatives_2_1_2.eContents().get(1);
+                private final RuleCall cINTTerminalRuleCall_2_1_3 = (RuleCall)cGroup_2_1.eContents().get(3);
+                
+                //Real returns ecore::EDouble hidden():
+                //    "-"? INT ("." INT | ("." INT)? ("e" | "E") ("-" | "+")? INT);
+                @Override public ParserRule getRule() { return rule; }
+                
+                //"-"? INT ("." INT | ("." INT)? ("e" | "E") ("-" | "+")? INT)
+                public Group getGroup() { return cGroup; }
+                
+                //"-"?
+                public Keyword getHyphenMinusKeyword_0() { return cHyphenMinusKeyword_0; }
+                
+                //INT
+                public RuleCall getINTTerminalRuleCall_1() { return cINTTerminalRuleCall_1; }
+                
+                //("." INT | ("." INT)? ("e" | "E") ("-" | "+")? INT)
+                public Alternatives getAlternatives_2() { return cAlternatives_2; }
+                
+                //"." INT
+                public Group getGroup_2_0() { return cGroup_2_0; }
+                
+                //"."
+                public Keyword getFullStopKeyword_2_0_0() { return cFullStopKeyword_2_0_0; }
+                
+                //INT
+                public RuleCall getINTTerminalRuleCall_2_0_1() { return cINTTerminalRuleCall_2_0_1; }
+                
+                //("." INT)? ("e" | "E") ("-" | "+")? INT
+                public Group getGroup_2_1() { return cGroup_2_1; }
+                
+                //("." INT)?
+                public Group getGroup_2_1_0() { return cGroup_2_1_0; }
+                
+                //"."
+                public Keyword getFullStopKeyword_2_1_0_0() { return cFullStopKeyword_2_1_0_0; }
+                
+                //INT
+                public RuleCall getINTTerminalRuleCall_2_1_0_1() { return cINTTerminalRuleCall_2_1_0_1; }
+                
+                //("e" | "E")
+                public Alternatives getAlternatives_2_1_1() { return cAlternatives_2_1_1; }
+                
+                //"e"
+                public Keyword getEKeyword_2_1_1_0() { return cEKeyword_2_1_1_0; }
+                
+                //"E"
+                public Keyword getEKeyword_2_1_1_1() { return cEKeyword_2_1_1_1; }
+                
+                //("-" | "+")?
+                public Alternatives getAlternatives_2_1_2() { return cAlternatives_2_1_2; }
+                
+                //"-"
+                public Keyword getHyphenMinusKeyword_2_1_2_0() { return cHyphenMinusKeyword_2_1_2_0; }
+                
+                //"+"
+                public Keyword getPlusSignKeyword_2_1_2_1() { return cPlusSignKeyword_2_1_2_1; }
+                
+                //INT
+                public RuleCall getINTTerminalRuleCall_2_1_3() { return cINTTerminalRuleCall_2_1_3; }
         }
         
         public class LogicValueElements extends AbstractElementFinder.AbstractEnumRuleElementFinder {
@@ -1283,9 +1571,19 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         private final NegativeLiteralElements pNegativeLiteral;
         private final AtomElements pAtom;
         private final ArgumentElements pArgument;
+        private final VariableOrNodeArgumentElements pVariableOrNodeArgument;
+        private final ConstantArgumentElements pConstantArgument;
         private final AssertionElements pAssertion;
+        private final AssertionArgumentElements pAssertionArgument;
+        private final NodeAssertionArgumentElements pNodeAssertionArgument;
+        private final ConstantAssertionArgumentElements pConstantAssertionArgument;
         private final LogicValueElements eLogicValue;
         private final ShortLogicValueElements eShortLogicValue;
+        private final NodeValueAssertionElements pNodeValueAssertion;
+        private final ConstantElements pConstant;
+        private final IntConstantElements pIntConstant;
+        private final RealConstantElements pRealConstant;
+        private final StringConstantElements pStringConstant;
         private final ScopeDeclarationElements pScopeDeclaration;
         private final TypeScopeElements pTypeScope;
         private final MultiplicityElements pMultiplicity;
@@ -1297,6 +1595,9 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         private final QuotedOrUnquotedIdElements pQuotedOrUnquotedId;
         private final QualifiedNameElements pQualifiedName;
         private final IdentifierElements pIdentifier;
+        private final IntegerElements pInteger;
+        private final RealElements pReal;
+        private final TerminalRule tID;
         private final TerminalRule tSTRING;
         private final TerminalRule tQUOTED_ID;
         private final TerminalRule tSL_COMMENT;
@@ -1323,9 +1624,19 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 this.pNegativeLiteral = new NegativeLiteralElements();
                 this.pAtom = new AtomElements();
                 this.pArgument = new ArgumentElements();
+                this.pVariableOrNodeArgument = new VariableOrNodeArgumentElements();
+                this.pConstantArgument = new ConstantArgumentElements();
                 this.pAssertion = new AssertionElements();
+                this.pAssertionArgument = new AssertionArgumentElements();
+                this.pNodeAssertionArgument = new NodeAssertionArgumentElements();
+                this.pConstantAssertionArgument = new ConstantAssertionArgumentElements();
                 this.eLogicValue = new LogicValueElements();
                 this.eShortLogicValue = new ShortLogicValueElements();
+                this.pNodeValueAssertion = new NodeValueAssertionElements();
+                this.pConstant = new ConstantElements();
+                this.pIntConstant = new IntConstantElements();
+                this.pRealConstant = new RealConstantElements();
+                this.pStringConstant = new StringConstantElements();
                 this.pScopeDeclaration = new ScopeDeclarationElements();
                 this.pTypeScope = new TypeScopeElements();
                 this.pMultiplicity = new MultiplicityElements();
@@ -1337,6 +1648,9 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 this.pQuotedOrUnquotedId = new QuotedOrUnquotedIdElements();
                 this.pQualifiedName = new QualifiedNameElements();
                 this.pIdentifier = new IdentifierElements();
+                this.pInteger = new IntegerElements();
+                this.pReal = new RealElements();
+                this.tID = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.ID");
                 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");
                 this.tSL_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.SL_COMMENT");
@@ -1381,7 +1695,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         }
         
         //Statement:
-        //    ClassDeclaration | EnumDeclaration | PredicateDefinition | Assertion | ScopeDeclaration;
+        //    ClassDeclaration | EnumDeclaration | PredicateDefinition | Assertion | NodeValueAssertion | ScopeDeclaration;
         public StatementElements getStatementAccess() {
                 return pStatement;
         }
@@ -1506,7 +1820,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         }
         
         //Argument:
-        //    variableOrNode=[VariableOrNode|QualifiedName];
+        //    VariableOrNodeArgument | ConstantArgument;
         public ArgumentElements getArgumentAccess() {
                 return pArgument;
         }
@@ -1515,13 +1829,33 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 return getArgumentAccess().getRule();
         }
         
+        //VariableOrNodeArgument:
+        //    variableOrNode=[VariableOrNode|QualifiedName];
+        public VariableOrNodeArgumentElements getVariableOrNodeArgumentAccess() {
+                return pVariableOrNodeArgument;
+        }
+        
+        public ParserRule getVariableOrNodeArgumentRule() {
+                return getVariableOrNodeArgumentAccess().getRule();
+        }
+        
+        //ConstantArgument:
+        //    constant=Constant;
+        public ConstantArgumentElements getConstantArgumentAccess() {
+                return pConstantArgument;
+        }
+        
+        public ParserRule getConstantArgumentRule() {
+                return getConstantArgumentAccess().getRule();
+        }
+        
         //Assertion:
         //    (relation=[Relation|QualifiedName]
-        //    "(" (arguments+=[Node|QualifiedName] ("," arguments+=[Node|QualifiedName])*)? ")"
+        //    "(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")"
         //    ":" value=LogicValue |
         //    value=ShortLogicValue?
         //    relation=[Relation|QualifiedName]
-        //    "(" (arguments+=[Node|QualifiedName] ("," arguments+=[Node|QualifiedName])*)? ")")
+        //    "(" (arguments+=AssertionArgument ("," arguments+=AssertionArgument)*)? ")")
         //    ".";
         public AssertionElements getAssertionAccess() {
                 return pAssertion;
@@ -1531,6 +1865,36 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 return getAssertionAccess().getRule();
         }
         
+        //AssertionArgument:
+        //    NodeAssertionArgument | ConstantAssertionArgument;
+        public AssertionArgumentElements getAssertionArgumentAccess() {
+                return pAssertionArgument;
+        }
+        
+        public ParserRule getAssertionArgumentRule() {
+                return getAssertionArgumentAccess().getRule();
+        }
+        
+        //NodeAssertionArgument:
+        //    node=[Node|QualifiedName];
+        public NodeAssertionArgumentElements getNodeAssertionArgumentAccess() {
+                return pNodeAssertionArgument;
+        }
+        
+        public ParserRule getNodeAssertionArgumentRule() {
+                return getNodeAssertionArgumentAccess().getRule();
+        }
+        
+        //ConstantAssertionArgument:
+        //    constant=Constant;
+        public ConstantAssertionArgumentElements getConstantAssertionArgumentAccess() {
+                return pConstantAssertionArgument;
+        }
+        
+        public ParserRule getConstantAssertionArgumentRule() {
+                return getConstantAssertionArgumentAccess().getRule();
+        }
+        
         //enum LogicValue:
         //    TRUE="true" | FALSE="false" | UNKNOWN="unknown";
         public LogicValueElements getLogicValueAccess() {
@@ -1551,6 +1915,56 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 return getShortLogicValueAccess().getRule();
         }
         
+        //NodeValueAssertion:
+        //    node=[Node|QualifiedName] ":" value=Constant ".";
+        public NodeValueAssertionElements getNodeValueAssertionAccess() {
+                return pNodeValueAssertion;
+        }
+        
+        public ParserRule getNodeValueAssertionRule() {
+                return getNodeValueAssertionAccess().getRule();
+        }
+        
+        //Constant:
+        //    IntConstant | RealConstant | StringConstant;
+        public ConstantElements getConstantAccess() {
+                return pConstant;
+        }
+        
+        public ParserRule getConstantRule() {
+                return getConstantAccess().getRule();
+        }
+        
+        //IntConstant:
+        //    intValue=Integer;
+        public IntConstantElements getIntConstantAccess() {
+                return pIntConstant;
+        }
+        
+        public ParserRule getIntConstantRule() {
+                return getIntConstantAccess().getRule();
+        }
+        
+        //RealConstant:
+        //    realValue=Real;
+        public RealConstantElements getRealConstantAccess() {
+                return pRealConstant;
+        }
+        
+        public ParserRule getRealConstantRule() {
+                return getRealConstantAccess().getRule();
+        }
+        
+        //StringConstant:
+        //    stringValue=STRING;
+        public StringConstantElements getStringConstantAccess() {
+                return pStringConstant;
+        }
+        
+        public ParserRule getStringConstantRule() {
+                return getStringConstantAccess().getRule();
+        }
+        
         //ScopeDeclaration:
         //    "scope" typeScopes+=TypeScope ("," typeScopes+=TypeScope)* ".";
         public ScopeDeclarationElements getScopeDeclarationAccess() {
@@ -1643,7 +2057,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 return getQuotedOrUnquotedIdAccess().getRule();
         }
         
-        //QualifiedName:
+        //QualifiedName hidden():
         //    QUOTED_ID | Identifier ("::" Identifier)* ("::" QUOTED_ID)?;
         public QualifiedNameElements getQualifiedNameAccess() {
                 return pQualifiedName;
@@ -1654,7 +2068,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         }
         
         //Identifier:
-        //    ID | "true" | "false";
+        //    ID | "true" | "false" | "e" | "E";
         public IdentifierElements getIdentifierAccess() {
                 return pIdentifier;
         }
@@ -1663,6 +2077,33 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 return getIdentifierAccess().getRule();
         }
         
+        //Integer returns ecore::EInt hidden():
+        //    "-"? INT;
+        public IntegerElements getIntegerAccess() {
+                return pInteger;
+        }
+        
+        public ParserRule getIntegerRule() {
+                return getIntegerAccess().getRule();
+        }
+        
+        //Real returns ecore::EDouble hidden():
+        //    "-"? INT ("." INT | ("." INT)? ("e" | "E") ("-" | "+")? INT);
+        public RealElements getRealAccess() {
+                return pReal;
+        }
+        
+        public ParserRule getRealRule() {
+                return getRealAccess().getRule();
+        }
+        
+        //@Override
+        //terminal ID:
+        //    ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
+        public TerminalRule getIDRule() {
+                return tID;
+        }
+        
         //@Override
         //terminal STRING:
         //    '"' ('\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\' | '"'))* '"';
@@ -1678,16 +2119,11 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         
         //@Override
         //terminal SL_COMMENT:
-        //    ('%' | '//') !('\n'|'\r')* ('\r'? '\n')?;
+        //    ('%' | '//') !('\n' | '\r')* ('\r'? '\n')?;
         public TerminalRule getSL_COMMENTRule() {
                 return tSL_COMMENT;
         }
         
-        //terminal ID: '^'?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
-        public TerminalRule getIDRule() {
-                return gaTerminals.getIDRule();
-        }
-        
         //terminal INT returns ecore::EInt: ('0'..'9')+;
         public TerminalRule getINTRule() {
                 return gaTerminals.getINTRule();