60 files changed, 8786 insertions, 5579 deletions

diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/.classpath b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/.classpath
index 94600478..b0c652b5 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/.classpath
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-        <classpathentry kind="src" output="bin/main" path="src/main/resources">
+        <classpathentry kind="src" output="bin/main" path="src/main/java">
                 <attributes>
                         <attribute name="gradle_scope" value="main"/>
                         <attribute name="gradle_used_by_scope" value="main,test"/>
@@ -18,7 +18,7 @@
                         <attribute name="gradle_used_by_scope" value="main,test"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="src" output="bin/main" path="src/main/java">
+        <classpathentry kind="src" output="bin/main" path="src/main/resources">
                 <attributes>
                         <attribute name="gradle_scope" value="main"/>
                         <attribute name="gradle_used_by_scope" value="main,test"/>
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7adc0fb9..00000000
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,10 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/java/org/eclipse/viatra/solver/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/java/org/eclipse/viatra/solver/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
index f6a29457..2f69e946 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/java/org/eclipse/viatra/solver/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/java/org/eclipse/viatra/solver/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
@@ -7,6 +7,7 @@ import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.viatra.solver.language.ProblemUtil;
 import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration;
 import org.eclipse.viatra.solver.language.model.problem.Node;
 import org.eclipse.viatra.solver.language.model.problem.Parameter;
@@ -22,6 +23,7 @@ import org.eclipse.xtext.service.OperationCanceledManager;
 import org.eclipse.xtext.util.CancelIndicator;
 import org.eclipse.xtext.util.SimpleAttributeResolver;
 
+import com.google.common.collect.ImmutableList;
 import com.google.inject.Inject;
 
 public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighlightingCalculator {
@@ -33,8 +35,11 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
         private static final String PREDICATE_CLASS = "problem-predicate";
         private static final String ERROR_CLASS = "problem-error";
         private static final String NODE_CLASS = "problem-node";
+        private static final String ENUM_NODE_CLASS = "problem-enum-node";
+        private static final String NEW_NODE_CLASS = "problem-new-node";
         private static final String PARAMETER_CLASS = "problem-parameter";
         private static final String VARIABLE_CLASS = "problem-variable";
+        private static final String SINGLETON_VARIABLE_CLASS = "problem-singleton-variable";
 
         @Inject
         private OperationCanceledManager operationCanceledManager;
@@ -49,8 +54,8 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
         
         protected void highlightName(EObject object, IHighlightedPositionAcceptor acceptor,
                         CancelIndicator cancelIndicator) {
-                String highlightClass = getHighlightClass(object);
-                if (highlightClass != null) {
+                String[] highlightClass = getHighlightClass(object);
+                if (highlightClass.length > 0) {
                         EAttribute nameAttribute = SimpleAttributeResolver.NAME_RESOLVER.getAttribute(object);
                         if (nameAttribute != null) {
                                 highlightFeature(acceptor, object, nameAttribute, highlightClass);
@@ -65,72 +70,84 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
                                 continue;
                         }
                         operationCanceledManager.checkCanceled(cancelIndicator);
-                        Object value = object.eGet(reference);
-                        if (value instanceof EList) {
+                        if (reference.isMany()) {
                                 @SuppressWarnings("unchecked")
-                                EList<? extends EObject> values = (EList<? extends EObject>) value;
+                                EList<? extends EObject> values = (EList<? extends EObject>) object.eGet(reference);
                                 List<INode> nodes = NodeModelUtils.findNodesForFeature(object, reference);
                                 int size = Math.min(values.size(), nodes.size());
                                 for (int i = 0; i < size; i++) {
                                         EObject valueInList = values.get(i);
                                         INode node = nodes.get(i);
-                                        String highlightClass = getHighlightClass(valueInList);
-                                        if (highlightClass != null) {
+                                        String[] highlightClass = getHighlightClass(valueInList);
+                                        if (highlightClass.length > 0) {
                                                 highlightNode(acceptor, node, highlightClass);
                                         }
                                 }
-                        } else if (value instanceof EObject) {
-                                EObject valueObj = (EObject) value;
-                                String highlightClass = getHighlightClass(valueObj);
-                                if (highlightClass != null) {
+                        } else {
+                                EObject valueObj = (EObject) object.eGet(reference);
+                                String[] highlightClass = getHighlightClass(valueObj);
+                                if (highlightClass.length > 0) {
                                         highlightFeature(acceptor, object, reference, highlightClass);
                                 }
                         }
                 }
         }
 
-        protected String getHighlightClass(EObject eObject) {
+        protected String[] getHighlightClass(EObject eObject) {
                 if (isBuiltIn(eObject)) {
-                        return BUILTIN_CLASS;
+                        return new String[] { BUILTIN_CLASS };
                 }
+                ImmutableList.Builder<String> classesBuilder = ImmutableList.builder();
                 if (eObject instanceof ClassDeclaration) {
+                        classesBuilder.add(CLASS_CLASS);
                         ClassDeclaration classDeclaration = (ClassDeclaration) eObject;
                         if (classDeclaration.isAbstract()) {
-                                return ABSTRACT_CLASS;
+                                classesBuilder.add(ABSTRACT_CLASS);
                         }
-                        return CLASS_CLASS;
                 }
                 if (eObject instanceof ReferenceDeclaration) {
+                        classesBuilder.add(REFERENCE_CLASS);
                         ReferenceDeclaration referenceDeclaration = (ReferenceDeclaration) eObject;
                         if (referenceDeclaration.isContainment()) {
-                                return CONTAINMENT_CLASS;
+                                classesBuilder.add(CONTAINMENT_CLASS);
                         }
-                        return REFERENCE_CLASS;
                 }
                 if (eObject instanceof PredicateDefinition) {
+                        classesBuilder.add(PREDICATE_CLASS);
                         PredicateDefinition predicateDefinition = (PredicateDefinition) eObject;
                         if (predicateDefinition.isError()) {
-                                return ERROR_CLASS;
+                                classesBuilder.add(ERROR_CLASS);
                         }
-                        return PREDICATE_CLASS;
                 }
                 if (eObject instanceof Node) {
-                        return NODE_CLASS;
+                        classesBuilder.add(NODE_CLASS);
+                        Node node = (Node) eObject;
+                        if (ProblemUtil.isEnumNode(node)) {
+                                classesBuilder.add(ENUM_NODE_CLASS);
+                        }
+                        if (ProblemUtil.isNewNode(node)) {
+                                classesBuilder.add(NEW_NODE_CLASS);
+                        }
                 }
                 if (eObject instanceof Parameter) {
-                        return PARAMETER_CLASS;
+                        classesBuilder.add(PARAMETER_CLASS);
                 }
                 if (eObject instanceof Variable) {
-                        return VARIABLE_CLASS;
+                        classesBuilder.add(VARIABLE_CLASS);
+                        Variable variable = (Variable) eObject;
+                        if (ProblemUtil.isSingletonVariable(variable)) {
+                                classesBuilder.add(SINGLETON_VARIABLE_CLASS);
+                        }
                 }
-                return null;
+                List<String> classes = classesBuilder.build();
+                return classes.toArray(new String[0]);
         }
 
         protected boolean isBuiltIn(EObject eObject) {
                 if (eObject != null) {
                         Resource eResource = eObject.eResource();
                         if (eResource != null) {
-                                return ProblemGlobalScopeProvider.LIBRARY_URI.equals(eResource.getURI());
+                                return ProblemGlobalScopeProvider.BULTIN_LIBRARY_URI.equals(eResource.getURI());
                         }
                 }
                 return false;
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/ProblemParser.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/ProblemParser.java
index 78416e64..2adb1a82 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/ProblemParser.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/ProblemParser.java
@@ -32,25 +32,28 @@ public class ProblemParser extends AbstractContentAssistParser {
                 
                 private static void init(ImmutableMap.Builder<AbstractElement, String> builder, ProblemGrammarAccess grammarAccess) {
                         builder.put(grammarAccess.getStatementAccess().getAlternatives(), "rule__Statement__Alternatives");
-                        builder.put(grammarAccess.getClassDeclarationAccess().getAlternatives_3(), "rule__ClassDeclaration__Alternatives_3");
-                        builder.put(grammarAccess.getClassDeclarationAccess().getAlternatives_3_0_1(), "rule__ClassDeclaration__Alternatives_3_0_1");
+                        builder.put(grammarAccess.getClassDeclarationAccess().getAlternatives_4(), "rule__ClassDeclaration__Alternatives_4");
                         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.getAssertionAccess().getAlternatives_0(), "rule__Assertion__Alternatives_0");
                         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");
                         builder.put(grammarAccess.getUpperBoundAccess().getAlternatives(), "rule__UpperBound__Alternatives");
+                        builder.put(grammarAccess.getQualifiedNameAccess().getAlternatives(), "rule__QualifiedName__Alternatives");
                         builder.put(grammarAccess.getLogicValueAccess().getAlternatives(), "rule__LogicValue__Alternatives");
                         builder.put(grammarAccess.getShortLogicValueAccess().getAlternatives(), "rule__ShortLogicValue__Alternatives");
+                        builder.put(grammarAccess.getProblemAccess().getGroup(), "rule__Problem__Group__0");
+                        builder.put(grammarAccess.getProblemAccess().getGroup_0(), "rule__Problem__Group_0__0");
                         builder.put(grammarAccess.getClassDeclarationAccess().getGroup(), "rule__ClassDeclaration__Group__0");
-                        builder.put(grammarAccess.getClassDeclarationAccess().getGroup_3_0(), "rule__ClassDeclaration__Group_3_0__0");
-                        builder.put(grammarAccess.getClassDeclarationAccess().getGroup_3_0_1_1(), "rule__ClassDeclaration__Group_3_0_1_1__0");
-                        builder.put(grammarAccess.getClassDeclarationAccess().getGroup_3_0_1_1_1(), "rule__ClassDeclaration__Group_3_0_1_1_1__0");
-                        builder.put(grammarAccess.getClassDeclarationAccess().getGroup_3_0_1_1_1_1(), "rule__ClassDeclaration__Group_3_0_1_1_1_1__0");
-                        builder.put(grammarAccess.getClassDeclarationAccess().getGroup_4(), "rule__ClassDeclaration__Group_4__0");
+                        builder.put(grammarAccess.getClassDeclarationAccess().getGroup_3(), "rule__ClassDeclaration__Group_3__0");
+                        builder.put(grammarAccess.getClassDeclarationAccess().getGroup_3_2(), "rule__ClassDeclaration__Group_3_2__0");
+                        builder.put(grammarAccess.getClassDeclarationAccess().getGroup_4_0(), "rule__ClassDeclaration__Group_4_0__0");
+                        builder.put(grammarAccess.getClassDeclarationAccess().getGroup_4_0_1(), "rule__ClassDeclaration__Group_4_0_1__0");
                         builder.put(grammarAccess.getReferenceDeclarationAccess().getGroup(), "rule__ReferenceDeclaration__Group__0");
-                        builder.put(grammarAccess.getReferenceDeclarationAccess().getGroup_6(), "rule__ReferenceDeclaration__Group_6__0");
+                        builder.put(grammarAccess.getReferenceDeclarationAccess().getGroup_2(), "rule__ReferenceDeclaration__Group_2__0");
+                        builder.put(grammarAccess.getReferenceDeclarationAccess().getGroup_4(), "rule__ReferenceDeclaration__Group_4__0");
                         builder.put(grammarAccess.getPredicateDefinitionAccess().getGroup(), "rule__PredicateDefinition__Group__0");
                         builder.put(grammarAccess.getPredicateDefinitionAccess().getGroup_0_0(), "rule__PredicateDefinition__Group_0_0__0");
                         builder.put(grammarAccess.getPredicateDefinitionAccess().getGroup_3(), "rule__PredicateDefinition__Group_3__0");
@@ -75,21 +78,21 @@ public class ProblemParser extends AbstractContentAssistParser {
                         builder.put(grammarAccess.getScopeDeclarationAccess().getGroup_2(), "rule__ScopeDeclaration__Group_2__0");
                         builder.put(grammarAccess.getTypeScopeAccess().getGroup(), "rule__TypeScope__Group__0");
                         builder.put(grammarAccess.getRangeMultiplicityAccess().getGroup(), "rule__RangeMultiplicity__Group__0");
-                        builder.put(grammarAccess.getQualifiedNameAccess().getGroup(), "rule__QualifiedName__Group__0");
                         builder.put(grammarAccess.getQualifiedNameAccess().getGroup_1(), "rule__QualifiedName__Group_1__0");
-                        builder.put(grammarAccess.getProblemAccess().getStatementsAssignment(), "rule__Problem__StatementsAssignment");
+                        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.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");
                         builder.put(grammarAccess.getClassDeclarationAccess().getNameAssignment_2(), "rule__ClassDeclaration__NameAssignment_2");
-                        builder.put(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_0_1_0(), "rule__ClassDeclaration__SuperTypesAssignment_3_0_1_0");
-                        builder.put(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_0_1_1_1_0(), "rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_0");
-                        builder.put(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_0_1_1_1_1_1(), "rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_1_1");
-                        builder.put(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsAssignment_3_1(), "rule__ClassDeclaration__ReferenceDeclarationsAssignment_3_1");
-                        builder.put(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsAssignment_4_1(), "rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_1");
+                        builder.put(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_1(), "rule__ClassDeclaration__SuperTypesAssignment_3_1");
+                        builder.put(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_2_1(), "rule__ClassDeclaration__SuperTypesAssignment_3_2_1");
+                        builder.put(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsAssignment_4_0_1_0(), "rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0");
                         builder.put(grammarAccess.getReferenceDeclarationAccess().getContainmentAssignment_0_0(), "rule__ReferenceDeclaration__ContainmentAssignment_0_0");
                         builder.put(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeAssignment_1(), "rule__ReferenceDeclaration__ReferenceTypeAssignment_1");
-                        builder.put(grammarAccess.getReferenceDeclarationAccess().getMultiplicityAssignment_3(), "rule__ReferenceDeclaration__MultiplicityAssignment_3");
-                        builder.put(grammarAccess.getReferenceDeclarationAccess().getNameAssignment_5(), "rule__ReferenceDeclaration__NameAssignment_5");
-                        builder.put(grammarAccess.getReferenceDeclarationAccess().getOppositeAssignment_6_1(), "rule__ReferenceDeclaration__OppositeAssignment_6_1");
+                        builder.put(grammarAccess.getReferenceDeclarationAccess().getMultiplicityAssignment_2_1(), "rule__ReferenceDeclaration__MultiplicityAssignment_2_1");
+                        builder.put(grammarAccess.getReferenceDeclarationAccess().getNameAssignment_3(), "rule__ReferenceDeclaration__NameAssignment_3");
+                        builder.put(grammarAccess.getReferenceDeclarationAccess().getOppositeAssignment_4_1(), "rule__ReferenceDeclaration__OppositeAssignment_4_1");
                         builder.put(grammarAccess.getPredicateDefinitionAccess().getErrorAssignment_0_0_0(), "rule__PredicateDefinition__ErrorAssignment_0_0_0");
                         builder.put(grammarAccess.getPredicateDefinitionAccess().getNameAssignment_1(), "rule__PredicateDefinition__NameAssignment_1");
                         builder.put(grammarAccess.getPredicateDefinitionAccess().getParametersAssignment_3_0(), "rule__PredicateDefinition__ParametersAssignment_3_0");
@@ -105,6 +108,7 @@ public class ProblemParser extends AbstractContentAssistParser {
                         builder.put(grammarAccess.getAtomAccess().getTransitiveClosureAssignment_1(), "rule__Atom__TransitiveClosureAssignment_1");
                         builder.put(grammarAccess.getAtomAccess().getArgumentsAssignment_3_0(), "rule__Atom__ArgumentsAssignment_3_0");
                         builder.put(grammarAccess.getAtomAccess().getArgumentsAssignment_3_1_1(), "rule__Atom__ArgumentsAssignment_3_1_1");
+                        builder.put(grammarAccess.getArgumentAccess().getVariableAssignment(), "rule__Argument__VariableAssignment");
                         builder.put(grammarAccess.getAssertionAccess().getRelationAssignment_0_0_0(), "rule__Assertion__RelationAssignment_0_0_0");
                         builder.put(grammarAccess.getAssertionAccess().getArgumentsAssignment_0_0_2_0(), "rule__Assertion__ArgumentsAssignment_0_0_2_0");
                         builder.put(grammarAccess.getAssertionAccess().getArgumentsAssignment_0_0_2_1_1(), "rule__Assertion__ArgumentsAssignment_0_0_2_1_1");
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.g b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.g
index 7dd99f99..01a6fd6e 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.g
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.g
@@ -65,9 +65,9 @@ ruleProblem
         }
         :
         (
-                { before(grammarAccess.getProblemAccess().getStatementsAssignment()); }
-                (rule__Problem__StatementsAssignment)*
-                { after(grammarAccess.getProblemAccess().getStatementsAssignment()); }
+                { before(grammarAccess.getProblemAccess().getGroup()); }
+                (rule__Problem__Group__0)
+                { after(grammarAccess.getProblemAccess().getGroup()); }
         )
 ;
 finally {
@@ -299,6 +299,31 @@ finally {
         restoreStackSize(stackSize);
 }
 
+// Entry rule entryRuleArgument
+entryRuleArgument
+:
+{ before(grammarAccess.getArgumentRule()); }
+         ruleArgument
+{ after(grammarAccess.getArgumentRule()); } 
+         EOF 
+;
+
+// Rule Argument
+ruleArgument 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getArgumentAccess().getVariableAssignment()); }
+                (rule__Argument__VariableAssignment)
+                { after(grammarAccess.getArgumentAccess().getVariableAssignment()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
 // Entry rule entryRuleAssertion
 entryRuleAssertion
 :
@@ -399,6 +424,56 @@ finally {
         restoreStackSize(stackSize);
 }
 
+// Entry rule entryRuleDefiniteMultiplicity
+entryRuleDefiniteMultiplicity
+:
+{ before(grammarAccess.getDefiniteMultiplicityRule()); }
+         ruleDefiniteMultiplicity
+{ after(grammarAccess.getDefiniteMultiplicityRule()); } 
+         EOF 
+;
+
+// Rule DefiniteMultiplicity
+ruleDefiniteMultiplicity 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getDefiniteMultiplicityAccess().getAlternatives()); }
+                (rule__DefiniteMultiplicity__Alternatives)
+                { after(grammarAccess.getDefiniteMultiplicityAccess().getAlternatives()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+// Entry rule entryRuleUnboundedMultiplicity
+entryRuleUnboundedMultiplicity
+:
+{ before(grammarAccess.getUnboundedMultiplicityRule()); }
+         ruleUnboundedMultiplicity
+{ after(grammarAccess.getUnboundedMultiplicityRule()); } 
+         EOF 
+;
+
+// Rule UnboundedMultiplicity
+ruleUnboundedMultiplicity 
+        @init {
+                int stackSize = keepStackSize();
+        }
+        :
+        (
+                { before(grammarAccess.getUnboundedMultiplicityAccess().getUnboundedMultiplicityAction()); }
+                ()
+                { after(grammarAccess.getUnboundedMultiplicityAccess().getUnboundedMultiplicityAction()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
 // Entry rule entryRuleRangeMultiplicity
 entryRuleRangeMultiplicity
 :
@@ -490,9 +565,9 @@ ruleQualifiedName
         }
         :
         (
-                { before(grammarAccess.getQualifiedNameAccess().getGroup()); }
-                (rule__QualifiedName__Group__0)
-                { after(grammarAccess.getQualifiedNameAccess().getGroup()); }
+                { before(grammarAccess.getQualifiedNameAccess().getAlternatives()); }
+                (rule__QualifiedName__Alternatives)
+                { after(grammarAccess.getQualifiedNameAccess().getAlternatives()); }
         )
 ;
 finally {
@@ -564,42 +639,21 @@ finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Alternatives_3
+rule__ClassDeclaration__Alternatives_4
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getClassDeclarationAccess().getGroup_3_0()); }
-                (rule__ClassDeclaration__Group_3_0__0)
-                { after(grammarAccess.getClassDeclarationAccess().getGroup_3_0()); }
+                { before(grammarAccess.getClassDeclarationAccess().getGroup_4_0()); }
+                (rule__ClassDeclaration__Group_4_0__0)
+                { after(grammarAccess.getClassDeclarationAccess().getGroup_4_0()); }
         )
         |
         (
-                { before(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsAssignment_3_1()); }
-                (rule__ClassDeclaration__ReferenceDeclarationsAssignment_3_1)
-                { after(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsAssignment_3_1()); }
-        )
-;
-finally {
-        restoreStackSize(stackSize);
-}
-
-rule__ClassDeclaration__Alternatives_3_0_1
-        @init {
-                int stackSize = keepStackSize();
-        }
-:
-        (
-                { before(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_0_1_0()); }
-                (rule__ClassDeclaration__SuperTypesAssignment_3_0_1_0)
-                { after(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_0_1_0()); }
-        )
-        |
-        (
-                { before(grammarAccess.getClassDeclarationAccess().getGroup_3_0_1_1()); }
-                (rule__ClassDeclaration__Group_3_0_1_1__0)
-                { after(grammarAccess.getClassDeclarationAccess().getGroup_3_0_1_1()); }
+                { before(grammarAccess.getClassDeclarationAccess().getFullStopKeyword_4_1()); }
+                '.'
+                { after(grammarAccess.getClassDeclarationAccess().getFullStopKeyword_4_1()); }
         )
 ;
 finally {
@@ -717,15 +771,36 @@ rule__Multiplicity__Alternatives
         }
 :
         (
-                { before(grammarAccess.getMultiplicityAccess().getRangeMultiplicityParserRuleCall_0()); }
+                { before(grammarAccess.getMultiplicityAccess().getUnboundedMultiplicityParserRuleCall_0()); }
+                ruleUnboundedMultiplicity
+                { after(grammarAccess.getMultiplicityAccess().getUnboundedMultiplicityParserRuleCall_0()); }
+        )
+        |
+        (
+                { before(grammarAccess.getMultiplicityAccess().getDefiniteMultiplicityParserRuleCall_1()); }
+                ruleDefiniteMultiplicity
+                { after(grammarAccess.getMultiplicityAccess().getDefiniteMultiplicityParserRuleCall_1()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__DefiniteMultiplicity__Alternatives
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getDefiniteMultiplicityAccess().getRangeMultiplicityParserRuleCall_0()); }
                 ruleRangeMultiplicity
-                { after(grammarAccess.getMultiplicityAccess().getRangeMultiplicityParserRuleCall_0()); }
+                { after(grammarAccess.getDefiniteMultiplicityAccess().getRangeMultiplicityParserRuleCall_0()); }
         )
         |
         (
-                { before(grammarAccess.getMultiplicityAccess().getExactMultiplicityParserRuleCall_1()); }
+                { before(grammarAccess.getDefiniteMultiplicityAccess().getExactMultiplicityParserRuleCall_1()); }
                 ruleExactMultiplicity
-                { after(grammarAccess.getMultiplicityAccess().getExactMultiplicityParserRuleCall_1()); }
+                { after(grammarAccess.getDefiniteMultiplicityAccess().getExactMultiplicityParserRuleCall_1()); }
         )
 ;
 finally {
@@ -753,6 +828,27 @@ finally {
         restoreStackSize(stackSize);
 }
 
+rule__QualifiedName__Alternatives
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getQualifiedNameAccess().getQUOTED_IDTerminalRuleCall_0()); }
+                RULE_QUOTED_ID
+                { after(grammarAccess.getQualifiedNameAccess().getQUOTED_IDTerminalRuleCall_0()); }
+        )
+        |
+        (
+                { before(grammarAccess.getQualifiedNameAccess().getGroup_1()); }
+                (rule__QualifiedName__Group_1__0)
+                { after(grammarAccess.getQualifiedNameAccess().getGroup_1()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
 rule__LogicValue__Alternatives
         @init {
                 int stackSize = keepStackSize();
@@ -801,296 +897,350 @@ finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group__0
+rule__Problem__Group__0
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ClassDeclaration__Group__0__Impl
-        rule__ClassDeclaration__Group__1
+        rule__Problem__Group__0__Impl
+        rule__Problem__Group__1
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group__0__Impl
+rule__Problem__Group__0__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getClassDeclarationAccess().getAbstractAssignment_0()); }
-        (rule__ClassDeclaration__AbstractAssignment_0)?
-        { after(grammarAccess.getClassDeclarationAccess().getAbstractAssignment_0()); }
+        { before(grammarAccess.getProblemAccess().getGroup_0()); }
+        (rule__Problem__Group_0__0)?
+        { after(grammarAccess.getProblemAccess().getGroup_0()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group__1
+rule__Problem__Group__1
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ClassDeclaration__Group__1__Impl
-        rule__ClassDeclaration__Group__2
+        rule__Problem__Group__1__Impl
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group__1__Impl
+rule__Problem__Group__1__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getClassDeclarationAccess().getClassKeyword_1()); }
-        'class'
-        { after(grammarAccess.getClassDeclarationAccess().getClassKeyword_1()); }
+        { before(grammarAccess.getProblemAccess().getStatementsAssignment_1()); }
+        (rule__Problem__StatementsAssignment_1)*
+        { after(grammarAccess.getProblemAccess().getStatementsAssignment_1()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group__2
+
+rule__Problem__Group_0__0
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ClassDeclaration__Group__2__Impl
-        rule__ClassDeclaration__Group__3
+        rule__Problem__Group_0__0__Impl
+        rule__Problem__Group_0__1
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group__2__Impl
+rule__Problem__Group_0__0__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getClassDeclarationAccess().getNameAssignment_2()); }
-        (rule__ClassDeclaration__NameAssignment_2)
-        { after(grammarAccess.getClassDeclarationAccess().getNameAssignment_2()); }
+        { before(grammarAccess.getProblemAccess().getProblemKeyword_0_0()); }
+        'problem'
+        { after(grammarAccess.getProblemAccess().getProblemKeyword_0_0()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group__3
+rule__Problem__Group_0__1
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ClassDeclaration__Group__3__Impl
-        rule__ClassDeclaration__Group__4
+        rule__Problem__Group_0__1__Impl
+        rule__Problem__Group_0__2
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group__3__Impl
+rule__Problem__Group_0__1__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getClassDeclarationAccess().getAlternatives_3()); }
-        (rule__ClassDeclaration__Alternatives_3)?
-        { after(grammarAccess.getClassDeclarationAccess().getAlternatives_3()); }
+        { before(grammarAccess.getProblemAccess().getNameAssignment_0_1()); }
+        (rule__Problem__NameAssignment_0_1)
+        { after(grammarAccess.getProblemAccess().getNameAssignment_0_1()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group__4
+rule__Problem__Group_0__2
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ClassDeclaration__Group__4__Impl
-        rule__ClassDeclaration__Group__5
+        rule__Problem__Group_0__2__Impl
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group__4__Impl
+rule__Problem__Group_0__2__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getClassDeclarationAccess().getGroup_4()); }
-        (rule__ClassDeclaration__Group_4__0)*
-        { after(grammarAccess.getClassDeclarationAccess().getGroup_4()); }
+        { before(grammarAccess.getProblemAccess().getFullStopKeyword_0_2()); }
+        '.'
+        { after(grammarAccess.getProblemAccess().getFullStopKeyword_0_2()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group__5
+
+rule__ClassDeclaration__Group__0
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ClassDeclaration__Group__5__Impl
+        rule__ClassDeclaration__Group__0__Impl
+        rule__ClassDeclaration__Group__1
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group__5__Impl
+rule__ClassDeclaration__Group__0__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getClassDeclarationAccess().getFullStopKeyword_5()); }
-        '.'
-        { after(grammarAccess.getClassDeclarationAccess().getFullStopKeyword_5()); }
+        { before(grammarAccess.getClassDeclarationAccess().getAbstractAssignment_0()); }
+        (rule__ClassDeclaration__AbstractAssignment_0)?
+        { after(grammarAccess.getClassDeclarationAccess().getAbstractAssignment_0()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
+rule__ClassDeclaration__Group__1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__ClassDeclaration__Group__1__Impl
+        rule__ClassDeclaration__Group__2
+;
+finally {
+        restoreStackSize(stackSize);
+}
 
-rule__ClassDeclaration__Group_3_0__0
+rule__ClassDeclaration__Group__1__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ClassDeclaration__Group_3_0__0__Impl
-        rule__ClassDeclaration__Group_3_0__1
+(
+        { before(grammarAccess.getClassDeclarationAccess().getClassKeyword_1()); }
+        'class'
+        { after(grammarAccess.getClassDeclarationAccess().getClassKeyword_1()); }
+)
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group_3_0__0__Impl
+rule__ClassDeclaration__Group__2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__ClassDeclaration__Group__2__Impl
+        rule__ClassDeclaration__Group__3
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__ClassDeclaration__Group__2__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0_0()); }
-        'extends'
-        { after(grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0_0()); }
+        { before(grammarAccess.getClassDeclarationAccess().getNameAssignment_2()); }
+        (rule__ClassDeclaration__NameAssignment_2)
+        { after(grammarAccess.getClassDeclarationAccess().getNameAssignment_2()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group_3_0__1
+rule__ClassDeclaration__Group__3
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ClassDeclaration__Group_3_0__1__Impl
+        rule__ClassDeclaration__Group__3__Impl
+        rule__ClassDeclaration__Group__4
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group_3_0__1__Impl
+rule__ClassDeclaration__Group__3__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getClassDeclarationAccess().getAlternatives_3_0_1()); }
-        (rule__ClassDeclaration__Alternatives_3_0_1)
-        { after(grammarAccess.getClassDeclarationAccess().getAlternatives_3_0_1()); }
+        { before(grammarAccess.getClassDeclarationAccess().getGroup_3()); }
+        (rule__ClassDeclaration__Group_3__0)?
+        { after(grammarAccess.getClassDeclarationAccess().getGroup_3()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
+rule__ClassDeclaration__Group__4
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__ClassDeclaration__Group__4__Impl
+;
+finally {
+        restoreStackSize(stackSize);
+}
 
-rule__ClassDeclaration__Group_3_0_1_1__0
+rule__ClassDeclaration__Group__4__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ClassDeclaration__Group_3_0_1_1__0__Impl
-        rule__ClassDeclaration__Group_3_0_1_1__1
+(
+        { before(grammarAccess.getClassDeclarationAccess().getAlternatives_4()); }
+        (rule__ClassDeclaration__Alternatives_4)
+        { after(grammarAccess.getClassDeclarationAccess().getAlternatives_4()); }
+)
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group_3_0_1_1__0__Impl
+
+rule__ClassDeclaration__Group_3__0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__ClassDeclaration__Group_3__0__Impl
+        rule__ClassDeclaration__Group_3__1
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__ClassDeclaration__Group_3__0__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getClassDeclarationAccess().getLeftSquareBracketKeyword_3_0_1_1_0()); }
-        '['
-        { after(grammarAccess.getClassDeclarationAccess().getLeftSquareBracketKeyword_3_0_1_1_0()); }
+        { before(grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0()); }
+        'extends'
+        { after(grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group_3_0_1_1__1
+rule__ClassDeclaration__Group_3__1
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ClassDeclaration__Group_3_0_1_1__1__Impl
-        rule__ClassDeclaration__Group_3_0_1_1__2
+        rule__ClassDeclaration__Group_3__1__Impl
+        rule__ClassDeclaration__Group_3__2
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group_3_0_1_1__1__Impl
+rule__ClassDeclaration__Group_3__1__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getClassDeclarationAccess().getGroup_3_0_1_1_1()); }
-        (rule__ClassDeclaration__Group_3_0_1_1_1__0)?
-        { after(grammarAccess.getClassDeclarationAccess().getGroup_3_0_1_1_1()); }
+        { before(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_1()); }
+        (rule__ClassDeclaration__SuperTypesAssignment_3_1)
+        { after(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_1()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group_3_0_1_1__2
+rule__ClassDeclaration__Group_3__2
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ClassDeclaration__Group_3_0_1_1__2__Impl
+        rule__ClassDeclaration__Group_3__2__Impl
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group_3_0_1_1__2__Impl
+rule__ClassDeclaration__Group_3__2__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getClassDeclarationAccess().getRightSquareBracketKeyword_3_0_1_1_2()); }
-        ']'
-        { after(grammarAccess.getClassDeclarationAccess().getRightSquareBracketKeyword_3_0_1_1_2()); }
+        { before(grammarAccess.getClassDeclarationAccess().getGroup_3_2()); }
+        (rule__ClassDeclaration__Group_3_2__0)*
+        { after(grammarAccess.getClassDeclarationAccess().getGroup_3_2()); }
 )
 ;
 finally {
@@ -1098,53 +1248,53 @@ finally {
 }
 
 
-rule__ClassDeclaration__Group_3_0_1_1_1__0
+rule__ClassDeclaration__Group_3_2__0
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ClassDeclaration__Group_3_0_1_1_1__0__Impl
-        rule__ClassDeclaration__Group_3_0_1_1_1__1
+        rule__ClassDeclaration__Group_3_2__0__Impl
+        rule__ClassDeclaration__Group_3_2__1
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group_3_0_1_1_1__0__Impl
+rule__ClassDeclaration__Group_3_2__0__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_0_1_1_1_0()); }
-        (rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_0)
-        { after(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_0_1_1_1_0()); }
+        { before(grammarAccess.getClassDeclarationAccess().getCommaKeyword_3_2_0()); }
+        ','
+        { after(grammarAccess.getClassDeclarationAccess().getCommaKeyword_3_2_0()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group_3_0_1_1_1__1
+rule__ClassDeclaration__Group_3_2__1
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ClassDeclaration__Group_3_0_1_1_1__1__Impl
+        rule__ClassDeclaration__Group_3_2__1__Impl
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group_3_0_1_1_1__1__Impl
+rule__ClassDeclaration__Group_3_2__1__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getClassDeclarationAccess().getGroup_3_0_1_1_1_1()); }
-        (rule__ClassDeclaration__Group_3_0_1_1_1_1__0)*
-        { after(grammarAccess.getClassDeclarationAccess().getGroup_3_0_1_1_1_1()); }
+        { before(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_2_1()); }
+        (rule__ClassDeclaration__SuperTypesAssignment_3_2_1)
+        { after(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_2_1()); }
 )
 ;
 finally {
@@ -1152,53 +1302,80 @@ finally {
 }
 
 
-rule__ClassDeclaration__Group_3_0_1_1_1_1__0
+rule__ClassDeclaration__Group_4_0__0
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ClassDeclaration__Group_3_0_1_1_1_1__0__Impl
-        rule__ClassDeclaration__Group_3_0_1_1_1_1__1
+        rule__ClassDeclaration__Group_4_0__0__Impl
+        rule__ClassDeclaration__Group_4_0__1
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group_3_0_1_1_1_1__0__Impl
+rule__ClassDeclaration__Group_4_0__0__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getClassDeclarationAccess().getCommaKeyword_3_0_1_1_1_1_0()); }
-        ','
-        { after(grammarAccess.getClassDeclarationAccess().getCommaKeyword_3_0_1_1_1_1_0()); }
+        { before(grammarAccess.getClassDeclarationAccess().getLeftCurlyBracketKeyword_4_0_0()); }
+        '{'
+        { after(grammarAccess.getClassDeclarationAccess().getLeftCurlyBracketKeyword_4_0_0()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__ClassDeclaration__Group_4_0__1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__ClassDeclaration__Group_4_0__1__Impl
+        rule__ClassDeclaration__Group_4_0__2
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__ClassDeclaration__Group_4_0__1__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getClassDeclarationAccess().getGroup_4_0_1()); }
+        (rule__ClassDeclaration__Group_4_0_1__0)*
+        { after(grammarAccess.getClassDeclarationAccess().getGroup_4_0_1()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group_3_0_1_1_1_1__1
+rule__ClassDeclaration__Group_4_0__2
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ClassDeclaration__Group_3_0_1_1_1_1__1__Impl
+        rule__ClassDeclaration__Group_4_0__2__Impl
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group_3_0_1_1_1_1__1__Impl
+rule__ClassDeclaration__Group_4_0__2__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_0_1_1_1_1_1()); }
-        (rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_1_1)
-        { after(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_0_1_1_1_1_1()); }
+        { before(grammarAccess.getClassDeclarationAccess().getRightCurlyBracketKeyword_4_0_2()); }
+        '}'
+        { after(grammarAccess.getClassDeclarationAccess().getRightCurlyBracketKeyword_4_0_2()); }
 )
 ;
 finally {
@@ -1206,53 +1383,53 @@ finally {
 }
 
 
-rule__ClassDeclaration__Group_4__0
+rule__ClassDeclaration__Group_4_0_1__0
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ClassDeclaration__Group_4__0__Impl
-        rule__ClassDeclaration__Group_4__1
+        rule__ClassDeclaration__Group_4_0_1__0__Impl
+        rule__ClassDeclaration__Group_4_0_1__1
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group_4__0__Impl
+rule__ClassDeclaration__Group_4_0_1__0__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getClassDeclarationAccess().getCommaKeyword_4_0()); }
-        ','
-        { after(grammarAccess.getClassDeclarationAccess().getCommaKeyword_4_0()); }
+        { before(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsAssignment_4_0_1_0()); }
+        (rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0)
+        { after(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsAssignment_4_0_1_0()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group_4__1
+rule__ClassDeclaration__Group_4_0_1__1
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ClassDeclaration__Group_4__1__Impl
+        rule__ClassDeclaration__Group_4_0_1__1__Impl
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__Group_4__1__Impl
+rule__ClassDeclaration__Group_4_0_1__1__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsAssignment_4_1()); }
-        (rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_1)
-        { after(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsAssignment_4_1()); }
+        { before(grammarAccess.getClassDeclarationAccess().getSemicolonKeyword_4_0_1_1()); }
+        (';')?
+        { after(grammarAccess.getClassDeclarationAccess().getSemicolonKeyword_4_0_1_1()); }
 )
 ;
 finally {
@@ -1332,9 +1509,9 @@ rule__ReferenceDeclaration__Group__2__Impl
         }
 :
 (
-        { before(grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2()); }
-        '['
-        { after(grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2()); }
+        { before(grammarAccess.getReferenceDeclarationAccess().getGroup_2()); }
+        (rule__ReferenceDeclaration__Group_2__0)?
+        { after(grammarAccess.getReferenceDeclarationAccess().getGroup_2()); }
 )
 ;
 finally {
@@ -1359,9 +1536,9 @@ rule__ReferenceDeclaration__Group__3__Impl
         }
 :
 (
-        { before(grammarAccess.getReferenceDeclarationAccess().getMultiplicityAssignment_3()); }
-        (rule__ReferenceDeclaration__MultiplicityAssignment_3)
-        { after(grammarAccess.getReferenceDeclarationAccess().getMultiplicityAssignment_3()); }
+        { before(grammarAccess.getReferenceDeclarationAccess().getNameAssignment_3()); }
+        (rule__ReferenceDeclaration__NameAssignment_3)
+        { after(grammarAccess.getReferenceDeclarationAccess().getNameAssignment_3()); }
 )
 ;
 finally {
@@ -1374,7 +1551,6 @@ rule__ReferenceDeclaration__Group__4
         }
 :
         rule__ReferenceDeclaration__Group__4__Impl
-        rule__ReferenceDeclaration__Group__5
 ;
 finally {
         restoreStackSize(stackSize);
@@ -1386,116 +1562,144 @@ rule__ReferenceDeclaration__Group__4__Impl
         }
 :
 (
-        { before(grammarAccess.getReferenceDeclarationAccess().getRightSquareBracketKeyword_4()); }
-        ']'
-        { after(grammarAccess.getReferenceDeclarationAccess().getRightSquareBracketKeyword_4()); }
+        { before(grammarAccess.getReferenceDeclarationAccess().getGroup_4()); }
+        (rule__ReferenceDeclaration__Group_4__0)?
+        { after(grammarAccess.getReferenceDeclarationAccess().getGroup_4()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ReferenceDeclaration__Group__5
+
+rule__ReferenceDeclaration__Group_2__0
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ReferenceDeclaration__Group__5__Impl
-        rule__ReferenceDeclaration__Group__6
+        rule__ReferenceDeclaration__Group_2__0__Impl
+        rule__ReferenceDeclaration__Group_2__1
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ReferenceDeclaration__Group__5__Impl
+rule__ReferenceDeclaration__Group_2__0__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getReferenceDeclarationAccess().getNameAssignment_5()); }
-        (rule__ReferenceDeclaration__NameAssignment_5)
-        { after(grammarAccess.getReferenceDeclarationAccess().getNameAssignment_5()); }
+        { before(grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2_0()); }
+        '['
+        { after(grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2_0()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ReferenceDeclaration__Group__6
+rule__ReferenceDeclaration__Group_2__1
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ReferenceDeclaration__Group__6__Impl
+        rule__ReferenceDeclaration__Group_2__1__Impl
+        rule__ReferenceDeclaration__Group_2__2
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ReferenceDeclaration__Group__6__Impl
+rule__ReferenceDeclaration__Group_2__1__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getReferenceDeclarationAccess().getGroup_6()); }
-        (rule__ReferenceDeclaration__Group_6__0)?
-        { after(grammarAccess.getReferenceDeclarationAccess().getGroup_6()); }
+        { before(grammarAccess.getReferenceDeclarationAccess().getMultiplicityAssignment_2_1()); }
+        (rule__ReferenceDeclaration__MultiplicityAssignment_2_1)
+        { after(grammarAccess.getReferenceDeclarationAccess().getMultiplicityAssignment_2_1()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
+rule__ReferenceDeclaration__Group_2__2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__ReferenceDeclaration__Group_2__2__Impl
+;
+finally {
+        restoreStackSize(stackSize);
+}
 
-rule__ReferenceDeclaration__Group_6__0
+rule__ReferenceDeclaration__Group_2__2__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ReferenceDeclaration__Group_6__0__Impl
-        rule__ReferenceDeclaration__Group_6__1
+(
+        { before(grammarAccess.getReferenceDeclarationAccess().getRightSquareBracketKeyword_2_2()); }
+        ']'
+        { after(grammarAccess.getReferenceDeclarationAccess().getRightSquareBracketKeyword_2_2()); }
+)
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ReferenceDeclaration__Group_6__0__Impl
+
+rule__ReferenceDeclaration__Group_4__0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__ReferenceDeclaration__Group_4__0__Impl
+        rule__ReferenceDeclaration__Group_4__1
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__ReferenceDeclaration__Group_4__0__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_6_0()); }
+        { before(grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_4_0()); }
         'opposite'
-        { after(grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_6_0()); }
+        { after(grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_4_0()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ReferenceDeclaration__Group_6__1
+rule__ReferenceDeclaration__Group_4__1
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__ReferenceDeclaration__Group_6__1__Impl
+        rule__ReferenceDeclaration__Group_4__1__Impl
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ReferenceDeclaration__Group_6__1__Impl
+rule__ReferenceDeclaration__Group_4__1__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getReferenceDeclarationAccess().getOppositeAssignment_6_1()); }
-        (rule__ReferenceDeclaration__OppositeAssignment_6_1)
-        { after(grammarAccess.getReferenceDeclarationAccess().getOppositeAssignment_6_1()); }
+        { before(grammarAccess.getReferenceDeclarationAccess().getOppositeAssignment_4_1()); }
+        (rule__ReferenceDeclaration__OppositeAssignment_4_1)
+        { after(grammarAccess.getReferenceDeclarationAccess().getOppositeAssignment_4_1()); }
 )
 ;
 finally {
@@ -1872,9 +2076,9 @@ rule__PredicateDefinition__Group_5__0__Impl
         }
 :
 (
-        { before(grammarAccess.getPredicateDefinitionAccess().getColonEqualsSignKeyword_5_0()); }
-        ':='
-        { after(grammarAccess.getPredicateDefinitionAccess().getColonEqualsSignKeyword_5_0()); }
+        { before(grammarAccess.getPredicateDefinitionAccess().getColonHyphenMinusKeyword_5_0()); }
+        ':-'
+        { after(grammarAccess.getPredicateDefinitionAccess().getColonHyphenMinusKeyword_5_0()); }
 )
 ;
 finally {
@@ -3339,107 +3543,134 @@ finally {
 }
 
 
-rule__QualifiedName__Group__0
+rule__QualifiedName__Group_1__0
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__QualifiedName__Group__0__Impl
-        rule__QualifiedName__Group__1
+        rule__QualifiedName__Group_1__0__Impl
+        rule__QualifiedName__Group_1__1
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__QualifiedName__Group__0__Impl
+rule__QualifiedName__Group_1__0__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_0()); }
+        { before(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_0()); }
         RULE_ID
-        { after(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_0()); }
+        { after(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_0()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__QualifiedName__Group__1
+rule__QualifiedName__Group_1__1
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__QualifiedName__Group__1__Impl
+        rule__QualifiedName__Group_1__1__Impl
+        rule__QualifiedName__Group_1__2
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__QualifiedName__Group__1__Impl
+rule__QualifiedName__Group_1__1__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getQualifiedNameAccess().getGroup_1()); }
-        (rule__QualifiedName__Group_1__0)*
-        { after(grammarAccess.getQualifiedNameAccess().getGroup_1()); }
+        { before(grammarAccess.getQualifiedNameAccess().getGroup_1_1()); }
+        (rule__QualifiedName__Group_1_1__0)*
+        { after(grammarAccess.getQualifiedNameAccess().getGroup_1_1()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
+rule__QualifiedName__Group_1__2
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__QualifiedName__Group_1__2__Impl
+;
+finally {
+        restoreStackSize(stackSize);
+}
 
-rule__QualifiedName__Group_1__0
+rule__QualifiedName__Group_1__2__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__QualifiedName__Group_1__0__Impl
-        rule__QualifiedName__Group_1__1
+(
+        { before(grammarAccess.getQualifiedNameAccess().getGroup_1_2()); }
+        (rule__QualifiedName__Group_1_2__0)?
+        { after(grammarAccess.getQualifiedNameAccess().getGroup_1_2()); }
+)
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__QualifiedName__Group_1__0__Impl
+
+rule__QualifiedName__Group_1_1__0
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__QualifiedName__Group_1_1__0__Impl
+        rule__QualifiedName__Group_1_1__1
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__QualifiedName__Group_1_1__0__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1_0()); }
-        '::'
-        { after(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1_0()); }
+        { before(grammarAccess.getQualifiedNameAccess().getColonKeyword_1_1_0()); }
+        ':'
+        { after(grammarAccess.getQualifiedNameAccess().getColonKeyword_1_1_0()); }
 )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__QualifiedName__Group_1__1
+rule__QualifiedName__Group_1_1__1
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        rule__QualifiedName__Group_1__1__Impl
+        rule__QualifiedName__Group_1_1__1__Impl
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__QualifiedName__Group_1__1__Impl
+rule__QualifiedName__Group_1_1__1__Impl
         @init {
                 int stackSize = keepStackSize();
         }
 :
 (
-        { before(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1()); }
+        { before(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1_1()); }
         RULE_ID
-        { after(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1()); }
+        { after(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1_1()); }
 )
 ;
 finally {
@@ -3447,136 +3678,171 @@ finally {
 }
 
 
-rule__Problem__StatementsAssignment
+rule__QualifiedName__Group_1_2__0
         @init {
                 int stackSize = keepStackSize();
         }
 :
-        (
-                { before(grammarAccess.getProblemAccess().getStatementsStatementParserRuleCall_0()); }
-                ruleStatement
-                { after(grammarAccess.getProblemAccess().getStatementsStatementParserRuleCall_0()); }
-        )
+        rule__QualifiedName__Group_1_2__0__Impl
+        rule__QualifiedName__Group_1_2__1
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__AbstractAssignment_0
+rule__QualifiedName__Group_1_2__0__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getQualifiedNameAccess().getColonKeyword_1_2_0()); }
+        ':'
+        { after(grammarAccess.getQualifiedNameAccess().getColonKeyword_1_2_0()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__QualifiedName__Group_1_2__1
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        rule__QualifiedName__Group_1_2__1__Impl
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__QualifiedName__Group_1_2__1__Impl
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+(
+        { before(grammarAccess.getQualifiedNameAccess().getQUOTED_IDTerminalRuleCall_1_2_1()); }
+        RULE_QUOTED_ID
+        { after(grammarAccess.getQualifiedNameAccess().getQUOTED_IDTerminalRuleCall_1_2_1()); }
+)
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+
+rule__Problem__NameAssignment_0_1
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); }
-                (
-                        { before(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); }
-                        'abstract'
-                        { after(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); }
-                )
-                { after(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); }
+                { before(grammarAccess.getProblemAccess().getNameIDTerminalRuleCall_0_1_0()); }
+                RULE_ID
+                { after(grammarAccess.getProblemAccess().getNameIDTerminalRuleCall_0_1_0()); }
         )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__NameAssignment_2
+rule__Problem__StatementsAssignment_1
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getClassDeclarationAccess().getNameIDTerminalRuleCall_2_0()); }
-                RULE_ID
-                { after(grammarAccess.getClassDeclarationAccess().getNameIDTerminalRuleCall_2_0()); }
+                { before(grammarAccess.getProblemAccess().getStatementsStatementParserRuleCall_1_0()); }
+                ruleStatement
+                { after(grammarAccess.getProblemAccess().getStatementsStatementParserRuleCall_1_0()); }
         )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__SuperTypesAssignment_3_0_1_0
+rule__ClassDeclaration__AbstractAssignment_0
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_0_1_0_0()); }
+                { before(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); }
                 (
-                        { before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_0_0_1()); }
-                        RULE_ID
-                        { after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_0_0_1()); }
+                        { before(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); }
+                        'abstract'
+                        { after(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); }
                 )
-                { after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_0_1_0_0()); }
+                { after(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); }
         )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_0
+rule__ClassDeclaration__NameAssignment_2
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_0_1_1_1_0_0()); }
-                (
-                        { before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_1_1_0_0_1()); }
-                        RULE_ID
-                        { after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_1_1_0_0_1()); }
-                )
-                { after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_0_1_1_1_0_0()); }
+                { before(grammarAccess.getClassDeclarationAccess().getNameIDTerminalRuleCall_2_0()); }
+                RULE_ID
+                { after(grammarAccess.getClassDeclarationAccess().getNameIDTerminalRuleCall_2_0()); }
         )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_1_1
+rule__ClassDeclaration__SuperTypesAssignment_3_1
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_0_1_1_1_1_1_0()); }
+                { before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_1_0()); }
                 (
-                        { before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_1_1_1_1_0_1()); }
-                        RULE_ID
-                        { after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_1_1_1_1_0_1()); }
+                        { before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_1_0_1()); }
+                        ruleQualifiedName
+                        { after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_1_0_1()); }
                 )
-                { after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_0_1_1_1_1_1_0()); }
+                { after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_1_0()); }
         )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__ReferenceDeclarationsAssignment_3_1
+rule__ClassDeclaration__SuperTypesAssignment_3_2_1
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_3_1_0()); }
-                ruleReferenceDeclaration
-                { after(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_3_1_0()); }
+                { before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_2_1_0()); }
+                (
+                        { before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_2_1_0_1()); }
+                        ruleQualifiedName
+                        { after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_2_1_0_1()); }
+                )
+                { after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_2_1_0()); }
         )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_1
+rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_1_0()); }
+                { before(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_0_1_0_0()); }
                 ruleReferenceDeclaration
-                { after(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_1_0()); }
+                { after(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_0_1_0_0()); }
         )
 ;
 finally {
@@ -3610,9 +3876,9 @@ rule__ReferenceDeclaration__ReferenceTypeAssignment_1
         (
                 { before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationCrossReference_1_0()); }
                 (
-                        { before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationIDTerminalRuleCall_1_0_1()); }
-                        RULE_ID
-                        { after(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationIDTerminalRuleCall_1_0_1()); }
+                        { before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationQualifiedNameParserRuleCall_1_0_1()); }
+                        ruleQualifiedName
+                        { after(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationQualifiedNameParserRuleCall_1_0_1()); }
                 )
                 { after(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationCrossReference_1_0()); }
         )
@@ -3621,49 +3887,49 @@ finally {
         restoreStackSize(stackSize);
 }
 
-rule__ReferenceDeclaration__MultiplicityAssignment_3
+rule__ReferenceDeclaration__MultiplicityAssignment_2_1
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getReferenceDeclarationAccess().getMultiplicityMultiplicityParserRuleCall_3_0()); }
+                { before(grammarAccess.getReferenceDeclarationAccess().getMultiplicityMultiplicityParserRuleCall_2_1_0()); }
                 ruleMultiplicity
-                { after(grammarAccess.getReferenceDeclarationAccess().getMultiplicityMultiplicityParserRuleCall_3_0()); }
+                { after(grammarAccess.getReferenceDeclarationAccess().getMultiplicityMultiplicityParserRuleCall_2_1_0()); }
         )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ReferenceDeclaration__NameAssignment_5
+rule__ReferenceDeclaration__NameAssignment_3
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_5_0()); }
+                { before(grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_3_0()); }
                 RULE_ID
-                { after(grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_5_0()); }
+                { after(grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_3_0()); }
         )
 ;
 finally {
         restoreStackSize(stackSize);
 }
 
-rule__ReferenceDeclaration__OppositeAssignment_6_1
+rule__ReferenceDeclaration__OppositeAssignment_4_1
         @init {
                 int stackSize = keepStackSize();
         }
 :
         (
-                { before(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationCrossReference_6_1_0()); }
+                { before(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationCrossReference_4_1_0()); }
                 (
-                        { before(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationQualifiedNameParserRuleCall_6_1_0_1()); }
+                        { before(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationQualifiedNameParserRuleCall_4_1_0_1()); }
                         ruleQualifiedName
-                        { after(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationQualifiedNameParserRuleCall_6_1_0_1()); }
+                        { after(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationQualifiedNameParserRuleCall_4_1_0_1()); }
                 )
-                { after(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationCrossReference_6_1_0()); }
+                { after(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationCrossReference_4_1_0()); }
         )
 ;
 finally {
@@ -3887,13 +4153,9 @@ rule__Atom__ArgumentsAssignment_3_0
         }
 :
         (
-                { before(grammarAccess.getAtomAccess().getArgumentsVariableCrossReference_3_0_0()); }
-                (
-                        { before(grammarAccess.getAtomAccess().getArgumentsVariableIDTerminalRuleCall_3_0_0_1()); }
-                        RULE_ID
-                        { after(grammarAccess.getAtomAccess().getArgumentsVariableIDTerminalRuleCall_3_0_0_1()); }
-                )
-                { after(grammarAccess.getAtomAccess().getArgumentsVariableCrossReference_3_0_0()); }
+                { before(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_0_0()); }
+                ruleArgument
+                { after(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_0_0()); }
         )
 ;
 finally {
@@ -3906,13 +4168,28 @@ rule__Atom__ArgumentsAssignment_3_1_1
         }
 :
         (
-                { before(grammarAccess.getAtomAccess().getArgumentsVariableCrossReference_3_1_1_0()); }
+                { before(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_1_1_0()); }
+                ruleArgument
+                { after(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_1_1_0()); }
+        )
+;
+finally {
+        restoreStackSize(stackSize);
+}
+
+rule__Argument__VariableAssignment
+        @init {
+                int stackSize = keepStackSize();
+        }
+:
+        (
+                { before(grammarAccess.getArgumentAccess().getVariableVariableCrossReference_0()); }
                 (
-                        { before(grammarAccess.getAtomAccess().getArgumentsVariableIDTerminalRuleCall_3_1_1_0_1()); }
+                        { before(grammarAccess.getArgumentAccess().getVariableVariableIDTerminalRuleCall_0_1()); }
                         RULE_ID
-                        { after(grammarAccess.getAtomAccess().getArgumentsVariableIDTerminalRuleCall_3_1_1_0_1()); }
+                        { after(grammarAccess.getArgumentAccess().getVariableVariableIDTerminalRuleCall_0_1()); }
                 )
-                { after(grammarAccess.getAtomAccess().getArgumentsVariableCrossReference_3_1_1_0()); }
+                { after(grammarAccess.getArgumentAccess().getVariableVariableCrossReference_0()); }
         )
 ;
 finally {
@@ -4137,9 +4414,9 @@ rule__TypeScope__MultiplicityAssignment_2
         }
 :
         (
-                { before(grammarAccess.getTypeScopeAccess().getMultiplicityMultiplicityParserRuleCall_2_0()); }
-                ruleMultiplicity
-                { after(grammarAccess.getTypeScopeAccess().getMultiplicityMultiplicityParserRuleCall_2_0()); }
+                { before(grammarAccess.getTypeScopeAccess().getMultiplicityDefiniteMultiplicityParserRuleCall_2_0()); }
+                ruleDefiniteMultiplicity
+                { after(grammarAccess.getTypeScopeAccess().getMultiplicityDefiniteMultiplicityParserRuleCall_2_0()); }
         )
 ;
 finally {
@@ -4191,12 +4468,14 @@ finally {
         restoreStackSize(stackSize);
 }
 
+RULE_STRING : '"' ('\\' .|~(('\\'|'"')))* '"';
+
+RULE_QUOTED_ID : '\'' ('\\' .|~(('\\'|'\'')))* '\'';
+
 RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
 RULE_INT : ('0'..'9')+;
 
-RULE_STRING : ('"' ('\\' .|~(('\\'|'"')))* '"'|'\'' ('\\' .|~(('\\'|'\'')))* '\'');
-
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
 
 RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.tokens b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.tokens
index b3c4a1ea..96f12627 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.tokens
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblem.tokens
@@ -1,40 +1,42 @@
-'!'=18
-'('=27
-')'=28
-'*'=14
-'+'=38
-'+='=39
+'!'=20
+'('=32
+')'=33
+'*'=16
+'+'=41
+'+='=42
 ','=25
-'.'=21
-'..'=33
-':'=31
-'::'=34
-':='=29
-';'=30
-'='=13
-'?'=19
-'['=23
-']'=24
-'abstract'=35
-'class'=20
-'contains'=36
-'error'=37
-'extends'=22
-'false'=16
-'opposite'=26
-'pred'=12
-'refers'=11
-'scope'=32
-'true'=15
-'unknown'=17
-RULE_ANY_OTHER=10
-RULE_ID=5
+'.'=12
+'..'=37
+':'=35
+':-'=34
+';'=28
+'='=15
+'?'=21
+'['=29
+']'=30
+'abstract'=38
+'class'=23
+'contains'=39
+'error'=40
+'extends'=24
+'false'=18
+'opposite'=31
+'pred'=14
+'problem'=22
+'refers'=13
+'scope'=36
+'true'=17
+'unknown'=19
+'{'=26
+'}'=27
+RULE_ANY_OTHER=11
+RULE_ID=6
 RULE_INT=4
-RULE_ML_COMMENT=7
-RULE_SL_COMMENT=8
-RULE_STRING=6
-RULE_WS=9
-T__11=11
+RULE_ML_COMMENT=8
+RULE_QUOTED_ID=5
+RULE_SL_COMMENT=9
+RULE_STRING=7
+RULE_WS=10
 T__12=12
 T__13=13
 T__14=14
@@ -63,3 +65,6 @@ T__36=36
 T__37=37
 T__38=38
 T__39=39
+T__40=40
+T__41=41
+T__42=42
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java
index 0bd65406..a180de53 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemLexer.java
@@ -12,8 +12,8 @@ import java.util.ArrayList;
 
 @SuppressWarnings("all")
 public class InternalProblemLexer extends Lexer {
-    public static final int RULE_STRING=6;
-    public static final int RULE_SL_COMMENT=8;
+    public static final int RULE_STRING=7;
+    public static final int RULE_SL_COMMENT=9;
     public static final int T__19=19;
     public static final int T__15=15;
     public static final int T__37=37;
@@ -22,7 +22,6 @@ public class InternalProblemLexer extends Lexer {
     public static final int T__17=17;
     public static final int T__39=39;
     public static final int T__18=18;
-    public static final int T__11=11;
     public static final int T__33=33;
     public static final int T__12=12;
     public static final int T__34=34;
@@ -34,20 +33,24 @@ public class InternalProblemLexer extends Lexer {
     public static final int T__30=30;
     public static final int T__31=31;
     public static final int T__32=32;
-    public static final int RULE_ID=5;
-    public static final int RULE_WS=9;
-    public static final int RULE_ANY_OTHER=10;
+    public static final int RULE_ID=6;
+    public static final int RULE_WS=10;
+    public static final int RULE_QUOTED_ID=5;
+    public static final int RULE_ANY_OTHER=11;
     public static final int T__26=26;
     public static final int T__27=27;
     public static final int T__28=28;
     public static final int RULE_INT=4;
     public static final int T__29=29;
     public static final int T__22=22;
-    public static final int RULE_ML_COMMENT=7;
+    public static final int RULE_ML_COMMENT=8;
     public static final int T__23=23;
     public static final int T__24=24;
     public static final int T__25=25;
+    public static final int T__40=40;
+    public static final int T__41=41;
     public static final int T__20=20;
+    public static final int T__42=42;
     public static final int T__21=21;
 
     // delegates
@@ -63,37 +66,15 @@ public class InternalProblemLexer extends Lexer {
     }
     public String getGrammarFileName() { return "InternalProblem.g"; }
 
-    // $ANTLR start "T__11"
-    public final void mT__11() throws RecognitionException {
-        try {
-            int _type = T__11;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:11:7: ( 'refers' )
-            // InternalProblem.g:11:9: 'refers'
-            {
-            match("refers"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__11"
-
     // $ANTLR start "T__12"
     public final void mT__12() throws RecognitionException {
         try {
             int _type = T__12;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:12:7: ( 'pred' )
-            // InternalProblem.g:12:9: 'pred'
+            // InternalProblem.g:11:7: ( '.' )
+            // InternalProblem.g:11:9: '.'
             {
-            match("pred"); 
-
+            match('.'); 
 
             }
 
@@ -110,10 +91,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:13:7: ( '=' )
-            // InternalProblem.g:13:9: '='
+            // InternalProblem.g:12:7: ( 'refers' )
+            // InternalProblem.g:12:9: 'refers'
             {
-            match('='); 
+            match("refers"); 
+
 
             }
 
@@ -130,10 +112,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:14:7: ( '*' )
-            // InternalProblem.g:14:9: '*'
+            // InternalProblem.g:13:7: ( 'pred' )
+            // InternalProblem.g:13:9: 'pred'
             {
-            match('*'); 
+            match("pred"); 
+
 
             }
 
@@ -150,11 +133,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:15:7: ( 'true' )
-            // InternalProblem.g:15:9: 'true'
+            // InternalProblem.g:14:7: ( '=' )
+            // InternalProblem.g:14:9: '='
             {
-            match("true"); 
-
+            match('='); 
 
             }
 
@@ -171,11 +153,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:16:7: ( 'false' )
-            // InternalProblem.g:16:9: 'false'
+            // InternalProblem.g:15:7: ( '*' )
+            // InternalProblem.g:15:9: '*'
             {
-            match("false"); 
-
+            match('*'); 
 
             }
 
@@ -192,10 +173,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:17:7: ( 'unknown' )
-            // InternalProblem.g:17:9: 'unknown'
+            // InternalProblem.g:16:7: ( 'true' )
+            // InternalProblem.g:16:9: 'true'
             {
-            match("unknown"); 
+            match("true"); 
 
 
             }
@@ -213,10 +194,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:18:7: ( '!' )
-            // InternalProblem.g:18:9: '!'
+            // InternalProblem.g:17:7: ( 'false' )
+            // InternalProblem.g:17:9: 'false'
             {
-            match('!'); 
+            match("false"); 
+
 
             }
 
@@ -233,10 +215,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:19:7: ( '?' )
-            // InternalProblem.g:19:9: '?'
+            // InternalProblem.g:18:7: ( 'unknown' )
+            // InternalProblem.g:18:9: 'unknown'
             {
-            match('?'); 
+            match("unknown"); 
+
 
             }
 
@@ -253,11 +236,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:20:7: ( 'class' )
-            // InternalProblem.g:20:9: 'class'
+            // InternalProblem.g:19:7: ( '!' )
+            // InternalProblem.g:19:9: '!'
             {
-            match("class"); 
-
+            match('!'); 
 
             }
 
@@ -274,10 +256,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:21:7: ( '.' )
-            // InternalProblem.g:21:9: '.'
+            // InternalProblem.g:20:7: ( '?' )
+            // InternalProblem.g:20:9: '?'
             {
-            match('.'); 
+            match('?'); 
 
             }
 
@@ -294,10 +276,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:22:7: ( 'extends' )
-            // InternalProblem.g:22:9: 'extends'
+            // InternalProblem.g:21:7: ( 'problem' )
+            // InternalProblem.g:21:9: 'problem'
             {
-            match("extends"); 
+            match("problem"); 
 
 
             }
@@ -315,10 +297,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:23:7: ( '[' )
-            // InternalProblem.g:23:9: '['
+            // InternalProblem.g:22:7: ( 'class' )
+            // InternalProblem.g:22:9: 'class'
             {
-            match('['); 
+            match("class"); 
+
 
             }
 
@@ -335,10 +318,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:24:7: ( ']' )
-            // InternalProblem.g:24:9: ']'
+            // InternalProblem.g:23:7: ( 'extends' )
+            // InternalProblem.g:23:9: 'extends'
             {
-            match(']'); 
+            match("extends"); 
+
 
             }
 
@@ -355,8 +339,8 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:25:7: ( ',' )
-            // InternalProblem.g:25:9: ','
+            // InternalProblem.g:24:7: ( ',' )
+            // InternalProblem.g:24:9: ','
             {
             match(','); 
 
@@ -375,11 +359,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:26:7: ( 'opposite' )
-            // InternalProblem.g:26:9: 'opposite'
+            // InternalProblem.g:25:7: ( '{' )
+            // InternalProblem.g:25:9: '{'
             {
-            match("opposite"); 
-
+            match('{'); 
 
             }
 
@@ -396,10 +379,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:27:7: ( '(' )
-            // InternalProblem.g:27:9: '('
+            // InternalProblem.g:26:7: ( '}' )
+            // InternalProblem.g:26:9: '}'
             {
-            match('('); 
+            match('}'); 
 
             }
 
@@ -416,10 +399,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:28:7: ( ')' )
-            // InternalProblem.g:28:9: ')'
+            // InternalProblem.g:27:7: ( ';' )
+            // InternalProblem.g:27:9: ';'
             {
-            match(')'); 
+            match(';'); 
 
             }
 
@@ -436,11 +419,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:29:7: ( ':=' )
-            // InternalProblem.g:29:9: ':='
+            // InternalProblem.g:28:7: ( '[' )
+            // InternalProblem.g:28:9: '['
             {
-            match(":="); 
-
+            match('['); 
 
             }
 
@@ -457,10 +439,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:30:7: ( ';' )
-            // InternalProblem.g:30:9: ';'
+            // InternalProblem.g:29:7: ( ']' )
+            // InternalProblem.g:29:9: ']'
             {
-            match(';'); 
+            match(']'); 
 
             }
 
@@ -477,10 +459,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:31:7: ( ':' )
-            // InternalProblem.g:31:9: ':'
+            // InternalProblem.g:30:7: ( 'opposite' )
+            // InternalProblem.g:30:9: 'opposite'
             {
-            match(':'); 
+            match("opposite"); 
+
 
             }
 
@@ -497,11 +480,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:32:7: ( 'scope' )
-            // InternalProblem.g:32:9: 'scope'
+            // InternalProblem.g:31:7: ( '(' )
+            // InternalProblem.g:31:9: '('
             {
-            match("scope"); 
-
+            match('('); 
 
             }
 
@@ -518,11 +500,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:33:7: ( '..' )
-            // InternalProblem.g:33:9: '..'
+            // InternalProblem.g:32:7: ( ')' )
+            // InternalProblem.g:32:9: ')'
             {
-            match(".."); 
-
+            match(')'); 
 
             }
 
@@ -539,10 +520,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:34:7: ( '::' )
-            // InternalProblem.g:34:9: '::'
+            // InternalProblem.g:33:7: ( ':-' )
+            // InternalProblem.g:33:9: ':-'
             {
-            match("::"); 
+            match(":-"); 
 
 
             }
@@ -560,11 +541,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:35:7: ( 'abstract' )
-            // InternalProblem.g:35:9: 'abstract'
+            // InternalProblem.g:34:7: ( ':' )
+            // InternalProblem.g:34:9: ':'
             {
-            match("abstract"); 
-
+            match(':'); 
 
             }
 
@@ -581,10 +561,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:36:7: ( 'contains' )
-            // InternalProblem.g:36:9: 'contains'
+            // InternalProblem.g:35:7: ( 'scope' )
+            // InternalProblem.g:35:9: 'scope'
             {
-            match("contains"); 
+            match("scope"); 
 
 
             }
@@ -602,10 +582,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:37:7: ( 'error' )
-            // InternalProblem.g:37:9: 'error'
+            // InternalProblem.g:36:7: ( '..' )
+            // InternalProblem.g:36:9: '..'
             {
-            match("error"); 
+            match(".."); 
 
 
             }
@@ -623,10 +603,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:38:7: ( '+' )
-            // InternalProblem.g:38:9: '+'
+            // InternalProblem.g:37:7: ( 'abstract' )
+            // InternalProblem.g:37:9: 'abstract'
             {
-            match('+'); 
+            match("abstract"); 
+
 
             }
 
@@ -643,10 +624,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:39:7: ( '+=' )
-            // InternalProblem.g:39:9: '+='
+            // InternalProblem.g:38:7: ( 'contains' )
+            // InternalProblem.g:38:9: 'contains'
             {
-            match("+="); 
+            match("contains"); 
 
 
             }
@@ -659,57 +640,104 @@ public class InternalProblemLexer extends Lexer {
     }
     // $ANTLR end "T__39"
 
-    // $ANTLR start "RULE_ID"
-    public final void mRULE_ID() throws RecognitionException {
+    // $ANTLR start "T__40"
+    public final void mT__40() throws RecognitionException {
         try {
-            int _type = RULE_ID;
+            int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4194:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // InternalProblem.g:4194:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalProblem.g:39:7: ( 'error' )
+            // InternalProblem.g:39:9: 'error'
             {
-            // InternalProblem.g:4194:11: ( '^' )?
-            int alt1=2;
-            int LA1_0 = input.LA(1);
+            match("error"); 
+
 
-            if ( (LA1_0=='^') ) {
-                alt1=1;
             }
-            switch (alt1) {
-                case 1 :
-                    // InternalProblem.g:4194:11: '^'
-                    {
-                    match('^'); 
 
-                    }
-                    break;
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__40"
+
+    // $ANTLR start "T__41"
+    public final void mT__41() throws RecognitionException {
+        try {
+            int _type = T__41;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:40:7: ( '+' )
+            // InternalProblem.g:40:9: '+'
+            {
+            match('+'); 
 
             }
 
-            if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
-                input.consume();
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__41"
+
+    // $ANTLR start "T__42"
+    public final void mT__42() throws RecognitionException {
+        try {
+            int _type = T__42;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:41:7: ( '+=' )
+            // InternalProblem.g:41:9: '+='
+            {
+            match("+="); 
+
 
             }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
 
-            // InternalProblem.g:4194:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
-            loop2:
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__42"
+
+    // $ANTLR start "RULE_STRING"
+    public final void mRULE_STRING() throws RecognitionException {
+        try {
+            int _type = RULE_STRING;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:4471:13: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
+            // InternalProblem.g:4471:15: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+            {
+            match('\"'); 
+            // InternalProblem.g:4471:19: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+            loop1:
             do {
-                int alt2=2;
-                int LA2_0 = input.LA(1);
+                int alt1=3;
+                int LA1_0 = input.LA(1);
 
-                if ( ((LA2_0>='0' && LA2_0<='9')||(LA2_0>='A' && LA2_0<='Z')||LA2_0=='_'||(LA2_0>='a' && LA2_0<='z')) ) {
-                    alt2=1;
+                if ( (LA1_0=='\\') ) {
+                    alt1=1;
+                }
+                else if ( ((LA1_0>='\u0000' && LA1_0<='!')||(LA1_0>='#' && LA1_0<='[')||(LA1_0>=']' && LA1_0<='\uFFFF')) ) {
+                    alt1=2;
                 }
 
 
-                switch (alt2) {
+                switch (alt1) {
                 case 1 :
-                    // InternalProblem.g:
+                    // InternalProblem.g:4471:20: '\\\\' .
                     {
-                    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') ) {
+                    match('\\'); 
+                    matchAny(); 
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:4471:27: ~ ( ( '\\\\' | '\"' ) )
+                    {
+                    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
 
                     }
@@ -723,10 +751,11 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    break loop2;
+                    break loop1;
                 }
             } while (true);
 
+            match('\"'); 
 
             }
 
@@ -736,46 +765,62 @@ public class InternalProblemLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end "RULE_ID"
+    // $ANTLR end "RULE_STRING"
 
-    // $ANTLR start "RULE_INT"
-    public final void mRULE_INT() throws RecognitionException {
+    // $ANTLR start "RULE_QUOTED_ID"
+    public final void mRULE_QUOTED_ID() throws RecognitionException {
         try {
-            int _type = RULE_INT;
+            int _type = RULE_QUOTED_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4196:10: ( ( '0' .. '9' )+ )
-            // InternalProblem.g:4196:12: ( '0' .. '9' )+
+            // InternalProblem.g:4473:16: ( '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalProblem.g:4473:18: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
             {
-            // InternalProblem.g:4196:12: ( '0' .. '9' )+
-            int cnt3=0;
-            loop3:
+            match('\''); 
+            // InternalProblem.g:4473:23: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+            loop2:
             do {
-                int alt3=2;
-                int LA3_0 = input.LA(1);
+                int alt2=3;
+                int LA2_0 = input.LA(1);
 
-                if ( ((LA3_0>='0' && LA3_0<='9')) ) {
-                    alt3=1;
+                if ( (LA2_0=='\\') ) {
+                    alt2=1;
+                }
+                else if ( ((LA2_0>='\u0000' && LA2_0<='&')||(LA2_0>='(' && LA2_0<='[')||(LA2_0>=']' && LA2_0<='\uFFFF')) ) {
+                    alt2=2;
                 }
 
 
-                switch (alt3) {
+                switch (alt2) {
                 case 1 :
-                    // InternalProblem.g:4196:13: '0' .. '9'
+                    // InternalProblem.g:4473:24: '\\\\' .
                     {
-                    matchRange('0','9'); 
+                    match('\\'); 
+                    matchAny(); 
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:4473:31: ~ ( ( '\\\\' | '\\'' ) )
+                    {
+                    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
+                        input.consume();
+
+                    }
+                    else {
+                        MismatchedSetException mse = new MismatchedSetException(null,input);
+                        recover(mse);
+                        throw mse;}
+
 
                     }
                     break;
 
                 default :
-                    if ( cnt3 >= 1 ) break loop3;
-                        EarlyExitException eee =
-                            new EarlyExitException(3, input);
-                        throw eee;
+                    break loop2;
                 }
-                cnt3++;
             } while (true);
 
+            match('\''); 
 
             }
 
@@ -785,140 +830,125 @@ public class InternalProblemLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end "RULE_INT"
+    // $ANTLR end "RULE_QUOTED_ID"
 
-    // $ANTLR start "RULE_STRING"
-    public final void mRULE_STRING() throws RecognitionException {
+    // $ANTLR start "RULE_ID"
+    public final void mRULE_ID() throws RecognitionException {
         try {
-            int _type = RULE_STRING;
+            int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4198:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // InternalProblem.g:4198:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalProblem.g:4475:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalProblem.g:4475:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // InternalProblem.g:4198:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
-            int alt6=2;
-            int LA6_0 = input.LA(1);
+            // InternalProblem.g:4475:11: ( '^' )?
+            int alt3=2;
+            int LA3_0 = input.LA(1);
 
-            if ( (LA6_0=='\"') ) {
-                alt6=1;
+            if ( (LA3_0=='^') ) {
+                alt3=1;
             }
-            else if ( (LA6_0=='\'') ) {
-                alt6=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("", 6, 0, input);
-
-                throw nvae;
-            }
-            switch (alt6) {
+            switch (alt3) {
                 case 1 :
-                    // InternalProblem.g:4198:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalProblem.g:4475:11: '^'
                     {
-                    match('\"'); 
-                    // InternalProblem.g:4198:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
-                    loop4:
-                    do {
-                        int alt4=3;
-                        int LA4_0 = input.LA(1);
-
-                        if ( (LA4_0=='\\') ) {
-                            alt4=1;
-                        }
-                        else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFF')) ) {
-                            alt4=2;
-                        }
-
-
-                        switch (alt4) {
-                        case 1 :
-                            // InternalProblem.g:4198:21: '\\\\' .
-                            {
-                            match('\\'); 
-                            matchAny(); 
-
-                            }
-                            break;
-                        case 2 :
-                            // InternalProblem.g:4198:28: ~ ( ( '\\\\' | '\"' ) )
-                            {
-                            if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
-                                input.consume();
-
-                            }
-                            else {
-                                MismatchedSetException mse = new MismatchedSetException(null,input);
-                                recover(mse);
-                                throw mse;}
-
-
-                            }
-                            break;
-
-                        default :
-                            break loop4;
-                        }
-                    } while (true);
-
-                    match('\"'); 
+                    match('^'); 
 
                     }
                     break;
-                case 2 :
-                    // InternalProblem.g:4198:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
-                    {
-                    match('\''); 
-                    // InternalProblem.g:4198:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
-                    loop5:
-                    do {
-                        int alt5=3;
-                        int LA5_0 = input.LA(1);
-
-                        if ( (LA5_0=='\\') ) {
-                            alt5=1;
-                        }
-                        else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFF')) ) {
-                            alt5=2;
-                        }
-
-
-                        switch (alt5) {
-                        case 1 :
-                            // InternalProblem.g:4198:54: '\\\\' .
-                            {
-                            match('\\'); 
-                            matchAny(); 
-
-                            }
-                            break;
-                        case 2 :
-                            // InternalProblem.g:4198:61: ~ ( ( '\\\\' | '\\'' ) )
-                            {
-                            if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
-                                input.consume();
-
-                            }
-                            else {
-                                MismatchedSetException mse = new MismatchedSetException(null,input);
-                                recover(mse);
-                                throw mse;}
-
-
-                            }
-                            break;
-
-                        default :
-                            break loop5;
-                        }
-                    } while (true);
-
-                    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:4475:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            loop4:
+            do {
+                int alt4=2;
+                int LA4_0 = input.LA(1);
+
+                if ( ((LA4_0>='0' && LA4_0<='9')||(LA4_0>='A' && LA4_0<='Z')||LA4_0=='_'||(LA4_0>='a' && LA4_0<='z')) ) {
+                    alt4=1;
+                }
+
+
+                switch (alt4) {
+                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 loop4;
+                }
+            } 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:4477:10: ( ( '0' .. '9' )+ )
+            // InternalProblem.g:4477:12: ( '0' .. '9' )+
+            {
+            // InternalProblem.g:4477:12: ( '0' .. '9' )+
+            int cnt5=0;
+            loop5:
+            do {
+                int alt5=2;
+                int LA5_0 = input.LA(1);
+
+                if ( ((LA5_0>='0' && LA5_0<='9')) ) {
+                    alt5=1;
+                }
+
+
+                switch (alt5) {
+                case 1 :
+                    // InternalProblem.g:4477:13: '0' .. '9'
+                    {
+                    matchRange('0','9'); 
+
+                    }
+                    break;
+
+                default :
+                    if ( cnt5 >= 1 ) break loop5;
+                        EarlyExitException eee =
+                            new EarlyExitException(5, input);
+                        throw eee;
+                }
+                cnt5++;
+            } while (true);
+
 
             }
 
@@ -928,44 +958,44 @@ public class InternalProblemLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end "RULE_STRING"
+    // $ANTLR end "RULE_INT"
 
     // $ANTLR start "RULE_ML_COMMENT"
     public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4200:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // InternalProblem.g:4200:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalProblem.g:4479:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalProblem.g:4479:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // InternalProblem.g:4200:24: ( options {greedy=false; } : . )*
-            loop7:
+            // InternalProblem.g:4479:24: ( options {greedy=false; } : . )*
+            loop6:
             do {
-                int alt7=2;
-                int LA7_0 = input.LA(1);
+                int alt6=2;
+                int LA6_0 = input.LA(1);
 
-                if ( (LA7_0=='*') ) {
-                    int LA7_1 = input.LA(2);
+                if ( (LA6_0=='*') ) {
+                    int LA6_1 = input.LA(2);
 
-                    if ( (LA7_1=='/') ) {
-                        alt7=2;
+                    if ( (LA6_1=='/') ) {
+                        alt6=2;
                     }
-                    else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFF')) ) {
-                        alt7=1;
+                    else if ( ((LA6_1>='\u0000' && LA6_1<='.')||(LA6_1>='0' && LA6_1<='\uFFFF')) ) {
+                        alt6=1;
                     }
 
 
                 }
-                else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {
-                    alt7=1;
+                else if ( ((LA6_0>='\u0000' && LA6_0<=')')||(LA6_0>='+' && LA6_0<='\uFFFF')) ) {
+                    alt6=1;
                 }
 
 
-                switch (alt7) {
+                switch (alt6) {
                 case 1 :
-                    // InternalProblem.g:4200:52: .
+                    // InternalProblem.g:4479:52: .
                     {
                     matchAny(); 
 
@@ -973,7 +1003,7 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    break loop7;
+                    break loop6;
                 }
             } while (true);
 
@@ -995,25 +1025,25 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4202:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // InternalProblem.g:4202:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalProblem.g:4481:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalProblem.g:4481:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // InternalProblem.g:4202:24: (~ ( ( '\\n' | '\\r' ) ) )*
-            loop8:
+            // InternalProblem.g:4481:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            loop7:
             do {
-                int alt8=2;
-                int LA8_0 = input.LA(1);
+                int alt7=2;
+                int LA7_0 = input.LA(1);
 
-                if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFF')) ) {
-                    alt8=1;
+                if ( ((LA7_0>='\u0000' && LA7_0<='\t')||(LA7_0>='\u000B' && LA7_0<='\f')||(LA7_0>='\u000E' && LA7_0<='\uFFFF')) ) {
+                    alt7=1;
                 }
 
 
-                switch (alt8) {
+                switch (alt7) {
                 case 1 :
-                    // InternalProblem.g:4202:24: ~ ( ( '\\n' | '\\r' ) )
+                    // InternalProblem.g:4481:24: ~ ( ( '\\n' | '\\r' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -1029,31 +1059,31 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    break loop8;
+                    break loop7;
                 }
             } while (true);
 
-            // InternalProblem.g:4202:40: ( ( '\\r' )? '\\n' )?
-            int alt10=2;
-            int LA10_0 = input.LA(1);
+            // InternalProblem.g:4481:40: ( ( '\\r' )? '\\n' )?
+            int alt9=2;
+            int LA9_0 = input.LA(1);
 
-            if ( (LA10_0=='\n'||LA10_0=='\r') ) {
-                alt10=1;
+            if ( (LA9_0=='\n'||LA9_0=='\r') ) {
+                alt9=1;
             }
-            switch (alt10) {
+            switch (alt9) {
                 case 1 :
-                    // InternalProblem.g:4202:41: ( '\\r' )? '\\n'
+                    // InternalProblem.g:4481:41: ( '\\r' )? '\\n'
                     {
-                    // InternalProblem.g:4202:41: ( '\\r' )?
-                    int alt9=2;
-                    int LA9_0 = input.LA(1);
+                    // InternalProblem.g:4481:41: ( '\\r' )?
+                    int alt8=2;
+                    int LA8_0 = input.LA(1);
 
-                    if ( (LA9_0=='\r') ) {
-                        alt9=1;
+                    if ( (LA8_0=='\r') ) {
+                        alt8=1;
                     }
-                    switch (alt9) {
+                    switch (alt8) {
                         case 1 :
-                            // InternalProblem.g:4202:41: '\\r'
+                            // InternalProblem.g:4481:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1085,22 +1115,22 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4204:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // InternalProblem.g:4204:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalProblem.g:4483:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalProblem.g:4483:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // InternalProblem.g:4204:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
-            int cnt11=0;
-            loop11:
+            // InternalProblem.g:4483: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:
                     {
@@ -1118,12 +1148,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);
 
 
@@ -1142,8 +1172,8 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:4206:16: ( . )
-            // InternalProblem.g:4206:18: .
+            // InternalProblem.g:4485:16: ( . )
+            // InternalProblem.g:4485:18: .
             {
             matchAny(); 
 
@@ -1158,257 +1188,278 @@ public class InternalProblemLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // InternalProblem.g:1:8: ( T__11 | 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 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt12=36;
-        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 | RULE_STRING | RULE_QUOTED_ID | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt11=39;
+        alt11 = dfa11.predict(input);
+        switch (alt11) {
             case 1 :
-                // InternalProblem.g:1:10: T__11
+                // InternalProblem.g:1:10: T__12
                 {
-                mT__11(); 
+                mT__12(); 
 
                 }
                 break;
             case 2 :
-                // InternalProblem.g:1:16: T__12
+                // InternalProblem.g:1:16: T__13
                 {
-                mT__12(); 
+                mT__13(); 
 
                 }
                 break;
             case 3 :
-                // InternalProblem.g:1:22: T__13
+                // InternalProblem.g:1:22: T__14
                 {
-                mT__13(); 
+                mT__14(); 
 
                 }
                 break;
             case 4 :
-                // InternalProblem.g:1:28: T__14
+                // InternalProblem.g:1:28: T__15
                 {
-                mT__14(); 
+                mT__15(); 
 
                 }
                 break;
             case 5 :
-                // InternalProblem.g:1:34: T__15
+                // InternalProblem.g:1:34: T__16
                 {
-                mT__15(); 
+                mT__16(); 
 
                 }
                 break;
             case 6 :
-                // InternalProblem.g:1:40: T__16
+                // InternalProblem.g:1:40: T__17
                 {
-                mT__16(); 
+                mT__17(); 
 
                 }
                 break;
             case 7 :
-                // InternalProblem.g:1:46: T__17
+                // InternalProblem.g:1:46: T__18
                 {
-                mT__17(); 
+                mT__18(); 
 
                 }
                 break;
             case 8 :
-                // InternalProblem.g:1:52: T__18
+                // InternalProblem.g:1:52: T__19
                 {
-                mT__18(); 
+                mT__19(); 
 
                 }
                 break;
             case 9 :
-                // InternalProblem.g:1:58: T__19
+                // InternalProblem.g:1:58: T__20
                 {
-                mT__19(); 
+                mT__20(); 
 
                 }
                 break;
             case 10 :
-                // InternalProblem.g:1:64: T__20
+                // InternalProblem.g:1:64: T__21
                 {
-                mT__20(); 
+                mT__21(); 
 
                 }
                 break;
             case 11 :
-                // InternalProblem.g:1:70: T__21
+                // InternalProblem.g:1:70: T__22
                 {
-                mT__21(); 
+                mT__22(); 
 
                 }
                 break;
             case 12 :
-                // InternalProblem.g:1:76: T__22
+                // InternalProblem.g:1:76: T__23
                 {
-                mT__22(); 
+                mT__23(); 
 
                 }
                 break;
             case 13 :
-                // InternalProblem.g:1:82: T__23
+                // InternalProblem.g:1:82: T__24
                 {
-                mT__23(); 
+                mT__24(); 
 
                 }
                 break;
             case 14 :
-                // InternalProblem.g:1:88: T__24
+                // InternalProblem.g:1:88: T__25
                 {
-                mT__24(); 
+                mT__25(); 
 
                 }
                 break;
             case 15 :
-                // InternalProblem.g:1:94: T__25
+                // InternalProblem.g:1:94: T__26
                 {
-                mT__25(); 
+                mT__26(); 
 
                 }
                 break;
             case 16 :
-                // InternalProblem.g:1:100: T__26
+                // InternalProblem.g:1:100: T__27
                 {
-                mT__26(); 
+                mT__27(); 
 
                 }
                 break;
             case 17 :
-                // InternalProblem.g:1:106: T__27
+                // InternalProblem.g:1:106: T__28
                 {
-                mT__27(); 
+                mT__28(); 
 
                 }
                 break;
             case 18 :
-                // InternalProblem.g:1:112: T__28
+                // InternalProblem.g:1:112: T__29
                 {
-                mT__28(); 
+                mT__29(); 
 
                 }
                 break;
             case 19 :
-                // InternalProblem.g:1:118: T__29
+                // InternalProblem.g:1:118: T__30
                 {
-                mT__29(); 
+                mT__30(); 
 
                 }
                 break;
             case 20 :
-                // InternalProblem.g:1:124: T__30
+                // InternalProblem.g:1:124: T__31
                 {
-                mT__30(); 
+                mT__31(); 
 
                 }
                 break;
             case 21 :
-                // InternalProblem.g:1:130: T__31
+                // InternalProblem.g:1:130: T__32
                 {
-                mT__31(); 
+                mT__32(); 
 
                 }
                 break;
             case 22 :
-                // InternalProblem.g:1:136: T__32
+                // InternalProblem.g:1:136: T__33
                 {
-                mT__32(); 
+                mT__33(); 
 
                 }
                 break;
             case 23 :
-                // InternalProblem.g:1:142: T__33
+                // InternalProblem.g:1:142: T__34
                 {
-                mT__33(); 
+                mT__34(); 
 
                 }
                 break;
             case 24 :
-                // InternalProblem.g:1:148: T__34
+                // InternalProblem.g:1:148: T__35
                 {
-                mT__34(); 
+                mT__35(); 
 
                 }
                 break;
             case 25 :
-                // InternalProblem.g:1:154: T__35
+                // InternalProblem.g:1:154: T__36
                 {
-                mT__35(); 
+                mT__36(); 
 
                 }
                 break;
             case 26 :
-                // InternalProblem.g:1:160: T__36
+                // InternalProblem.g:1:160: T__37
                 {
-                mT__36(); 
+                mT__37(); 
 
                 }
                 break;
             case 27 :
-                // InternalProblem.g:1:166: T__37
+                // InternalProblem.g:1:166: T__38
                 {
-                mT__37(); 
+                mT__38(); 
 
                 }
                 break;
             case 28 :
-                // InternalProblem.g:1:172: T__38
+                // InternalProblem.g:1:172: T__39
                 {
-                mT__38(); 
+                mT__39(); 
 
                 }
                 break;
             case 29 :
-                // InternalProblem.g:1:178: T__39
+                // InternalProblem.g:1:178: T__40
                 {
-                mT__39(); 
+                mT__40(); 
 
                 }
                 break;
             case 30 :
-                // InternalProblem.g:1:184: RULE_ID
+                // InternalProblem.g:1:184: T__41
                 {
-                mRULE_ID(); 
+                mT__41(); 
 
                 }
                 break;
             case 31 :
-                // InternalProblem.g:1:192: RULE_INT
+                // InternalProblem.g:1:190: T__42
                 {
-                mRULE_INT(); 
+                mT__42(); 
 
                 }
                 break;
             case 32 :
-                // InternalProblem.g:1:201: RULE_STRING
+                // InternalProblem.g:1:196: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 33 :
-                // InternalProblem.g:1:213: RULE_ML_COMMENT
+                // InternalProblem.g:1:208: RULE_QUOTED_ID
                 {
-                mRULE_ML_COMMENT(); 
+                mRULE_QUOTED_ID(); 
 
                 }
                 break;
             case 34 :
-                // InternalProblem.g:1:229: RULE_SL_COMMENT
+                // InternalProblem.g:1:223: RULE_ID
                 {
-                mRULE_SL_COMMENT(); 
+                mRULE_ID(); 
 
                 }
                 break;
             case 35 :
-                // InternalProblem.g:1:245: RULE_WS
+                // InternalProblem.g:1:231: RULE_INT
                 {
-                mRULE_WS(); 
+                mRULE_INT(); 
 
                 }
                 break;
             case 36 :
-                // InternalProblem.g:1:253: RULE_ANY_OTHER
+                // InternalProblem.g:1:240: RULE_ML_COMMENT
+                {
+                mRULE_ML_COMMENT(); 
+
+                }
+                break;
+            case 37 :
+                // InternalProblem.g:1:256: RULE_SL_COMMENT
+                {
+                mRULE_SL_COMMENT(); 
+
+                }
+                break;
+            case 38 :
+                // InternalProblem.g:1:272: RULE_WS
+                {
+                mRULE_WS(); 
+
+                }
+                break;
+            case 39 :
+                // InternalProblem.g:1:280: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1420,80 +1471,84 @@ public class InternalProblemLexer extends Lexer {
     }
 
 
-    protected DFA12 dfa12 = new DFA12(this);
-    static final String DFA12_eotS =
-        "\1\uffff\2\41\2\uffff\3\41\2\uffff\1\41\1\55\1\41\3\uffff\1\41\2\uffff\1\70\1\uffff\2\41\1\75\1\37\2\uffff\3\37\2\uffff\1\41\1\uffff\1\41\2\uffff\3\41\2\uffff\2\41\2\uffff\2\41\3\uffff\1\41\6\uffff\2\41\7\uffff\15\41\1\134\1\135\12\41\2\uffff\1\150\1\41\1\152\2\41\1\155\1\41\1\157\1\41\1\161\1\uffff\1\41\1\uffff\2\41\1\uffff\1\41\1\uffff\1\41\1\uffff\1\167\1\41\1\171\2\41\1\uffff\1\174\1\uffff\1\175\1\176\3\uffff";
-    static final String DFA12_eofS =
-        "\177\uffff";
-    static final String DFA12_minS =
-        "\1\0\1\145\1\162\2\uffff\1\162\1\141\1\156\2\uffff\1\154\1\56\1\162\3\uffff\1\160\2\uffff\1\72\1\uffff\1\143\1\142\1\75\1\101\2\uffff\2\0\1\52\2\uffff\1\146\1\uffff\1\145\2\uffff\1\165\1\154\1\153\2\uffff\1\141\1\156\2\uffff\1\164\1\162\3\uffff\1\160\6\uffff\1\157\1\163\7\uffff\1\145\1\144\1\145\1\163\1\156\1\163\1\164\1\145\2\157\1\160\1\164\1\162\2\60\1\145\1\157\1\163\1\141\1\156\1\162\1\163\1\145\1\162\1\163\2\uffff\1\60\1\167\1\60\1\151\1\144\1\60\1\151\1\60\1\141\1\60\1\uffff\1\156\1\uffff\1\156\1\163\1\uffff\1\164\1\uffff\1\143\1\uffff\1\60\1\163\1\60\1\145\1\164\1\uffff\1\60\1\uffff\2\60\3\uffff";
-    static final String DFA12_maxS =
-        "\1\uffff\1\145\1\162\2\uffff\1\162\1\141\1\156\2\uffff\1\157\1\56\1\170\3\uffff\1\160\2\uffff\1\75\1\uffff\1\143\1\142\1\75\1\172\2\uffff\2\uffff\1\57\2\uffff\1\146\1\uffff\1\145\2\uffff\1\165\1\154\1\153\2\uffff\1\141\1\156\2\uffff\1\164\1\162\3\uffff\1\160\6\uffff\1\157\1\163\7\uffff\1\145\1\144\1\145\1\163\1\156\1\163\1\164\1\145\2\157\1\160\1\164\1\162\2\172\1\145\1\157\1\163\1\141\1\156\1\162\1\163\1\145\1\162\1\163\2\uffff\1\172\1\167\1\172\1\151\1\144\1\172\1\151\1\172\1\141\1\172\1\uffff\1\156\1\uffff\1\156\1\163\1\uffff\1\164\1\uffff\1\143\1\uffff\1\172\1\163\1\172\1\145\1\164\1\uffff\1\172\1\uffff\2\172\3\uffff";
-    static final String DFA12_acceptS =
-        "\3\uffff\1\3\1\4\3\uffff\1\10\1\11\3\uffff\1\15\1\16\1\17\1\uffff\1\21\1\22\1\uffff\1\24\4\uffff\1\36\1\37\3\uffff\1\43\1\44\1\uffff\1\36\1\uffff\1\3\1\4\3\uffff\1\10\1\11\2\uffff\1\27\1\13\2\uffff\1\15\1\16\1\17\1\uffff\1\21\1\22\1\23\1\30\1\25\1\24\2\uffff\1\35\1\34\1\37\1\40\1\41\1\42\1\43\31\uffff\1\2\1\5\12\uffff\1\6\1\uffff\1\12\2\uffff\1\33\1\uffff\1\26\1\uffff\1\1\5\uffff\1\7\1\uffff\1\14\2\uffff\1\32\1\20\1\31";
-    static final String DFA12_specialS =
-        "\1\1\32\uffff\1\2\1\0\142\uffff}>";
-    static final String[] DFA12_transitionS = {
-            "\11\37\2\36\2\37\1\36\22\37\1\36\1\10\1\33\4\37\1\34\1\21\1\22\1\4\1\27\1\17\1\37\1\13\1\35\12\32\1\23\1\24\1\37\1\3\1\37\1\11\1\37\32\31\1\15\1\37\1\16\1\30\1\31\1\37\1\26\1\31\1\12\1\31\1\14\1\6\10\31\1\20\1\2\1\31\1\1\1\25\1\5\1\7\5\31\uff85\37",
-            "\1\40",
+    protected DFA11 dfa11 = new DFA11(this);
+    static final String DFA11_eotS =
+        "\1\uffff\1\43\2\45\2\uffff\3\45\2\uffff\2\45\6\uffff\1\45\2\uffff\1\74\2\45\1\100\3\41\2\uffff\1\41\4\uffff\1\45\1\uffff\1\45\2\uffff\3\45\2\uffff\4\45\6\uffff\1\45\4\uffff\2\45\10\uffff\16\45\1\142\1\45\1\144\12\45\1\uffff\1\45\1\uffff\1\160\1\45\1\162\2\45\1\165\1\45\1\167\1\45\1\171\1\45\1\uffff\1\45\1\uffff\2\45\1\uffff\1\45\1\uffff\1\45\1\uffff\1\u0080\1\u0081\1\45\1\u0083\2\45\2\uffff\1\u0086\1\uffff\1\u0087\1\u0088\3\uffff";
+    static final String DFA11_eofS =
+        "\u0089\uffff";
+    static final String DFA11_minS =
+        "\1\0\1\56\1\145\1\162\2\uffff\1\162\1\141\1\156\2\uffff\1\154\1\162\6\uffff\1\160\2\uffff\1\55\1\143\1\142\1\75\2\0\1\101\2\uffff\1\52\4\uffff\1\146\1\uffff\1\145\2\uffff\1\165\1\154\1\153\2\uffff\1\141\1\156\1\164\1\162\6\uffff\1\160\4\uffff\1\157\1\163\10\uffff\1\145\1\144\1\142\1\145\1\163\1\156\1\163\1\164\1\145\2\157\1\160\1\164\1\162\1\60\1\154\1\60\1\145\1\157\1\163\1\141\1\156\1\162\1\163\1\145\1\162\1\163\1\uffff\1\145\1\uffff\1\60\1\167\1\60\1\151\1\144\1\60\1\151\1\60\1\141\1\60\1\155\1\uffff\1\156\1\uffff\1\156\1\163\1\uffff\1\164\1\uffff\1\143\1\uffff\2\60\1\163\1\60\1\145\1\164\2\uffff\1\60\1\uffff\2\60\3\uffff";
+    static final String DFA11_maxS =
+        "\1\uffff\1\56\1\145\1\162\2\uffff\1\162\1\141\1\156\2\uffff\1\157\1\170\6\uffff\1\160\2\uffff\1\55\1\143\1\142\1\75\2\uffff\1\172\2\uffff\1\57\4\uffff\1\146\1\uffff\1\157\2\uffff\1\165\1\154\1\153\2\uffff\1\141\1\156\1\164\1\162\6\uffff\1\160\4\uffff\1\157\1\163\10\uffff\1\145\1\144\1\142\1\145\1\163\1\156\1\163\1\164\1\145\2\157\1\160\1\164\1\162\1\172\1\154\1\172\1\145\1\157\1\163\1\141\1\156\1\162\1\163\1\145\1\162\1\163\1\uffff\1\145\1\uffff\1\172\1\167\1\172\1\151\1\144\1\172\1\151\1\172\1\141\1\172\1\155\1\uffff\1\156\1\uffff\1\156\1\163\1\uffff\1\164\1\uffff\1\143\1\uffff\2\172\1\163\1\172\1\145\1\164\2\uffff\1\172\1\uffff\2\172\3\uffff";
+    static final String DFA11_acceptS =
+        "\4\uffff\1\4\1\5\3\uffff\1\11\1\12\2\uffff\1\16\1\17\1\20\1\21\1\22\1\23\1\uffff\1\25\1\26\7\uffff\1\42\1\43\1\uffff\1\46\1\47\1\32\1\1\1\uffff\1\42\1\uffff\1\4\1\5\3\uffff\1\11\1\12\4\uffff\1\16\1\17\1\20\1\21\1\22\1\23\1\uffff\1\25\1\26\1\27\1\30\2\uffff\1\37\1\36\1\40\1\41\1\43\1\44\1\45\1\46\33\uffff\1\3\1\uffff\1\6\13\uffff\1\7\1\uffff\1\14\2\uffff\1\35\1\uffff\1\31\1\uffff\1\2\6\uffff\1\13\1\10\1\uffff\1\15\2\uffff\1\34\1\24\1\33";
+    static final String DFA11_specialS =
+        "\1\0\31\uffff\1\2\1\1\155\uffff}>";
+    static final String[] DFA11_transitionS = {
+            "\11\41\2\40\2\41\1\40\22\41\1\40\1\11\1\32\4\41\1\33\1\24\1\25\1\5\1\31\1\15\1\41\1\1\1\37\12\36\1\26\1\20\1\41\1\4\1\41\1\12\1\41\32\35\1\21\1\41\1\22\1\34\1\35\1\41\1\30\1\35\1\13\1\35\1\14\1\7\10\35\1\23\1\3\1\35\1\2\1\27\1\6\1\10\5\35\1\16\1\41\1\17\uff82\41",
             "\1\42",
+            "\1\44",
+            "\1\46",
             "",
             "",
-            "\1\45",
-            "\1\46",
-            "\1\47",
+            "\1\51",
+            "\1\52",
+            "\1\53",
             "",
             "",
-            "\1\52\2\uffff\1\53",
-            "\1\54",
-            "\1\57\5\uffff\1\56",
+            "\1\56\2\uffff\1\57",
+            "\1\61\5\uffff\1\60",
             "",
             "",
             "",
-            "\1\63",
             "",
             "",
-            "\1\67\2\uffff\1\66",
             "",
-            "\1\72",
-            "\1\73",
-            "\1\74",
-            "\32\41\4\uffff\1\41\1\uffff\32\41",
+            "\1\70",
             "",
             "",
-            "\0\77",
-            "\0\77",
-            "\1\100\4\uffff\1\101",
+            "\1\73",
+            "\1\75",
+            "\1\76",
+            "\1\77",
+            "\0\101",
+            "\0\102",
+            "\32\45\4\uffff\1\45\1\uffff\32\45",
             "",
             "",
-            "\1\103",
+            "\1\104\4\uffff\1\105",
             "",
-            "\1\104",
             "",
             "",
-            "\1\105",
-            "\1\106",
-            "\1\107",
             "",
+            "\1\107",
             "",
-            "\1\110",
-            "\1\111",
+            "\1\110\11\uffff\1\111",
             "",
             "",
             "\1\112",
             "\1\113",
+            "\1\114",
             "",
             "",
+            "\1\115",
+            "\1\116",
+            "\1\117",
+            "\1\120",
             "",
-            "\1\114",
             "",
             "",
             "",
             "",
             "",
+            "\1\121",
+            "",
+            "",
+            "",
+            "",
+            "\1\122",
+            "\1\123",
             "",
-            "\1\115",
-            "\1\116",
             "",
             "",
             "",
@@ -1501,11 +1556,6 @@ public class InternalProblemLexer extends Lexer {
             "",
             "",
             "",
-            "\1\117",
-            "\1\120",
-            "\1\121",
-            "\1\122",
-            "\1\123",
             "\1\124",
             "\1\125",
             "\1\126",
@@ -1514,182 +1564,197 @@ public class InternalProblemLexer extends Lexer {
             "\1\131",
             "\1\132",
             "\1\133",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
+            "\1\134",
+            "\1\135",
             "\1\136",
             "\1\137",
             "\1\140",
             "\1\141",
-            "\1\142",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
             "\1\143",
-            "\1\144",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
             "\1\145",
             "\1\146",
             "\1\147",
-            "",
-            "",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
+            "\1\150",
             "\1\151",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
+            "\1\152",
             "\1\153",
             "\1\154",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
+            "\1\155",
             "\1\156",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
-            "\1\160",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
             "",
-            "\1\162",
+            "\1\157",
             "",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\161",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
             "\1\163",
             "\1\164",
-            "",
-            "\1\165",
-            "",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
             "\1\166",
-            "",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
             "\1\170",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
             "\1\172",
+            "",
             "\1\173",
             "",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
+            "\1\174",
+            "\1\175",
+            "",
+            "\1\176",
+            "",
+            "\1\177",
+            "",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\u0082",
+            "\12\45\7\uffff\32\45\4\uffff\1\45\1\uffff\32\45",
+            "\1\u0084",
+            "\1\u0085",
             "",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
+            "",
+            "\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__11 | 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 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+            return "1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | RULE_STRING | RULE_QUOTED_ID | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             IntStream input = _input;
                 int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA12_28 = input.LA(1);
+                        int LA11_0 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA12_28>='\u0000' && LA12_28<='\uFFFF')) ) {s = 63;}
+                        if ( (LA11_0=='.') ) {s = 1;}
 
-                        else s = 31;
+                        else if ( (LA11_0=='r') ) {s = 2;}
 
-                        if ( s>=0 ) return s;
-                        break;
-                    case 1 : 
-                        int LA12_0 = input.LA(1);
+                        else if ( (LA11_0=='p') ) {s = 3;}
 
-                        s = -1;
-                        if ( (LA12_0=='r') ) {s = 1;}
+                        else if ( (LA11_0=='=') ) {s = 4;}
 
-                        else if ( (LA12_0=='p') ) {s = 2;}
+                        else if ( (LA11_0=='*') ) {s = 5;}
 
-                        else if ( (LA12_0=='=') ) {s = 3;}
+                        else if ( (LA11_0=='t') ) {s = 6;}
 
-                        else if ( (LA12_0=='*') ) {s = 4;}
+                        else if ( (LA11_0=='f') ) {s = 7;}
 
-                        else if ( (LA12_0=='t') ) {s = 5;}
+                        else if ( (LA11_0=='u') ) {s = 8;}
 
-                        else if ( (LA12_0=='f') ) {s = 6;}
+                        else if ( (LA11_0=='!') ) {s = 9;}
 
-                        else if ( (LA12_0=='u') ) {s = 7;}
+                        else if ( (LA11_0=='?') ) {s = 10;}
 
-                        else if ( (LA12_0=='!') ) {s = 8;}
+                        else if ( (LA11_0=='c') ) {s = 11;}
 
-                        else if ( (LA12_0=='?') ) {s = 9;}
+                        else if ( (LA11_0=='e') ) {s = 12;}
 
-                        else if ( (LA12_0=='c') ) {s = 10;}
+                        else if ( (LA11_0==',') ) {s = 13;}
 
-                        else if ( (LA12_0=='.') ) {s = 11;}
+                        else if ( (LA11_0=='{') ) {s = 14;}
 
-                        else if ( (LA12_0=='e') ) {s = 12;}
+                        else if ( (LA11_0=='}') ) {s = 15;}
 
-                        else if ( (LA12_0=='[') ) {s = 13;}
+                        else if ( (LA11_0==';') ) {s = 16;}
 
-                        else if ( (LA12_0==']') ) {s = 14;}
+                        else if ( (LA11_0=='[') ) {s = 17;}
 
-                        else if ( (LA12_0==',') ) {s = 15;}
+                        else if ( (LA11_0==']') ) {s = 18;}
 
-                        else if ( (LA12_0=='o') ) {s = 16;}
+                        else if ( (LA11_0=='o') ) {s = 19;}
 
-                        else if ( (LA12_0=='(') ) {s = 17;}
+                        else if ( (LA11_0=='(') ) {s = 20;}
 
-                        else if ( (LA12_0==')') ) {s = 18;}
+                        else if ( (LA11_0==')') ) {s = 21;}
 
-                        else if ( (LA12_0==':') ) {s = 19;}
+                        else if ( (LA11_0==':') ) {s = 22;}
 
-                        else if ( (LA12_0==';') ) {s = 20;}
+                        else if ( (LA11_0=='s') ) {s = 23;}
 
-                        else if ( (LA12_0=='s') ) {s = 21;}
+                        else if ( (LA11_0=='a') ) {s = 24;}
 
-                        else if ( (LA12_0=='a') ) {s = 22;}
+                        else if ( (LA11_0=='+') ) {s = 25;}
 
-                        else if ( (LA12_0=='+') ) {s = 23;}
+                        else if ( (LA11_0=='\"') ) {s = 26;}
 
-                        else if ( (LA12_0=='^') ) {s = 24;}
+                        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 = 25;}
+                        else if ( (LA11_0=='^') ) {s = 28;}
 
-                        else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 26;}
+                        else if ( ((LA11_0>='A' && 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 = 29;}
 
-                        else if ( (LA12_0=='\"') ) {s = 27;}
+                        else if ( ((LA11_0>='0' && LA11_0<='9')) ) {s = 30;}
 
-                        else if ( (LA12_0=='\'') ) {s = 28;}
+                        else if ( (LA11_0=='/') ) {s = 31;}
 
-                        else if ( (LA12_0=='/') ) {s = 29;}
+                        else if ( ((LA11_0>='\t' && LA11_0<='\n')||LA11_0=='\r'||LA11_0==' ') ) {s = 32;}
 
-                        else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 30;}
+                        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<='\uFFFF')) ) {s = 33;}
+
+                        if ( s>=0 ) return s;
+                        break;
+                    case 1 : 
+                        int LA11_27 = input.LA(1);
+
+                        s = -1;
+                        if ( ((LA11_27>='\u0000' && LA11_27<='\uFFFF')) ) {s = 66;}
 
-                        else 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<='\uFFFF')) ) {s = 31;}
+                        else s = 33;
 
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA12_27 = input.LA(1);
+                        int LA11_26 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA12_27>='\u0000' && LA12_27<='\uFFFF')) ) {s = 63;}
+                        if ( ((LA11_26>='\u0000' && LA11_26<='\uFFFF')) ) {s = 65;}
 
-                        else s = 31;
+                        else s = 33;
 
                         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/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemParser.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemParser.java
index 1169b189..5eb272e7 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemParser.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.ide/src/main/xtext-gen/org/eclipse/viatra/solver/language/ide/contentassist/antlr/internal/InternalProblemParser.java
@@ -22,10 +22,10 @@ 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_ID", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'refers'", "'pred'", "'='", "'*'", "'true'", "'false'", "'unknown'", "'!'", "'?'", "'class'", "'.'", "'extends'", "'['", "']'", "','", "'opposite'", "'('", "')'", "':='", "';'", "':'", "'scope'", "'..'", "'::'", "'abstract'", "'contains'", "'error'", "'+'", "'+='"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_INT", "RULE_QUOTED_ID", "RULE_ID", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'.'", "'refers'", "'pred'", "'='", "'*'", "'true'", "'false'", "'unknown'", "'!'", "'?'", "'problem'", "'class'", "'extends'", "','", "'{'", "'}'", "';'", "'['", "']'", "'opposite'", "'('", "')'", "':-'", "':'", "'scope'", "'..'", "'abstract'", "'contains'", "'error'", "'+'", "'+='"
     };
-    public static final int RULE_STRING=6;
-    public static final int RULE_SL_COMMENT=8;
+    public static final int RULE_STRING=7;
+    public static final int RULE_SL_COMMENT=9;
     public static final int T__19=19;
     public static final int T__15=15;
     public static final int T__37=37;
@@ -34,7 +34,6 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     public static final int T__17=17;
     public static final int T__39=39;
     public static final int T__18=18;
-    public static final int T__11=11;
     public static final int T__33=33;
     public static final int T__12=12;
     public static final int T__34=34;
@@ -46,20 +45,24 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     public static final int T__30=30;
     public static final int T__31=31;
     public static final int T__32=32;
-    public static final int RULE_ID=5;
-    public static final int RULE_WS=9;
-    public static final int RULE_ANY_OTHER=10;
+    public static final int RULE_ID=6;
+    public static final int RULE_WS=10;
+    public static final int RULE_QUOTED_ID=5;
+    public static final int RULE_ANY_OTHER=11;
     public static final int T__26=26;
     public static final int T__27=27;
     public static final int T__28=28;
     public static final int RULE_INT=4;
     public static final int T__29=29;
     public static final int T__22=22;
-    public static final int RULE_ML_COMMENT=7;
+    public static final int RULE_ML_COMMENT=8;
     public static final int T__23=23;
     public static final int T__24=24;
     public static final int T__25=25;
+    public static final int T__40=40;
+    public static final int T__41=41;
     public static final int T__20=20;
+    public static final int T__42=42;
     public static final int T__21=21;
 
     // delegates
@@ -128,49 +131,31 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleProblem"
-    // InternalProblem.g:62:1: ruleProblem : ( ( rule__Problem__StatementsAssignment )* ) ;
+    // InternalProblem.g:62:1: ruleProblem : ( ( rule__Problem__Group__0 ) ) ;
     public final void ruleProblem() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:66:2: ( ( ( rule__Problem__StatementsAssignment )* ) )
-            // InternalProblem.g:67:2: ( ( rule__Problem__StatementsAssignment )* )
+            // InternalProblem.g:66:2: ( ( ( rule__Problem__Group__0 ) ) )
+            // InternalProblem.g:67:2: ( ( rule__Problem__Group__0 ) )
             {
-            // InternalProblem.g:67:2: ( ( rule__Problem__StatementsAssignment )* )
-            // InternalProblem.g:68:3: ( rule__Problem__StatementsAssignment )*
+            // InternalProblem.g:67:2: ( ( rule__Problem__Group__0 ) )
+            // InternalProblem.g:68:3: ( rule__Problem__Group__0 )
             {
-             before(grammarAccess.getProblemAccess().getStatementsAssignment()); 
-            // InternalProblem.g:69:3: ( rule__Problem__StatementsAssignment )*
-            loop1:
-            do {
-                int alt1=2;
-                int LA1_0 = input.LA(1);
-
-                if ( (LA1_0==RULE_ID||LA1_0==12||(LA1_0>=18 && LA1_0<=20)||LA1_0==32||LA1_0==35||LA1_0==37) ) {
-                    alt1=1;
-                }
-
-
-                switch (alt1) {
-                case 1 :
-                    // InternalProblem.g:69:4: rule__Problem__StatementsAssignment
-                    {
-                    pushFollow(FOLLOW_3);
-                    rule__Problem__StatementsAssignment();
+             before(grammarAccess.getProblemAccess().getGroup()); 
+            // InternalProblem.g:69:3: ( rule__Problem__Group__0 )
+            // InternalProblem.g:69:4: rule__Problem__Group__0
+            {
+            pushFollow(FOLLOW_2);
+            rule__Problem__Group__0();
 
-                    state._fsp--;
+            state._fsp--;
 
 
-                    }
-                    break;
-
-                default :
-                    break loop1;
-                }
-            } while (true);
+            }
 
-             after(grammarAccess.getProblemAccess().getStatementsAssignment()); 
+             after(grammarAccess.getProblemAccess().getGroup()); 
 
             }
 
@@ -885,12 +870,89 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "ruleAtom"
 
 
+    // $ANTLR start "entryRuleArgument"
+    // InternalProblem.g:303:1: entryRuleArgument : ruleArgument EOF ;
+    public final void entryRuleArgument() throws RecognitionException {
+        try {
+            // InternalProblem.g:304:1: ( ruleArgument EOF )
+            // InternalProblem.g:305:1: ruleArgument EOF
+            {
+             before(grammarAccess.getArgumentRule()); 
+            pushFollow(FOLLOW_1);
+            ruleArgument();
+
+            state._fsp--;
+
+             after(grammarAccess.getArgumentRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleArgument"
+
+
+    // $ANTLR start "ruleArgument"
+    // InternalProblem.g:312:1: ruleArgument : ( ( rule__Argument__VariableAssignment ) ) ;
+    public final void ruleArgument() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:316:2: ( ( ( rule__Argument__VariableAssignment ) ) )
+            // InternalProblem.g:317:2: ( ( rule__Argument__VariableAssignment ) )
+            {
+            // InternalProblem.g:317:2: ( ( rule__Argument__VariableAssignment ) )
+            // InternalProblem.g:318:3: ( rule__Argument__VariableAssignment )
+            {
+             before(grammarAccess.getArgumentAccess().getVariableAssignment()); 
+            // InternalProblem.g:319:3: ( rule__Argument__VariableAssignment )
+            // InternalProblem.g:319:4: rule__Argument__VariableAssignment
+            {
+            pushFollow(FOLLOW_2);
+            rule__Argument__VariableAssignment();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getArgumentAccess().getVariableAssignment()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleArgument"
+
+
     // $ANTLR start "entryRuleAssertion"
-    // InternalProblem.g:303:1: entryRuleAssertion : ruleAssertion EOF ;
+    // InternalProblem.g:328:1: entryRuleAssertion : ruleAssertion EOF ;
     public final void entryRuleAssertion() throws RecognitionException {
         try {
-            // InternalProblem.g:304:1: ( ruleAssertion EOF )
-            // InternalProblem.g:305:1: ruleAssertion EOF
+            // InternalProblem.g:329:1: ( ruleAssertion EOF )
+            // InternalProblem.g:330:1: ruleAssertion EOF
             {
              before(grammarAccess.getAssertionRule()); 
             pushFollow(FOLLOW_1);
@@ -916,21 +978,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleAssertion"
-    // InternalProblem.g:312:1: ruleAssertion : ( ( rule__Assertion__Group__0 ) ) ;
+    // InternalProblem.g:337:1: ruleAssertion : ( ( rule__Assertion__Group__0 ) ) ;
     public final void ruleAssertion() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:316:2: ( ( ( rule__Assertion__Group__0 ) ) )
-            // InternalProblem.g:317:2: ( ( rule__Assertion__Group__0 ) )
+            // InternalProblem.g:341:2: ( ( ( rule__Assertion__Group__0 ) ) )
+            // InternalProblem.g:342:2: ( ( rule__Assertion__Group__0 ) )
             {
-            // InternalProblem.g:317:2: ( ( rule__Assertion__Group__0 ) )
-            // InternalProblem.g:318:3: ( rule__Assertion__Group__0 )
+            // InternalProblem.g:342:2: ( ( rule__Assertion__Group__0 ) )
+            // InternalProblem.g:343:3: ( rule__Assertion__Group__0 )
             {
              before(grammarAccess.getAssertionAccess().getGroup()); 
-            // InternalProblem.g:319:3: ( rule__Assertion__Group__0 )
-            // InternalProblem.g:319:4: rule__Assertion__Group__0
+            // InternalProblem.g:344:3: ( rule__Assertion__Group__0 )
+            // InternalProblem.g:344:4: rule__Assertion__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group__0();
@@ -963,11 +1025,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleScopeDeclaration"
-    // InternalProblem.g:328:1: entryRuleScopeDeclaration : ruleScopeDeclaration EOF ;
+    // InternalProblem.g:353:1: entryRuleScopeDeclaration : ruleScopeDeclaration EOF ;
     public final void entryRuleScopeDeclaration() throws RecognitionException {
         try {
-            // InternalProblem.g:329:1: ( ruleScopeDeclaration EOF )
-            // InternalProblem.g:330:1: ruleScopeDeclaration EOF
+            // InternalProblem.g:354:1: ( ruleScopeDeclaration EOF )
+            // InternalProblem.g:355:1: ruleScopeDeclaration EOF
             {
              before(grammarAccess.getScopeDeclarationRule()); 
             pushFollow(FOLLOW_1);
@@ -993,21 +1055,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleScopeDeclaration"
-    // InternalProblem.g:337:1: ruleScopeDeclaration : ( ( rule__ScopeDeclaration__Group__0 ) ) ;
+    // InternalProblem.g:362:1: ruleScopeDeclaration : ( ( rule__ScopeDeclaration__Group__0 ) ) ;
     public final void ruleScopeDeclaration() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:341:2: ( ( ( rule__ScopeDeclaration__Group__0 ) ) )
-            // InternalProblem.g:342:2: ( ( rule__ScopeDeclaration__Group__0 ) )
+            // InternalProblem.g:366:2: ( ( ( rule__ScopeDeclaration__Group__0 ) ) )
+            // InternalProblem.g:367:2: ( ( rule__ScopeDeclaration__Group__0 ) )
             {
-            // InternalProblem.g:342:2: ( ( rule__ScopeDeclaration__Group__0 ) )
-            // InternalProblem.g:343:3: ( rule__ScopeDeclaration__Group__0 )
+            // InternalProblem.g:367:2: ( ( rule__ScopeDeclaration__Group__0 ) )
+            // InternalProblem.g:368:3: ( rule__ScopeDeclaration__Group__0 )
             {
              before(grammarAccess.getScopeDeclarationAccess().getGroup()); 
-            // InternalProblem.g:344:3: ( rule__ScopeDeclaration__Group__0 )
-            // InternalProblem.g:344:4: rule__ScopeDeclaration__Group__0
+            // InternalProblem.g:369:3: ( rule__ScopeDeclaration__Group__0 )
+            // InternalProblem.g:369:4: rule__ScopeDeclaration__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__ScopeDeclaration__Group__0();
@@ -1040,11 +1102,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleTypeScope"
-    // InternalProblem.g:353:1: entryRuleTypeScope : ruleTypeScope EOF ;
+    // InternalProblem.g:378:1: entryRuleTypeScope : ruleTypeScope EOF ;
     public final void entryRuleTypeScope() throws RecognitionException {
         try {
-            // InternalProblem.g:354:1: ( ruleTypeScope EOF )
-            // InternalProblem.g:355:1: ruleTypeScope EOF
+            // InternalProblem.g:379:1: ( ruleTypeScope EOF )
+            // InternalProblem.g:380:1: ruleTypeScope EOF
             {
              before(grammarAccess.getTypeScopeRule()); 
             pushFollow(FOLLOW_1);
@@ -1070,21 +1132,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleTypeScope"
-    // InternalProblem.g:362:1: ruleTypeScope : ( ( rule__TypeScope__Group__0 ) ) ;
+    // InternalProblem.g:387:1: ruleTypeScope : ( ( rule__TypeScope__Group__0 ) ) ;
     public final void ruleTypeScope() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:366:2: ( ( ( rule__TypeScope__Group__0 ) ) )
-            // InternalProblem.g:367:2: ( ( rule__TypeScope__Group__0 ) )
+            // InternalProblem.g:391:2: ( ( ( rule__TypeScope__Group__0 ) ) )
+            // InternalProblem.g:392:2: ( ( rule__TypeScope__Group__0 ) )
             {
-            // InternalProblem.g:367:2: ( ( rule__TypeScope__Group__0 ) )
-            // InternalProblem.g:368:3: ( rule__TypeScope__Group__0 )
+            // InternalProblem.g:392:2: ( ( rule__TypeScope__Group__0 ) )
+            // InternalProblem.g:393:3: ( rule__TypeScope__Group__0 )
             {
              before(grammarAccess.getTypeScopeAccess().getGroup()); 
-            // InternalProblem.g:369:3: ( rule__TypeScope__Group__0 )
-            // InternalProblem.g:369:4: rule__TypeScope__Group__0
+            // InternalProblem.g:394:3: ( rule__TypeScope__Group__0 )
+            // InternalProblem.g:394:4: rule__TypeScope__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__TypeScope__Group__0();
@@ -1117,11 +1179,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleMultiplicity"
-    // InternalProblem.g:378:1: entryRuleMultiplicity : ruleMultiplicity EOF ;
+    // InternalProblem.g:403:1: entryRuleMultiplicity : ruleMultiplicity EOF ;
     public final void entryRuleMultiplicity() throws RecognitionException {
         try {
-            // InternalProblem.g:379:1: ( ruleMultiplicity EOF )
-            // InternalProblem.g:380:1: ruleMultiplicity EOF
+            // InternalProblem.g:404:1: ( ruleMultiplicity EOF )
+            // InternalProblem.g:405:1: ruleMultiplicity EOF
             {
              before(grammarAccess.getMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -1147,21 +1209,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleMultiplicity"
-    // InternalProblem.g:387:1: ruleMultiplicity : ( ( rule__Multiplicity__Alternatives ) ) ;
+    // InternalProblem.g:412:1: ruleMultiplicity : ( ( rule__Multiplicity__Alternatives ) ) ;
     public final void ruleMultiplicity() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:391:2: ( ( ( rule__Multiplicity__Alternatives ) ) )
-            // InternalProblem.g:392:2: ( ( rule__Multiplicity__Alternatives ) )
+            // InternalProblem.g:416:2: ( ( ( rule__Multiplicity__Alternatives ) ) )
+            // InternalProblem.g:417:2: ( ( rule__Multiplicity__Alternatives ) )
             {
-            // InternalProblem.g:392:2: ( ( rule__Multiplicity__Alternatives ) )
-            // InternalProblem.g:393:3: ( rule__Multiplicity__Alternatives )
+            // InternalProblem.g:417:2: ( ( rule__Multiplicity__Alternatives ) )
+            // InternalProblem.g:418:3: ( rule__Multiplicity__Alternatives )
             {
              before(grammarAccess.getMultiplicityAccess().getAlternatives()); 
-            // InternalProblem.g:394:3: ( rule__Multiplicity__Alternatives )
-            // InternalProblem.g:394:4: rule__Multiplicity__Alternatives
+            // InternalProblem.g:419:3: ( rule__Multiplicity__Alternatives )
+            // InternalProblem.g:419:4: rule__Multiplicity__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__Multiplicity__Alternatives();
@@ -1193,12 +1255,156 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "ruleMultiplicity"
 
 
+    // $ANTLR start "entryRuleDefiniteMultiplicity"
+    // InternalProblem.g:428:1: entryRuleDefiniteMultiplicity : ruleDefiniteMultiplicity EOF ;
+    public final void entryRuleDefiniteMultiplicity() throws RecognitionException {
+        try {
+            // InternalProblem.g:429:1: ( ruleDefiniteMultiplicity EOF )
+            // InternalProblem.g:430:1: ruleDefiniteMultiplicity EOF
+            {
+             before(grammarAccess.getDefiniteMultiplicityRule()); 
+            pushFollow(FOLLOW_1);
+            ruleDefiniteMultiplicity();
+
+            state._fsp--;
+
+             after(grammarAccess.getDefiniteMultiplicityRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleDefiniteMultiplicity"
+
+
+    // $ANTLR start "ruleDefiniteMultiplicity"
+    // InternalProblem.g:437:1: ruleDefiniteMultiplicity : ( ( rule__DefiniteMultiplicity__Alternatives ) ) ;
+    public final void ruleDefiniteMultiplicity() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:441:2: ( ( ( rule__DefiniteMultiplicity__Alternatives ) ) )
+            // InternalProblem.g:442:2: ( ( rule__DefiniteMultiplicity__Alternatives ) )
+            {
+            // InternalProblem.g:442:2: ( ( rule__DefiniteMultiplicity__Alternatives ) )
+            // InternalProblem.g:443:3: ( rule__DefiniteMultiplicity__Alternatives )
+            {
+             before(grammarAccess.getDefiniteMultiplicityAccess().getAlternatives()); 
+            // InternalProblem.g:444:3: ( rule__DefiniteMultiplicity__Alternatives )
+            // InternalProblem.g:444:4: rule__DefiniteMultiplicity__Alternatives
+            {
+            pushFollow(FOLLOW_2);
+            rule__DefiniteMultiplicity__Alternatives();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getDefiniteMultiplicityAccess().getAlternatives()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleDefiniteMultiplicity"
+
+
+    // $ANTLR start "entryRuleUnboundedMultiplicity"
+    // InternalProblem.g:453:1: entryRuleUnboundedMultiplicity : ruleUnboundedMultiplicity EOF ;
+    public final void entryRuleUnboundedMultiplicity() throws RecognitionException {
+        try {
+            // InternalProblem.g:454:1: ( ruleUnboundedMultiplicity EOF )
+            // InternalProblem.g:455:1: ruleUnboundedMultiplicity EOF
+            {
+             before(grammarAccess.getUnboundedMultiplicityRule()); 
+            pushFollow(FOLLOW_1);
+            ruleUnboundedMultiplicity();
+
+            state._fsp--;
+
+             after(grammarAccess.getUnboundedMultiplicityRule()); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+        }
+        return ;
+    }
+    // $ANTLR end "entryRuleUnboundedMultiplicity"
+
+
+    // $ANTLR start "ruleUnboundedMultiplicity"
+    // InternalProblem.g:462:1: ruleUnboundedMultiplicity : ( () ) ;
+    public final void ruleUnboundedMultiplicity() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:466:2: ( ( () ) )
+            // InternalProblem.g:467:2: ( () )
+            {
+            // InternalProblem.g:467:2: ( () )
+            // InternalProblem.g:468:3: ()
+            {
+             before(grammarAccess.getUnboundedMultiplicityAccess().getUnboundedMultiplicityAction()); 
+            // InternalProblem.g:469:3: ()
+            // InternalProblem.g:469:4: 
+            {
+            }
+
+             after(grammarAccess.getUnboundedMultiplicityAccess().getUnboundedMultiplicityAction()); 
+
+            }
+
+
+            }
+
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "ruleUnboundedMultiplicity"
+
+
     // $ANTLR start "entryRuleRangeMultiplicity"
-    // InternalProblem.g:403:1: entryRuleRangeMultiplicity : ruleRangeMultiplicity EOF ;
+    // InternalProblem.g:478:1: entryRuleRangeMultiplicity : ruleRangeMultiplicity EOF ;
     public final void entryRuleRangeMultiplicity() throws RecognitionException {
         try {
-            // InternalProblem.g:404:1: ( ruleRangeMultiplicity EOF )
-            // InternalProblem.g:405:1: ruleRangeMultiplicity EOF
+            // InternalProblem.g:479:1: ( ruleRangeMultiplicity EOF )
+            // InternalProblem.g:480:1: ruleRangeMultiplicity EOF
             {
              before(grammarAccess.getRangeMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -1224,21 +1430,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleRangeMultiplicity"
-    // InternalProblem.g:412:1: ruleRangeMultiplicity : ( ( rule__RangeMultiplicity__Group__0 ) ) ;
+    // InternalProblem.g:487:1: ruleRangeMultiplicity : ( ( rule__RangeMultiplicity__Group__0 ) ) ;
     public final void ruleRangeMultiplicity() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:416:2: ( ( ( rule__RangeMultiplicity__Group__0 ) ) )
-            // InternalProblem.g:417:2: ( ( rule__RangeMultiplicity__Group__0 ) )
+            // InternalProblem.g:491:2: ( ( ( rule__RangeMultiplicity__Group__0 ) ) )
+            // InternalProblem.g:492:2: ( ( rule__RangeMultiplicity__Group__0 ) )
             {
-            // InternalProblem.g:417:2: ( ( rule__RangeMultiplicity__Group__0 ) )
-            // InternalProblem.g:418:3: ( rule__RangeMultiplicity__Group__0 )
+            // InternalProblem.g:492:2: ( ( rule__RangeMultiplicity__Group__0 ) )
+            // InternalProblem.g:493:3: ( rule__RangeMultiplicity__Group__0 )
             {
              before(grammarAccess.getRangeMultiplicityAccess().getGroup()); 
-            // InternalProblem.g:419:3: ( rule__RangeMultiplicity__Group__0 )
-            // InternalProblem.g:419:4: rule__RangeMultiplicity__Group__0
+            // InternalProblem.g:494:3: ( rule__RangeMultiplicity__Group__0 )
+            // InternalProblem.g:494:4: rule__RangeMultiplicity__Group__0
             {
             pushFollow(FOLLOW_2);
             rule__RangeMultiplicity__Group__0();
@@ -1271,11 +1477,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleExactMultiplicity"
-    // InternalProblem.g:428:1: entryRuleExactMultiplicity : ruleExactMultiplicity EOF ;
+    // InternalProblem.g:503:1: entryRuleExactMultiplicity : ruleExactMultiplicity EOF ;
     public final void entryRuleExactMultiplicity() throws RecognitionException {
         try {
-            // InternalProblem.g:429:1: ( ruleExactMultiplicity EOF )
-            // InternalProblem.g:430:1: ruleExactMultiplicity EOF
+            // InternalProblem.g:504:1: ( ruleExactMultiplicity EOF )
+            // InternalProblem.g:505:1: ruleExactMultiplicity EOF
             {
              before(grammarAccess.getExactMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -1301,21 +1507,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleExactMultiplicity"
-    // InternalProblem.g:437:1: ruleExactMultiplicity : ( ( rule__ExactMultiplicity__ExactValueAssignment ) ) ;
+    // InternalProblem.g:512:1: ruleExactMultiplicity : ( ( rule__ExactMultiplicity__ExactValueAssignment ) ) ;
     public final void ruleExactMultiplicity() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:441:2: ( ( ( rule__ExactMultiplicity__ExactValueAssignment ) ) )
-            // InternalProblem.g:442:2: ( ( rule__ExactMultiplicity__ExactValueAssignment ) )
+            // InternalProblem.g:516:2: ( ( ( rule__ExactMultiplicity__ExactValueAssignment ) ) )
+            // InternalProblem.g:517:2: ( ( rule__ExactMultiplicity__ExactValueAssignment ) )
             {
-            // InternalProblem.g:442:2: ( ( rule__ExactMultiplicity__ExactValueAssignment ) )
-            // InternalProblem.g:443:3: ( rule__ExactMultiplicity__ExactValueAssignment )
+            // InternalProblem.g:517:2: ( ( rule__ExactMultiplicity__ExactValueAssignment ) )
+            // InternalProblem.g:518:3: ( rule__ExactMultiplicity__ExactValueAssignment )
             {
              before(grammarAccess.getExactMultiplicityAccess().getExactValueAssignment()); 
-            // InternalProblem.g:444:3: ( rule__ExactMultiplicity__ExactValueAssignment )
-            // InternalProblem.g:444:4: rule__ExactMultiplicity__ExactValueAssignment
+            // InternalProblem.g:519:3: ( rule__ExactMultiplicity__ExactValueAssignment )
+            // InternalProblem.g:519:4: rule__ExactMultiplicity__ExactValueAssignment
             {
             pushFollow(FOLLOW_2);
             rule__ExactMultiplicity__ExactValueAssignment();
@@ -1348,11 +1554,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleUpperBound"
-    // InternalProblem.g:453:1: entryRuleUpperBound : ruleUpperBound EOF ;
+    // InternalProblem.g:528:1: entryRuleUpperBound : ruleUpperBound EOF ;
     public final void entryRuleUpperBound() throws RecognitionException {
         try {
-            // InternalProblem.g:454:1: ( ruleUpperBound EOF )
-            // InternalProblem.g:455:1: ruleUpperBound EOF
+            // InternalProblem.g:529:1: ( ruleUpperBound EOF )
+            // InternalProblem.g:530:1: ruleUpperBound EOF
             {
              before(grammarAccess.getUpperBoundRule()); 
             pushFollow(FOLLOW_1);
@@ -1378,21 +1584,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleUpperBound"
-    // InternalProblem.g:462:1: ruleUpperBound : ( ( rule__UpperBound__Alternatives ) ) ;
+    // InternalProblem.g:537:1: ruleUpperBound : ( ( rule__UpperBound__Alternatives ) ) ;
     public final void ruleUpperBound() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:466:2: ( ( ( rule__UpperBound__Alternatives ) ) )
-            // InternalProblem.g:467:2: ( ( rule__UpperBound__Alternatives ) )
+            // InternalProblem.g:541:2: ( ( ( rule__UpperBound__Alternatives ) ) )
+            // InternalProblem.g:542:2: ( ( rule__UpperBound__Alternatives ) )
             {
-            // InternalProblem.g:467:2: ( ( rule__UpperBound__Alternatives ) )
-            // InternalProblem.g:468:3: ( rule__UpperBound__Alternatives )
+            // InternalProblem.g:542:2: ( ( rule__UpperBound__Alternatives ) )
+            // InternalProblem.g:543:3: ( rule__UpperBound__Alternatives )
             {
              before(grammarAccess.getUpperBoundAccess().getAlternatives()); 
-            // InternalProblem.g:469:3: ( rule__UpperBound__Alternatives )
-            // InternalProblem.g:469:4: rule__UpperBound__Alternatives
+            // InternalProblem.g:544:3: ( rule__UpperBound__Alternatives )
+            // InternalProblem.g:544:4: rule__UpperBound__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__UpperBound__Alternatives();
@@ -1425,11 +1631,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "entryRuleQualifiedName"
-    // InternalProblem.g:478:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
+    // InternalProblem.g:553:1: entryRuleQualifiedName : ruleQualifiedName EOF ;
     public final void entryRuleQualifiedName() throws RecognitionException {
         try {
-            // InternalProblem.g:479:1: ( ruleQualifiedName EOF )
-            // InternalProblem.g:480:1: ruleQualifiedName EOF
+            // InternalProblem.g:554:1: ( ruleQualifiedName EOF )
+            // InternalProblem.g:555:1: ruleQualifiedName EOF
             {
              before(grammarAccess.getQualifiedNameRule()); 
             pushFollow(FOLLOW_1);
@@ -1455,31 +1661,31 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // InternalProblem.g:487:1: ruleQualifiedName : ( ( rule__QualifiedName__Group__0 ) ) ;
+    // InternalProblem.g:562:1: ruleQualifiedName : ( ( rule__QualifiedName__Alternatives ) ) ;
     public final void ruleQualifiedName() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:491:2: ( ( ( rule__QualifiedName__Group__0 ) ) )
-            // InternalProblem.g:492:2: ( ( rule__QualifiedName__Group__0 ) )
+            // InternalProblem.g:566:2: ( ( ( rule__QualifiedName__Alternatives ) ) )
+            // InternalProblem.g:567:2: ( ( rule__QualifiedName__Alternatives ) )
             {
-            // InternalProblem.g:492:2: ( ( rule__QualifiedName__Group__0 ) )
-            // InternalProblem.g:493:3: ( rule__QualifiedName__Group__0 )
+            // InternalProblem.g:567:2: ( ( rule__QualifiedName__Alternatives ) )
+            // InternalProblem.g:568:3: ( rule__QualifiedName__Alternatives )
             {
-             before(grammarAccess.getQualifiedNameAccess().getGroup()); 
-            // InternalProblem.g:494:3: ( rule__QualifiedName__Group__0 )
-            // InternalProblem.g:494:4: rule__QualifiedName__Group__0
+             before(grammarAccess.getQualifiedNameAccess().getAlternatives()); 
+            // InternalProblem.g:569:3: ( rule__QualifiedName__Alternatives )
+            // InternalProblem.g:569:4: rule__QualifiedName__Alternatives
             {
             pushFollow(FOLLOW_2);
-            rule__QualifiedName__Group__0();
+            rule__QualifiedName__Alternatives();
 
             state._fsp--;
 
 
             }
 
-             after(grammarAccess.getQualifiedNameAccess().getGroup()); 
+             after(grammarAccess.getQualifiedNameAccess().getAlternatives()); 
 
             }
 
@@ -1502,21 +1708,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleLogicValue"
-    // InternalProblem.g:503:1: ruleLogicValue : ( ( rule__LogicValue__Alternatives ) ) ;
+    // InternalProblem.g:578:1: ruleLogicValue : ( ( rule__LogicValue__Alternatives ) ) ;
     public final void ruleLogicValue() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:507:1: ( ( ( rule__LogicValue__Alternatives ) ) )
-            // InternalProblem.g:508:2: ( ( rule__LogicValue__Alternatives ) )
+            // InternalProblem.g:582:1: ( ( ( rule__LogicValue__Alternatives ) ) )
+            // InternalProblem.g:583:2: ( ( rule__LogicValue__Alternatives ) )
             {
-            // InternalProblem.g:508:2: ( ( rule__LogicValue__Alternatives ) )
-            // InternalProblem.g:509:3: ( rule__LogicValue__Alternatives )
+            // InternalProblem.g:583:2: ( ( rule__LogicValue__Alternatives ) )
+            // InternalProblem.g:584:3: ( rule__LogicValue__Alternatives )
             {
              before(grammarAccess.getLogicValueAccess().getAlternatives()); 
-            // InternalProblem.g:510:3: ( rule__LogicValue__Alternatives )
-            // InternalProblem.g:510:4: rule__LogicValue__Alternatives
+            // InternalProblem.g:585:3: ( rule__LogicValue__Alternatives )
+            // InternalProblem.g:585:4: rule__LogicValue__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__LogicValue__Alternatives();
@@ -1549,21 +1755,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "ruleShortLogicValue"
-    // InternalProblem.g:519:1: ruleShortLogicValue : ( ( rule__ShortLogicValue__Alternatives ) ) ;
+    // InternalProblem.g:594:1: ruleShortLogicValue : ( ( rule__ShortLogicValue__Alternatives ) ) ;
     public final void ruleShortLogicValue() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:523:1: ( ( ( rule__ShortLogicValue__Alternatives ) ) )
-            // InternalProblem.g:524:2: ( ( rule__ShortLogicValue__Alternatives ) )
+            // InternalProblem.g:598:1: ( ( ( rule__ShortLogicValue__Alternatives ) ) )
+            // InternalProblem.g:599:2: ( ( rule__ShortLogicValue__Alternatives ) )
             {
-            // InternalProblem.g:524:2: ( ( rule__ShortLogicValue__Alternatives ) )
-            // InternalProblem.g:525:3: ( rule__ShortLogicValue__Alternatives )
+            // InternalProblem.g:599:2: ( ( rule__ShortLogicValue__Alternatives ) )
+            // InternalProblem.g:600:3: ( rule__ShortLogicValue__Alternatives )
             {
              before(grammarAccess.getShortLogicValueAccess().getAlternatives()); 
-            // InternalProblem.g:526:3: ( rule__ShortLogicValue__Alternatives )
-            // InternalProblem.g:526:4: rule__ShortLogicValue__Alternatives
+            // InternalProblem.g:601:3: ( rule__ShortLogicValue__Alternatives )
+            // InternalProblem.g:601:4: rule__ShortLogicValue__Alternatives
             {
             pushFollow(FOLLOW_2);
             rule__ShortLogicValue__Alternatives();
@@ -1596,52 +1802,53 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Statement__Alternatives"
-    // InternalProblem.g:534:1: rule__Statement__Alternatives : ( ( ruleClassDeclaration ) | ( rulePredicateDefinition ) | ( ruleAssertion ) | ( ruleScopeDeclaration ) );
+    // InternalProblem.g:609:1: rule__Statement__Alternatives : ( ( ruleClassDeclaration ) | ( rulePredicateDefinition ) | ( ruleAssertion ) | ( ruleScopeDeclaration ) );
     public final void rule__Statement__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:538:1: ( ( ruleClassDeclaration ) | ( rulePredicateDefinition ) | ( ruleAssertion ) | ( ruleScopeDeclaration ) )
-            int alt2=4;
+            // InternalProblem.g:613:1: ( ( ruleClassDeclaration ) | ( rulePredicateDefinition ) | ( ruleAssertion ) | ( ruleScopeDeclaration ) )
+            int alt1=4;
             switch ( input.LA(1) ) {
-            case 20:
-            case 35:
+            case 23:
+            case 38:
                 {
-                alt2=1;
+                alt1=1;
                 }
                 break;
-            case 12:
-            case 37:
+            case 14:
+            case 40:
                 {
-                alt2=2;
+                alt1=2;
                 }
                 break;
+            case RULE_QUOTED_ID:
             case RULE_ID:
-            case 18:
-            case 19:
+            case 20:
+            case 21:
                 {
-                alt2=3;
+                alt1=3;
                 }
                 break;
-            case 32:
+            case 36:
                 {
-                alt2=4;
+                alt1=4;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("", 2, 0, input);
+                    new NoViableAltException("", 1, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt2) {
+            switch (alt1) {
                 case 1 :
-                    // InternalProblem.g:539:2: ( ruleClassDeclaration )
+                    // InternalProblem.g:614:2: ( ruleClassDeclaration )
                     {
-                    // InternalProblem.g:539:2: ( ruleClassDeclaration )
-                    // InternalProblem.g:540:3: ruleClassDeclaration
+                    // InternalProblem.g:614:2: ( ruleClassDeclaration )
+                    // InternalProblem.g:615:3: ruleClassDeclaration
                     {
                      before(grammarAccess.getStatementAccess().getClassDeclarationParserRuleCall_0()); 
                     pushFollow(FOLLOW_2);
@@ -1657,10 +1864,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:545:2: ( rulePredicateDefinition )
+                    // InternalProblem.g:620:2: ( rulePredicateDefinition )
                     {
-                    // InternalProblem.g:545:2: ( rulePredicateDefinition )
-                    // InternalProblem.g:546:3: rulePredicateDefinition
+                    // InternalProblem.g:620:2: ( rulePredicateDefinition )
+                    // InternalProblem.g:621:3: rulePredicateDefinition
                     {
                      before(grammarAccess.getStatementAccess().getPredicateDefinitionParserRuleCall_1()); 
                     pushFollow(FOLLOW_2);
@@ -1676,10 +1883,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalProblem.g:551:2: ( ruleAssertion )
+                    // InternalProblem.g:626:2: ( ruleAssertion )
                     {
-                    // InternalProblem.g:551:2: ( ruleAssertion )
-                    // InternalProblem.g:552:3: ruleAssertion
+                    // InternalProblem.g:626:2: ( ruleAssertion )
+                    // InternalProblem.g:627:3: ruleAssertion
                     {
                      before(grammarAccess.getStatementAccess().getAssertionParserRuleCall_2()); 
                     pushFollow(FOLLOW_2);
@@ -1695,10 +1902,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 4 :
-                    // InternalProblem.g:557:2: ( ruleScopeDeclaration )
+                    // InternalProblem.g:632:2: ( ruleScopeDeclaration )
                     {
-                    // InternalProblem.g:557:2: ( ruleScopeDeclaration )
-                    // InternalProblem.g:558:3: ruleScopeDeclaration
+                    // InternalProblem.g:632:2: ( ruleScopeDeclaration )
+                    // InternalProblem.g:633:3: ruleScopeDeclaration
                     {
                      before(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_3()); 
                     pushFollow(FOLLOW_2);
@@ -1730,140 +1937,49 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__Statement__Alternatives"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Alternatives_3"
-    // InternalProblem.g:567:1: rule__ClassDeclaration__Alternatives_3 : ( ( ( rule__ClassDeclaration__Group_3_0__0 ) ) | ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_3_1 ) ) );
-    public final void rule__ClassDeclaration__Alternatives_3() throws RecognitionException {
-
-                        int stackSize = keepStackSize();
-                
-        try {
-            // InternalProblem.g:571:1: ( ( ( rule__ClassDeclaration__Group_3_0__0 ) ) | ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_3_1 ) ) )
-            int alt3=2;
-            int LA3_0 = input.LA(1);
-
-            if ( (LA3_0==22) ) {
-                alt3=1;
-            }
-            else if ( (LA3_0==11||LA3_0==36) ) {
-                alt3=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("", 3, 0, input);
-
-                throw nvae;
-            }
-            switch (alt3) {
-                case 1 :
-                    // InternalProblem.g:572:2: ( ( rule__ClassDeclaration__Group_3_0__0 ) )
-                    {
-                    // InternalProblem.g:572:2: ( ( rule__ClassDeclaration__Group_3_0__0 ) )
-                    // InternalProblem.g:573:3: ( rule__ClassDeclaration__Group_3_0__0 )
-                    {
-                     before(grammarAccess.getClassDeclarationAccess().getGroup_3_0()); 
-                    // InternalProblem.g:574:3: ( rule__ClassDeclaration__Group_3_0__0 )
-                    // InternalProblem.g:574:4: rule__ClassDeclaration__Group_3_0__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__ClassDeclaration__Group_3_0__0();
-
-                    state._fsp--;
-
-
-                    }
-
-                     after(grammarAccess.getClassDeclarationAccess().getGroup_3_0()); 
-
-                    }
-
-
-                    }
-                    break;
-                case 2 :
-                    // InternalProblem.g:578:2: ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_3_1 ) )
-                    {
-                    // InternalProblem.g:578:2: ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_3_1 ) )
-                    // InternalProblem.g:579:3: ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_3_1 )
-                    {
-                     before(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsAssignment_3_1()); 
-                    // InternalProblem.g:580:3: ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_3_1 )
-                    // InternalProblem.g:580:4: rule__ClassDeclaration__ReferenceDeclarationsAssignment_3_1
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__ClassDeclaration__ReferenceDeclarationsAssignment_3_1();
-
-                    state._fsp--;
-
-
-                    }
-
-                     after(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsAssignment_3_1()); 
-
-                    }
-
-
-                    }
-                    break;
-
-            }
-        }
-        catch (RecognitionException re) {
-            reportError(re);
-            recover(input,re);
-        }
-        finally {
-
-                restoreStackSize(stackSize);
-
-        }
-        return ;
-    }
-    // $ANTLR end "rule__ClassDeclaration__Alternatives_3"
-
-
-    // $ANTLR start "rule__ClassDeclaration__Alternatives_3_0_1"
-    // InternalProblem.g:588:1: rule__ClassDeclaration__Alternatives_3_0_1 : ( ( ( rule__ClassDeclaration__SuperTypesAssignment_3_0_1_0 ) ) | ( ( rule__ClassDeclaration__Group_3_0_1_1__0 ) ) );
-    public final void rule__ClassDeclaration__Alternatives_3_0_1() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Alternatives_4"
+    // InternalProblem.g:642: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:592:1: ( ( ( rule__ClassDeclaration__SuperTypesAssignment_3_0_1_0 ) ) | ( ( rule__ClassDeclaration__Group_3_0_1_1__0 ) ) )
-            int alt4=2;
-            int LA4_0 = input.LA(1);
+            // InternalProblem.g:646:1: ( ( ( rule__ClassDeclaration__Group_4_0__0 ) ) | ( '.' ) )
+            int alt2=2;
+            int LA2_0 = input.LA(1);
 
-            if ( (LA4_0==RULE_ID) ) {
-                alt4=1;
+            if ( (LA2_0==26) ) {
+                alt2=1;
             }
-            else if ( (LA4_0==23) ) {
-                alt4=2;
+            else if ( (LA2_0==12) ) {
+                alt2=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 4, 0, input);
+                    new NoViableAltException("", 2, 0, input);
 
                 throw nvae;
             }
-            switch (alt4) {
+            switch (alt2) {
                 case 1 :
-                    // InternalProblem.g:593:2: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_0_1_0 ) )
+                    // InternalProblem.g:647:2: ( ( rule__ClassDeclaration__Group_4_0__0 ) )
                     {
-                    // InternalProblem.g:593:2: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_0_1_0 ) )
-                    // InternalProblem.g:594:3: ( rule__ClassDeclaration__SuperTypesAssignment_3_0_1_0 )
+                    // InternalProblem.g:647:2: ( ( rule__ClassDeclaration__Group_4_0__0 ) )
+                    // InternalProblem.g:648:3: ( rule__ClassDeclaration__Group_4_0__0 )
                     {
-                     before(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_0_1_0()); 
-                    // InternalProblem.g:595:3: ( rule__ClassDeclaration__SuperTypesAssignment_3_0_1_0 )
-                    // InternalProblem.g:595:4: rule__ClassDeclaration__SuperTypesAssignment_3_0_1_0
+                     before(grammarAccess.getClassDeclarationAccess().getGroup_4_0()); 
+                    // InternalProblem.g:649:3: ( rule__ClassDeclaration__Group_4_0__0 )
+                    // InternalProblem.g:649:4: rule__ClassDeclaration__Group_4_0__0
                     {
                     pushFollow(FOLLOW_2);
-                    rule__ClassDeclaration__SuperTypesAssignment_3_0_1_0();
+                    rule__ClassDeclaration__Group_4_0__0();
 
                     state._fsp--;
 
 
                     }
 
-                     after(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_0_1_0()); 
+                     after(grammarAccess.getClassDeclarationAccess().getGroup_4_0()); 
 
                     }
 
@@ -1871,24 +1987,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:599:2: ( ( rule__ClassDeclaration__Group_3_0_1_1__0 ) )
-                    {
-                    // InternalProblem.g:599:2: ( ( rule__ClassDeclaration__Group_3_0_1_1__0 ) )
-                    // InternalProblem.g:600:3: ( rule__ClassDeclaration__Group_3_0_1_1__0 )
+                    // InternalProblem.g:653:2: ( '.' )
                     {
-                     before(grammarAccess.getClassDeclarationAccess().getGroup_3_0_1_1()); 
-                    // InternalProblem.g:601:3: ( rule__ClassDeclaration__Group_3_0_1_1__0 )
-                    // InternalProblem.g:601:4: rule__ClassDeclaration__Group_3_0_1_1__0
+                    // InternalProblem.g:653:2: ( '.' )
+                    // InternalProblem.g:654:3: '.'
                     {
-                    pushFollow(FOLLOW_2);
-                    rule__ClassDeclaration__Group_3_0_1_1__0();
-
-                    state._fsp--;
-
-
-                    }
-
-                     after(grammarAccess.getClassDeclarationAccess().getGroup_3_0_1_1()); 
+                     before(grammarAccess.getClassDeclarationAccess().getFullStopKeyword_4_1()); 
+                    match(input,12,FOLLOW_2); 
+                     after(grammarAccess.getClassDeclarationAccess().getFullStopKeyword_4_1()); 
 
                     }
 
@@ -1909,42 +2015,42 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Alternatives_3_0_1"
+    // $ANTLR end "rule__ClassDeclaration__Alternatives_4"
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Alternatives_0"
-    // InternalProblem.g:609:1: rule__ReferenceDeclaration__Alternatives_0 : ( ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) ) | ( 'refers' ) );
+    // InternalProblem.g:663: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:613:1: ( ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) ) | ( 'refers' ) )
-            int alt5=2;
-            int LA5_0 = input.LA(1);
+            // InternalProblem.g:667:1: ( ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) ) | ( 'refers' ) )
+            int alt3=2;
+            int LA3_0 = input.LA(1);
 
-            if ( (LA5_0==36) ) {
-                alt5=1;
+            if ( (LA3_0==39) ) {
+                alt3=1;
             }
-            else if ( (LA5_0==11) ) {
-                alt5=2;
+            else if ( (LA3_0==13) ) {
+                alt3=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 5, 0, input);
+                    new NoViableAltException("", 3, 0, input);
 
                 throw nvae;
             }
-            switch (alt5) {
+            switch (alt3) {
                 case 1 :
-                    // InternalProblem.g:614:2: ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) )
+                    // InternalProblem.g:668:2: ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) )
                     {
-                    // InternalProblem.g:614:2: ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) )
-                    // InternalProblem.g:615:3: ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 )
+                    // InternalProblem.g:668:2: ( ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 ) )
+                    // InternalProblem.g:669:3: ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 )
                     {
                      before(grammarAccess.getReferenceDeclarationAccess().getContainmentAssignment_0_0()); 
-                    // InternalProblem.g:616:3: ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 )
-                    // InternalProblem.g:616:4: rule__ReferenceDeclaration__ContainmentAssignment_0_0
+                    // InternalProblem.g:670:3: ( rule__ReferenceDeclaration__ContainmentAssignment_0_0 )
+                    // InternalProblem.g:670:4: rule__ReferenceDeclaration__ContainmentAssignment_0_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__ReferenceDeclaration__ContainmentAssignment_0_0();
@@ -1962,13 +2068,13 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:620:2: ( 'refers' )
+                    // InternalProblem.g:674:2: ( 'refers' )
                     {
-                    // InternalProblem.g:620:2: ( 'refers' )
-                    // InternalProblem.g:621:3: 'refers'
+                    // InternalProblem.g:674:2: ( 'refers' )
+                    // InternalProblem.g:675:3: 'refers'
                     {
                      before(grammarAccess.getReferenceDeclarationAccess().getRefersKeyword_0_1()); 
-                    match(input,11,FOLLOW_2); 
+                    match(input,13,FOLLOW_2); 
                      after(grammarAccess.getReferenceDeclarationAccess().getRefersKeyword_0_1()); 
 
                     }
@@ -1994,38 +2100,38 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Alternatives_0"
-    // InternalProblem.g:630:1: rule__PredicateDefinition__Alternatives_0 : ( ( ( rule__PredicateDefinition__Group_0_0__0 ) ) | ( 'pred' ) );
+    // InternalProblem.g:684: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:634:1: ( ( ( rule__PredicateDefinition__Group_0_0__0 ) ) | ( 'pred' ) )
-            int alt6=2;
-            int LA6_0 = input.LA(1);
+            // InternalProblem.g:688:1: ( ( ( rule__PredicateDefinition__Group_0_0__0 ) ) | ( 'pred' ) )
+            int alt4=2;
+            int LA4_0 = input.LA(1);
 
-            if ( (LA6_0==37) ) {
-                alt6=1;
+            if ( (LA4_0==40) ) {
+                alt4=1;
             }
-            else if ( (LA6_0==12) ) {
-                alt6=2;
+            else if ( (LA4_0==14) ) {
+                alt4=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 6, 0, input);
+                    new NoViableAltException("", 4, 0, input);
 
                 throw nvae;
             }
-            switch (alt6) {
+            switch (alt4) {
                 case 1 :
-                    // InternalProblem.g:635:2: ( ( rule__PredicateDefinition__Group_0_0__0 ) )
+                    // InternalProblem.g:689:2: ( ( rule__PredicateDefinition__Group_0_0__0 ) )
                     {
-                    // InternalProblem.g:635:2: ( ( rule__PredicateDefinition__Group_0_0__0 ) )
-                    // InternalProblem.g:636:3: ( rule__PredicateDefinition__Group_0_0__0 )
+                    // InternalProblem.g:689:2: ( ( rule__PredicateDefinition__Group_0_0__0 ) )
+                    // InternalProblem.g:690:3: ( rule__PredicateDefinition__Group_0_0__0 )
                     {
                      before(grammarAccess.getPredicateDefinitionAccess().getGroup_0_0()); 
-                    // InternalProblem.g:637:3: ( rule__PredicateDefinition__Group_0_0__0 )
-                    // InternalProblem.g:637:4: rule__PredicateDefinition__Group_0_0__0
+                    // InternalProblem.g:691:3: ( rule__PredicateDefinition__Group_0_0__0 )
+                    // InternalProblem.g:691:4: rule__PredicateDefinition__Group_0_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__PredicateDefinition__Group_0_0__0();
@@ -2043,13 +2149,13 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:641:2: ( 'pred' )
+                    // InternalProblem.g:695:2: ( 'pred' )
                     {
-                    // InternalProblem.g:641:2: ( 'pred' )
-                    // InternalProblem.g:642:3: 'pred'
+                    // InternalProblem.g:695:2: ( 'pred' )
+                    // InternalProblem.g:696:3: 'pred'
                     {
                      before(grammarAccess.getPredicateDefinitionAccess().getPredKeyword_0_1()); 
-                    match(input,12,FOLLOW_2); 
+                    match(input,14,FOLLOW_2); 
                      after(grammarAccess.getPredicateDefinitionAccess().getPredKeyword_0_1()); 
 
                     }
@@ -2075,34 +2181,34 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Literal__Alternatives"
-    // InternalProblem.g:651:1: rule__Literal__Alternatives : ( ( ruleAtom ) | ( ruleNegativeLiteral ) );
+    // InternalProblem.g:705:1: rule__Literal__Alternatives : ( ( ruleAtom ) | ( ruleNegativeLiteral ) );
     public final void rule__Literal__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:655:1: ( ( ruleAtom ) | ( ruleNegativeLiteral ) )
-            int alt7=2;
-            int LA7_0 = input.LA(1);
+            // InternalProblem.g:709:1: ( ( ruleAtom ) | ( ruleNegativeLiteral ) )
+            int alt5=2;
+            int LA5_0 = input.LA(1);
 
-            if ( (LA7_0==RULE_ID) ) {
-                alt7=1;
+            if ( ((LA5_0>=RULE_QUOTED_ID && LA5_0<=RULE_ID)) ) {
+                alt5=1;
             }
-            else if ( (LA7_0==18) ) {
-                alt7=2;
+            else if ( (LA5_0==20) ) {
+                alt5=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 7, 0, input);
+                    new NoViableAltException("", 5, 0, input);
 
                 throw nvae;
             }
-            switch (alt7) {
+            switch (alt5) {
                 case 1 :
-                    // InternalProblem.g:656:2: ( ruleAtom )
+                    // InternalProblem.g:710:2: ( ruleAtom )
                     {
-                    // InternalProblem.g:656:2: ( ruleAtom )
-                    // InternalProblem.g:657:3: ruleAtom
+                    // InternalProblem.g:710:2: ( ruleAtom )
+                    // InternalProblem.g:711:3: ruleAtom
                     {
                      before(grammarAccess.getLiteralAccess().getAtomParserRuleCall_0()); 
                     pushFollow(FOLLOW_2);
@@ -2118,10 +2224,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:662:2: ( ruleNegativeLiteral )
+                    // InternalProblem.g:716:2: ( ruleNegativeLiteral )
                     {
-                    // InternalProblem.g:662:2: ( ruleNegativeLiteral )
-                    // InternalProblem.g:663:3: ruleNegativeLiteral
+                    // InternalProblem.g:716:2: ( ruleNegativeLiteral )
+                    // InternalProblem.g:717:3: ruleNegativeLiteral
                     {
                      before(grammarAccess.getLiteralAccess().getNegativeLiteralParserRuleCall_1()); 
                     pushFollow(FOLLOW_2);
@@ -2154,25 +2260,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Alternatives_0"
-    // InternalProblem.g:672:1: rule__Assertion__Alternatives_0 : ( ( ( rule__Assertion__Group_0_0__0 ) ) | ( ( rule__Assertion__Group_0_1__0 ) ) );
+    // InternalProblem.g:726: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:676:1: ( ( ( rule__Assertion__Group_0_0__0 ) ) | ( ( rule__Assertion__Group_0_1__0 ) ) )
-            int alt8=2;
-            alt8 = dfa8.predict(input);
-            switch (alt8) {
+            // InternalProblem.g:730:1: ( ( ( rule__Assertion__Group_0_0__0 ) ) | ( ( rule__Assertion__Group_0_1__0 ) ) )
+            int alt6=2;
+            alt6 = dfa6.predict(input);
+            switch (alt6) {
                 case 1 :
-                    // InternalProblem.g:677:2: ( ( rule__Assertion__Group_0_0__0 ) )
+                    // InternalProblem.g:731:2: ( ( rule__Assertion__Group_0_0__0 ) )
                     {
-                    // InternalProblem.g:677:2: ( ( rule__Assertion__Group_0_0__0 ) )
-                    // InternalProblem.g:678:3: ( rule__Assertion__Group_0_0__0 )
+                    // InternalProblem.g:731:2: ( ( rule__Assertion__Group_0_0__0 ) )
+                    // InternalProblem.g:732:3: ( rule__Assertion__Group_0_0__0 )
                     {
                      before(grammarAccess.getAssertionAccess().getGroup_0_0()); 
-                    // InternalProblem.g:679:3: ( rule__Assertion__Group_0_0__0 )
-                    // InternalProblem.g:679:4: rule__Assertion__Group_0_0__0
+                    // InternalProblem.g:733:3: ( rule__Assertion__Group_0_0__0 )
+                    // InternalProblem.g:733:4: rule__Assertion__Group_0_0__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Assertion__Group_0_0__0();
@@ -2190,14 +2296,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:683:2: ( ( rule__Assertion__Group_0_1__0 ) )
+                    // InternalProblem.g:737:2: ( ( rule__Assertion__Group_0_1__0 ) )
                     {
-                    // InternalProblem.g:683:2: ( ( rule__Assertion__Group_0_1__0 ) )
-                    // InternalProblem.g:684:3: ( rule__Assertion__Group_0_1__0 )
+                    // InternalProblem.g:737:2: ( ( rule__Assertion__Group_0_1__0 ) )
+                    // InternalProblem.g:738:3: ( rule__Assertion__Group_0_1__0 )
                     {
                      before(grammarAccess.getAssertionAccess().getGroup_0_1()); 
-                    // InternalProblem.g:685:3: ( rule__Assertion__Group_0_1__0 )
-                    // InternalProblem.g:685:4: rule__Assertion__Group_0_1__0
+                    // InternalProblem.g:739:3: ( rule__Assertion__Group_0_1__0 )
+                    // InternalProblem.g:739:4: rule__Assertion__Group_0_1__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Assertion__Group_0_1__0();
@@ -2232,38 +2338,38 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Alternatives_1"
-    // InternalProblem.g:693:1: rule__TypeScope__Alternatives_1 : ( ( ( rule__TypeScope__IncrementAssignment_1_0 ) ) | ( '=' ) );
+    // InternalProblem.g:747: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:697:1: ( ( ( rule__TypeScope__IncrementAssignment_1_0 ) ) | ( '=' ) )
-            int alt9=2;
-            int LA9_0 = input.LA(1);
+            // InternalProblem.g:751:1: ( ( ( rule__TypeScope__IncrementAssignment_1_0 ) ) | ( '=' ) )
+            int alt7=2;
+            int LA7_0 = input.LA(1);
 
-            if ( (LA9_0==39) ) {
-                alt9=1;
+            if ( (LA7_0==42) ) {
+                alt7=1;
             }
-            else if ( (LA9_0==13) ) {
-                alt9=2;
+            else if ( (LA7_0==15) ) {
+                alt7=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 9, 0, input);
+                    new NoViableAltException("", 7, 0, input);
 
                 throw nvae;
             }
-            switch (alt9) {
+            switch (alt7) {
                 case 1 :
-                    // InternalProblem.g:698:2: ( ( rule__TypeScope__IncrementAssignment_1_0 ) )
+                    // InternalProblem.g:752:2: ( ( rule__TypeScope__IncrementAssignment_1_0 ) )
                     {
-                    // InternalProblem.g:698:2: ( ( rule__TypeScope__IncrementAssignment_1_0 ) )
-                    // InternalProblem.g:699:3: ( rule__TypeScope__IncrementAssignment_1_0 )
+                    // InternalProblem.g:752:2: ( ( rule__TypeScope__IncrementAssignment_1_0 ) )
+                    // InternalProblem.g:753:3: ( rule__TypeScope__IncrementAssignment_1_0 )
                     {
                      before(grammarAccess.getTypeScopeAccess().getIncrementAssignment_1_0()); 
-                    // InternalProblem.g:700:3: ( rule__TypeScope__IncrementAssignment_1_0 )
-                    // InternalProblem.g:700:4: rule__TypeScope__IncrementAssignment_1_0
+                    // InternalProblem.g:754:3: ( rule__TypeScope__IncrementAssignment_1_0 )
+                    // InternalProblem.g:754:4: rule__TypeScope__IncrementAssignment_1_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__TypeScope__IncrementAssignment_1_0();
@@ -2281,13 +2387,13 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:704:2: ( '=' )
+                    // InternalProblem.g:758:2: ( '=' )
                     {
-                    // InternalProblem.g:704:2: ( '=' )
-                    // InternalProblem.g:705:3: '='
+                    // InternalProblem.g:758:2: ( '=' )
+                    // InternalProblem.g:759:3: '='
                     {
                      before(grammarAccess.getTypeScopeAccess().getEqualsSignKeyword_1_1()); 
-                    match(input,13,FOLLOW_2); 
+                    match(input,15,FOLLOW_2); 
                      after(grammarAccess.getTypeScopeAccess().getEqualsSignKeyword_1_1()); 
 
                     }
@@ -2313,52 +2419,131 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Multiplicity__Alternatives"
-    // InternalProblem.g:714:1: rule__Multiplicity__Alternatives : ( ( ruleRangeMultiplicity ) | ( ruleExactMultiplicity ) );
+    // InternalProblem.g:768:1: rule__Multiplicity__Alternatives : ( ( ruleUnboundedMultiplicity ) | ( ruleDefiniteMultiplicity ) );
     public final void rule__Multiplicity__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:718:1: ( ( ruleRangeMultiplicity ) | ( ruleExactMultiplicity ) )
-            int alt10=2;
-            int LA10_0 = input.LA(1);
+            // InternalProblem.g:772:1: ( ( ruleUnboundedMultiplicity ) | ( ruleDefiniteMultiplicity ) )
+            int alt8=2;
+            int LA8_0 = input.LA(1);
 
-            if ( (LA10_0==RULE_INT) ) {
-                int LA10_1 = input.LA(2);
+            if ( (LA8_0==EOF||LA8_0==30) ) {
+                alt8=1;
+            }
+            else if ( (LA8_0==RULE_INT) ) {
+                alt8=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 8, 0, input);
+
+                throw nvae;
+            }
+            switch (alt8) {
+                case 1 :
+                    // InternalProblem.g:773:2: ( ruleUnboundedMultiplicity )
+                    {
+                    // InternalProblem.g:773:2: ( ruleUnboundedMultiplicity )
+                    // InternalProblem.g:774:3: ruleUnboundedMultiplicity
+                    {
+                     before(grammarAccess.getMultiplicityAccess().getUnboundedMultiplicityParserRuleCall_0()); 
+                    pushFollow(FOLLOW_2);
+                    ruleUnboundedMultiplicity();
+
+                    state._fsp--;
+
+                     after(grammarAccess.getMultiplicityAccess().getUnboundedMultiplicityParserRuleCall_0()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:779:2: ( ruleDefiniteMultiplicity )
+                    {
+                    // InternalProblem.g:779:2: ( ruleDefiniteMultiplicity )
+                    // InternalProblem.g:780:3: ruleDefiniteMultiplicity
+                    {
+                     before(grammarAccess.getMultiplicityAccess().getDefiniteMultiplicityParserRuleCall_1()); 
+                    pushFollow(FOLLOW_2);
+                    ruleDefiniteMultiplicity();
+
+                    state._fsp--;
+
+                     after(grammarAccess.getMultiplicityAccess().getDefiniteMultiplicityParserRuleCall_1()); 
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
 
-                if ( (LA10_1==33) ) {
-                    alt10=1;
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Multiplicity__Alternatives"
+
+
+    // $ANTLR start "rule__DefiniteMultiplicity__Alternatives"
+    // InternalProblem.g:789:1: rule__DefiniteMultiplicity__Alternatives : ( ( ruleRangeMultiplicity ) | ( ruleExactMultiplicity ) );
+    public final void rule__DefiniteMultiplicity__Alternatives() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:793:1: ( ( ruleRangeMultiplicity ) | ( ruleExactMultiplicity ) )
+            int alt9=2;
+            int LA9_0 = input.LA(1);
+
+            if ( (LA9_0==RULE_INT) ) {
+                int LA9_1 = input.LA(2);
+
+                if ( (LA9_1==37) ) {
+                    alt9=1;
                 }
-                else if ( (LA10_1==EOF||LA10_1==21||(LA10_1>=24 && LA10_1<=25)) ) {
-                    alt10=2;
+                else if ( (LA9_1==EOF||LA9_1==12||LA9_1==25||LA9_1==30) ) {
+                    alt9=2;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("", 10, 1, input);
+                        new NoViableAltException("", 9, 1, input);
 
                     throw nvae;
                 }
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 10, 0, input);
+                    new NoViableAltException("", 9, 0, input);
 
                 throw nvae;
             }
-            switch (alt10) {
+            switch (alt9) {
                 case 1 :
-                    // InternalProblem.g:719:2: ( ruleRangeMultiplicity )
+                    // InternalProblem.g:794:2: ( ruleRangeMultiplicity )
                     {
-                    // InternalProblem.g:719:2: ( ruleRangeMultiplicity )
-                    // InternalProblem.g:720:3: ruleRangeMultiplicity
+                    // InternalProblem.g:794:2: ( ruleRangeMultiplicity )
+                    // InternalProblem.g:795:3: ruleRangeMultiplicity
                     {
-                     before(grammarAccess.getMultiplicityAccess().getRangeMultiplicityParserRuleCall_0()); 
+                     before(grammarAccess.getDefiniteMultiplicityAccess().getRangeMultiplicityParserRuleCall_0()); 
                     pushFollow(FOLLOW_2);
                     ruleRangeMultiplicity();
 
                     state._fsp--;
 
-                     after(grammarAccess.getMultiplicityAccess().getRangeMultiplicityParserRuleCall_0()); 
+                     after(grammarAccess.getDefiniteMultiplicityAccess().getRangeMultiplicityParserRuleCall_0()); 
 
                     }
 
@@ -2366,18 +2551,18 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:725:2: ( ruleExactMultiplicity )
+                    // InternalProblem.g:800:2: ( ruleExactMultiplicity )
                     {
-                    // InternalProblem.g:725:2: ( ruleExactMultiplicity )
-                    // InternalProblem.g:726:3: ruleExactMultiplicity
+                    // InternalProblem.g:800:2: ( ruleExactMultiplicity )
+                    // InternalProblem.g:801:3: ruleExactMultiplicity
                     {
-                     before(grammarAccess.getMultiplicityAccess().getExactMultiplicityParserRuleCall_1()); 
+                     before(grammarAccess.getDefiniteMultiplicityAccess().getExactMultiplicityParserRuleCall_1()); 
                     pushFollow(FOLLOW_2);
                     ruleExactMultiplicity();
 
                     state._fsp--;
 
-                     after(grammarAccess.getMultiplicityAccess().getExactMultiplicityParserRuleCall_1()); 
+                     after(grammarAccess.getDefiniteMultiplicityAccess().getExactMultiplicityParserRuleCall_1()); 
 
                     }
 
@@ -2398,38 +2583,38 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__Multiplicity__Alternatives"
+    // $ANTLR end "rule__DefiniteMultiplicity__Alternatives"
 
 
     // $ANTLR start "rule__UpperBound__Alternatives"
-    // InternalProblem.g:735:1: rule__UpperBound__Alternatives : ( ( RULE_INT ) | ( '*' ) );
+    // InternalProblem.g:810:1: rule__UpperBound__Alternatives : ( ( RULE_INT ) | ( '*' ) );
     public final void rule__UpperBound__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:739:1: ( ( RULE_INT ) | ( '*' ) )
-            int alt11=2;
-            int LA11_0 = input.LA(1);
+            // InternalProblem.g:814:1: ( ( RULE_INT ) | ( '*' ) )
+            int alt10=2;
+            int LA10_0 = input.LA(1);
 
-            if ( (LA11_0==RULE_INT) ) {
-                alt11=1;
+            if ( (LA10_0==RULE_INT) ) {
+                alt10=1;
             }
-            else if ( (LA11_0==14) ) {
-                alt11=2;
+            else if ( (LA10_0==16) ) {
+                alt10=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 11, 0, input);
+                    new NoViableAltException("", 10, 0, input);
 
                 throw nvae;
             }
-            switch (alt11) {
+            switch (alt10) {
                 case 1 :
-                    // InternalProblem.g:740:2: ( RULE_INT )
+                    // InternalProblem.g:815:2: ( RULE_INT )
                     {
-                    // InternalProblem.g:740:2: ( RULE_INT )
-                    // InternalProblem.g:741:3: RULE_INT
+                    // InternalProblem.g:815:2: ( RULE_INT )
+                    // InternalProblem.g:816:3: RULE_INT
                     {
                      before(grammarAccess.getUpperBoundAccess().getINTTerminalRuleCall_0()); 
                     match(input,RULE_INT,FOLLOW_2); 
@@ -2441,13 +2626,13 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:746:2: ( '*' )
+                    // InternalProblem.g:821:2: ( '*' )
                     {
-                    // InternalProblem.g:746:2: ( '*' )
-                    // InternalProblem.g:747:3: '*'
+                    // InternalProblem.g:821:2: ( '*' )
+                    // InternalProblem.g:822:3: '*'
                     {
                      before(grammarAccess.getUpperBoundAccess().getAsteriskKeyword_1()); 
-                    match(input,14,FOLLOW_2); 
+                    match(input,16,FOLLOW_2); 
                      after(grammarAccess.getUpperBoundAccess().getAsteriskKeyword_1()); 
 
                     }
@@ -2472,27 +2657,108 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__UpperBound__Alternatives"
 
 
+    // $ANTLR start "rule__QualifiedName__Alternatives"
+    // InternalProblem.g:831:1: rule__QualifiedName__Alternatives : ( ( RULE_QUOTED_ID ) | ( ( rule__QualifiedName__Group_1__0 ) ) );
+    public final void rule__QualifiedName__Alternatives() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:835:1: ( ( RULE_QUOTED_ID ) | ( ( rule__QualifiedName__Group_1__0 ) ) )
+            int alt11=2;
+            int LA11_0 = input.LA(1);
+
+            if ( (LA11_0==RULE_QUOTED_ID) ) {
+                alt11=1;
+            }
+            else if ( (LA11_0==RULE_ID) ) {
+                alt11=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 11, 0, input);
+
+                throw nvae;
+            }
+            switch (alt11) {
+                case 1 :
+                    // InternalProblem.g:836:2: ( RULE_QUOTED_ID )
+                    {
+                    // InternalProblem.g:836:2: ( RULE_QUOTED_ID )
+                    // InternalProblem.g:837:3: RULE_QUOTED_ID
+                    {
+                     before(grammarAccess.getQualifiedNameAccess().getQUOTED_IDTerminalRuleCall_0()); 
+                    match(input,RULE_QUOTED_ID,FOLLOW_2); 
+                     after(grammarAccess.getQualifiedNameAccess().getQUOTED_IDTerminalRuleCall_0()); 
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:842:2: ( ( rule__QualifiedName__Group_1__0 ) )
+                    {
+                    // InternalProblem.g:842:2: ( ( rule__QualifiedName__Group_1__0 ) )
+                    // InternalProblem.g:843:3: ( rule__QualifiedName__Group_1__0 )
+                    {
+                     before(grammarAccess.getQualifiedNameAccess().getGroup_1()); 
+                    // InternalProblem.g:844:3: ( rule__QualifiedName__Group_1__0 )
+                    // InternalProblem.g:844:4: rule__QualifiedName__Group_1__0
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__QualifiedName__Group_1__0();
+
+                    state._fsp--;
+
+
+                    }
+
+                     after(grammarAccess.getQualifiedNameAccess().getGroup_1()); 
+
+                    }
+
+
+                    }
+                    break;
+
+            }
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__QualifiedName__Alternatives"
+
+
     // $ANTLR start "rule__LogicValue__Alternatives"
-    // InternalProblem.g:756:1: rule__LogicValue__Alternatives : ( ( ( 'true' ) ) | ( ( 'false' ) ) | ( ( 'unknown' ) ) );
+    // InternalProblem.g:852:1: rule__LogicValue__Alternatives : ( ( ( 'true' ) ) | ( ( 'false' ) ) | ( ( 'unknown' ) ) );
     public final void rule__LogicValue__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:760:1: ( ( ( 'true' ) ) | ( ( 'false' ) ) | ( ( 'unknown' ) ) )
+            // InternalProblem.g:856:1: ( ( ( 'true' ) ) | ( ( 'false' ) ) | ( ( 'unknown' ) ) )
             int alt12=3;
             switch ( input.LA(1) ) {
-            case 15:
+            case 17:
                 {
                 alt12=1;
                 }
                 break;
-            case 16:
+            case 18:
                 {
                 alt12=2;
                 }
                 break;
-            case 17:
+            case 19:
                 {
                 alt12=3;
                 }
@@ -2506,16 +2772,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
             switch (alt12) {
                 case 1 :
-                    // InternalProblem.g:761:2: ( ( 'true' ) )
+                    // InternalProblem.g:857:2: ( ( 'true' ) )
                     {
-                    // InternalProblem.g:761:2: ( ( 'true' ) )
-                    // InternalProblem.g:762:3: ( 'true' )
+                    // InternalProblem.g:857:2: ( ( 'true' ) )
+                    // InternalProblem.g:858:3: ( 'true' )
                     {
                      before(grammarAccess.getLogicValueAccess().getTRUEEnumLiteralDeclaration_0()); 
-                    // InternalProblem.g:763:3: ( 'true' )
-                    // InternalProblem.g:763:4: 'true'
+                    // InternalProblem.g:859:3: ( 'true' )
+                    // InternalProblem.g:859:4: 'true'
                     {
-                    match(input,15,FOLLOW_2); 
+                    match(input,17,FOLLOW_2); 
 
                     }
 
@@ -2527,16 +2793,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:767:2: ( ( 'false' ) )
+                    // InternalProblem.g:863:2: ( ( 'false' ) )
                     {
-                    // InternalProblem.g:767:2: ( ( 'false' ) )
-                    // InternalProblem.g:768:3: ( 'false' )
+                    // InternalProblem.g:863:2: ( ( 'false' ) )
+                    // InternalProblem.g:864:3: ( 'false' )
                     {
                      before(grammarAccess.getLogicValueAccess().getFALSEEnumLiteralDeclaration_1()); 
-                    // InternalProblem.g:769:3: ( 'false' )
-                    // InternalProblem.g:769:4: 'false'
+                    // InternalProblem.g:865:3: ( 'false' )
+                    // InternalProblem.g:865:4: 'false'
                     {
-                    match(input,16,FOLLOW_2); 
+                    match(input,18,FOLLOW_2); 
 
                     }
 
@@ -2548,16 +2814,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 3 :
-                    // InternalProblem.g:773:2: ( ( 'unknown' ) )
+                    // InternalProblem.g:869:2: ( ( 'unknown' ) )
                     {
-                    // InternalProblem.g:773:2: ( ( 'unknown' ) )
-                    // InternalProblem.g:774:3: ( 'unknown' )
+                    // InternalProblem.g:869:2: ( ( 'unknown' ) )
+                    // InternalProblem.g:870:3: ( 'unknown' )
                     {
                      before(grammarAccess.getLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_2()); 
-                    // InternalProblem.g:775:3: ( 'unknown' )
-                    // InternalProblem.g:775:4: 'unknown'
+                    // InternalProblem.g:871:3: ( 'unknown' )
+                    // InternalProblem.g:871:4: 'unknown'
                     {
-                    match(input,17,FOLLOW_2); 
+                    match(input,19,FOLLOW_2); 
 
                     }
 
@@ -2586,20 +2852,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ShortLogicValue__Alternatives"
-    // InternalProblem.g:783:1: rule__ShortLogicValue__Alternatives : ( ( ( '!' ) ) | ( ( '?' ) ) );
+    // InternalProblem.g:879:1: rule__ShortLogicValue__Alternatives : ( ( ( '!' ) ) | ( ( '?' ) ) );
     public final void rule__ShortLogicValue__Alternatives() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:787:1: ( ( ( '!' ) ) | ( ( '?' ) ) )
+            // InternalProblem.g:883:1: ( ( ( '!' ) ) | ( ( '?' ) ) )
             int alt13=2;
             int LA13_0 = input.LA(1);
 
-            if ( (LA13_0==18) ) {
+            if ( (LA13_0==20) ) {
                 alt13=1;
             }
-            else if ( (LA13_0==19) ) {
+            else if ( (LA13_0==21) ) {
                 alt13=2;
             }
             else {
@@ -2610,16 +2876,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
             }
             switch (alt13) {
                 case 1 :
-                    // InternalProblem.g:788:2: ( ( '!' ) )
+                    // InternalProblem.g:884:2: ( ( '!' ) )
                     {
-                    // InternalProblem.g:788:2: ( ( '!' ) )
-                    // InternalProblem.g:789:3: ( '!' )
+                    // InternalProblem.g:884:2: ( ( '!' ) )
+                    // InternalProblem.g:885:3: ( '!' )
                     {
                      before(grammarAccess.getShortLogicValueAccess().getFALSEEnumLiteralDeclaration_0()); 
-                    // InternalProblem.g:790:3: ( '!' )
-                    // InternalProblem.g:790:4: '!'
+                    // InternalProblem.g:886:3: ( '!' )
+                    // InternalProblem.g:886:4: '!'
                     {
-                    match(input,18,FOLLOW_2); 
+                    match(input,20,FOLLOW_2); 
 
                     }
 
@@ -2631,16 +2897,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:794:2: ( ( '?' ) )
+                    // InternalProblem.g:890:2: ( ( '?' ) )
                     {
-                    // InternalProblem.g:794:2: ( ( '?' ) )
-                    // InternalProblem.g:795:3: ( '?' )
+                    // InternalProblem.g:890:2: ( ( '?' ) )
+                    // InternalProblem.g:891:3: ( '?' )
                     {
                      before(grammarAccess.getShortLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_1()); 
-                    // InternalProblem.g:796:3: ( '?' )
-                    // InternalProblem.g:796:4: '?'
+                    // InternalProblem.g:892:3: ( '?' )
+                    // InternalProblem.g:892:4: '?'
                     {
-                    match(input,19,FOLLOW_2); 
+                    match(input,21,FOLLOW_2); 
 
                     }
 
@@ -2668,23 +2934,23 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__ShortLogicValue__Alternatives"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group__0"
-    // InternalProblem.g:804:1: rule__ClassDeclaration__Group__0 : rule__ClassDeclaration__Group__0__Impl rule__ClassDeclaration__Group__1 ;
-    public final void rule__ClassDeclaration__Group__0() throws RecognitionException {
+    // $ANTLR start "rule__Problem__Group__0"
+    // InternalProblem.g:900: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:808:1: ( rule__ClassDeclaration__Group__0__Impl rule__ClassDeclaration__Group__1 )
-            // InternalProblem.g:809:2: rule__ClassDeclaration__Group__0__Impl rule__ClassDeclaration__Group__1
+            // InternalProblem.g:904:1: ( rule__Problem__Group__0__Impl rule__Problem__Group__1 )
+            // InternalProblem.g:905:2: rule__Problem__Group__0__Impl rule__Problem__Group__1
             {
-            pushFollow(FOLLOW_4);
-            rule__ClassDeclaration__Group__0__Impl();
+            pushFollow(FOLLOW_3);
+            rule__Problem__Group__0__Impl();
 
             state._fsp--;
 
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__Group__1();
+            rule__Problem__Group__1();
 
             state._fsp--;
 
@@ -2703,36 +2969,36 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group__0"
+    // $ANTLR end "rule__Problem__Group__0"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group__0__Impl"
-    // InternalProblem.g:816:1: rule__ClassDeclaration__Group__0__Impl : ( ( rule__ClassDeclaration__AbstractAssignment_0 )? ) ;
-    public final void rule__ClassDeclaration__Group__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__Problem__Group__0__Impl"
+    // InternalProblem.g:912: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:820:1: ( ( ( rule__ClassDeclaration__AbstractAssignment_0 )? ) )
-            // InternalProblem.g:821:1: ( ( rule__ClassDeclaration__AbstractAssignment_0 )? )
+            // InternalProblem.g:916:1: ( ( ( rule__Problem__Group_0__0 )? ) )
+            // InternalProblem.g:917:1: ( ( rule__Problem__Group_0__0 )? )
             {
-            // InternalProblem.g:821:1: ( ( rule__ClassDeclaration__AbstractAssignment_0 )? )
-            // InternalProblem.g:822:2: ( rule__ClassDeclaration__AbstractAssignment_0 )?
+            // InternalProblem.g:917:1: ( ( rule__Problem__Group_0__0 )? )
+            // InternalProblem.g:918:2: ( rule__Problem__Group_0__0 )?
             {
-             before(grammarAccess.getClassDeclarationAccess().getAbstractAssignment_0()); 
-            // InternalProblem.g:823:2: ( rule__ClassDeclaration__AbstractAssignment_0 )?
+             before(grammarAccess.getProblemAccess().getGroup_0()); 
+            // InternalProblem.g:919:2: ( rule__Problem__Group_0__0 )?
             int alt14=2;
             int LA14_0 = input.LA(1);
 
-            if ( (LA14_0==35) ) {
+            if ( (LA14_0==22) ) {
                 alt14=1;
             }
             switch (alt14) {
                 case 1 :
-                    // InternalProblem.g:823:3: rule__ClassDeclaration__AbstractAssignment_0
+                    // InternalProblem.g:919:3: rule__Problem__Group_0__0
                     {
                     pushFollow(FOLLOW_2);
-                    rule__ClassDeclaration__AbstractAssignment_0();
+                    rule__Problem__Group_0__0();
 
                     state._fsp--;
 
@@ -2742,7 +3008,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
             }
 
-             after(grammarAccess.getClassDeclarationAccess().getAbstractAssignment_0()); 
+             after(grammarAccess.getProblemAccess().getGroup_0()); 
 
             }
 
@@ -2761,26 +3027,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group__0__Impl"
+    // $ANTLR end "rule__Problem__Group__0__Impl"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group__1"
-    // InternalProblem.g:831:1: rule__ClassDeclaration__Group__1 : rule__ClassDeclaration__Group__1__Impl rule__ClassDeclaration__Group__2 ;
-    public final void rule__ClassDeclaration__Group__1() throws RecognitionException {
+    // $ANTLR start "rule__Problem__Group__1"
+    // InternalProblem.g:927: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:835:1: ( rule__ClassDeclaration__Group__1__Impl rule__ClassDeclaration__Group__2 )
-            // InternalProblem.g:836:2: rule__ClassDeclaration__Group__1__Impl rule__ClassDeclaration__Group__2
+            // InternalProblem.g:931:1: ( rule__Problem__Group__1__Impl )
+            // InternalProblem.g:932:2: rule__Problem__Group__1__Impl
             {
-            pushFollow(FOLLOW_5);
-            rule__ClassDeclaration__Group__1__Impl();
-
-            state._fsp--;
-
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__Group__2();
+            rule__Problem__Group__1__Impl();
 
             state._fsp--;
 
@@ -2799,25 +3060,53 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group__1"
+    // $ANTLR end "rule__Problem__Group__1"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group__1__Impl"
-    // InternalProblem.g:843:1: rule__ClassDeclaration__Group__1__Impl : ( 'class' ) ;
-    public final void rule__ClassDeclaration__Group__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__Problem__Group__1__Impl"
+    // InternalProblem.g:938: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:847:1: ( ( 'class' ) )
-            // InternalProblem.g:848:1: ( 'class' )
+            // InternalProblem.g:942:1: ( ( ( rule__Problem__StatementsAssignment_1 )* ) )
+            // InternalProblem.g:943:1: ( ( rule__Problem__StatementsAssignment_1 )* )
             {
-            // InternalProblem.g:848:1: ( 'class' )
-            // InternalProblem.g:849:2: 'class'
+            // InternalProblem.g:943:1: ( ( rule__Problem__StatementsAssignment_1 )* )
+            // InternalProblem.g:944:2: ( rule__Problem__StatementsAssignment_1 )*
             {
-             before(grammarAccess.getClassDeclarationAccess().getClassKeyword_1()); 
-            match(input,20,FOLLOW_2); 
-             after(grammarAccess.getClassDeclarationAccess().getClassKeyword_1()); 
+             before(grammarAccess.getProblemAccess().getStatementsAssignment_1()); 
+            // InternalProblem.g:945:2: ( rule__Problem__StatementsAssignment_1 )*
+            loop15:
+            do {
+                int alt15=2;
+                int LA15_0 = input.LA(1);
+
+                if ( ((LA15_0>=RULE_QUOTED_ID && LA15_0<=RULE_ID)||LA15_0==14||(LA15_0>=20 && LA15_0<=21)||LA15_0==23||LA15_0==36||LA15_0==38||LA15_0==40) ) {
+                    alt15=1;
+                }
+
+
+                switch (alt15) {
+                case 1 :
+                    // InternalProblem.g:945:3: rule__Problem__StatementsAssignment_1
+                    {
+                    pushFollow(FOLLOW_4);
+                    rule__Problem__StatementsAssignment_1();
+
+                    state._fsp--;
+
+
+                    }
+                    break;
+
+                default :
+                    break loop15;
+                }
+            } while (true);
+
+             after(grammarAccess.getProblemAccess().getStatementsAssignment_1()); 
 
             }
 
@@ -2836,26 +3125,26 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group__1__Impl"
+    // $ANTLR end "rule__Problem__Group__1__Impl"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group__2"
-    // InternalProblem.g:858:1: rule__ClassDeclaration__Group__2 : rule__ClassDeclaration__Group__2__Impl rule__ClassDeclaration__Group__3 ;
-    public final void rule__ClassDeclaration__Group__2() throws RecognitionException {
+    // $ANTLR start "rule__Problem__Group_0__0"
+    // InternalProblem.g:954:1: rule__Problem__Group_0__0 : rule__Problem__Group_0__0__Impl rule__Problem__Group_0__1 ;
+    public final void rule__Problem__Group_0__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:862:1: ( rule__ClassDeclaration__Group__2__Impl rule__ClassDeclaration__Group__3 )
-            // InternalProblem.g:863:2: rule__ClassDeclaration__Group__2__Impl rule__ClassDeclaration__Group__3
+            // InternalProblem.g:958:1: ( rule__Problem__Group_0__0__Impl rule__Problem__Group_0__1 )
+            // InternalProblem.g:959:2: rule__Problem__Group_0__0__Impl rule__Problem__Group_0__1
             {
-            pushFollow(FOLLOW_6);
-            rule__ClassDeclaration__Group__2__Impl();
+            pushFollow(FOLLOW_5);
+            rule__Problem__Group_0__0__Impl();
 
             state._fsp--;
 
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__Group__3();
+            rule__Problem__Group_0__1();
 
             state._fsp--;
 
@@ -2874,35 +3163,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group__2"
+    // $ANTLR end "rule__Problem__Group_0__0"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group__2__Impl"
-    // InternalProblem.g:870:1: rule__ClassDeclaration__Group__2__Impl : ( ( rule__ClassDeclaration__NameAssignment_2 ) ) ;
-    public final void rule__ClassDeclaration__Group__2__Impl() throws RecognitionException {
+    // $ANTLR start "rule__Problem__Group_0__0__Impl"
+    // InternalProblem.g:966: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:874:1: ( ( ( rule__ClassDeclaration__NameAssignment_2 ) ) )
-            // InternalProblem.g:875:1: ( ( rule__ClassDeclaration__NameAssignment_2 ) )
+            // InternalProblem.g:970:1: ( ( 'problem' ) )
+            // InternalProblem.g:971:1: ( 'problem' )
             {
-            // InternalProblem.g:875:1: ( ( rule__ClassDeclaration__NameAssignment_2 ) )
-            // InternalProblem.g:876:2: ( rule__ClassDeclaration__NameAssignment_2 )
-            {
-             before(grammarAccess.getClassDeclarationAccess().getNameAssignment_2()); 
-            // InternalProblem.g:877:2: ( rule__ClassDeclaration__NameAssignment_2 )
-            // InternalProblem.g:877:3: rule__ClassDeclaration__NameAssignment_2
+            // InternalProblem.g:971:1: ( 'problem' )
+            // InternalProblem.g:972:2: 'problem'
             {
-            pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__NameAssignment_2();
-
-            state._fsp--;
-
-
-            }
-
-             after(grammarAccess.getClassDeclarationAccess().getNameAssignment_2()); 
+             before(grammarAccess.getProblemAccess().getProblemKeyword_0_0()); 
+            match(input,22,FOLLOW_2); 
+             after(grammarAccess.getProblemAccess().getProblemKeyword_0_0()); 
 
             }
 
@@ -2921,26 +3200,26 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group__2__Impl"
+    // $ANTLR end "rule__Problem__Group_0__0__Impl"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group__3"
-    // InternalProblem.g:885:1: rule__ClassDeclaration__Group__3 : rule__ClassDeclaration__Group__3__Impl rule__ClassDeclaration__Group__4 ;
-    public final void rule__ClassDeclaration__Group__3() throws RecognitionException {
+    // $ANTLR start "rule__Problem__Group_0__1"
+    // InternalProblem.g:981:1: rule__Problem__Group_0__1 : rule__Problem__Group_0__1__Impl rule__Problem__Group_0__2 ;
+    public final void rule__Problem__Group_0__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:889:1: ( rule__ClassDeclaration__Group__3__Impl rule__ClassDeclaration__Group__4 )
-            // InternalProblem.g:890:2: rule__ClassDeclaration__Group__3__Impl rule__ClassDeclaration__Group__4
+            // InternalProblem.g:985:1: ( rule__Problem__Group_0__1__Impl rule__Problem__Group_0__2 )
+            // InternalProblem.g:986:2: rule__Problem__Group_0__1__Impl rule__Problem__Group_0__2
             {
             pushFollow(FOLLOW_6);
-            rule__ClassDeclaration__Group__3__Impl();
+            rule__Problem__Group_0__1__Impl();
 
             state._fsp--;
 
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__Group__4();
+            rule__Problem__Group_0__2();
 
             state._fsp--;
 
@@ -2959,46 +3238,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group__3"
+    // $ANTLR end "rule__Problem__Group_0__1"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group__3__Impl"
-    // InternalProblem.g:897:1: rule__ClassDeclaration__Group__3__Impl : ( ( rule__ClassDeclaration__Alternatives_3 )? ) ;
-    public final void rule__ClassDeclaration__Group__3__Impl() throws RecognitionException {
+    // $ANTLR start "rule__Problem__Group_0__1__Impl"
+    // InternalProblem.g:993: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:901:1: ( ( ( rule__ClassDeclaration__Alternatives_3 )? ) )
-            // InternalProblem.g:902:1: ( ( rule__ClassDeclaration__Alternatives_3 )? )
+            // InternalProblem.g:997:1: ( ( ( rule__Problem__NameAssignment_0_1 ) ) )
+            // InternalProblem.g:998:1: ( ( rule__Problem__NameAssignment_0_1 ) )
             {
-            // InternalProblem.g:902:1: ( ( rule__ClassDeclaration__Alternatives_3 )? )
-            // InternalProblem.g:903:2: ( rule__ClassDeclaration__Alternatives_3 )?
+            // InternalProblem.g:998:1: ( ( rule__Problem__NameAssignment_0_1 ) )
+            // InternalProblem.g:999:2: ( rule__Problem__NameAssignment_0_1 )
             {
-             before(grammarAccess.getClassDeclarationAccess().getAlternatives_3()); 
-            // InternalProblem.g:904:2: ( rule__ClassDeclaration__Alternatives_3 )?
-            int alt15=2;
-            int LA15_0 = input.LA(1);
-
-            if ( (LA15_0==11||LA15_0==22||LA15_0==36) ) {
-                alt15=1;
-            }
-            switch (alt15) {
-                case 1 :
-                    // InternalProblem.g:904:3: rule__ClassDeclaration__Alternatives_3
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__ClassDeclaration__Alternatives_3();
-
-                    state._fsp--;
+             before(grammarAccess.getProblemAccess().getNameAssignment_0_1()); 
+            // InternalProblem.g:1000:2: ( rule__Problem__NameAssignment_0_1 )
+            // InternalProblem.g:1000:3: rule__Problem__NameAssignment_0_1
+            {
+            pushFollow(FOLLOW_2);
+            rule__Problem__NameAssignment_0_1();
 
+            state._fsp--;
 
-                    }
-                    break;
 
             }
 
-             after(grammarAccess.getClassDeclarationAccess().getAlternatives_3()); 
+             after(grammarAccess.getProblemAccess().getNameAssignment_0_1()); 
 
             }
 
@@ -3017,26 +3285,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group__3__Impl"
+    // $ANTLR end "rule__Problem__Group_0__1__Impl"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group__4"
-    // InternalProblem.g:912:1: rule__ClassDeclaration__Group__4 : rule__ClassDeclaration__Group__4__Impl rule__ClassDeclaration__Group__5 ;
-    public final void rule__ClassDeclaration__Group__4() throws RecognitionException {
+    // $ANTLR start "rule__Problem__Group_0__2"
+    // InternalProblem.g:1008: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:916:1: ( rule__ClassDeclaration__Group__4__Impl rule__ClassDeclaration__Group__5 )
-            // InternalProblem.g:917:2: rule__ClassDeclaration__Group__4__Impl rule__ClassDeclaration__Group__5
+            // InternalProblem.g:1012:1: ( rule__Problem__Group_0__2__Impl )
+            // InternalProblem.g:1013:2: rule__Problem__Group_0__2__Impl
             {
-            pushFollow(FOLLOW_6);
-            rule__ClassDeclaration__Group__4__Impl();
-
-            state._fsp--;
-
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__Group__5();
+            rule__Problem__Group_0__2__Impl();
 
             state._fsp--;
 
@@ -3055,53 +3318,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group__4"
+    // $ANTLR end "rule__Problem__Group_0__2"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group__4__Impl"
-    // InternalProblem.g:924:1: rule__ClassDeclaration__Group__4__Impl : ( ( rule__ClassDeclaration__Group_4__0 )* ) ;
-    public final void rule__ClassDeclaration__Group__4__Impl() throws RecognitionException {
+    // $ANTLR start "rule__Problem__Group_0__2__Impl"
+    // InternalProblem.g:1019:1: rule__Problem__Group_0__2__Impl : ( '.' ) ;
+    public final void rule__Problem__Group_0__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:928:1: ( ( ( rule__ClassDeclaration__Group_4__0 )* ) )
-            // InternalProblem.g:929:1: ( ( rule__ClassDeclaration__Group_4__0 )* )
+            // InternalProblem.g:1023:1: ( ( '.' ) )
+            // InternalProblem.g:1024:1: ( '.' )
             {
-            // InternalProblem.g:929:1: ( ( rule__ClassDeclaration__Group_4__0 )* )
-            // InternalProblem.g:930:2: ( rule__ClassDeclaration__Group_4__0 )*
+            // InternalProblem.g:1024:1: ( '.' )
+            // InternalProblem.g:1025:2: '.'
             {
-             before(grammarAccess.getClassDeclarationAccess().getGroup_4()); 
-            // InternalProblem.g:931:2: ( rule__ClassDeclaration__Group_4__0 )*
-            loop16:
-            do {
-                int alt16=2;
-                int LA16_0 = input.LA(1);
-
-                if ( (LA16_0==25) ) {
-                    alt16=1;
-                }
-
-
-                switch (alt16) {
-                case 1 :
-                    // InternalProblem.g:931:3: rule__ClassDeclaration__Group_4__0
-                    {
-                    pushFollow(FOLLOW_7);
-                    rule__ClassDeclaration__Group_4__0();
-
-                    state._fsp--;
-
-
-                    }
-                    break;
-
-                default :
-                    break loop16;
-                }
-            } while (true);
-
-             after(grammarAccess.getClassDeclarationAccess().getGroup_4()); 
+             before(grammarAccess.getProblemAccess().getFullStopKeyword_0_2()); 
+            match(input,12,FOLLOW_2); 
+             after(grammarAccess.getProblemAccess().getFullStopKeyword_0_2()); 
 
             }
 
@@ -3120,21 +3355,26 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group__4__Impl"
+    // $ANTLR end "rule__Problem__Group_0__2__Impl"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group__5"
-    // InternalProblem.g:939:1: rule__ClassDeclaration__Group__5 : rule__ClassDeclaration__Group__5__Impl ;
-    public final void rule__ClassDeclaration__Group__5() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group__0"
+    // InternalProblem.g:1035: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:943:1: ( rule__ClassDeclaration__Group__5__Impl )
-            // InternalProblem.g:944:2: rule__ClassDeclaration__Group__5__Impl
+            // InternalProblem.g:1039:1: ( rule__ClassDeclaration__Group__0__Impl rule__ClassDeclaration__Group__1 )
+            // InternalProblem.g:1040:2: rule__ClassDeclaration__Group__0__Impl rule__ClassDeclaration__Group__1
             {
+            pushFollow(FOLLOW_7);
+            rule__ClassDeclaration__Group__0__Impl();
+
+            state._fsp--;
+
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__Group__5__Impl();
+            rule__ClassDeclaration__Group__1();
 
             state._fsp--;
 
@@ -3153,25 +3393,46 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group__5"
+    // $ANTLR end "rule__ClassDeclaration__Group__0"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group__5__Impl"
-    // InternalProblem.g:950:1: rule__ClassDeclaration__Group__5__Impl : ( '.' ) ;
-    public final void rule__ClassDeclaration__Group__5__Impl() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group__0__Impl"
+    // InternalProblem.g:1047: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:954:1: ( ( '.' ) )
-            // InternalProblem.g:955:1: ( '.' )
+            // InternalProblem.g:1051:1: ( ( ( rule__ClassDeclaration__AbstractAssignment_0 )? ) )
+            // InternalProblem.g:1052:1: ( ( rule__ClassDeclaration__AbstractAssignment_0 )? )
             {
-            // InternalProblem.g:955:1: ( '.' )
-            // InternalProblem.g:956:2: '.'
+            // InternalProblem.g:1052:1: ( ( rule__ClassDeclaration__AbstractAssignment_0 )? )
+            // InternalProblem.g:1053:2: ( rule__ClassDeclaration__AbstractAssignment_0 )?
             {
-             before(grammarAccess.getClassDeclarationAccess().getFullStopKeyword_5()); 
-            match(input,21,FOLLOW_2); 
-             after(grammarAccess.getClassDeclarationAccess().getFullStopKeyword_5()); 
+             before(grammarAccess.getClassDeclarationAccess().getAbstractAssignment_0()); 
+            // InternalProblem.g:1054:2: ( rule__ClassDeclaration__AbstractAssignment_0 )?
+            int alt16=2;
+            int LA16_0 = input.LA(1);
+
+            if ( (LA16_0==38) ) {
+                alt16=1;
+            }
+            switch (alt16) {
+                case 1 :
+                    // InternalProblem.g:1054:3: rule__ClassDeclaration__AbstractAssignment_0
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__ClassDeclaration__AbstractAssignment_0();
+
+                    state._fsp--;
+
+
+                    }
+                    break;
+
+            }
+
+             after(grammarAccess.getClassDeclarationAccess().getAbstractAssignment_0()); 
 
             }
 
@@ -3190,26 +3451,26 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group__5__Impl"
+    // $ANTLR end "rule__ClassDeclaration__Group__0__Impl"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_3_0__0"
-    // InternalProblem.g:966:1: rule__ClassDeclaration__Group_3_0__0 : rule__ClassDeclaration__Group_3_0__0__Impl rule__ClassDeclaration__Group_3_0__1 ;
-    public final void rule__ClassDeclaration__Group_3_0__0() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group__1"
+    // InternalProblem.g:1062: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:970:1: ( rule__ClassDeclaration__Group_3_0__0__Impl rule__ClassDeclaration__Group_3_0__1 )
-            // InternalProblem.g:971:2: rule__ClassDeclaration__Group_3_0__0__Impl rule__ClassDeclaration__Group_3_0__1
+            // InternalProblem.g:1066:1: ( rule__ClassDeclaration__Group__1__Impl rule__ClassDeclaration__Group__2 )
+            // InternalProblem.g:1067:2: rule__ClassDeclaration__Group__1__Impl rule__ClassDeclaration__Group__2
             {
-            pushFollow(FOLLOW_8);
-            rule__ClassDeclaration__Group_3_0__0__Impl();
+            pushFollow(FOLLOW_5);
+            rule__ClassDeclaration__Group__1__Impl();
 
             state._fsp--;
 
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__Group_3_0__1();
+            rule__ClassDeclaration__Group__2();
 
             state._fsp--;
 
@@ -3228,25 +3489,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_3_0__0"
+    // $ANTLR end "rule__ClassDeclaration__Group__1"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_3_0__0__Impl"
-    // InternalProblem.g:978:1: rule__ClassDeclaration__Group_3_0__0__Impl : ( 'extends' ) ;
-    public final void rule__ClassDeclaration__Group_3_0__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group__1__Impl"
+    // InternalProblem.g:1074:1: rule__ClassDeclaration__Group__1__Impl : ( 'class' ) ;
+    public final void rule__ClassDeclaration__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:982:1: ( ( 'extends' ) )
-            // InternalProblem.g:983:1: ( 'extends' )
+            // InternalProblem.g:1078:1: ( ( 'class' ) )
+            // InternalProblem.g:1079:1: ( 'class' )
             {
-            // InternalProblem.g:983:1: ( 'extends' )
-            // InternalProblem.g:984:2: 'extends'
+            // InternalProblem.g:1079:1: ( 'class' )
+            // InternalProblem.g:1080:2: 'class'
             {
-             before(grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0_0()); 
-            match(input,22,FOLLOW_2); 
-             after(grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0_0()); 
+             before(grammarAccess.getClassDeclarationAccess().getClassKeyword_1()); 
+            match(input,23,FOLLOW_2); 
+             after(grammarAccess.getClassDeclarationAccess().getClassKeyword_1()); 
 
             }
 
@@ -3265,21 +3526,26 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_3_0__0__Impl"
+    // $ANTLR end "rule__ClassDeclaration__Group__1__Impl"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_3_0__1"
-    // InternalProblem.g:993:1: rule__ClassDeclaration__Group_3_0__1 : rule__ClassDeclaration__Group_3_0__1__Impl ;
-    public final void rule__ClassDeclaration__Group_3_0__1() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group__2"
+    // InternalProblem.g:1089: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:997:1: ( rule__ClassDeclaration__Group_3_0__1__Impl )
-            // InternalProblem.g:998:2: rule__ClassDeclaration__Group_3_0__1__Impl
+            // InternalProblem.g:1093:1: ( rule__ClassDeclaration__Group__2__Impl rule__ClassDeclaration__Group__3 )
+            // InternalProblem.g:1094:2: rule__ClassDeclaration__Group__2__Impl rule__ClassDeclaration__Group__3
             {
+            pushFollow(FOLLOW_8);
+            rule__ClassDeclaration__Group__2__Impl();
+
+            state._fsp--;
+
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__Group_3_0__1__Impl();
+            rule__ClassDeclaration__Group__3();
 
             state._fsp--;
 
@@ -3298,35 +3564,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_3_0__1"
+    // $ANTLR end "rule__ClassDeclaration__Group__2"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_3_0__1__Impl"
-    // InternalProblem.g:1004:1: rule__ClassDeclaration__Group_3_0__1__Impl : ( ( rule__ClassDeclaration__Alternatives_3_0_1 ) ) ;
-    public final void rule__ClassDeclaration__Group_3_0__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group__2__Impl"
+    // InternalProblem.g:1101: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:1008:1: ( ( ( rule__ClassDeclaration__Alternatives_3_0_1 ) ) )
-            // InternalProblem.g:1009:1: ( ( rule__ClassDeclaration__Alternatives_3_0_1 ) )
+            // InternalProblem.g:1105:1: ( ( ( rule__ClassDeclaration__NameAssignment_2 ) ) )
+            // InternalProblem.g:1106:1: ( ( rule__ClassDeclaration__NameAssignment_2 ) )
             {
-            // InternalProblem.g:1009:1: ( ( rule__ClassDeclaration__Alternatives_3_0_1 ) )
-            // InternalProblem.g:1010:2: ( rule__ClassDeclaration__Alternatives_3_0_1 )
+            // InternalProblem.g:1106:1: ( ( rule__ClassDeclaration__NameAssignment_2 ) )
+            // InternalProblem.g:1107:2: ( rule__ClassDeclaration__NameAssignment_2 )
             {
-             before(grammarAccess.getClassDeclarationAccess().getAlternatives_3_0_1()); 
-            // InternalProblem.g:1011:2: ( rule__ClassDeclaration__Alternatives_3_0_1 )
-            // InternalProblem.g:1011:3: rule__ClassDeclaration__Alternatives_3_0_1
+             before(grammarAccess.getClassDeclarationAccess().getNameAssignment_2()); 
+            // InternalProblem.g:1108:2: ( rule__ClassDeclaration__NameAssignment_2 )
+            // InternalProblem.g:1108:3: rule__ClassDeclaration__NameAssignment_2
             {
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__Alternatives_3_0_1();
+            rule__ClassDeclaration__NameAssignment_2();
 
             state._fsp--;
 
 
             }
 
-             after(grammarAccess.getClassDeclarationAccess().getAlternatives_3_0_1()); 
+             after(grammarAccess.getClassDeclarationAccess().getNameAssignment_2()); 
 
             }
 
@@ -3345,26 +3611,26 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_3_0__1__Impl"
+    // $ANTLR end "rule__ClassDeclaration__Group__2__Impl"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_3_0_1_1__0"
-    // InternalProblem.g:1020:1: rule__ClassDeclaration__Group_3_0_1_1__0 : rule__ClassDeclaration__Group_3_0_1_1__0__Impl rule__ClassDeclaration__Group_3_0_1_1__1 ;
-    public final void rule__ClassDeclaration__Group_3_0_1_1__0() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group__3"
+    // InternalProblem.g:1116: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:1024:1: ( rule__ClassDeclaration__Group_3_0_1_1__0__Impl rule__ClassDeclaration__Group_3_0_1_1__1 )
-            // InternalProblem.g:1025:2: rule__ClassDeclaration__Group_3_0_1_1__0__Impl rule__ClassDeclaration__Group_3_0_1_1__1
+            // InternalProblem.g:1120:1: ( rule__ClassDeclaration__Group__3__Impl rule__ClassDeclaration__Group__4 )
+            // InternalProblem.g:1121:2: rule__ClassDeclaration__Group__3__Impl rule__ClassDeclaration__Group__4
             {
-            pushFollow(FOLLOW_9);
-            rule__ClassDeclaration__Group_3_0_1_1__0__Impl();
+            pushFollow(FOLLOW_8);
+            rule__ClassDeclaration__Group__3__Impl();
 
             state._fsp--;
 
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__Group_3_0_1_1__1();
+            rule__ClassDeclaration__Group__4();
 
             state._fsp--;
 
@@ -3383,25 +3649,46 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_3_0_1_1__0"
+    // $ANTLR end "rule__ClassDeclaration__Group__3"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_3_0_1_1__0__Impl"
-    // InternalProblem.g:1032:1: rule__ClassDeclaration__Group_3_0_1_1__0__Impl : ( '[' ) ;
-    public final void rule__ClassDeclaration__Group_3_0_1_1__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group__3__Impl"
+    // InternalProblem.g:1128: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:1036:1: ( ( '[' ) )
-            // InternalProblem.g:1037:1: ( '[' )
+            // InternalProblem.g:1132:1: ( ( ( rule__ClassDeclaration__Group_3__0 )? ) )
+            // InternalProblem.g:1133:1: ( ( rule__ClassDeclaration__Group_3__0 )? )
             {
-            // InternalProblem.g:1037:1: ( '[' )
-            // InternalProblem.g:1038:2: '['
+            // InternalProblem.g:1133:1: ( ( rule__ClassDeclaration__Group_3__0 )? )
+            // InternalProblem.g:1134:2: ( rule__ClassDeclaration__Group_3__0 )?
             {
-             before(grammarAccess.getClassDeclarationAccess().getLeftSquareBracketKeyword_3_0_1_1_0()); 
-            match(input,23,FOLLOW_2); 
-             after(grammarAccess.getClassDeclarationAccess().getLeftSquareBracketKeyword_3_0_1_1_0()); 
+             before(grammarAccess.getClassDeclarationAccess().getGroup_3()); 
+            // InternalProblem.g:1135:2: ( rule__ClassDeclaration__Group_3__0 )?
+            int alt17=2;
+            int LA17_0 = input.LA(1);
+
+            if ( (LA17_0==24) ) {
+                alt17=1;
+            }
+            switch (alt17) {
+                case 1 :
+                    // InternalProblem.g:1135:3: rule__ClassDeclaration__Group_3__0
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__ClassDeclaration__Group_3__0();
+
+                    state._fsp--;
+
+
+                    }
+                    break;
+
+            }
+
+             after(grammarAccess.getClassDeclarationAccess().getGroup_3()); 
 
             }
 
@@ -3420,26 +3707,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_3_0_1_1__0__Impl"
+    // $ANTLR end "rule__ClassDeclaration__Group__3__Impl"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_3_0_1_1__1"
-    // InternalProblem.g:1047:1: rule__ClassDeclaration__Group_3_0_1_1__1 : rule__ClassDeclaration__Group_3_0_1_1__1__Impl rule__ClassDeclaration__Group_3_0_1_1__2 ;
-    public final void rule__ClassDeclaration__Group_3_0_1_1__1() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group__4"
+    // InternalProblem.g:1143: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:1051:1: ( rule__ClassDeclaration__Group_3_0_1_1__1__Impl rule__ClassDeclaration__Group_3_0_1_1__2 )
-            // InternalProblem.g:1052:2: rule__ClassDeclaration__Group_3_0_1_1__1__Impl rule__ClassDeclaration__Group_3_0_1_1__2
+            // InternalProblem.g:1147:1: ( rule__ClassDeclaration__Group__4__Impl )
+            // InternalProblem.g:1148:2: rule__ClassDeclaration__Group__4__Impl
             {
-            pushFollow(FOLLOW_9);
-            rule__ClassDeclaration__Group_3_0_1_1__1__Impl();
-
-            state._fsp--;
-
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__Group_3_0_1_1__2();
+            rule__ClassDeclaration__Group__4__Impl();
 
             state._fsp--;
 
@@ -3458,46 +3740,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_3_0_1_1__1"
+    // $ANTLR end "rule__ClassDeclaration__Group__4"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_3_0_1_1__1__Impl"
-    // InternalProblem.g:1059:1: rule__ClassDeclaration__Group_3_0_1_1__1__Impl : ( ( rule__ClassDeclaration__Group_3_0_1_1_1__0 )? ) ;
-    public final void rule__ClassDeclaration__Group_3_0_1_1__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group__4__Impl"
+    // InternalProblem.g:1154: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:1063:1: ( ( ( rule__ClassDeclaration__Group_3_0_1_1_1__0 )? ) )
-            // InternalProblem.g:1064:1: ( ( rule__ClassDeclaration__Group_3_0_1_1_1__0 )? )
+            // InternalProblem.g:1158:1: ( ( ( rule__ClassDeclaration__Alternatives_4 ) ) )
+            // InternalProblem.g:1159:1: ( ( rule__ClassDeclaration__Alternatives_4 ) )
             {
-            // InternalProblem.g:1064:1: ( ( rule__ClassDeclaration__Group_3_0_1_1_1__0 )? )
-            // InternalProblem.g:1065:2: ( rule__ClassDeclaration__Group_3_0_1_1_1__0 )?
+            // InternalProblem.g:1159:1: ( ( rule__ClassDeclaration__Alternatives_4 ) )
+            // InternalProblem.g:1160:2: ( rule__ClassDeclaration__Alternatives_4 )
             {
-             before(grammarAccess.getClassDeclarationAccess().getGroup_3_0_1_1_1()); 
-            // InternalProblem.g:1066:2: ( rule__ClassDeclaration__Group_3_0_1_1_1__0 )?
-            int alt17=2;
-            int LA17_0 = input.LA(1);
-
-            if ( (LA17_0==RULE_ID) ) {
-                alt17=1;
-            }
-            switch (alt17) {
-                case 1 :
-                    // InternalProblem.g:1066:3: rule__ClassDeclaration__Group_3_0_1_1_1__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__ClassDeclaration__Group_3_0_1_1_1__0();
+             before(grammarAccess.getClassDeclarationAccess().getAlternatives_4()); 
+            // InternalProblem.g:1161:2: ( rule__ClassDeclaration__Alternatives_4 )
+            // InternalProblem.g:1161:3: rule__ClassDeclaration__Alternatives_4
+            {
+            pushFollow(FOLLOW_2);
+            rule__ClassDeclaration__Alternatives_4();
 
-                    state._fsp--;
+            state._fsp--;
 
 
-                    }
-                    break;
-
             }
 
-             after(grammarAccess.getClassDeclarationAccess().getGroup_3_0_1_1_1()); 
+             after(grammarAccess.getClassDeclarationAccess().getAlternatives_4()); 
 
             }
 
@@ -3516,21 +3787,26 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_3_0_1_1__1__Impl"
+    // $ANTLR end "rule__ClassDeclaration__Group__4__Impl"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_3_0_1_1__2"
-    // InternalProblem.g:1074:1: rule__ClassDeclaration__Group_3_0_1_1__2 : rule__ClassDeclaration__Group_3_0_1_1__2__Impl ;
-    public final void rule__ClassDeclaration__Group_3_0_1_1__2() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group_3__0"
+    // InternalProblem.g:1170:1: rule__ClassDeclaration__Group_3__0 : rule__ClassDeclaration__Group_3__0__Impl rule__ClassDeclaration__Group_3__1 ;
+    public final void rule__ClassDeclaration__Group_3__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1078:1: ( rule__ClassDeclaration__Group_3_0_1_1__2__Impl )
-            // InternalProblem.g:1079:2: rule__ClassDeclaration__Group_3_0_1_1__2__Impl
+            // InternalProblem.g:1174:1: ( rule__ClassDeclaration__Group_3__0__Impl rule__ClassDeclaration__Group_3__1 )
+            // InternalProblem.g:1175:2: rule__ClassDeclaration__Group_3__0__Impl rule__ClassDeclaration__Group_3__1
             {
+            pushFollow(FOLLOW_9);
+            rule__ClassDeclaration__Group_3__0__Impl();
+
+            state._fsp--;
+
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__Group_3_0_1_1__2__Impl();
+            rule__ClassDeclaration__Group_3__1();
 
             state._fsp--;
 
@@ -3549,25 +3825,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_3_0_1_1__2"
+    // $ANTLR end "rule__ClassDeclaration__Group_3__0"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_3_0_1_1__2__Impl"
-    // InternalProblem.g:1085:1: rule__ClassDeclaration__Group_3_0_1_1__2__Impl : ( ']' ) ;
-    public final void rule__ClassDeclaration__Group_3_0_1_1__2__Impl() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group_3__0__Impl"
+    // InternalProblem.g:1182: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:1089:1: ( ( ']' ) )
-            // InternalProblem.g:1090:1: ( ']' )
+            // InternalProblem.g:1186:1: ( ( 'extends' ) )
+            // InternalProblem.g:1187:1: ( 'extends' )
             {
-            // InternalProblem.g:1090:1: ( ']' )
-            // InternalProblem.g:1091:2: ']'
+            // InternalProblem.g:1187:1: ( 'extends' )
+            // InternalProblem.g:1188:2: 'extends'
             {
-             before(grammarAccess.getClassDeclarationAccess().getRightSquareBracketKeyword_3_0_1_1_2()); 
+             before(grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0()); 
             match(input,24,FOLLOW_2); 
-             after(grammarAccess.getClassDeclarationAccess().getRightSquareBracketKeyword_3_0_1_1_2()); 
+             after(grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0()); 
 
             }
 
@@ -3586,26 +3862,26 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_3_0_1_1__2__Impl"
+    // $ANTLR end "rule__ClassDeclaration__Group_3__0__Impl"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_3_0_1_1_1__0"
-    // InternalProblem.g:1101:1: rule__ClassDeclaration__Group_3_0_1_1_1__0 : rule__ClassDeclaration__Group_3_0_1_1_1__0__Impl rule__ClassDeclaration__Group_3_0_1_1_1__1 ;
-    public final void rule__ClassDeclaration__Group_3_0_1_1_1__0() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group_3__1"
+    // InternalProblem.g:1197:1: rule__ClassDeclaration__Group_3__1 : rule__ClassDeclaration__Group_3__1__Impl rule__ClassDeclaration__Group_3__2 ;
+    public final void rule__ClassDeclaration__Group_3__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1105:1: ( rule__ClassDeclaration__Group_3_0_1_1_1__0__Impl rule__ClassDeclaration__Group_3_0_1_1_1__1 )
-            // InternalProblem.g:1106:2: rule__ClassDeclaration__Group_3_0_1_1_1__0__Impl rule__ClassDeclaration__Group_3_0_1_1_1__1
+            // InternalProblem.g:1201:1: ( rule__ClassDeclaration__Group_3__1__Impl rule__ClassDeclaration__Group_3__2 )
+            // InternalProblem.g:1202:2: rule__ClassDeclaration__Group_3__1__Impl rule__ClassDeclaration__Group_3__2
             {
             pushFollow(FOLLOW_10);
-            rule__ClassDeclaration__Group_3_0_1_1_1__0__Impl();
+            rule__ClassDeclaration__Group_3__1__Impl();
 
             state._fsp--;
 
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__Group_3_0_1_1_1__1();
+            rule__ClassDeclaration__Group_3__2();
 
             state._fsp--;
 
@@ -3624,35 +3900,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_3_0_1_1_1__0"
+    // $ANTLR end "rule__ClassDeclaration__Group_3__1"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_3_0_1_1_1__0__Impl"
-    // InternalProblem.g:1113:1: rule__ClassDeclaration__Group_3_0_1_1_1__0__Impl : ( ( rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_0 ) ) ;
-    public final void rule__ClassDeclaration__Group_3_0_1_1_1__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group_3__1__Impl"
+    // InternalProblem.g:1209: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:1117:1: ( ( ( rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_0 ) ) )
-            // InternalProblem.g:1118:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_0 ) )
+            // InternalProblem.g:1213:1: ( ( ( rule__ClassDeclaration__SuperTypesAssignment_3_1 ) ) )
+            // InternalProblem.g:1214:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_1 ) )
             {
-            // InternalProblem.g:1118:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_0 ) )
-            // InternalProblem.g:1119:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_0 )
+            // InternalProblem.g:1214:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_1 ) )
+            // InternalProblem.g:1215:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_1 )
             {
-             before(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_0_1_1_1_0()); 
-            // InternalProblem.g:1120:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_0 )
-            // InternalProblem.g:1120:3: rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_0
+             before(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_1()); 
+            // InternalProblem.g:1216:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_1 )
+            // InternalProblem.g:1216:3: rule__ClassDeclaration__SuperTypesAssignment_3_1
             {
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_0();
+            rule__ClassDeclaration__SuperTypesAssignment_3_1();
 
             state._fsp--;
 
 
             }
 
-             after(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_0_1_1_1_0()); 
+             after(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_1()); 
 
             }
 
@@ -3671,21 +3947,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_3_0_1_1_1__0__Impl"
+    // $ANTLR end "rule__ClassDeclaration__Group_3__1__Impl"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_3_0_1_1_1__1"
-    // InternalProblem.g:1128:1: rule__ClassDeclaration__Group_3_0_1_1_1__1 : rule__ClassDeclaration__Group_3_0_1_1_1__1__Impl ;
-    public final void rule__ClassDeclaration__Group_3_0_1_1_1__1() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group_3__2"
+    // InternalProblem.g:1224: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:1132:1: ( rule__ClassDeclaration__Group_3_0_1_1_1__1__Impl )
-            // InternalProblem.g:1133:2: rule__ClassDeclaration__Group_3_0_1_1_1__1__Impl
+            // InternalProblem.g:1228:1: ( rule__ClassDeclaration__Group_3__2__Impl )
+            // InternalProblem.g:1229:2: rule__ClassDeclaration__Group_3__2__Impl
             {
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__Group_3_0_1_1_1__1__Impl();
+            rule__ClassDeclaration__Group_3__2__Impl();
 
             state._fsp--;
 
@@ -3704,24 +3980,24 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_3_0_1_1_1__1"
+    // $ANTLR end "rule__ClassDeclaration__Group_3__2"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_3_0_1_1_1__1__Impl"
-    // InternalProblem.g:1139:1: rule__ClassDeclaration__Group_3_0_1_1_1__1__Impl : ( ( rule__ClassDeclaration__Group_3_0_1_1_1_1__0 )* ) ;
-    public final void rule__ClassDeclaration__Group_3_0_1_1_1__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group_3__2__Impl"
+    // InternalProblem.g:1235: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:1143:1: ( ( ( rule__ClassDeclaration__Group_3_0_1_1_1_1__0 )* ) )
-            // InternalProblem.g:1144:1: ( ( rule__ClassDeclaration__Group_3_0_1_1_1_1__0 )* )
+            // InternalProblem.g:1239:1: ( ( ( rule__ClassDeclaration__Group_3_2__0 )* ) )
+            // InternalProblem.g:1240:1: ( ( rule__ClassDeclaration__Group_3_2__0 )* )
             {
-            // InternalProblem.g:1144:1: ( ( rule__ClassDeclaration__Group_3_0_1_1_1_1__0 )* )
-            // InternalProblem.g:1145:2: ( rule__ClassDeclaration__Group_3_0_1_1_1_1__0 )*
+            // InternalProblem.g:1240:1: ( ( rule__ClassDeclaration__Group_3_2__0 )* )
+            // InternalProblem.g:1241:2: ( rule__ClassDeclaration__Group_3_2__0 )*
             {
-             before(grammarAccess.getClassDeclarationAccess().getGroup_3_0_1_1_1_1()); 
-            // InternalProblem.g:1146:2: ( rule__ClassDeclaration__Group_3_0_1_1_1_1__0 )*
+             before(grammarAccess.getClassDeclarationAccess().getGroup_3_2()); 
+            // InternalProblem.g:1242:2: ( rule__ClassDeclaration__Group_3_2__0 )*
             loop18:
             do {
                 int alt18=2;
@@ -3734,10 +4010,10 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
                 switch (alt18) {
                 case 1 :
-                    // InternalProblem.g:1146:3: rule__ClassDeclaration__Group_3_0_1_1_1_1__0
+                    // InternalProblem.g:1242:3: rule__ClassDeclaration__Group_3_2__0
                     {
-                    pushFollow(FOLLOW_7);
-                    rule__ClassDeclaration__Group_3_0_1_1_1_1__0();
+                    pushFollow(FOLLOW_11);
+                    rule__ClassDeclaration__Group_3_2__0();
 
                     state._fsp--;
 
@@ -3750,7 +4026,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                 }
             } while (true);
 
-             after(grammarAccess.getClassDeclarationAccess().getGroup_3_0_1_1_1_1()); 
+             after(grammarAccess.getClassDeclarationAccess().getGroup_3_2()); 
 
             }
 
@@ -3769,26 +4045,26 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_3_0_1_1_1__1__Impl"
+    // $ANTLR end "rule__ClassDeclaration__Group_3__2__Impl"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_3_0_1_1_1_1__0"
-    // InternalProblem.g:1155:1: rule__ClassDeclaration__Group_3_0_1_1_1_1__0 : rule__ClassDeclaration__Group_3_0_1_1_1_1__0__Impl rule__ClassDeclaration__Group_3_0_1_1_1_1__1 ;
-    public final void rule__ClassDeclaration__Group_3_0_1_1_1_1__0() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group_3_2__0"
+    // InternalProblem.g:1251:1: rule__ClassDeclaration__Group_3_2__0 : rule__ClassDeclaration__Group_3_2__0__Impl rule__ClassDeclaration__Group_3_2__1 ;
+    public final void rule__ClassDeclaration__Group_3_2__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1159:1: ( rule__ClassDeclaration__Group_3_0_1_1_1_1__0__Impl rule__ClassDeclaration__Group_3_0_1_1_1_1__1 )
-            // InternalProblem.g:1160:2: rule__ClassDeclaration__Group_3_0_1_1_1_1__0__Impl rule__ClassDeclaration__Group_3_0_1_1_1_1__1
+            // InternalProblem.g:1255:1: ( rule__ClassDeclaration__Group_3_2__0__Impl rule__ClassDeclaration__Group_3_2__1 )
+            // InternalProblem.g:1256:2: rule__ClassDeclaration__Group_3_2__0__Impl rule__ClassDeclaration__Group_3_2__1
             {
-            pushFollow(FOLLOW_5);
-            rule__ClassDeclaration__Group_3_0_1_1_1_1__0__Impl();
+            pushFollow(FOLLOW_9);
+            rule__ClassDeclaration__Group_3_2__0__Impl();
 
             state._fsp--;
 
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__Group_3_0_1_1_1_1__1();
+            rule__ClassDeclaration__Group_3_2__1();
 
             state._fsp--;
 
@@ -3807,25 +4083,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_3_0_1_1_1_1__0"
+    // $ANTLR end "rule__ClassDeclaration__Group_3_2__0"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_3_0_1_1_1_1__0__Impl"
-    // InternalProblem.g:1167:1: rule__ClassDeclaration__Group_3_0_1_1_1_1__0__Impl : ( ',' ) ;
-    public final void rule__ClassDeclaration__Group_3_0_1_1_1_1__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group_3_2__0__Impl"
+    // InternalProblem.g:1263: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:1171:1: ( ( ',' ) )
-            // InternalProblem.g:1172:1: ( ',' )
+            // InternalProblem.g:1267:1: ( ( ',' ) )
+            // InternalProblem.g:1268:1: ( ',' )
             {
-            // InternalProblem.g:1172:1: ( ',' )
-            // InternalProblem.g:1173:2: ','
+            // InternalProblem.g:1268:1: ( ',' )
+            // InternalProblem.g:1269:2: ','
             {
-             before(grammarAccess.getClassDeclarationAccess().getCommaKeyword_3_0_1_1_1_1_0()); 
+             before(grammarAccess.getClassDeclarationAccess().getCommaKeyword_3_2_0()); 
             match(input,25,FOLLOW_2); 
-             after(grammarAccess.getClassDeclarationAccess().getCommaKeyword_3_0_1_1_1_1_0()); 
+             after(grammarAccess.getClassDeclarationAccess().getCommaKeyword_3_2_0()); 
 
             }
 
@@ -3844,21 +4120,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_3_0_1_1_1_1__0__Impl"
+    // $ANTLR end "rule__ClassDeclaration__Group_3_2__0__Impl"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_3_0_1_1_1_1__1"
-    // InternalProblem.g:1182:1: rule__ClassDeclaration__Group_3_0_1_1_1_1__1 : rule__ClassDeclaration__Group_3_0_1_1_1_1__1__Impl ;
-    public final void rule__ClassDeclaration__Group_3_0_1_1_1_1__1() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group_3_2__1"
+    // InternalProblem.g:1278:1: rule__ClassDeclaration__Group_3_2__1 : rule__ClassDeclaration__Group_3_2__1__Impl ;
+    public final void rule__ClassDeclaration__Group_3_2__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1186:1: ( rule__ClassDeclaration__Group_3_0_1_1_1_1__1__Impl )
-            // InternalProblem.g:1187:2: rule__ClassDeclaration__Group_3_0_1_1_1_1__1__Impl
+            // InternalProblem.g:1282:1: ( rule__ClassDeclaration__Group_3_2__1__Impl )
+            // InternalProblem.g:1283:2: rule__ClassDeclaration__Group_3_2__1__Impl
             {
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__Group_3_0_1_1_1_1__1__Impl();
+            rule__ClassDeclaration__Group_3_2__1__Impl();
 
             state._fsp--;
 
@@ -3877,35 +4153,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_3_0_1_1_1_1__1"
+    // $ANTLR end "rule__ClassDeclaration__Group_3_2__1"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_3_0_1_1_1_1__1__Impl"
-    // InternalProblem.g:1193:1: rule__ClassDeclaration__Group_3_0_1_1_1_1__1__Impl : ( ( rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_1_1 ) ) ;
-    public final void rule__ClassDeclaration__Group_3_0_1_1_1_1__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group_3_2__1__Impl"
+    // InternalProblem.g:1289:1: rule__ClassDeclaration__Group_3_2__1__Impl : ( ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 ) ) ;
+    public final void rule__ClassDeclaration__Group_3_2__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1197:1: ( ( ( rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_1_1 ) ) )
-            // InternalProblem.g:1198:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_1_1 ) )
+            // InternalProblem.g:1293:1: ( ( ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 ) ) )
+            // InternalProblem.g:1294:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 ) )
             {
-            // InternalProblem.g:1198:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_1_1 ) )
-            // InternalProblem.g:1199:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_1_1 )
+            // InternalProblem.g:1294:1: ( ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 ) )
+            // InternalProblem.g:1295:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 )
             {
-             before(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_0_1_1_1_1_1()); 
-            // InternalProblem.g:1200:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_1_1 )
-            // InternalProblem.g:1200:3: rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_1_1
+             before(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_2_1()); 
+            // InternalProblem.g:1296:2: ( rule__ClassDeclaration__SuperTypesAssignment_3_2_1 )
+            // InternalProblem.g:1296:3: rule__ClassDeclaration__SuperTypesAssignment_3_2_1
             {
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_1_1();
+            rule__ClassDeclaration__SuperTypesAssignment_3_2_1();
 
             state._fsp--;
 
 
             }
 
-             after(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_0_1_1_1_1_1()); 
+             after(grammarAccess.getClassDeclarationAccess().getSuperTypesAssignment_3_2_1()); 
 
             }
 
@@ -3924,26 +4200,26 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_3_0_1_1_1_1__1__Impl"
+    // $ANTLR end "rule__ClassDeclaration__Group_3_2__1__Impl"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_4__0"
-    // InternalProblem.g:1209:1: rule__ClassDeclaration__Group_4__0 : rule__ClassDeclaration__Group_4__0__Impl rule__ClassDeclaration__Group_4__1 ;
-    public final void rule__ClassDeclaration__Group_4__0() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group_4_0__0"
+    // InternalProblem.g:1305:1: rule__ClassDeclaration__Group_4_0__0 : rule__ClassDeclaration__Group_4_0__0__Impl rule__ClassDeclaration__Group_4_0__1 ;
+    public final void rule__ClassDeclaration__Group_4_0__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1213:1: ( rule__ClassDeclaration__Group_4__0__Impl rule__ClassDeclaration__Group_4__1 )
-            // InternalProblem.g:1214:2: rule__ClassDeclaration__Group_4__0__Impl rule__ClassDeclaration__Group_4__1
+            // InternalProblem.g:1309:1: ( rule__ClassDeclaration__Group_4_0__0__Impl rule__ClassDeclaration__Group_4_0__1 )
+            // InternalProblem.g:1310:2: rule__ClassDeclaration__Group_4_0__0__Impl rule__ClassDeclaration__Group_4_0__1
             {
-            pushFollow(FOLLOW_11);
-            rule__ClassDeclaration__Group_4__0__Impl();
+            pushFollow(FOLLOW_12);
+            rule__ClassDeclaration__Group_4_0__0__Impl();
 
             state._fsp--;
 
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__Group_4__1();
+            rule__ClassDeclaration__Group_4_0__1();
 
             state._fsp--;
 
@@ -3962,25 +4238,128 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_4__0"
+    // $ANTLR end "rule__ClassDeclaration__Group_4_0__0"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_4__0__Impl"
-    // InternalProblem.g:1221:1: rule__ClassDeclaration__Group_4__0__Impl : ( ',' ) ;
-    public final void rule__ClassDeclaration__Group_4__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group_4_0__0__Impl"
+    // InternalProblem.g:1317: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:1225:1: ( ( ',' ) )
-            // InternalProblem.g:1226:1: ( ',' )
+            // InternalProblem.g:1321:1: ( ( '{' ) )
+            // InternalProblem.g:1322:1: ( '{' )
             {
-            // InternalProblem.g:1226:1: ( ',' )
-            // InternalProblem.g:1227:2: ','
+            // InternalProblem.g:1322:1: ( '{' )
+            // InternalProblem.g:1323:2: '{'
             {
-             before(grammarAccess.getClassDeclarationAccess().getCommaKeyword_4_0()); 
-            match(input,25,FOLLOW_2); 
-             after(grammarAccess.getClassDeclarationAccess().getCommaKeyword_4_0()); 
+             before(grammarAccess.getClassDeclarationAccess().getLeftCurlyBracketKeyword_4_0_0()); 
+            match(input,26,FOLLOW_2); 
+             after(grammarAccess.getClassDeclarationAccess().getLeftCurlyBracketKeyword_4_0_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ClassDeclaration__Group_4_0__0__Impl"
+
+
+    // $ANTLR start "rule__ClassDeclaration__Group_4_0__1"
+    // InternalProblem.g:1332:1: rule__ClassDeclaration__Group_4_0__1 : rule__ClassDeclaration__Group_4_0__1__Impl rule__ClassDeclaration__Group_4_0__2 ;
+    public final void rule__ClassDeclaration__Group_4_0__1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1336:1: ( rule__ClassDeclaration__Group_4_0__1__Impl rule__ClassDeclaration__Group_4_0__2 )
+            // InternalProblem.g:1337:2: rule__ClassDeclaration__Group_4_0__1__Impl rule__ClassDeclaration__Group_4_0__2
+            {
+            pushFollow(FOLLOW_12);
+            rule__ClassDeclaration__Group_4_0__1__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__ClassDeclaration__Group_4_0__2();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ClassDeclaration__Group_4_0__1"
+
+
+    // $ANTLR start "rule__ClassDeclaration__Group_4_0__1__Impl"
+    // InternalProblem.g:1344:1: rule__ClassDeclaration__Group_4_0__1__Impl : ( ( rule__ClassDeclaration__Group_4_0_1__0 )* ) ;
+    public final void rule__ClassDeclaration__Group_4_0__1__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1348:1: ( ( ( rule__ClassDeclaration__Group_4_0_1__0 )* ) )
+            // InternalProblem.g:1349:1: ( ( rule__ClassDeclaration__Group_4_0_1__0 )* )
+            {
+            // InternalProblem.g:1349:1: ( ( rule__ClassDeclaration__Group_4_0_1__0 )* )
+            // InternalProblem.g:1350:2: ( rule__ClassDeclaration__Group_4_0_1__0 )*
+            {
+             before(grammarAccess.getClassDeclarationAccess().getGroup_4_0_1()); 
+            // InternalProblem.g:1351:2: ( rule__ClassDeclaration__Group_4_0_1__0 )*
+            loop19:
+            do {
+                int alt19=2;
+                int LA19_0 = input.LA(1);
+
+                if ( (LA19_0==13||LA19_0==39) ) {
+                    alt19=1;
+                }
+
+
+                switch (alt19) {
+                case 1 :
+                    // InternalProblem.g:1351:3: rule__ClassDeclaration__Group_4_0_1__0
+                    {
+                    pushFollow(FOLLOW_13);
+                    rule__ClassDeclaration__Group_4_0_1__0();
+
+                    state._fsp--;
+
+
+                    }
+                    break;
+
+                default :
+                    break loop19;
+                }
+            } while (true);
+
+             after(grammarAccess.getClassDeclarationAccess().getGroup_4_0_1()); 
 
             }
 
@@ -3999,21 +4378,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_4__0__Impl"
+    // $ANTLR end "rule__ClassDeclaration__Group_4_0__1__Impl"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_4__1"
-    // InternalProblem.g:1236:1: rule__ClassDeclaration__Group_4__1 : rule__ClassDeclaration__Group_4__1__Impl ;
-    public final void rule__ClassDeclaration__Group_4__1() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group_4_0__2"
+    // InternalProblem.g:1359:1: rule__ClassDeclaration__Group_4_0__2 : rule__ClassDeclaration__Group_4_0__2__Impl ;
+    public final void rule__ClassDeclaration__Group_4_0__2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1240:1: ( rule__ClassDeclaration__Group_4__1__Impl )
-            // InternalProblem.g:1241:2: rule__ClassDeclaration__Group_4__1__Impl
+            // InternalProblem.g:1363:1: ( rule__ClassDeclaration__Group_4_0__2__Impl )
+            // InternalProblem.g:1364:2: rule__ClassDeclaration__Group_4_0__2__Impl
             {
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__Group_4__1__Impl();
+            rule__ClassDeclaration__Group_4_0__2__Impl();
 
             state._fsp--;
 
@@ -4032,35 +4411,110 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_4__1"
+    // $ANTLR end "rule__ClassDeclaration__Group_4_0__2"
 
 
-    // $ANTLR start "rule__ClassDeclaration__Group_4__1__Impl"
-    // InternalProblem.g:1247:1: rule__ClassDeclaration__Group_4__1__Impl : ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_1 ) ) ;
-    public final void rule__ClassDeclaration__Group_4__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__Group_4_0__2__Impl"
+    // InternalProblem.g:1370: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:1251:1: ( ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_1 ) ) )
-            // InternalProblem.g:1252:1: ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_1 ) )
+            // InternalProblem.g:1374:1: ( ( '}' ) )
+            // InternalProblem.g:1375:1: ( '}' )
             {
-            // InternalProblem.g:1252:1: ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_1 ) )
-            // InternalProblem.g:1253:2: ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_1 )
+            // InternalProblem.g:1375:1: ( '}' )
+            // InternalProblem.g:1376:2: '}'
             {
-             before(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsAssignment_4_1()); 
-            // InternalProblem.g:1254:2: ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_1 )
-            // InternalProblem.g:1254:3: rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_1
+             before(grammarAccess.getClassDeclarationAccess().getRightCurlyBracketKeyword_4_0_2()); 
+            match(input,27,FOLLOW_2); 
+             after(grammarAccess.getClassDeclarationAccess().getRightCurlyBracketKeyword_4_0_2()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ClassDeclaration__Group_4_0__2__Impl"
+
+
+    // $ANTLR start "rule__ClassDeclaration__Group_4_0_1__0"
+    // InternalProblem.g:1386:1: rule__ClassDeclaration__Group_4_0_1__0 : rule__ClassDeclaration__Group_4_0_1__0__Impl rule__ClassDeclaration__Group_4_0_1__1 ;
+    public final void rule__ClassDeclaration__Group_4_0_1__0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1390:1: ( rule__ClassDeclaration__Group_4_0_1__0__Impl rule__ClassDeclaration__Group_4_0_1__1 )
+            // InternalProblem.g:1391:2: rule__ClassDeclaration__Group_4_0_1__0__Impl rule__ClassDeclaration__Group_4_0_1__1
             {
+            pushFollow(FOLLOW_14);
+            rule__ClassDeclaration__Group_4_0_1__0__Impl();
+
+            state._fsp--;
+
             pushFollow(FOLLOW_2);
-            rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_1();
+            rule__ClassDeclaration__Group_4_0_1__1();
 
             state._fsp--;
 
 
             }
 
-             after(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsAssignment_4_1()); 
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ClassDeclaration__Group_4_0_1__0"
+
+
+    // $ANTLR start "rule__ClassDeclaration__Group_4_0_1__0__Impl"
+    // InternalProblem.g:1398:1: rule__ClassDeclaration__Group_4_0_1__0__Impl : ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 ) ) ;
+    public final void rule__ClassDeclaration__Group_4_0_1__0__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1402:1: ( ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 ) ) )
+            // InternalProblem.g:1403:1: ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 ) )
+            {
+            // InternalProblem.g:1403:1: ( ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 ) )
+            // InternalProblem.g:1404:2: ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 )
+            {
+             before(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsAssignment_4_0_1_0()); 
+            // InternalProblem.g:1405:2: ( rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0 )
+            // InternalProblem.g:1405:3: rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0
+            {
+            pushFollow(FOLLOW_2);
+            rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0();
+
+            state._fsp--;
+
+
+            }
+
+             after(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsAssignment_4_0_1_0()); 
 
             }
 
@@ -4079,20 +4533,107 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__Group_4__1__Impl"
+    // $ANTLR end "rule__ClassDeclaration__Group_4_0_1__0__Impl"
+
+
+    // $ANTLR start "rule__ClassDeclaration__Group_4_0_1__1"
+    // InternalProblem.g:1413:1: rule__ClassDeclaration__Group_4_0_1__1 : rule__ClassDeclaration__Group_4_0_1__1__Impl ;
+    public final void rule__ClassDeclaration__Group_4_0_1__1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1417:1: ( rule__ClassDeclaration__Group_4_0_1__1__Impl )
+            // InternalProblem.g:1418:2: rule__ClassDeclaration__Group_4_0_1__1__Impl
+            {
+            pushFollow(FOLLOW_2);
+            rule__ClassDeclaration__Group_4_0_1__1__Impl();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ClassDeclaration__Group_4_0_1__1"
+
+
+    // $ANTLR start "rule__ClassDeclaration__Group_4_0_1__1__Impl"
+    // InternalProblem.g:1424:1: rule__ClassDeclaration__Group_4_0_1__1__Impl : ( ( ';' )? ) ;
+    public final void rule__ClassDeclaration__Group_4_0_1__1__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1428:1: ( ( ( ';' )? ) )
+            // InternalProblem.g:1429:1: ( ( ';' )? )
+            {
+            // InternalProblem.g:1429:1: ( ( ';' )? )
+            // InternalProblem.g:1430:2: ( ';' )?
+            {
+             before(grammarAccess.getClassDeclarationAccess().getSemicolonKeyword_4_0_1_1()); 
+            // InternalProblem.g:1431:2: ( ';' )?
+            int alt20=2;
+            int LA20_0 = input.LA(1);
+
+            if ( (LA20_0==28) ) {
+                alt20=1;
+            }
+            switch (alt20) {
+                case 1 :
+                    // InternalProblem.g:1431:3: ';'
+                    {
+                    match(input,28,FOLLOW_2); 
+
+                    }
+                    break;
+
+            }
+
+             after(grammarAccess.getClassDeclarationAccess().getSemicolonKeyword_4_0_1_1()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ClassDeclaration__Group_4_0_1__1__Impl"
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__0"
-    // InternalProblem.g:1263:1: rule__ReferenceDeclaration__Group__0 : rule__ReferenceDeclaration__Group__0__Impl rule__ReferenceDeclaration__Group__1 ;
+    // InternalProblem.g:1440: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:1267:1: ( rule__ReferenceDeclaration__Group__0__Impl rule__ReferenceDeclaration__Group__1 )
-            // InternalProblem.g:1268:2: rule__ReferenceDeclaration__Group__0__Impl rule__ReferenceDeclaration__Group__1
+            // InternalProblem.g:1444:1: ( rule__ReferenceDeclaration__Group__0__Impl rule__ReferenceDeclaration__Group__1 )
+            // InternalProblem.g:1445:2: rule__ReferenceDeclaration__Group__0__Impl rule__ReferenceDeclaration__Group__1
             {
-            pushFollow(FOLLOW_5);
+            pushFollow(FOLLOW_9);
             rule__ReferenceDeclaration__Group__0__Impl();
 
             state._fsp--;
@@ -4121,21 +4662,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__0__Impl"
-    // InternalProblem.g:1275:1: rule__ReferenceDeclaration__Group__0__Impl : ( ( rule__ReferenceDeclaration__Alternatives_0 ) ) ;
+    // InternalProblem.g:1452: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:1279:1: ( ( ( rule__ReferenceDeclaration__Alternatives_0 ) ) )
-            // InternalProblem.g:1280:1: ( ( rule__ReferenceDeclaration__Alternatives_0 ) )
+            // InternalProblem.g:1456:1: ( ( ( rule__ReferenceDeclaration__Alternatives_0 ) ) )
+            // InternalProblem.g:1457:1: ( ( rule__ReferenceDeclaration__Alternatives_0 ) )
             {
-            // InternalProblem.g:1280:1: ( ( rule__ReferenceDeclaration__Alternatives_0 ) )
-            // InternalProblem.g:1281:2: ( rule__ReferenceDeclaration__Alternatives_0 )
+            // InternalProblem.g:1457:1: ( ( rule__ReferenceDeclaration__Alternatives_0 ) )
+            // InternalProblem.g:1458:2: ( rule__ReferenceDeclaration__Alternatives_0 )
             {
              before(grammarAccess.getReferenceDeclarationAccess().getAlternatives_0()); 
-            // InternalProblem.g:1282:2: ( rule__ReferenceDeclaration__Alternatives_0 )
-            // InternalProblem.g:1282:3: rule__ReferenceDeclaration__Alternatives_0
+            // InternalProblem.g:1459:2: ( rule__ReferenceDeclaration__Alternatives_0 )
+            // InternalProblem.g:1459:3: rule__ReferenceDeclaration__Alternatives_0
             {
             pushFollow(FOLLOW_2);
             rule__ReferenceDeclaration__Alternatives_0();
@@ -4168,16 +4709,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__1"
-    // InternalProblem.g:1290:1: rule__ReferenceDeclaration__Group__1 : rule__ReferenceDeclaration__Group__1__Impl rule__ReferenceDeclaration__Group__2 ;
+    // InternalProblem.g:1467: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:1294:1: ( rule__ReferenceDeclaration__Group__1__Impl rule__ReferenceDeclaration__Group__2 )
-            // InternalProblem.g:1295:2: rule__ReferenceDeclaration__Group__1__Impl rule__ReferenceDeclaration__Group__2
+            // InternalProblem.g:1471:1: ( rule__ReferenceDeclaration__Group__1__Impl rule__ReferenceDeclaration__Group__2 )
+            // InternalProblem.g:1472:2: rule__ReferenceDeclaration__Group__1__Impl rule__ReferenceDeclaration__Group__2
             {
-            pushFollow(FOLLOW_12);
+            pushFollow(FOLLOW_15);
             rule__ReferenceDeclaration__Group__1__Impl();
 
             state._fsp--;
@@ -4206,21 +4747,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__1__Impl"
-    // InternalProblem.g:1302:1: rule__ReferenceDeclaration__Group__1__Impl : ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) ) ;
+    // InternalProblem.g:1479: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:1306:1: ( ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) ) )
-            // InternalProblem.g:1307:1: ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) )
+            // InternalProblem.g:1483:1: ( ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) ) )
+            // InternalProblem.g:1484:1: ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) )
             {
-            // InternalProblem.g:1307:1: ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) )
-            // InternalProblem.g:1308:2: ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 )
+            // InternalProblem.g:1484:1: ( ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 ) )
+            // InternalProblem.g:1485:2: ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 )
             {
              before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeAssignment_1()); 
-            // InternalProblem.g:1309:2: ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 )
-            // InternalProblem.g:1309:3: rule__ReferenceDeclaration__ReferenceTypeAssignment_1
+            // InternalProblem.g:1486:2: ( rule__ReferenceDeclaration__ReferenceTypeAssignment_1 )
+            // InternalProblem.g:1486:3: rule__ReferenceDeclaration__ReferenceTypeAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__ReferenceDeclaration__ReferenceTypeAssignment_1();
@@ -4253,16 +4794,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__2"
-    // InternalProblem.g:1317:1: rule__ReferenceDeclaration__Group__2 : rule__ReferenceDeclaration__Group__2__Impl rule__ReferenceDeclaration__Group__3 ;
+    // InternalProblem.g:1494: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:1321:1: ( rule__ReferenceDeclaration__Group__2__Impl rule__ReferenceDeclaration__Group__3 )
-            // InternalProblem.g:1322:2: rule__ReferenceDeclaration__Group__2__Impl rule__ReferenceDeclaration__Group__3
+            // InternalProblem.g:1498:1: ( rule__ReferenceDeclaration__Group__2__Impl rule__ReferenceDeclaration__Group__3 )
+            // InternalProblem.g:1499:2: rule__ReferenceDeclaration__Group__2__Impl rule__ReferenceDeclaration__Group__3
             {
-            pushFollow(FOLLOW_13);
+            pushFollow(FOLLOW_15);
             rule__ReferenceDeclaration__Group__2__Impl();
 
             state._fsp--;
@@ -4291,21 +4832,42 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__2__Impl"
-    // InternalProblem.g:1329:1: rule__ReferenceDeclaration__Group__2__Impl : ( '[' ) ;
+    // InternalProblem.g:1506: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:1333:1: ( ( '[' ) )
-            // InternalProblem.g:1334:1: ( '[' )
+            // InternalProblem.g:1510:1: ( ( ( rule__ReferenceDeclaration__Group_2__0 )? ) )
+            // InternalProblem.g:1511:1: ( ( rule__ReferenceDeclaration__Group_2__0 )? )
             {
-            // InternalProblem.g:1334:1: ( '[' )
-            // InternalProblem.g:1335:2: '['
+            // InternalProblem.g:1511:1: ( ( rule__ReferenceDeclaration__Group_2__0 )? )
+            // InternalProblem.g:1512:2: ( rule__ReferenceDeclaration__Group_2__0 )?
             {
-             before(grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2()); 
-            match(input,23,FOLLOW_2); 
-             after(grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2()); 
+             before(grammarAccess.getReferenceDeclarationAccess().getGroup_2()); 
+            // InternalProblem.g:1513:2: ( rule__ReferenceDeclaration__Group_2__0 )?
+            int alt21=2;
+            int LA21_0 = input.LA(1);
+
+            if ( (LA21_0==29) ) {
+                alt21=1;
+            }
+            switch (alt21) {
+                case 1 :
+                    // InternalProblem.g:1513:3: rule__ReferenceDeclaration__Group_2__0
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__ReferenceDeclaration__Group_2__0();
+
+                    state._fsp--;
+
+
+                    }
+                    break;
+
+            }
+
+             after(grammarAccess.getReferenceDeclarationAccess().getGroup_2()); 
 
             }
 
@@ -4328,16 +4890,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__3"
-    // InternalProblem.g:1344:1: rule__ReferenceDeclaration__Group__3 : rule__ReferenceDeclaration__Group__3__Impl rule__ReferenceDeclaration__Group__4 ;
+    // InternalProblem.g:1521: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:1348:1: ( rule__ReferenceDeclaration__Group__3__Impl rule__ReferenceDeclaration__Group__4 )
-            // InternalProblem.g:1349:2: rule__ReferenceDeclaration__Group__3__Impl rule__ReferenceDeclaration__Group__4
+            // InternalProblem.g:1525:1: ( rule__ReferenceDeclaration__Group__3__Impl rule__ReferenceDeclaration__Group__4 )
+            // InternalProblem.g:1526:2: rule__ReferenceDeclaration__Group__3__Impl rule__ReferenceDeclaration__Group__4
             {
-            pushFollow(FOLLOW_14);
+            pushFollow(FOLLOW_16);
             rule__ReferenceDeclaration__Group__3__Impl();
 
             state._fsp--;
@@ -4366,31 +4928,31 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__3__Impl"
-    // InternalProblem.g:1356:1: rule__ReferenceDeclaration__Group__3__Impl : ( ( rule__ReferenceDeclaration__MultiplicityAssignment_3 ) ) ;
+    // InternalProblem.g:1533: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:1360:1: ( ( ( rule__ReferenceDeclaration__MultiplicityAssignment_3 ) ) )
-            // InternalProblem.g:1361:1: ( ( rule__ReferenceDeclaration__MultiplicityAssignment_3 ) )
+            // InternalProblem.g:1537:1: ( ( ( rule__ReferenceDeclaration__NameAssignment_3 ) ) )
+            // InternalProblem.g:1538:1: ( ( rule__ReferenceDeclaration__NameAssignment_3 ) )
             {
-            // InternalProblem.g:1361:1: ( ( rule__ReferenceDeclaration__MultiplicityAssignment_3 ) )
-            // InternalProblem.g:1362:2: ( rule__ReferenceDeclaration__MultiplicityAssignment_3 )
+            // InternalProblem.g:1538:1: ( ( rule__ReferenceDeclaration__NameAssignment_3 ) )
+            // InternalProblem.g:1539:2: ( rule__ReferenceDeclaration__NameAssignment_3 )
             {
-             before(grammarAccess.getReferenceDeclarationAccess().getMultiplicityAssignment_3()); 
-            // InternalProblem.g:1363:2: ( rule__ReferenceDeclaration__MultiplicityAssignment_3 )
-            // InternalProblem.g:1363:3: rule__ReferenceDeclaration__MultiplicityAssignment_3
+             before(grammarAccess.getReferenceDeclarationAccess().getNameAssignment_3()); 
+            // InternalProblem.g:1540:2: ( rule__ReferenceDeclaration__NameAssignment_3 )
+            // InternalProblem.g:1540:3: rule__ReferenceDeclaration__NameAssignment_3
             {
             pushFollow(FOLLOW_2);
-            rule__ReferenceDeclaration__MultiplicityAssignment_3();
+            rule__ReferenceDeclaration__NameAssignment_3();
 
             state._fsp--;
 
 
             }
 
-             after(grammarAccess.getReferenceDeclarationAccess().getMultiplicityAssignment_3()); 
+             after(grammarAccess.getReferenceDeclarationAccess().getNameAssignment_3()); 
 
             }
 
@@ -4413,22 +4975,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__4"
-    // InternalProblem.g:1371:1: rule__ReferenceDeclaration__Group__4 : rule__ReferenceDeclaration__Group__4__Impl rule__ReferenceDeclaration__Group__5 ;
+    // InternalProblem.g:1548: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:1375:1: ( rule__ReferenceDeclaration__Group__4__Impl rule__ReferenceDeclaration__Group__5 )
-            // InternalProblem.g:1376:2: rule__ReferenceDeclaration__Group__4__Impl rule__ReferenceDeclaration__Group__5
+            // InternalProblem.g:1552:1: ( rule__ReferenceDeclaration__Group__4__Impl )
+            // InternalProblem.g:1553:2: rule__ReferenceDeclaration__Group__4__Impl
             {
-            pushFollow(FOLLOW_5);
-            rule__ReferenceDeclaration__Group__4__Impl();
-
-            state._fsp--;
-
             pushFollow(FOLLOW_2);
-            rule__ReferenceDeclaration__Group__5();
+            rule__ReferenceDeclaration__Group__4__Impl();
 
             state._fsp--;
 
@@ -4451,21 +5008,42 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__Group__4__Impl"
-    // InternalProblem.g:1383:1: rule__ReferenceDeclaration__Group__4__Impl : ( ']' ) ;
+    // InternalProblem.g:1559: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:1387:1: ( ( ']' ) )
-            // InternalProblem.g:1388:1: ( ']' )
+            // InternalProblem.g:1563:1: ( ( ( rule__ReferenceDeclaration__Group_4__0 )? ) )
+            // InternalProblem.g:1564:1: ( ( rule__ReferenceDeclaration__Group_4__0 )? )
             {
-            // InternalProblem.g:1388:1: ( ']' )
-            // InternalProblem.g:1389:2: ']'
+            // InternalProblem.g:1564:1: ( ( rule__ReferenceDeclaration__Group_4__0 )? )
+            // InternalProblem.g:1565:2: ( rule__ReferenceDeclaration__Group_4__0 )?
             {
-             before(grammarAccess.getReferenceDeclarationAccess().getRightSquareBracketKeyword_4()); 
-            match(input,24,FOLLOW_2); 
-             after(grammarAccess.getReferenceDeclarationAccess().getRightSquareBracketKeyword_4()); 
+             before(grammarAccess.getReferenceDeclarationAccess().getGroup_4()); 
+            // InternalProblem.g:1566:2: ( rule__ReferenceDeclaration__Group_4__0 )?
+            int alt22=2;
+            int LA22_0 = input.LA(1);
+
+            if ( (LA22_0==31) ) {
+                alt22=1;
+            }
+            switch (alt22) {
+                case 1 :
+                    // InternalProblem.g:1566:3: rule__ReferenceDeclaration__Group_4__0
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__ReferenceDeclaration__Group_4__0();
+
+                    state._fsp--;
+
+
+                    }
+                    break;
+
+            }
+
+             after(grammarAccess.getReferenceDeclarationAccess().getGroup_4()); 
 
             }
 
@@ -4487,23 +5065,23 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__ReferenceDeclaration__Group__4__Impl"
 
 
-    // $ANTLR start "rule__ReferenceDeclaration__Group__5"
-    // InternalProblem.g:1398:1: rule__ReferenceDeclaration__Group__5 : rule__ReferenceDeclaration__Group__5__Impl rule__ReferenceDeclaration__Group__6 ;
-    public final void rule__ReferenceDeclaration__Group__5() throws RecognitionException {
+    // $ANTLR start "rule__ReferenceDeclaration__Group_2__0"
+    // InternalProblem.g:1575:1: rule__ReferenceDeclaration__Group_2__0 : rule__ReferenceDeclaration__Group_2__0__Impl rule__ReferenceDeclaration__Group_2__1 ;
+    public final void rule__ReferenceDeclaration__Group_2__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1402:1: ( rule__ReferenceDeclaration__Group__5__Impl rule__ReferenceDeclaration__Group__6 )
-            // InternalProblem.g:1403:2: rule__ReferenceDeclaration__Group__5__Impl rule__ReferenceDeclaration__Group__6
+            // InternalProblem.g:1579:1: ( rule__ReferenceDeclaration__Group_2__0__Impl rule__ReferenceDeclaration__Group_2__1 )
+            // InternalProblem.g:1580:2: rule__ReferenceDeclaration__Group_2__0__Impl rule__ReferenceDeclaration__Group_2__1
             {
-            pushFollow(FOLLOW_15);
-            rule__ReferenceDeclaration__Group__5__Impl();
+            pushFollow(FOLLOW_17);
+            rule__ReferenceDeclaration__Group_2__0__Impl();
 
             state._fsp--;
 
             pushFollow(FOLLOW_2);
-            rule__ReferenceDeclaration__Group__6();
+            rule__ReferenceDeclaration__Group_2__1();
 
             state._fsp--;
 
@@ -4522,37 +5100,65 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ReferenceDeclaration__Group__5"
+    // $ANTLR end "rule__ReferenceDeclaration__Group_2__0"
 
 
-    // $ANTLR start "rule__ReferenceDeclaration__Group__5__Impl"
-    // InternalProblem.g:1410:1: rule__ReferenceDeclaration__Group__5__Impl : ( ( rule__ReferenceDeclaration__NameAssignment_5 ) ) ;
-    public final void rule__ReferenceDeclaration__Group__5__Impl() throws RecognitionException {
+    // $ANTLR start "rule__ReferenceDeclaration__Group_2__0__Impl"
+    // InternalProblem.g:1587:1: rule__ReferenceDeclaration__Group_2__0__Impl : ( '[' ) ;
+    public final void rule__ReferenceDeclaration__Group_2__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1414:1: ( ( ( rule__ReferenceDeclaration__NameAssignment_5 ) ) )
-            // InternalProblem.g:1415:1: ( ( rule__ReferenceDeclaration__NameAssignment_5 ) )
+            // InternalProblem.g:1591:1: ( ( '[' ) )
+            // InternalProblem.g:1592:1: ( '[' )
             {
-            // InternalProblem.g:1415:1: ( ( rule__ReferenceDeclaration__NameAssignment_5 ) )
-            // InternalProblem.g:1416:2: ( rule__ReferenceDeclaration__NameAssignment_5 )
+            // InternalProblem.g:1592:1: ( '[' )
+            // InternalProblem.g:1593:2: '['
             {
-             before(grammarAccess.getReferenceDeclarationAccess().getNameAssignment_5()); 
-            // InternalProblem.g:1417:2: ( rule__ReferenceDeclaration__NameAssignment_5 )
-            // InternalProblem.g:1417:3: rule__ReferenceDeclaration__NameAssignment_5
-            {
-            pushFollow(FOLLOW_2);
-            rule__ReferenceDeclaration__NameAssignment_5();
+             before(grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2_0()); 
+            match(input,29,FOLLOW_2); 
+             after(grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2_0()); 
 
-            state._fsp--;
+            }
 
 
             }
 
-             after(grammarAccess.getReferenceDeclarationAccess().getNameAssignment_5()); 
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
 
-            }
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ReferenceDeclaration__Group_2__0__Impl"
+
+
+    // $ANTLR start "rule__ReferenceDeclaration__Group_2__1"
+    // InternalProblem.g:1602:1: rule__ReferenceDeclaration__Group_2__1 : rule__ReferenceDeclaration__Group_2__1__Impl rule__ReferenceDeclaration__Group_2__2 ;
+    public final void rule__ReferenceDeclaration__Group_2__1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1606:1: ( rule__ReferenceDeclaration__Group_2__1__Impl rule__ReferenceDeclaration__Group_2__2 )
+            // InternalProblem.g:1607:2: rule__ReferenceDeclaration__Group_2__1__Impl rule__ReferenceDeclaration__Group_2__2
+            {
+            pushFollow(FOLLOW_18);
+            rule__ReferenceDeclaration__Group_2__1__Impl();
+
+            state._fsp--;
+
+            pushFollow(FOLLOW_2);
+            rule__ReferenceDeclaration__Group_2__2();
+
+            state._fsp--;
 
 
             }
@@ -4569,27 +5175,41 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ReferenceDeclaration__Group__5__Impl"
+    // $ANTLR end "rule__ReferenceDeclaration__Group_2__1"
 
 
-    // $ANTLR start "rule__ReferenceDeclaration__Group__6"
-    // InternalProblem.g:1425:1: rule__ReferenceDeclaration__Group__6 : rule__ReferenceDeclaration__Group__6__Impl ;
-    public final void rule__ReferenceDeclaration__Group__6() throws RecognitionException {
+    // $ANTLR start "rule__ReferenceDeclaration__Group_2__1__Impl"
+    // InternalProblem.g:1614: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:1429:1: ( rule__ReferenceDeclaration__Group__6__Impl )
-            // InternalProblem.g:1430:2: rule__ReferenceDeclaration__Group__6__Impl
+            // InternalProblem.g:1618:1: ( ( ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 ) ) )
+            // InternalProblem.g:1619:1: ( ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 ) )
+            {
+            // InternalProblem.g:1619:1: ( ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 ) )
+            // InternalProblem.g:1620:2: ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 )
+            {
+             before(grammarAccess.getReferenceDeclarationAccess().getMultiplicityAssignment_2_1()); 
+            // InternalProblem.g:1621:2: ( rule__ReferenceDeclaration__MultiplicityAssignment_2_1 )
+            // InternalProblem.g:1621:3: rule__ReferenceDeclaration__MultiplicityAssignment_2_1
             {
             pushFollow(FOLLOW_2);
-            rule__ReferenceDeclaration__Group__6__Impl();
+            rule__ReferenceDeclaration__MultiplicityAssignment_2_1();
 
             state._fsp--;
 
 
             }
 
+             after(grammarAccess.getReferenceDeclarationAccess().getMultiplicityAssignment_2_1()); 
+
+            }
+
+
+            }
+
         }
         catch (RecognitionException re) {
             reportError(re);
@@ -4602,46 +5222,58 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ReferenceDeclaration__Group__6"
+    // $ANTLR end "rule__ReferenceDeclaration__Group_2__1__Impl"
 
 
-    // $ANTLR start "rule__ReferenceDeclaration__Group__6__Impl"
-    // InternalProblem.g:1436:1: rule__ReferenceDeclaration__Group__6__Impl : ( ( rule__ReferenceDeclaration__Group_6__0 )? ) ;
-    public final void rule__ReferenceDeclaration__Group__6__Impl() throws RecognitionException {
+    // $ANTLR start "rule__ReferenceDeclaration__Group_2__2"
+    // InternalProblem.g:1629: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:1440:1: ( ( ( rule__ReferenceDeclaration__Group_6__0 )? ) )
-            // InternalProblem.g:1441:1: ( ( rule__ReferenceDeclaration__Group_6__0 )? )
-            {
-            // InternalProblem.g:1441:1: ( ( rule__ReferenceDeclaration__Group_6__0 )? )
-            // InternalProblem.g:1442:2: ( rule__ReferenceDeclaration__Group_6__0 )?
+            // InternalProblem.g:1633:1: ( rule__ReferenceDeclaration__Group_2__2__Impl )
+            // InternalProblem.g:1634:2: rule__ReferenceDeclaration__Group_2__2__Impl
             {
-             before(grammarAccess.getReferenceDeclarationAccess().getGroup_6()); 
-            // InternalProblem.g:1443:2: ( rule__ReferenceDeclaration__Group_6__0 )?
-            int alt19=2;
-            int LA19_0 = input.LA(1);
+            pushFollow(FOLLOW_2);
+            rule__ReferenceDeclaration__Group_2__2__Impl();
+
+            state._fsp--;
+
 
-            if ( (LA19_0==26) ) {
-                alt19=1;
             }
-            switch (alt19) {
-                case 1 :
-                    // InternalProblem.g:1443:3: rule__ReferenceDeclaration__Group_6__0
-                    {
-                    pushFollow(FOLLOW_2);
-                    rule__ReferenceDeclaration__Group_6__0();
 
-                    state._fsp--;
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
 
+                restoreStackSize(stackSize);
 
-                    }
-                    break;
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ReferenceDeclaration__Group_2__2"
 
-            }
 
-             after(grammarAccess.getReferenceDeclarationAccess().getGroup_6()); 
+    // $ANTLR start "rule__ReferenceDeclaration__Group_2__2__Impl"
+    // InternalProblem.g:1640:1: rule__ReferenceDeclaration__Group_2__2__Impl : ( ']' ) ;
+    public final void rule__ReferenceDeclaration__Group_2__2__Impl() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:1644:1: ( ( ']' ) )
+            // InternalProblem.g:1645:1: ( ']' )
+            {
+            // InternalProblem.g:1645:1: ( ']' )
+            // InternalProblem.g:1646:2: ']'
+            {
+             before(grammarAccess.getReferenceDeclarationAccess().getRightSquareBracketKeyword_2_2()); 
+            match(input,30,FOLLOW_2); 
+             after(grammarAccess.getReferenceDeclarationAccess().getRightSquareBracketKeyword_2_2()); 
 
             }
 
@@ -4660,26 +5292,26 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ReferenceDeclaration__Group__6__Impl"
+    // $ANTLR end "rule__ReferenceDeclaration__Group_2__2__Impl"
 
 
-    // $ANTLR start "rule__ReferenceDeclaration__Group_6__0"
-    // InternalProblem.g:1452:1: rule__ReferenceDeclaration__Group_6__0 : rule__ReferenceDeclaration__Group_6__0__Impl rule__ReferenceDeclaration__Group_6__1 ;
-    public final void rule__ReferenceDeclaration__Group_6__0() throws RecognitionException {
+    // $ANTLR start "rule__ReferenceDeclaration__Group_4__0"
+    // InternalProblem.g:1656:1: rule__ReferenceDeclaration__Group_4__0 : rule__ReferenceDeclaration__Group_4__0__Impl rule__ReferenceDeclaration__Group_4__1 ;
+    public final void rule__ReferenceDeclaration__Group_4__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1456:1: ( rule__ReferenceDeclaration__Group_6__0__Impl rule__ReferenceDeclaration__Group_6__1 )
-            // InternalProblem.g:1457:2: rule__ReferenceDeclaration__Group_6__0__Impl rule__ReferenceDeclaration__Group_6__1
+            // InternalProblem.g:1660:1: ( rule__ReferenceDeclaration__Group_4__0__Impl rule__ReferenceDeclaration__Group_4__1 )
+            // InternalProblem.g:1661:2: rule__ReferenceDeclaration__Group_4__0__Impl rule__ReferenceDeclaration__Group_4__1
             {
-            pushFollow(FOLLOW_5);
-            rule__ReferenceDeclaration__Group_6__0__Impl();
+            pushFollow(FOLLOW_9);
+            rule__ReferenceDeclaration__Group_4__0__Impl();
 
             state._fsp--;
 
             pushFollow(FOLLOW_2);
-            rule__ReferenceDeclaration__Group_6__1();
+            rule__ReferenceDeclaration__Group_4__1();
 
             state._fsp--;
 
@@ -4698,25 +5330,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ReferenceDeclaration__Group_6__0"
+    // $ANTLR end "rule__ReferenceDeclaration__Group_4__0"
 
 
-    // $ANTLR start "rule__ReferenceDeclaration__Group_6__0__Impl"
-    // InternalProblem.g:1464:1: rule__ReferenceDeclaration__Group_6__0__Impl : ( 'opposite' ) ;
-    public final void rule__ReferenceDeclaration__Group_6__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__ReferenceDeclaration__Group_4__0__Impl"
+    // InternalProblem.g:1668: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:1468:1: ( ( 'opposite' ) )
-            // InternalProblem.g:1469:1: ( 'opposite' )
+            // InternalProblem.g:1672:1: ( ( 'opposite' ) )
+            // InternalProblem.g:1673:1: ( 'opposite' )
             {
-            // InternalProblem.g:1469:1: ( 'opposite' )
-            // InternalProblem.g:1470:2: 'opposite'
+            // InternalProblem.g:1673:1: ( 'opposite' )
+            // InternalProblem.g:1674:2: 'opposite'
             {
-             before(grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_6_0()); 
-            match(input,26,FOLLOW_2); 
-             after(grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_6_0()); 
+             before(grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_4_0()); 
+            match(input,31,FOLLOW_2); 
+             after(grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_4_0()); 
 
             }
 
@@ -4735,21 +5367,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ReferenceDeclaration__Group_6__0__Impl"
+    // $ANTLR end "rule__ReferenceDeclaration__Group_4__0__Impl"
 
 
-    // $ANTLR start "rule__ReferenceDeclaration__Group_6__1"
-    // InternalProblem.g:1479:1: rule__ReferenceDeclaration__Group_6__1 : rule__ReferenceDeclaration__Group_6__1__Impl ;
-    public final void rule__ReferenceDeclaration__Group_6__1() throws RecognitionException {
+    // $ANTLR start "rule__ReferenceDeclaration__Group_4__1"
+    // InternalProblem.g:1683: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:1483:1: ( rule__ReferenceDeclaration__Group_6__1__Impl )
-            // InternalProblem.g:1484:2: rule__ReferenceDeclaration__Group_6__1__Impl
+            // InternalProblem.g:1687:1: ( rule__ReferenceDeclaration__Group_4__1__Impl )
+            // InternalProblem.g:1688:2: rule__ReferenceDeclaration__Group_4__1__Impl
             {
             pushFollow(FOLLOW_2);
-            rule__ReferenceDeclaration__Group_6__1__Impl();
+            rule__ReferenceDeclaration__Group_4__1__Impl();
 
             state._fsp--;
 
@@ -4768,35 +5400,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ReferenceDeclaration__Group_6__1"
+    // $ANTLR end "rule__ReferenceDeclaration__Group_4__1"
 
 
-    // $ANTLR start "rule__ReferenceDeclaration__Group_6__1__Impl"
-    // InternalProblem.g:1490:1: rule__ReferenceDeclaration__Group_6__1__Impl : ( ( rule__ReferenceDeclaration__OppositeAssignment_6_1 ) ) ;
-    public final void rule__ReferenceDeclaration__Group_6__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__ReferenceDeclaration__Group_4__1__Impl"
+    // InternalProblem.g:1694: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:1494:1: ( ( ( rule__ReferenceDeclaration__OppositeAssignment_6_1 ) ) )
-            // InternalProblem.g:1495:1: ( ( rule__ReferenceDeclaration__OppositeAssignment_6_1 ) )
+            // InternalProblem.g:1698:1: ( ( ( rule__ReferenceDeclaration__OppositeAssignment_4_1 ) ) )
+            // InternalProblem.g:1699:1: ( ( rule__ReferenceDeclaration__OppositeAssignment_4_1 ) )
             {
-            // InternalProblem.g:1495:1: ( ( rule__ReferenceDeclaration__OppositeAssignment_6_1 ) )
-            // InternalProblem.g:1496:2: ( rule__ReferenceDeclaration__OppositeAssignment_6_1 )
+            // InternalProblem.g:1699:1: ( ( rule__ReferenceDeclaration__OppositeAssignment_4_1 ) )
+            // InternalProblem.g:1700:2: ( rule__ReferenceDeclaration__OppositeAssignment_4_1 )
             {
-             before(grammarAccess.getReferenceDeclarationAccess().getOppositeAssignment_6_1()); 
-            // InternalProblem.g:1497:2: ( rule__ReferenceDeclaration__OppositeAssignment_6_1 )
-            // InternalProblem.g:1497:3: rule__ReferenceDeclaration__OppositeAssignment_6_1
+             before(grammarAccess.getReferenceDeclarationAccess().getOppositeAssignment_4_1()); 
+            // InternalProblem.g:1701:2: ( rule__ReferenceDeclaration__OppositeAssignment_4_1 )
+            // InternalProblem.g:1701:3: rule__ReferenceDeclaration__OppositeAssignment_4_1
             {
             pushFollow(FOLLOW_2);
-            rule__ReferenceDeclaration__OppositeAssignment_6_1();
+            rule__ReferenceDeclaration__OppositeAssignment_4_1();
 
             state._fsp--;
 
 
             }
 
-             after(grammarAccess.getReferenceDeclarationAccess().getOppositeAssignment_6_1()); 
+             after(grammarAccess.getReferenceDeclarationAccess().getOppositeAssignment_4_1()); 
 
             }
 
@@ -4815,18 +5447,18 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ReferenceDeclaration__Group_6__1__Impl"
+    // $ANTLR end "rule__ReferenceDeclaration__Group_4__1__Impl"
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__0"
-    // InternalProblem.g:1506:1: rule__PredicateDefinition__Group__0 : rule__PredicateDefinition__Group__0__Impl rule__PredicateDefinition__Group__1 ;
+    // InternalProblem.g:1710: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:1510:1: ( rule__PredicateDefinition__Group__0__Impl rule__PredicateDefinition__Group__1 )
-            // InternalProblem.g:1511:2: rule__PredicateDefinition__Group__0__Impl rule__PredicateDefinition__Group__1
+            // InternalProblem.g:1714:1: ( rule__PredicateDefinition__Group__0__Impl rule__PredicateDefinition__Group__1 )
+            // InternalProblem.g:1715:2: rule__PredicateDefinition__Group__0__Impl rule__PredicateDefinition__Group__1
             {
             pushFollow(FOLLOW_5);
             rule__PredicateDefinition__Group__0__Impl();
@@ -4857,21 +5489,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__0__Impl"
-    // InternalProblem.g:1518:1: rule__PredicateDefinition__Group__0__Impl : ( ( rule__PredicateDefinition__Alternatives_0 ) ) ;
+    // InternalProblem.g:1722: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:1522:1: ( ( ( rule__PredicateDefinition__Alternatives_0 ) ) )
-            // InternalProblem.g:1523:1: ( ( rule__PredicateDefinition__Alternatives_0 ) )
+            // InternalProblem.g:1726:1: ( ( ( rule__PredicateDefinition__Alternatives_0 ) ) )
+            // InternalProblem.g:1727:1: ( ( rule__PredicateDefinition__Alternatives_0 ) )
             {
-            // InternalProblem.g:1523:1: ( ( rule__PredicateDefinition__Alternatives_0 ) )
-            // InternalProblem.g:1524:2: ( rule__PredicateDefinition__Alternatives_0 )
+            // InternalProblem.g:1727:1: ( ( rule__PredicateDefinition__Alternatives_0 ) )
+            // InternalProblem.g:1728:2: ( rule__PredicateDefinition__Alternatives_0 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getAlternatives_0()); 
-            // InternalProblem.g:1525:2: ( rule__PredicateDefinition__Alternatives_0 )
-            // InternalProblem.g:1525:3: rule__PredicateDefinition__Alternatives_0
+            // InternalProblem.g:1729:2: ( rule__PredicateDefinition__Alternatives_0 )
+            // InternalProblem.g:1729:3: rule__PredicateDefinition__Alternatives_0
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Alternatives_0();
@@ -4904,16 +5536,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__1"
-    // InternalProblem.g:1533:1: rule__PredicateDefinition__Group__1 : rule__PredicateDefinition__Group__1__Impl rule__PredicateDefinition__Group__2 ;
+    // InternalProblem.g:1737: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:1537:1: ( rule__PredicateDefinition__Group__1__Impl rule__PredicateDefinition__Group__2 )
-            // InternalProblem.g:1538:2: rule__PredicateDefinition__Group__1__Impl rule__PredicateDefinition__Group__2
+            // InternalProblem.g:1741:1: ( rule__PredicateDefinition__Group__1__Impl rule__PredicateDefinition__Group__2 )
+            // InternalProblem.g:1742:2: rule__PredicateDefinition__Group__1__Impl rule__PredicateDefinition__Group__2
             {
-            pushFollow(FOLLOW_16);
+            pushFollow(FOLLOW_19);
             rule__PredicateDefinition__Group__1__Impl();
 
             state._fsp--;
@@ -4942,21 +5574,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__1__Impl"
-    // InternalProblem.g:1545:1: rule__PredicateDefinition__Group__1__Impl : ( ( rule__PredicateDefinition__NameAssignment_1 ) ) ;
+    // InternalProblem.g:1749: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:1549:1: ( ( ( rule__PredicateDefinition__NameAssignment_1 ) ) )
-            // InternalProblem.g:1550:1: ( ( rule__PredicateDefinition__NameAssignment_1 ) )
+            // InternalProblem.g:1753:1: ( ( ( rule__PredicateDefinition__NameAssignment_1 ) ) )
+            // InternalProblem.g:1754:1: ( ( rule__PredicateDefinition__NameAssignment_1 ) )
             {
-            // InternalProblem.g:1550:1: ( ( rule__PredicateDefinition__NameAssignment_1 ) )
-            // InternalProblem.g:1551:2: ( rule__PredicateDefinition__NameAssignment_1 )
+            // InternalProblem.g:1754:1: ( ( rule__PredicateDefinition__NameAssignment_1 ) )
+            // InternalProblem.g:1755:2: ( rule__PredicateDefinition__NameAssignment_1 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getNameAssignment_1()); 
-            // InternalProblem.g:1552:2: ( rule__PredicateDefinition__NameAssignment_1 )
-            // InternalProblem.g:1552:3: rule__PredicateDefinition__NameAssignment_1
+            // InternalProblem.g:1756:2: ( rule__PredicateDefinition__NameAssignment_1 )
+            // InternalProblem.g:1756:3: rule__PredicateDefinition__NameAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__NameAssignment_1();
@@ -4989,16 +5621,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__2"
-    // InternalProblem.g:1560:1: rule__PredicateDefinition__Group__2 : rule__PredicateDefinition__Group__2__Impl rule__PredicateDefinition__Group__3 ;
+    // InternalProblem.g:1764: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:1564:1: ( rule__PredicateDefinition__Group__2__Impl rule__PredicateDefinition__Group__3 )
-            // InternalProblem.g:1565:2: rule__PredicateDefinition__Group__2__Impl rule__PredicateDefinition__Group__3
+            // InternalProblem.g:1768:1: ( rule__PredicateDefinition__Group__2__Impl rule__PredicateDefinition__Group__3 )
+            // InternalProblem.g:1769:2: rule__PredicateDefinition__Group__2__Impl rule__PredicateDefinition__Group__3
             {
-            pushFollow(FOLLOW_17);
+            pushFollow(FOLLOW_20);
             rule__PredicateDefinition__Group__2__Impl();
 
             state._fsp--;
@@ -5027,20 +5659,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__2__Impl"
-    // InternalProblem.g:1572:1: rule__PredicateDefinition__Group__2__Impl : ( '(' ) ;
+    // InternalProblem.g:1776:1: rule__PredicateDefinition__Group__2__Impl : ( '(' ) ;
     public final void rule__PredicateDefinition__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1576:1: ( ( '(' ) )
-            // InternalProblem.g:1577:1: ( '(' )
+            // InternalProblem.g:1780:1: ( ( '(' ) )
+            // InternalProblem.g:1781:1: ( '(' )
             {
-            // InternalProblem.g:1577:1: ( '(' )
-            // InternalProblem.g:1578:2: '('
+            // InternalProblem.g:1781:1: ( '(' )
+            // InternalProblem.g:1782:2: '('
             {
              before(grammarAccess.getPredicateDefinitionAccess().getLeftParenthesisKeyword_2()); 
-            match(input,27,FOLLOW_2); 
+            match(input,32,FOLLOW_2); 
              after(grammarAccess.getPredicateDefinitionAccess().getLeftParenthesisKeyword_2()); 
 
             }
@@ -5064,16 +5696,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__3"
-    // InternalProblem.g:1587:1: rule__PredicateDefinition__Group__3 : rule__PredicateDefinition__Group__3__Impl rule__PredicateDefinition__Group__4 ;
+    // InternalProblem.g:1791: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:1591:1: ( rule__PredicateDefinition__Group__3__Impl rule__PredicateDefinition__Group__4 )
-            // InternalProblem.g:1592:2: rule__PredicateDefinition__Group__3__Impl rule__PredicateDefinition__Group__4
+            // InternalProblem.g:1795:1: ( rule__PredicateDefinition__Group__3__Impl rule__PredicateDefinition__Group__4 )
+            // InternalProblem.g:1796:2: rule__PredicateDefinition__Group__3__Impl rule__PredicateDefinition__Group__4
             {
-            pushFollow(FOLLOW_17);
+            pushFollow(FOLLOW_20);
             rule__PredicateDefinition__Group__3__Impl();
 
             state._fsp--;
@@ -5102,29 +5734,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__3__Impl"
-    // InternalProblem.g:1599:1: rule__PredicateDefinition__Group__3__Impl : ( ( rule__PredicateDefinition__Group_3__0 )? ) ;
+    // InternalProblem.g:1803: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:1603:1: ( ( ( rule__PredicateDefinition__Group_3__0 )? ) )
-            // InternalProblem.g:1604:1: ( ( rule__PredicateDefinition__Group_3__0 )? )
+            // InternalProblem.g:1807:1: ( ( ( rule__PredicateDefinition__Group_3__0 )? ) )
+            // InternalProblem.g:1808:1: ( ( rule__PredicateDefinition__Group_3__0 )? )
             {
-            // InternalProblem.g:1604:1: ( ( rule__PredicateDefinition__Group_3__0 )? )
-            // InternalProblem.g:1605:2: ( rule__PredicateDefinition__Group_3__0 )?
+            // InternalProblem.g:1808:1: ( ( rule__PredicateDefinition__Group_3__0 )? )
+            // InternalProblem.g:1809:2: ( rule__PredicateDefinition__Group_3__0 )?
             {
              before(grammarAccess.getPredicateDefinitionAccess().getGroup_3()); 
-            // InternalProblem.g:1606:2: ( rule__PredicateDefinition__Group_3__0 )?
-            int alt20=2;
-            int LA20_0 = input.LA(1);
+            // InternalProblem.g:1810:2: ( rule__PredicateDefinition__Group_3__0 )?
+            int alt23=2;
+            int LA23_0 = input.LA(1);
 
-            if ( (LA20_0==RULE_ID) ) {
-                alt20=1;
+            if ( (LA23_0==RULE_ID) ) {
+                alt23=1;
             }
-            switch (alt20) {
+            switch (alt23) {
                 case 1 :
-                    // InternalProblem.g:1606:3: rule__PredicateDefinition__Group_3__0
+                    // InternalProblem.g:1810:3: rule__PredicateDefinition__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__PredicateDefinition__Group_3__0();
@@ -5160,16 +5792,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__4"
-    // InternalProblem.g:1614:1: rule__PredicateDefinition__Group__4 : rule__PredicateDefinition__Group__4__Impl rule__PredicateDefinition__Group__5 ;
+    // InternalProblem.g:1818: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:1618:1: ( rule__PredicateDefinition__Group__4__Impl rule__PredicateDefinition__Group__5 )
-            // InternalProblem.g:1619:2: rule__PredicateDefinition__Group__4__Impl rule__PredicateDefinition__Group__5
+            // InternalProblem.g:1822:1: ( rule__PredicateDefinition__Group__4__Impl rule__PredicateDefinition__Group__5 )
+            // InternalProblem.g:1823:2: rule__PredicateDefinition__Group__4__Impl rule__PredicateDefinition__Group__5
             {
-            pushFollow(FOLLOW_18);
+            pushFollow(FOLLOW_21);
             rule__PredicateDefinition__Group__4__Impl();
 
             state._fsp--;
@@ -5198,20 +5830,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__4__Impl"
-    // InternalProblem.g:1626:1: rule__PredicateDefinition__Group__4__Impl : ( ')' ) ;
+    // InternalProblem.g:1830:1: rule__PredicateDefinition__Group__4__Impl : ( ')' ) ;
     public final void rule__PredicateDefinition__Group__4__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1630:1: ( ( ')' ) )
-            // InternalProblem.g:1631:1: ( ')' )
+            // InternalProblem.g:1834:1: ( ( ')' ) )
+            // InternalProblem.g:1835:1: ( ')' )
             {
-            // InternalProblem.g:1631:1: ( ')' )
-            // InternalProblem.g:1632:2: ')'
+            // InternalProblem.g:1835:1: ( ')' )
+            // InternalProblem.g:1836:2: ')'
             {
              before(grammarAccess.getPredicateDefinitionAccess().getRightParenthesisKeyword_4()); 
-            match(input,28,FOLLOW_2); 
+            match(input,33,FOLLOW_2); 
              after(grammarAccess.getPredicateDefinitionAccess().getRightParenthesisKeyword_4()); 
 
             }
@@ -5235,16 +5867,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__5"
-    // InternalProblem.g:1641:1: rule__PredicateDefinition__Group__5 : rule__PredicateDefinition__Group__5__Impl rule__PredicateDefinition__Group__6 ;
+    // InternalProblem.g:1845: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:1645:1: ( rule__PredicateDefinition__Group__5__Impl rule__PredicateDefinition__Group__6 )
-            // InternalProblem.g:1646:2: rule__PredicateDefinition__Group__5__Impl rule__PredicateDefinition__Group__6
+            // InternalProblem.g:1849:1: ( rule__PredicateDefinition__Group__5__Impl rule__PredicateDefinition__Group__6 )
+            // InternalProblem.g:1850:2: rule__PredicateDefinition__Group__5__Impl rule__PredicateDefinition__Group__6
             {
-            pushFollow(FOLLOW_18);
+            pushFollow(FOLLOW_21);
             rule__PredicateDefinition__Group__5__Impl();
 
             state._fsp--;
@@ -5273,29 +5905,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__5__Impl"
-    // InternalProblem.g:1653:1: rule__PredicateDefinition__Group__5__Impl : ( ( rule__PredicateDefinition__Group_5__0 )? ) ;
+    // InternalProblem.g:1857: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:1657:1: ( ( ( rule__PredicateDefinition__Group_5__0 )? ) )
-            // InternalProblem.g:1658:1: ( ( rule__PredicateDefinition__Group_5__0 )? )
+            // InternalProblem.g:1861:1: ( ( ( rule__PredicateDefinition__Group_5__0 )? ) )
+            // InternalProblem.g:1862:1: ( ( rule__PredicateDefinition__Group_5__0 )? )
             {
-            // InternalProblem.g:1658:1: ( ( rule__PredicateDefinition__Group_5__0 )? )
-            // InternalProblem.g:1659:2: ( rule__PredicateDefinition__Group_5__0 )?
+            // InternalProblem.g:1862:1: ( ( rule__PredicateDefinition__Group_5__0 )? )
+            // InternalProblem.g:1863:2: ( rule__PredicateDefinition__Group_5__0 )?
             {
              before(grammarAccess.getPredicateDefinitionAccess().getGroup_5()); 
-            // InternalProblem.g:1660:2: ( rule__PredicateDefinition__Group_5__0 )?
-            int alt21=2;
-            int LA21_0 = input.LA(1);
+            // InternalProblem.g:1864:2: ( rule__PredicateDefinition__Group_5__0 )?
+            int alt24=2;
+            int LA24_0 = input.LA(1);
 
-            if ( (LA21_0==29) ) {
-                alt21=1;
+            if ( (LA24_0==34) ) {
+                alt24=1;
             }
-            switch (alt21) {
+            switch (alt24) {
                 case 1 :
-                    // InternalProblem.g:1660:3: rule__PredicateDefinition__Group_5__0
+                    // InternalProblem.g:1864:3: rule__PredicateDefinition__Group_5__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__PredicateDefinition__Group_5__0();
@@ -5331,14 +5963,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__6"
-    // InternalProblem.g:1668:1: rule__PredicateDefinition__Group__6 : rule__PredicateDefinition__Group__6__Impl ;
+    // InternalProblem.g:1872: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:1672:1: ( rule__PredicateDefinition__Group__6__Impl )
-            // InternalProblem.g:1673:2: rule__PredicateDefinition__Group__6__Impl
+            // InternalProblem.g:1876:1: ( rule__PredicateDefinition__Group__6__Impl )
+            // InternalProblem.g:1877:2: rule__PredicateDefinition__Group__6__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group__6__Impl();
@@ -5364,20 +5996,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group__6__Impl"
-    // InternalProblem.g:1679:1: rule__PredicateDefinition__Group__6__Impl : ( '.' ) ;
+    // InternalProblem.g:1883:1: rule__PredicateDefinition__Group__6__Impl : ( '.' ) ;
     public final void rule__PredicateDefinition__Group__6__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1683:1: ( ( '.' ) )
-            // InternalProblem.g:1684:1: ( '.' )
+            // InternalProblem.g:1887:1: ( ( '.' ) )
+            // InternalProblem.g:1888:1: ( '.' )
             {
-            // InternalProblem.g:1684:1: ( '.' )
-            // InternalProblem.g:1685:2: '.'
+            // InternalProblem.g:1888:1: ( '.' )
+            // InternalProblem.g:1889:2: '.'
             {
              before(grammarAccess.getPredicateDefinitionAccess().getFullStopKeyword_6()); 
-            match(input,21,FOLLOW_2); 
+            match(input,12,FOLLOW_2); 
              after(grammarAccess.getPredicateDefinitionAccess().getFullStopKeyword_6()); 
 
             }
@@ -5401,16 +6033,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_0_0__0"
-    // InternalProblem.g:1695:1: rule__PredicateDefinition__Group_0_0__0 : rule__PredicateDefinition__Group_0_0__0__Impl rule__PredicateDefinition__Group_0_0__1 ;
+    // InternalProblem.g:1899: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:1699:1: ( rule__PredicateDefinition__Group_0_0__0__Impl rule__PredicateDefinition__Group_0_0__1 )
-            // InternalProblem.g:1700:2: rule__PredicateDefinition__Group_0_0__0__Impl rule__PredicateDefinition__Group_0_0__1
+            // InternalProblem.g:1903:1: ( rule__PredicateDefinition__Group_0_0__0__Impl rule__PredicateDefinition__Group_0_0__1 )
+            // InternalProblem.g:1904:2: rule__PredicateDefinition__Group_0_0__0__Impl rule__PredicateDefinition__Group_0_0__1
             {
-            pushFollow(FOLLOW_19);
+            pushFollow(FOLLOW_22);
             rule__PredicateDefinition__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -5439,21 +6071,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_0_0__0__Impl"
-    // InternalProblem.g:1707:1: rule__PredicateDefinition__Group_0_0__0__Impl : ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) ) ;
+    // InternalProblem.g:1911: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:1711:1: ( ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) ) )
-            // InternalProblem.g:1712:1: ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) )
+            // InternalProblem.g:1915:1: ( ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) ) )
+            // InternalProblem.g:1916:1: ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) )
             {
-            // InternalProblem.g:1712:1: ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) )
-            // InternalProblem.g:1713:2: ( rule__PredicateDefinition__ErrorAssignment_0_0_0 )
+            // InternalProblem.g:1916:1: ( ( rule__PredicateDefinition__ErrorAssignment_0_0_0 ) )
+            // InternalProblem.g:1917:2: ( rule__PredicateDefinition__ErrorAssignment_0_0_0 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getErrorAssignment_0_0_0()); 
-            // InternalProblem.g:1714:2: ( rule__PredicateDefinition__ErrorAssignment_0_0_0 )
-            // InternalProblem.g:1714:3: rule__PredicateDefinition__ErrorAssignment_0_0_0
+            // InternalProblem.g:1918:2: ( rule__PredicateDefinition__ErrorAssignment_0_0_0 )
+            // InternalProblem.g:1918:3: rule__PredicateDefinition__ErrorAssignment_0_0_0
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__ErrorAssignment_0_0_0();
@@ -5486,14 +6118,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_0_0__1"
-    // InternalProblem.g:1722:1: rule__PredicateDefinition__Group_0_0__1 : rule__PredicateDefinition__Group_0_0__1__Impl ;
+    // InternalProblem.g:1926: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:1726:1: ( rule__PredicateDefinition__Group_0_0__1__Impl )
-            // InternalProblem.g:1727:2: rule__PredicateDefinition__Group_0_0__1__Impl
+            // InternalProblem.g:1930:1: ( rule__PredicateDefinition__Group_0_0__1__Impl )
+            // InternalProblem.g:1931:2: rule__PredicateDefinition__Group_0_0__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group_0_0__1__Impl();
@@ -5519,31 +6151,31 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_0_0__1__Impl"
-    // InternalProblem.g:1733:1: rule__PredicateDefinition__Group_0_0__1__Impl : ( ( 'pred' )? ) ;
+    // InternalProblem.g:1937: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:1737:1: ( ( ( 'pred' )? ) )
-            // InternalProblem.g:1738:1: ( ( 'pred' )? )
+            // InternalProblem.g:1941:1: ( ( ( 'pred' )? ) )
+            // InternalProblem.g:1942:1: ( ( 'pred' )? )
             {
-            // InternalProblem.g:1738:1: ( ( 'pred' )? )
-            // InternalProblem.g:1739:2: ( 'pred' )?
+            // InternalProblem.g:1942:1: ( ( 'pred' )? )
+            // InternalProblem.g:1943:2: ( 'pred' )?
             {
              before(grammarAccess.getPredicateDefinitionAccess().getPredKeyword_0_0_1()); 
-            // InternalProblem.g:1740:2: ( 'pred' )?
-            int alt22=2;
-            int LA22_0 = input.LA(1);
+            // InternalProblem.g:1944:2: ( 'pred' )?
+            int alt25=2;
+            int LA25_0 = input.LA(1);
 
-            if ( (LA22_0==12) ) {
-                alt22=1;
+            if ( (LA25_0==14) ) {
+                alt25=1;
             }
-            switch (alt22) {
+            switch (alt25) {
                 case 1 :
-                    // InternalProblem.g:1740:3: 'pred'
+                    // InternalProblem.g:1944:3: 'pred'
                     {
-                    match(input,12,FOLLOW_2); 
+                    match(input,14,FOLLOW_2); 
 
                     }
                     break;
@@ -5573,14 +6205,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3__0"
-    // InternalProblem.g:1749:1: rule__PredicateDefinition__Group_3__0 : rule__PredicateDefinition__Group_3__0__Impl rule__PredicateDefinition__Group_3__1 ;
+    // InternalProblem.g:1953: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:1753:1: ( rule__PredicateDefinition__Group_3__0__Impl rule__PredicateDefinition__Group_3__1 )
-            // InternalProblem.g:1754:2: rule__PredicateDefinition__Group_3__0__Impl rule__PredicateDefinition__Group_3__1
+            // InternalProblem.g:1957:1: ( rule__PredicateDefinition__Group_3__0__Impl rule__PredicateDefinition__Group_3__1 )
+            // InternalProblem.g:1958:2: rule__PredicateDefinition__Group_3__0__Impl rule__PredicateDefinition__Group_3__1
             {
             pushFollow(FOLLOW_10);
             rule__PredicateDefinition__Group_3__0__Impl();
@@ -5611,21 +6243,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3__0__Impl"
-    // InternalProblem.g:1761:1: rule__PredicateDefinition__Group_3__0__Impl : ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) ) ;
+    // InternalProblem.g:1965: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:1765:1: ( ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) ) )
-            // InternalProblem.g:1766:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) )
+            // InternalProblem.g:1969:1: ( ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) ) )
+            // InternalProblem.g:1970:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) )
             {
-            // InternalProblem.g:1766:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) )
-            // InternalProblem.g:1767:2: ( rule__PredicateDefinition__ParametersAssignment_3_0 )
+            // InternalProblem.g:1970:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_0 ) )
+            // InternalProblem.g:1971:2: ( rule__PredicateDefinition__ParametersAssignment_3_0 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getParametersAssignment_3_0()); 
-            // InternalProblem.g:1768:2: ( rule__PredicateDefinition__ParametersAssignment_3_0 )
-            // InternalProblem.g:1768:3: rule__PredicateDefinition__ParametersAssignment_3_0
+            // InternalProblem.g:1972:2: ( rule__PredicateDefinition__ParametersAssignment_3_0 )
+            // InternalProblem.g:1972:3: rule__PredicateDefinition__ParametersAssignment_3_0
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__ParametersAssignment_3_0();
@@ -5658,14 +6290,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3__1"
-    // InternalProblem.g:1776:1: rule__PredicateDefinition__Group_3__1 : rule__PredicateDefinition__Group_3__1__Impl ;
+    // InternalProblem.g:1980: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:1780:1: ( rule__PredicateDefinition__Group_3__1__Impl )
-            // InternalProblem.g:1781:2: rule__PredicateDefinition__Group_3__1__Impl
+            // InternalProblem.g:1984:1: ( rule__PredicateDefinition__Group_3__1__Impl )
+            // InternalProblem.g:1985:2: rule__PredicateDefinition__Group_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group_3__1__Impl();
@@ -5691,35 +6323,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3__1__Impl"
-    // InternalProblem.g:1787:1: rule__PredicateDefinition__Group_3__1__Impl : ( ( rule__PredicateDefinition__Group_3_1__0 )* ) ;
+    // InternalProblem.g:1991: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:1791:1: ( ( ( rule__PredicateDefinition__Group_3_1__0 )* ) )
-            // InternalProblem.g:1792:1: ( ( rule__PredicateDefinition__Group_3_1__0 )* )
+            // InternalProblem.g:1995:1: ( ( ( rule__PredicateDefinition__Group_3_1__0 )* ) )
+            // InternalProblem.g:1996:1: ( ( rule__PredicateDefinition__Group_3_1__0 )* )
             {
-            // InternalProblem.g:1792:1: ( ( rule__PredicateDefinition__Group_3_1__0 )* )
-            // InternalProblem.g:1793:2: ( rule__PredicateDefinition__Group_3_1__0 )*
+            // InternalProblem.g:1996:1: ( ( rule__PredicateDefinition__Group_3_1__0 )* )
+            // InternalProblem.g:1997:2: ( rule__PredicateDefinition__Group_3_1__0 )*
             {
              before(grammarAccess.getPredicateDefinitionAccess().getGroup_3_1()); 
-            // InternalProblem.g:1794:2: ( rule__PredicateDefinition__Group_3_1__0 )*
-            loop23:
+            // InternalProblem.g:1998:2: ( rule__PredicateDefinition__Group_3_1__0 )*
+            loop26:
             do {
-                int alt23=2;
-                int LA23_0 = input.LA(1);
+                int alt26=2;
+                int LA26_0 = input.LA(1);
 
-                if ( (LA23_0==25) ) {
-                    alt23=1;
+                if ( (LA26_0==25) ) {
+                    alt26=1;
                 }
 
 
-                switch (alt23) {
+                switch (alt26) {
                 case 1 :
-                    // InternalProblem.g:1794:3: rule__PredicateDefinition__Group_3_1__0
+                    // InternalProblem.g:1998:3: rule__PredicateDefinition__Group_3_1__0
                     {
-                    pushFollow(FOLLOW_7);
+                    pushFollow(FOLLOW_11);
                     rule__PredicateDefinition__Group_3_1__0();
 
                     state._fsp--;
@@ -5729,7 +6361,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop23;
+                    break loop26;
                 }
             } while (true);
 
@@ -5756,14 +6388,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3_1__0"
-    // InternalProblem.g:1803:1: rule__PredicateDefinition__Group_3_1__0 : rule__PredicateDefinition__Group_3_1__0__Impl rule__PredicateDefinition__Group_3_1__1 ;
+    // InternalProblem.g:2007: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:1807:1: ( rule__PredicateDefinition__Group_3_1__0__Impl rule__PredicateDefinition__Group_3_1__1 )
-            // InternalProblem.g:1808:2: rule__PredicateDefinition__Group_3_1__0__Impl rule__PredicateDefinition__Group_3_1__1
+            // InternalProblem.g:2011:1: ( rule__PredicateDefinition__Group_3_1__0__Impl rule__PredicateDefinition__Group_3_1__1 )
+            // InternalProblem.g:2012:2: rule__PredicateDefinition__Group_3_1__0__Impl rule__PredicateDefinition__Group_3_1__1
             {
             pushFollow(FOLLOW_5);
             rule__PredicateDefinition__Group_3_1__0__Impl();
@@ -5794,17 +6426,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3_1__0__Impl"
-    // InternalProblem.g:1815:1: rule__PredicateDefinition__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalProblem.g:2019: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:1819:1: ( ( ',' ) )
-            // InternalProblem.g:1820:1: ( ',' )
+            // InternalProblem.g:2023:1: ( ( ',' ) )
+            // InternalProblem.g:2024:1: ( ',' )
             {
-            // InternalProblem.g:1820:1: ( ',' )
-            // InternalProblem.g:1821:2: ','
+            // InternalProblem.g:2024:1: ( ',' )
+            // InternalProblem.g:2025:2: ','
             {
              before(grammarAccess.getPredicateDefinitionAccess().getCommaKeyword_3_1_0()); 
             match(input,25,FOLLOW_2); 
@@ -5831,14 +6463,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3_1__1"
-    // InternalProblem.g:1830:1: rule__PredicateDefinition__Group_3_1__1 : rule__PredicateDefinition__Group_3_1__1__Impl ;
+    // InternalProblem.g:2034: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:1834:1: ( rule__PredicateDefinition__Group_3_1__1__Impl )
-            // InternalProblem.g:1835:2: rule__PredicateDefinition__Group_3_1__1__Impl
+            // InternalProblem.g:2038:1: ( rule__PredicateDefinition__Group_3_1__1__Impl )
+            // InternalProblem.g:2039:2: rule__PredicateDefinition__Group_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group_3_1__1__Impl();
@@ -5864,21 +6496,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_3_1__1__Impl"
-    // InternalProblem.g:1841:1: rule__PredicateDefinition__Group_3_1__1__Impl : ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) ) ;
+    // InternalProblem.g:2045: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:1845:1: ( ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) ) )
-            // InternalProblem.g:1846:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) )
+            // InternalProblem.g:2049:1: ( ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) ) )
+            // InternalProblem.g:2050:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) )
             {
-            // InternalProblem.g:1846:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) )
-            // InternalProblem.g:1847:2: ( rule__PredicateDefinition__ParametersAssignment_3_1_1 )
+            // InternalProblem.g:2050:1: ( ( rule__PredicateDefinition__ParametersAssignment_3_1_1 ) )
+            // InternalProblem.g:2051:2: ( rule__PredicateDefinition__ParametersAssignment_3_1_1 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getParametersAssignment_3_1_1()); 
-            // InternalProblem.g:1848:2: ( rule__PredicateDefinition__ParametersAssignment_3_1_1 )
-            // InternalProblem.g:1848:3: rule__PredicateDefinition__ParametersAssignment_3_1_1
+            // InternalProblem.g:2052:2: ( rule__PredicateDefinition__ParametersAssignment_3_1_1 )
+            // InternalProblem.g:2052:3: rule__PredicateDefinition__ParametersAssignment_3_1_1
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__ParametersAssignment_3_1_1();
@@ -5911,16 +6543,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5__0"
-    // InternalProblem.g:1857:1: rule__PredicateDefinition__Group_5__0 : rule__PredicateDefinition__Group_5__0__Impl rule__PredicateDefinition__Group_5__1 ;
+    // InternalProblem.g:2061: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:1861:1: ( rule__PredicateDefinition__Group_5__0__Impl rule__PredicateDefinition__Group_5__1 )
-            // InternalProblem.g:1862:2: rule__PredicateDefinition__Group_5__0__Impl rule__PredicateDefinition__Group_5__1
+            // InternalProblem.g:2065:1: ( rule__PredicateDefinition__Group_5__0__Impl rule__PredicateDefinition__Group_5__1 )
+            // InternalProblem.g:2066:2: rule__PredicateDefinition__Group_5__0__Impl rule__PredicateDefinition__Group_5__1
             {
-            pushFollow(FOLLOW_20);
+            pushFollow(FOLLOW_23);
             rule__PredicateDefinition__Group_5__0__Impl();
 
             state._fsp--;
@@ -5949,21 +6581,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5__0__Impl"
-    // InternalProblem.g:1869:1: rule__PredicateDefinition__Group_5__0__Impl : ( ':=' ) ;
+    // InternalProblem.g:2073:1: rule__PredicateDefinition__Group_5__0__Impl : ( ':-' ) ;
     public final void rule__PredicateDefinition__Group_5__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:1873:1: ( ( ':=' ) )
-            // InternalProblem.g:1874:1: ( ':=' )
+            // InternalProblem.g:2077:1: ( ( ':-' ) )
+            // InternalProblem.g:2078:1: ( ':-' )
             {
-            // InternalProblem.g:1874:1: ( ':=' )
-            // InternalProblem.g:1875:2: ':='
+            // InternalProblem.g:2078:1: ( ':-' )
+            // InternalProblem.g:2079:2: ':-'
             {
-             before(grammarAccess.getPredicateDefinitionAccess().getColonEqualsSignKeyword_5_0()); 
-            match(input,29,FOLLOW_2); 
-             after(grammarAccess.getPredicateDefinitionAccess().getColonEqualsSignKeyword_5_0()); 
+             before(grammarAccess.getPredicateDefinitionAccess().getColonHyphenMinusKeyword_5_0()); 
+            match(input,34,FOLLOW_2); 
+             after(grammarAccess.getPredicateDefinitionAccess().getColonHyphenMinusKeyword_5_0()); 
 
             }
 
@@ -5986,16 +6618,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5__1"
-    // InternalProblem.g:1884:1: rule__PredicateDefinition__Group_5__1 : rule__PredicateDefinition__Group_5__1__Impl rule__PredicateDefinition__Group_5__2 ;
+    // InternalProblem.g:2088: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:1888:1: ( rule__PredicateDefinition__Group_5__1__Impl rule__PredicateDefinition__Group_5__2 )
-            // InternalProblem.g:1889:2: rule__PredicateDefinition__Group_5__1__Impl rule__PredicateDefinition__Group_5__2
+            // InternalProblem.g:2092:1: ( rule__PredicateDefinition__Group_5__1__Impl rule__PredicateDefinition__Group_5__2 )
+            // InternalProblem.g:2093:2: rule__PredicateDefinition__Group_5__1__Impl rule__PredicateDefinition__Group_5__2
             {
-            pushFollow(FOLLOW_21);
+            pushFollow(FOLLOW_14);
             rule__PredicateDefinition__Group_5__1__Impl();
 
             state._fsp--;
@@ -6024,21 +6656,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5__1__Impl"
-    // InternalProblem.g:1896:1: rule__PredicateDefinition__Group_5__1__Impl : ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) ) ;
+    // InternalProblem.g:2100: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:1900:1: ( ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) ) )
-            // InternalProblem.g:1901:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) )
+            // InternalProblem.g:2104:1: ( ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) ) )
+            // InternalProblem.g:2105:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) )
             {
-            // InternalProblem.g:1901:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) )
-            // InternalProblem.g:1902:2: ( rule__PredicateDefinition__BodiesAssignment_5_1 )
+            // InternalProblem.g:2105:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_1 ) )
+            // InternalProblem.g:2106:2: ( rule__PredicateDefinition__BodiesAssignment_5_1 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getBodiesAssignment_5_1()); 
-            // InternalProblem.g:1903:2: ( rule__PredicateDefinition__BodiesAssignment_5_1 )
-            // InternalProblem.g:1903:3: rule__PredicateDefinition__BodiesAssignment_5_1
+            // InternalProblem.g:2107:2: ( rule__PredicateDefinition__BodiesAssignment_5_1 )
+            // InternalProblem.g:2107:3: rule__PredicateDefinition__BodiesAssignment_5_1
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__BodiesAssignment_5_1();
@@ -6071,14 +6703,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5__2"
-    // InternalProblem.g:1911:1: rule__PredicateDefinition__Group_5__2 : rule__PredicateDefinition__Group_5__2__Impl ;
+    // InternalProblem.g:2115: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:1915:1: ( rule__PredicateDefinition__Group_5__2__Impl )
-            // InternalProblem.g:1916:2: rule__PredicateDefinition__Group_5__2__Impl
+            // InternalProblem.g:2119:1: ( rule__PredicateDefinition__Group_5__2__Impl )
+            // InternalProblem.g:2120:2: rule__PredicateDefinition__Group_5__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group_5__2__Impl();
@@ -6104,35 +6736,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5__2__Impl"
-    // InternalProblem.g:1922:1: rule__PredicateDefinition__Group_5__2__Impl : ( ( rule__PredicateDefinition__Group_5_2__0 )* ) ;
+    // InternalProblem.g:2126: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:1926:1: ( ( ( rule__PredicateDefinition__Group_5_2__0 )* ) )
-            // InternalProblem.g:1927:1: ( ( rule__PredicateDefinition__Group_5_2__0 )* )
+            // InternalProblem.g:2130:1: ( ( ( rule__PredicateDefinition__Group_5_2__0 )* ) )
+            // InternalProblem.g:2131:1: ( ( rule__PredicateDefinition__Group_5_2__0 )* )
             {
-            // InternalProblem.g:1927:1: ( ( rule__PredicateDefinition__Group_5_2__0 )* )
-            // InternalProblem.g:1928:2: ( rule__PredicateDefinition__Group_5_2__0 )*
+            // InternalProblem.g:2131:1: ( ( rule__PredicateDefinition__Group_5_2__0 )* )
+            // InternalProblem.g:2132:2: ( rule__PredicateDefinition__Group_5_2__0 )*
             {
              before(grammarAccess.getPredicateDefinitionAccess().getGroup_5_2()); 
-            // InternalProblem.g:1929:2: ( rule__PredicateDefinition__Group_5_2__0 )*
-            loop24:
+            // InternalProblem.g:2133:2: ( rule__PredicateDefinition__Group_5_2__0 )*
+            loop27:
             do {
-                int alt24=2;
-                int LA24_0 = input.LA(1);
+                int alt27=2;
+                int LA27_0 = input.LA(1);
 
-                if ( (LA24_0==30) ) {
-                    alt24=1;
+                if ( (LA27_0==28) ) {
+                    alt27=1;
                 }
 
 
-                switch (alt24) {
+                switch (alt27) {
                 case 1 :
-                    // InternalProblem.g:1929:3: rule__PredicateDefinition__Group_5_2__0
+                    // InternalProblem.g:2133:3: rule__PredicateDefinition__Group_5_2__0
                     {
-                    pushFollow(FOLLOW_22);
+                    pushFollow(FOLLOW_24);
                     rule__PredicateDefinition__Group_5_2__0();
 
                     state._fsp--;
@@ -6142,7 +6774,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop24;
+                    break loop27;
                 }
             } while (true);
 
@@ -6169,16 +6801,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5_2__0"
-    // InternalProblem.g:1938:1: rule__PredicateDefinition__Group_5_2__0 : rule__PredicateDefinition__Group_5_2__0__Impl rule__PredicateDefinition__Group_5_2__1 ;
+    // InternalProblem.g:2142: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:1942:1: ( rule__PredicateDefinition__Group_5_2__0__Impl rule__PredicateDefinition__Group_5_2__1 )
-            // InternalProblem.g:1943:2: rule__PredicateDefinition__Group_5_2__0__Impl rule__PredicateDefinition__Group_5_2__1
+            // InternalProblem.g:2146:1: ( rule__PredicateDefinition__Group_5_2__0__Impl rule__PredicateDefinition__Group_5_2__1 )
+            // InternalProblem.g:2147:2: rule__PredicateDefinition__Group_5_2__0__Impl rule__PredicateDefinition__Group_5_2__1
             {
-            pushFollow(FOLLOW_20);
+            pushFollow(FOLLOW_23);
             rule__PredicateDefinition__Group_5_2__0__Impl();
 
             state._fsp--;
@@ -6207,20 +6839,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5_2__0__Impl"
-    // InternalProblem.g:1950:1: rule__PredicateDefinition__Group_5_2__0__Impl : ( ';' ) ;
+    // InternalProblem.g:2154: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:1954:1: ( ( ';' ) )
-            // InternalProblem.g:1955:1: ( ';' )
+            // InternalProblem.g:2158:1: ( ( ';' ) )
+            // InternalProblem.g:2159:1: ( ';' )
             {
-            // InternalProblem.g:1955:1: ( ';' )
-            // InternalProblem.g:1956:2: ';'
+            // InternalProblem.g:2159:1: ( ';' )
+            // InternalProblem.g:2160:2: ';'
             {
              before(grammarAccess.getPredicateDefinitionAccess().getSemicolonKeyword_5_2_0()); 
-            match(input,30,FOLLOW_2); 
+            match(input,28,FOLLOW_2); 
              after(grammarAccess.getPredicateDefinitionAccess().getSemicolonKeyword_5_2_0()); 
 
             }
@@ -6244,14 +6876,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5_2__1"
-    // InternalProblem.g:1965:1: rule__PredicateDefinition__Group_5_2__1 : rule__PredicateDefinition__Group_5_2__1__Impl ;
+    // InternalProblem.g:2169: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:1969:1: ( rule__PredicateDefinition__Group_5_2__1__Impl )
-            // InternalProblem.g:1970:2: rule__PredicateDefinition__Group_5_2__1__Impl
+            // InternalProblem.g:2173:1: ( rule__PredicateDefinition__Group_5_2__1__Impl )
+            // InternalProblem.g:2174:2: rule__PredicateDefinition__Group_5_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__Group_5_2__1__Impl();
@@ -6277,21 +6909,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__Group_5_2__1__Impl"
-    // InternalProblem.g:1976:1: rule__PredicateDefinition__Group_5_2__1__Impl : ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) ) ;
+    // InternalProblem.g:2180: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:1980:1: ( ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) ) )
-            // InternalProblem.g:1981:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) )
+            // InternalProblem.g:2184:1: ( ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) ) )
+            // InternalProblem.g:2185:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) )
             {
-            // InternalProblem.g:1981:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) )
-            // InternalProblem.g:1982:2: ( rule__PredicateDefinition__BodiesAssignment_5_2_1 )
+            // InternalProblem.g:2185:1: ( ( rule__PredicateDefinition__BodiesAssignment_5_2_1 ) )
+            // InternalProblem.g:2186:2: ( rule__PredicateDefinition__BodiesAssignment_5_2_1 )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getBodiesAssignment_5_2_1()); 
-            // InternalProblem.g:1983:2: ( rule__PredicateDefinition__BodiesAssignment_5_2_1 )
-            // InternalProblem.g:1983:3: rule__PredicateDefinition__BodiesAssignment_5_2_1
+            // InternalProblem.g:2187:2: ( rule__PredicateDefinition__BodiesAssignment_5_2_1 )
+            // InternalProblem.g:2187:3: rule__PredicateDefinition__BodiesAssignment_5_2_1
             {
             pushFollow(FOLLOW_2);
             rule__PredicateDefinition__BodiesAssignment_5_2_1();
@@ -6324,14 +6956,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Parameter__Group__0"
-    // InternalProblem.g:1992:1: rule__Parameter__Group__0 : rule__Parameter__Group__0__Impl rule__Parameter__Group__1 ;
+    // InternalProblem.g:2196: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:1996:1: ( rule__Parameter__Group__0__Impl rule__Parameter__Group__1 )
-            // InternalProblem.g:1997:2: rule__Parameter__Group__0__Impl rule__Parameter__Group__1
+            // InternalProblem.g:2200:1: ( rule__Parameter__Group__0__Impl rule__Parameter__Group__1 )
+            // InternalProblem.g:2201:2: rule__Parameter__Group__0__Impl rule__Parameter__Group__1
             {
             pushFollow(FOLLOW_5);
             rule__Parameter__Group__0__Impl();
@@ -6362,21 +6994,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Parameter__Group__0__Impl"
-    // InternalProblem.g:2004:1: rule__Parameter__Group__0__Impl : ( ( rule__Parameter__ParameterTypeAssignment_0 ) ) ;
+    // InternalProblem.g:2208: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:2008:1: ( ( ( rule__Parameter__ParameterTypeAssignment_0 ) ) )
-            // InternalProblem.g:2009:1: ( ( rule__Parameter__ParameterTypeAssignment_0 ) )
+            // InternalProblem.g:2212:1: ( ( ( rule__Parameter__ParameterTypeAssignment_0 ) ) )
+            // InternalProblem.g:2213:1: ( ( rule__Parameter__ParameterTypeAssignment_0 ) )
             {
-            // InternalProblem.g:2009:1: ( ( rule__Parameter__ParameterTypeAssignment_0 ) )
-            // InternalProblem.g:2010:2: ( rule__Parameter__ParameterTypeAssignment_0 )
+            // InternalProblem.g:2213:1: ( ( rule__Parameter__ParameterTypeAssignment_0 ) )
+            // InternalProblem.g:2214:2: ( rule__Parameter__ParameterTypeAssignment_0 )
             {
              before(grammarAccess.getParameterAccess().getParameterTypeAssignment_0()); 
-            // InternalProblem.g:2011:2: ( rule__Parameter__ParameterTypeAssignment_0 )
-            // InternalProblem.g:2011:3: rule__Parameter__ParameterTypeAssignment_0
+            // InternalProblem.g:2215:2: ( rule__Parameter__ParameterTypeAssignment_0 )
+            // InternalProblem.g:2215:3: rule__Parameter__ParameterTypeAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__Parameter__ParameterTypeAssignment_0();
@@ -6409,14 +7041,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Parameter__Group__1"
-    // InternalProblem.g:2019:1: rule__Parameter__Group__1 : rule__Parameter__Group__1__Impl ;
+    // InternalProblem.g:2223: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:2023:1: ( rule__Parameter__Group__1__Impl )
-            // InternalProblem.g:2024:2: rule__Parameter__Group__1__Impl
+            // InternalProblem.g:2227:1: ( rule__Parameter__Group__1__Impl )
+            // InternalProblem.g:2228:2: rule__Parameter__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Parameter__Group__1__Impl();
@@ -6442,21 +7074,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Parameter__Group__1__Impl"
-    // InternalProblem.g:2030:1: rule__Parameter__Group__1__Impl : ( ( rule__Parameter__NameAssignment_1 ) ) ;
+    // InternalProblem.g:2234: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:2034:1: ( ( ( rule__Parameter__NameAssignment_1 ) ) )
-            // InternalProblem.g:2035:1: ( ( rule__Parameter__NameAssignment_1 ) )
+            // InternalProblem.g:2238:1: ( ( ( rule__Parameter__NameAssignment_1 ) ) )
+            // InternalProblem.g:2239:1: ( ( rule__Parameter__NameAssignment_1 ) )
             {
-            // InternalProblem.g:2035:1: ( ( rule__Parameter__NameAssignment_1 ) )
-            // InternalProblem.g:2036:2: ( rule__Parameter__NameAssignment_1 )
+            // InternalProblem.g:2239:1: ( ( rule__Parameter__NameAssignment_1 ) )
+            // InternalProblem.g:2240:2: ( rule__Parameter__NameAssignment_1 )
             {
              before(grammarAccess.getParameterAccess().getNameAssignment_1()); 
-            // InternalProblem.g:2037:2: ( rule__Parameter__NameAssignment_1 )
-            // InternalProblem.g:2037:3: rule__Parameter__NameAssignment_1
+            // InternalProblem.g:2241:2: ( rule__Parameter__NameAssignment_1 )
+            // InternalProblem.g:2241:3: rule__Parameter__NameAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__Parameter__NameAssignment_1();
@@ -6489,14 +7121,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group__0"
-    // InternalProblem.g:2046:1: rule__Conjunction__Group__0 : rule__Conjunction__Group__0__Impl rule__Conjunction__Group__1 ;
+    // InternalProblem.g:2250: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:2050:1: ( rule__Conjunction__Group__0__Impl rule__Conjunction__Group__1 )
-            // InternalProblem.g:2051:2: rule__Conjunction__Group__0__Impl rule__Conjunction__Group__1
+            // InternalProblem.g:2254:1: ( rule__Conjunction__Group__0__Impl rule__Conjunction__Group__1 )
+            // InternalProblem.g:2255:2: rule__Conjunction__Group__0__Impl rule__Conjunction__Group__1
             {
             pushFollow(FOLLOW_10);
             rule__Conjunction__Group__0__Impl();
@@ -6527,21 +7159,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group__0__Impl"
-    // InternalProblem.g:2058:1: rule__Conjunction__Group__0__Impl : ( ( rule__Conjunction__LiteralsAssignment_0 ) ) ;
+    // InternalProblem.g:2262: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:2062:1: ( ( ( rule__Conjunction__LiteralsAssignment_0 ) ) )
-            // InternalProblem.g:2063:1: ( ( rule__Conjunction__LiteralsAssignment_0 ) )
+            // InternalProblem.g:2266:1: ( ( ( rule__Conjunction__LiteralsAssignment_0 ) ) )
+            // InternalProblem.g:2267:1: ( ( rule__Conjunction__LiteralsAssignment_0 ) )
             {
-            // InternalProblem.g:2063:1: ( ( rule__Conjunction__LiteralsAssignment_0 ) )
-            // InternalProblem.g:2064:2: ( rule__Conjunction__LiteralsAssignment_0 )
+            // InternalProblem.g:2267:1: ( ( rule__Conjunction__LiteralsAssignment_0 ) )
+            // InternalProblem.g:2268:2: ( rule__Conjunction__LiteralsAssignment_0 )
             {
              before(grammarAccess.getConjunctionAccess().getLiteralsAssignment_0()); 
-            // InternalProblem.g:2065:2: ( rule__Conjunction__LiteralsAssignment_0 )
-            // InternalProblem.g:2065:3: rule__Conjunction__LiteralsAssignment_0
+            // InternalProblem.g:2269:2: ( rule__Conjunction__LiteralsAssignment_0 )
+            // InternalProblem.g:2269:3: rule__Conjunction__LiteralsAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__Conjunction__LiteralsAssignment_0();
@@ -6574,14 +7206,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group__1"
-    // InternalProblem.g:2073:1: rule__Conjunction__Group__1 : rule__Conjunction__Group__1__Impl ;
+    // InternalProblem.g:2277: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:2077:1: ( rule__Conjunction__Group__1__Impl )
-            // InternalProblem.g:2078:2: rule__Conjunction__Group__1__Impl
+            // InternalProblem.g:2281:1: ( rule__Conjunction__Group__1__Impl )
+            // InternalProblem.g:2282:2: rule__Conjunction__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Conjunction__Group__1__Impl();
@@ -6607,35 +7239,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group__1__Impl"
-    // InternalProblem.g:2084:1: rule__Conjunction__Group__1__Impl : ( ( rule__Conjunction__Group_1__0 )* ) ;
+    // InternalProblem.g:2288: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:2088:1: ( ( ( rule__Conjunction__Group_1__0 )* ) )
-            // InternalProblem.g:2089:1: ( ( rule__Conjunction__Group_1__0 )* )
+            // InternalProblem.g:2292:1: ( ( ( rule__Conjunction__Group_1__0 )* ) )
+            // InternalProblem.g:2293:1: ( ( rule__Conjunction__Group_1__0 )* )
             {
-            // InternalProblem.g:2089:1: ( ( rule__Conjunction__Group_1__0 )* )
-            // InternalProblem.g:2090:2: ( rule__Conjunction__Group_1__0 )*
+            // InternalProblem.g:2293:1: ( ( rule__Conjunction__Group_1__0 )* )
+            // InternalProblem.g:2294:2: ( rule__Conjunction__Group_1__0 )*
             {
              before(grammarAccess.getConjunctionAccess().getGroup_1()); 
-            // InternalProblem.g:2091:2: ( rule__Conjunction__Group_1__0 )*
-            loop25:
+            // InternalProblem.g:2295:2: ( rule__Conjunction__Group_1__0 )*
+            loop28:
             do {
-                int alt25=2;
-                int LA25_0 = input.LA(1);
+                int alt28=2;
+                int LA28_0 = input.LA(1);
 
-                if ( (LA25_0==25) ) {
-                    alt25=1;
+                if ( (LA28_0==25) ) {
+                    alt28=1;
                 }
 
 
-                switch (alt25) {
+                switch (alt28) {
                 case 1 :
-                    // InternalProblem.g:2091:3: rule__Conjunction__Group_1__0
+                    // InternalProblem.g:2295:3: rule__Conjunction__Group_1__0
                     {
-                    pushFollow(FOLLOW_7);
+                    pushFollow(FOLLOW_11);
                     rule__Conjunction__Group_1__0();
 
                     state._fsp--;
@@ -6645,7 +7277,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop25;
+                    break loop28;
                 }
             } while (true);
 
@@ -6672,16 +7304,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group_1__0"
-    // InternalProblem.g:2100:1: rule__Conjunction__Group_1__0 : rule__Conjunction__Group_1__0__Impl rule__Conjunction__Group_1__1 ;
+    // InternalProblem.g:2304: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:2104:1: ( rule__Conjunction__Group_1__0__Impl rule__Conjunction__Group_1__1 )
-            // InternalProblem.g:2105:2: rule__Conjunction__Group_1__0__Impl rule__Conjunction__Group_1__1
+            // InternalProblem.g:2308:1: ( rule__Conjunction__Group_1__0__Impl rule__Conjunction__Group_1__1 )
+            // InternalProblem.g:2309:2: rule__Conjunction__Group_1__0__Impl rule__Conjunction__Group_1__1
             {
-            pushFollow(FOLLOW_20);
+            pushFollow(FOLLOW_23);
             rule__Conjunction__Group_1__0__Impl();
 
             state._fsp--;
@@ -6710,17 +7342,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group_1__0__Impl"
-    // InternalProblem.g:2112:1: rule__Conjunction__Group_1__0__Impl : ( ',' ) ;
+    // InternalProblem.g:2316:1: rule__Conjunction__Group_1__0__Impl : ( ',' ) ;
     public final void rule__Conjunction__Group_1__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2116:1: ( ( ',' ) )
-            // InternalProblem.g:2117:1: ( ',' )
+            // InternalProblem.g:2320:1: ( ( ',' ) )
+            // InternalProblem.g:2321:1: ( ',' )
             {
-            // InternalProblem.g:2117:1: ( ',' )
-            // InternalProblem.g:2118:2: ','
+            // InternalProblem.g:2321:1: ( ',' )
+            // InternalProblem.g:2322:2: ','
             {
              before(grammarAccess.getConjunctionAccess().getCommaKeyword_1_0()); 
             match(input,25,FOLLOW_2); 
@@ -6747,14 +7379,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group_1__1"
-    // InternalProblem.g:2127:1: rule__Conjunction__Group_1__1 : rule__Conjunction__Group_1__1__Impl ;
+    // InternalProblem.g:2331: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:2131:1: ( rule__Conjunction__Group_1__1__Impl )
-            // InternalProblem.g:2132:2: rule__Conjunction__Group_1__1__Impl
+            // InternalProblem.g:2335:1: ( rule__Conjunction__Group_1__1__Impl )
+            // InternalProblem.g:2336:2: rule__Conjunction__Group_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Conjunction__Group_1__1__Impl();
@@ -6780,21 +7412,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__Group_1__1__Impl"
-    // InternalProblem.g:2138:1: rule__Conjunction__Group_1__1__Impl : ( ( rule__Conjunction__LiteralsAssignment_1_1 ) ) ;
+    // InternalProblem.g:2342: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:2142:1: ( ( ( rule__Conjunction__LiteralsAssignment_1_1 ) ) )
-            // InternalProblem.g:2143:1: ( ( rule__Conjunction__LiteralsAssignment_1_1 ) )
+            // InternalProblem.g:2346:1: ( ( ( rule__Conjunction__LiteralsAssignment_1_1 ) ) )
+            // InternalProblem.g:2347:1: ( ( rule__Conjunction__LiteralsAssignment_1_1 ) )
             {
-            // InternalProblem.g:2143:1: ( ( rule__Conjunction__LiteralsAssignment_1_1 ) )
-            // InternalProblem.g:2144:2: ( rule__Conjunction__LiteralsAssignment_1_1 )
+            // InternalProblem.g:2347:1: ( ( rule__Conjunction__LiteralsAssignment_1_1 ) )
+            // InternalProblem.g:2348:2: ( rule__Conjunction__LiteralsAssignment_1_1 )
             {
              before(grammarAccess.getConjunctionAccess().getLiteralsAssignment_1_1()); 
-            // InternalProblem.g:2145:2: ( rule__Conjunction__LiteralsAssignment_1_1 )
-            // InternalProblem.g:2145:3: rule__Conjunction__LiteralsAssignment_1_1
+            // InternalProblem.g:2349:2: ( rule__Conjunction__LiteralsAssignment_1_1 )
+            // InternalProblem.g:2349:3: rule__Conjunction__LiteralsAssignment_1_1
             {
             pushFollow(FOLLOW_2);
             rule__Conjunction__LiteralsAssignment_1_1();
@@ -6827,16 +7459,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NegativeLiteral__Group__0"
-    // InternalProblem.g:2154:1: rule__NegativeLiteral__Group__0 : rule__NegativeLiteral__Group__0__Impl rule__NegativeLiteral__Group__1 ;
+    // InternalProblem.g:2358: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:2158:1: ( rule__NegativeLiteral__Group__0__Impl rule__NegativeLiteral__Group__1 )
-            // InternalProblem.g:2159:2: rule__NegativeLiteral__Group__0__Impl rule__NegativeLiteral__Group__1
+            // InternalProblem.g:2362:1: ( rule__NegativeLiteral__Group__0__Impl rule__NegativeLiteral__Group__1 )
+            // InternalProblem.g:2363:2: rule__NegativeLiteral__Group__0__Impl rule__NegativeLiteral__Group__1
             {
-            pushFollow(FOLLOW_5);
+            pushFollow(FOLLOW_9);
             rule__NegativeLiteral__Group__0__Impl();
 
             state._fsp--;
@@ -6865,20 +7497,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NegativeLiteral__Group__0__Impl"
-    // InternalProblem.g:2166:1: rule__NegativeLiteral__Group__0__Impl : ( '!' ) ;
+    // InternalProblem.g:2370:1: rule__NegativeLiteral__Group__0__Impl : ( '!' ) ;
     public final void rule__NegativeLiteral__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2170:1: ( ( '!' ) )
-            // InternalProblem.g:2171:1: ( '!' )
+            // InternalProblem.g:2374:1: ( ( '!' ) )
+            // InternalProblem.g:2375:1: ( '!' )
             {
-            // InternalProblem.g:2171:1: ( '!' )
-            // InternalProblem.g:2172:2: '!'
+            // InternalProblem.g:2375:1: ( '!' )
+            // InternalProblem.g:2376:2: '!'
             {
              before(grammarAccess.getNegativeLiteralAccess().getExclamationMarkKeyword_0()); 
-            match(input,18,FOLLOW_2); 
+            match(input,20,FOLLOW_2); 
              after(grammarAccess.getNegativeLiteralAccess().getExclamationMarkKeyword_0()); 
 
             }
@@ -6902,14 +7534,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NegativeLiteral__Group__1"
-    // InternalProblem.g:2181:1: rule__NegativeLiteral__Group__1 : rule__NegativeLiteral__Group__1__Impl ;
+    // InternalProblem.g:2385: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:2185:1: ( rule__NegativeLiteral__Group__1__Impl )
-            // InternalProblem.g:2186:2: rule__NegativeLiteral__Group__1__Impl
+            // InternalProblem.g:2389:1: ( rule__NegativeLiteral__Group__1__Impl )
+            // InternalProblem.g:2390:2: rule__NegativeLiteral__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__NegativeLiteral__Group__1__Impl();
@@ -6935,21 +7567,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NegativeLiteral__Group__1__Impl"
-    // InternalProblem.g:2192:1: rule__NegativeLiteral__Group__1__Impl : ( ( rule__NegativeLiteral__AtomAssignment_1 ) ) ;
+    // InternalProblem.g:2396: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:2196:1: ( ( ( rule__NegativeLiteral__AtomAssignment_1 ) ) )
-            // InternalProblem.g:2197:1: ( ( rule__NegativeLiteral__AtomAssignment_1 ) )
+            // InternalProblem.g:2400:1: ( ( ( rule__NegativeLiteral__AtomAssignment_1 ) ) )
+            // InternalProblem.g:2401:1: ( ( rule__NegativeLiteral__AtomAssignment_1 ) )
             {
-            // InternalProblem.g:2197:1: ( ( rule__NegativeLiteral__AtomAssignment_1 ) )
-            // InternalProblem.g:2198:2: ( rule__NegativeLiteral__AtomAssignment_1 )
+            // InternalProblem.g:2401:1: ( ( rule__NegativeLiteral__AtomAssignment_1 ) )
+            // InternalProblem.g:2402:2: ( rule__NegativeLiteral__AtomAssignment_1 )
             {
              before(grammarAccess.getNegativeLiteralAccess().getAtomAssignment_1()); 
-            // InternalProblem.g:2199:2: ( rule__NegativeLiteral__AtomAssignment_1 )
-            // InternalProblem.g:2199:3: rule__NegativeLiteral__AtomAssignment_1
+            // InternalProblem.g:2403:2: ( rule__NegativeLiteral__AtomAssignment_1 )
+            // InternalProblem.g:2403:3: rule__NegativeLiteral__AtomAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__NegativeLiteral__AtomAssignment_1();
@@ -6982,16 +7614,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__0"
-    // InternalProblem.g:2208:1: rule__Atom__Group__0 : rule__Atom__Group__0__Impl rule__Atom__Group__1 ;
+    // InternalProblem.g:2412: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:2212:1: ( rule__Atom__Group__0__Impl rule__Atom__Group__1 )
-            // InternalProblem.g:2213:2: rule__Atom__Group__0__Impl rule__Atom__Group__1
+            // InternalProblem.g:2416:1: ( rule__Atom__Group__0__Impl rule__Atom__Group__1 )
+            // InternalProblem.g:2417:2: rule__Atom__Group__0__Impl rule__Atom__Group__1
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_25);
             rule__Atom__Group__0__Impl();
 
             state._fsp--;
@@ -7020,21 +7652,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__0__Impl"
-    // InternalProblem.g:2220:1: rule__Atom__Group__0__Impl : ( ( rule__Atom__RelationAssignment_0 ) ) ;
+    // InternalProblem.g:2424: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:2224:1: ( ( ( rule__Atom__RelationAssignment_0 ) ) )
-            // InternalProblem.g:2225:1: ( ( rule__Atom__RelationAssignment_0 ) )
+            // InternalProblem.g:2428:1: ( ( ( rule__Atom__RelationAssignment_0 ) ) )
+            // InternalProblem.g:2429:1: ( ( rule__Atom__RelationAssignment_0 ) )
             {
-            // InternalProblem.g:2225:1: ( ( rule__Atom__RelationAssignment_0 ) )
-            // InternalProblem.g:2226:2: ( rule__Atom__RelationAssignment_0 )
+            // InternalProblem.g:2429:1: ( ( rule__Atom__RelationAssignment_0 ) )
+            // InternalProblem.g:2430:2: ( rule__Atom__RelationAssignment_0 )
             {
              before(grammarAccess.getAtomAccess().getRelationAssignment_0()); 
-            // InternalProblem.g:2227:2: ( rule__Atom__RelationAssignment_0 )
-            // InternalProblem.g:2227:3: rule__Atom__RelationAssignment_0
+            // InternalProblem.g:2431:2: ( rule__Atom__RelationAssignment_0 )
+            // InternalProblem.g:2431:3: rule__Atom__RelationAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__Atom__RelationAssignment_0();
@@ -7067,16 +7699,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__1"
-    // InternalProblem.g:2235:1: rule__Atom__Group__1 : rule__Atom__Group__1__Impl rule__Atom__Group__2 ;
+    // InternalProblem.g:2439: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:2239:1: ( rule__Atom__Group__1__Impl rule__Atom__Group__2 )
-            // InternalProblem.g:2240:2: rule__Atom__Group__1__Impl rule__Atom__Group__2
+            // InternalProblem.g:2443:1: ( rule__Atom__Group__1__Impl rule__Atom__Group__2 )
+            // InternalProblem.g:2444:2: rule__Atom__Group__1__Impl rule__Atom__Group__2
             {
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_25);
             rule__Atom__Group__1__Impl();
 
             state._fsp--;
@@ -7105,29 +7737,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__1__Impl"
-    // InternalProblem.g:2247:1: rule__Atom__Group__1__Impl : ( ( rule__Atom__TransitiveClosureAssignment_1 )? ) ;
+    // InternalProblem.g:2451: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:2251:1: ( ( ( rule__Atom__TransitiveClosureAssignment_1 )? ) )
-            // InternalProblem.g:2252:1: ( ( rule__Atom__TransitiveClosureAssignment_1 )? )
+            // InternalProblem.g:2455:1: ( ( ( rule__Atom__TransitiveClosureAssignment_1 )? ) )
+            // InternalProblem.g:2456:1: ( ( rule__Atom__TransitiveClosureAssignment_1 )? )
             {
-            // InternalProblem.g:2252:1: ( ( rule__Atom__TransitiveClosureAssignment_1 )? )
-            // InternalProblem.g:2253:2: ( rule__Atom__TransitiveClosureAssignment_1 )?
+            // InternalProblem.g:2456:1: ( ( rule__Atom__TransitiveClosureAssignment_1 )? )
+            // InternalProblem.g:2457:2: ( rule__Atom__TransitiveClosureAssignment_1 )?
             {
              before(grammarAccess.getAtomAccess().getTransitiveClosureAssignment_1()); 
-            // InternalProblem.g:2254:2: ( rule__Atom__TransitiveClosureAssignment_1 )?
-            int alt26=2;
-            int LA26_0 = input.LA(1);
+            // InternalProblem.g:2458:2: ( rule__Atom__TransitiveClosureAssignment_1 )?
+            int alt29=2;
+            int LA29_0 = input.LA(1);
 
-            if ( (LA26_0==38) ) {
-                alt26=1;
+            if ( (LA29_0==41) ) {
+                alt29=1;
             }
-            switch (alt26) {
+            switch (alt29) {
                 case 1 :
-                    // InternalProblem.g:2254:3: rule__Atom__TransitiveClosureAssignment_1
+                    // InternalProblem.g:2458:3: rule__Atom__TransitiveClosureAssignment_1
                     {
                     pushFollow(FOLLOW_2);
                     rule__Atom__TransitiveClosureAssignment_1();
@@ -7163,16 +7795,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__2"
-    // InternalProblem.g:2262:1: rule__Atom__Group__2 : rule__Atom__Group__2__Impl rule__Atom__Group__3 ;
+    // InternalProblem.g:2466: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:2266:1: ( rule__Atom__Group__2__Impl rule__Atom__Group__3 )
-            // InternalProblem.g:2267:2: rule__Atom__Group__2__Impl rule__Atom__Group__3
+            // InternalProblem.g:2470:1: ( rule__Atom__Group__2__Impl rule__Atom__Group__3 )
+            // InternalProblem.g:2471:2: rule__Atom__Group__2__Impl rule__Atom__Group__3
             {
-            pushFollow(FOLLOW_17);
+            pushFollow(FOLLOW_20);
             rule__Atom__Group__2__Impl();
 
             state._fsp--;
@@ -7201,20 +7833,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__2__Impl"
-    // InternalProblem.g:2274:1: rule__Atom__Group__2__Impl : ( '(' ) ;
+    // InternalProblem.g:2478:1: rule__Atom__Group__2__Impl : ( '(' ) ;
     public final void rule__Atom__Group__2__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2278:1: ( ( '(' ) )
-            // InternalProblem.g:2279:1: ( '(' )
+            // InternalProblem.g:2482:1: ( ( '(' ) )
+            // InternalProblem.g:2483:1: ( '(' )
             {
-            // InternalProblem.g:2279:1: ( '(' )
-            // InternalProblem.g:2280:2: '('
+            // InternalProblem.g:2483:1: ( '(' )
+            // InternalProblem.g:2484:2: '('
             {
              before(grammarAccess.getAtomAccess().getLeftParenthesisKeyword_2()); 
-            match(input,27,FOLLOW_2); 
+            match(input,32,FOLLOW_2); 
              after(grammarAccess.getAtomAccess().getLeftParenthesisKeyword_2()); 
 
             }
@@ -7238,16 +7870,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__3"
-    // InternalProblem.g:2289:1: rule__Atom__Group__3 : rule__Atom__Group__3__Impl rule__Atom__Group__4 ;
+    // InternalProblem.g:2493: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:2293:1: ( rule__Atom__Group__3__Impl rule__Atom__Group__4 )
-            // InternalProblem.g:2294:2: rule__Atom__Group__3__Impl rule__Atom__Group__4
+            // InternalProblem.g:2497:1: ( rule__Atom__Group__3__Impl rule__Atom__Group__4 )
+            // InternalProblem.g:2498:2: rule__Atom__Group__3__Impl rule__Atom__Group__4
             {
-            pushFollow(FOLLOW_17);
+            pushFollow(FOLLOW_20);
             rule__Atom__Group__3__Impl();
 
             state._fsp--;
@@ -7276,29 +7908,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__3__Impl"
-    // InternalProblem.g:2301:1: rule__Atom__Group__3__Impl : ( ( rule__Atom__Group_3__0 )? ) ;
+    // InternalProblem.g:2505: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:2305:1: ( ( ( rule__Atom__Group_3__0 )? ) )
-            // InternalProblem.g:2306:1: ( ( rule__Atom__Group_3__0 )? )
+            // InternalProblem.g:2509:1: ( ( ( rule__Atom__Group_3__0 )? ) )
+            // InternalProblem.g:2510:1: ( ( rule__Atom__Group_3__0 )? )
             {
-            // InternalProblem.g:2306:1: ( ( rule__Atom__Group_3__0 )? )
-            // InternalProblem.g:2307:2: ( rule__Atom__Group_3__0 )?
+            // InternalProblem.g:2510:1: ( ( rule__Atom__Group_3__0 )? )
+            // InternalProblem.g:2511:2: ( rule__Atom__Group_3__0 )?
             {
              before(grammarAccess.getAtomAccess().getGroup_3()); 
-            // InternalProblem.g:2308:2: ( rule__Atom__Group_3__0 )?
-            int alt27=2;
-            int LA27_0 = input.LA(1);
+            // InternalProblem.g:2512:2: ( rule__Atom__Group_3__0 )?
+            int alt30=2;
+            int LA30_0 = input.LA(1);
 
-            if ( (LA27_0==RULE_ID) ) {
-                alt27=1;
+            if ( (LA30_0==RULE_ID) ) {
+                alt30=1;
             }
-            switch (alt27) {
+            switch (alt30) {
                 case 1 :
-                    // InternalProblem.g:2308:3: rule__Atom__Group_3__0
+                    // InternalProblem.g:2512:3: rule__Atom__Group_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Atom__Group_3__0();
@@ -7334,14 +7966,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__4"
-    // InternalProblem.g:2316:1: rule__Atom__Group__4 : rule__Atom__Group__4__Impl ;
+    // InternalProblem.g:2520: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:2320:1: ( rule__Atom__Group__4__Impl )
-            // InternalProblem.g:2321:2: rule__Atom__Group__4__Impl
+            // InternalProblem.g:2524:1: ( rule__Atom__Group__4__Impl )
+            // InternalProblem.g:2525:2: rule__Atom__Group__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Atom__Group__4__Impl();
@@ -7367,20 +7999,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group__4__Impl"
-    // InternalProblem.g:2327:1: rule__Atom__Group__4__Impl : ( ')' ) ;
+    // InternalProblem.g:2531:1: rule__Atom__Group__4__Impl : ( ')' ) ;
     public final void rule__Atom__Group__4__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2331:1: ( ( ')' ) )
-            // InternalProblem.g:2332:1: ( ')' )
+            // InternalProblem.g:2535:1: ( ( ')' ) )
+            // InternalProblem.g:2536:1: ( ')' )
             {
-            // InternalProblem.g:2332:1: ( ')' )
-            // InternalProblem.g:2333:2: ')'
+            // InternalProblem.g:2536:1: ( ')' )
+            // InternalProblem.g:2537:2: ')'
             {
              before(grammarAccess.getAtomAccess().getRightParenthesisKeyword_4()); 
-            match(input,28,FOLLOW_2); 
+            match(input,33,FOLLOW_2); 
              after(grammarAccess.getAtomAccess().getRightParenthesisKeyword_4()); 
 
             }
@@ -7404,14 +8036,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3__0"
-    // InternalProblem.g:2343:1: rule__Atom__Group_3__0 : rule__Atom__Group_3__0__Impl rule__Atom__Group_3__1 ;
+    // InternalProblem.g:2547: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:2347:1: ( rule__Atom__Group_3__0__Impl rule__Atom__Group_3__1 )
-            // InternalProblem.g:2348:2: rule__Atom__Group_3__0__Impl rule__Atom__Group_3__1
+            // InternalProblem.g:2551:1: ( rule__Atom__Group_3__0__Impl rule__Atom__Group_3__1 )
+            // InternalProblem.g:2552:2: rule__Atom__Group_3__0__Impl rule__Atom__Group_3__1
             {
             pushFollow(FOLLOW_10);
             rule__Atom__Group_3__0__Impl();
@@ -7442,21 +8074,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3__0__Impl"
-    // InternalProblem.g:2355:1: rule__Atom__Group_3__0__Impl : ( ( rule__Atom__ArgumentsAssignment_3_0 ) ) ;
+    // InternalProblem.g:2559: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:2359:1: ( ( ( rule__Atom__ArgumentsAssignment_3_0 ) ) )
-            // InternalProblem.g:2360:1: ( ( rule__Atom__ArgumentsAssignment_3_0 ) )
+            // InternalProblem.g:2563:1: ( ( ( rule__Atom__ArgumentsAssignment_3_0 ) ) )
+            // InternalProblem.g:2564:1: ( ( rule__Atom__ArgumentsAssignment_3_0 ) )
             {
-            // InternalProblem.g:2360:1: ( ( rule__Atom__ArgumentsAssignment_3_0 ) )
-            // InternalProblem.g:2361:2: ( rule__Atom__ArgumentsAssignment_3_0 )
+            // InternalProblem.g:2564:1: ( ( rule__Atom__ArgumentsAssignment_3_0 ) )
+            // InternalProblem.g:2565:2: ( rule__Atom__ArgumentsAssignment_3_0 )
             {
              before(grammarAccess.getAtomAccess().getArgumentsAssignment_3_0()); 
-            // InternalProblem.g:2362:2: ( rule__Atom__ArgumentsAssignment_3_0 )
-            // InternalProblem.g:2362:3: rule__Atom__ArgumentsAssignment_3_0
+            // InternalProblem.g:2566:2: ( rule__Atom__ArgumentsAssignment_3_0 )
+            // InternalProblem.g:2566:3: rule__Atom__ArgumentsAssignment_3_0
             {
             pushFollow(FOLLOW_2);
             rule__Atom__ArgumentsAssignment_3_0();
@@ -7489,14 +8121,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3__1"
-    // InternalProblem.g:2370:1: rule__Atom__Group_3__1 : rule__Atom__Group_3__1__Impl ;
+    // InternalProblem.g:2574: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:2374:1: ( rule__Atom__Group_3__1__Impl )
-            // InternalProblem.g:2375:2: rule__Atom__Group_3__1__Impl
+            // InternalProblem.g:2578:1: ( rule__Atom__Group_3__1__Impl )
+            // InternalProblem.g:2579:2: rule__Atom__Group_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Atom__Group_3__1__Impl();
@@ -7522,35 +8154,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3__1__Impl"
-    // InternalProblem.g:2381:1: rule__Atom__Group_3__1__Impl : ( ( rule__Atom__Group_3_1__0 )* ) ;
+    // InternalProblem.g:2585: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:2385:1: ( ( ( rule__Atom__Group_3_1__0 )* ) )
-            // InternalProblem.g:2386:1: ( ( rule__Atom__Group_3_1__0 )* )
+            // InternalProblem.g:2589:1: ( ( ( rule__Atom__Group_3_1__0 )* ) )
+            // InternalProblem.g:2590:1: ( ( rule__Atom__Group_3_1__0 )* )
             {
-            // InternalProblem.g:2386:1: ( ( rule__Atom__Group_3_1__0 )* )
-            // InternalProblem.g:2387:2: ( rule__Atom__Group_3_1__0 )*
+            // InternalProblem.g:2590:1: ( ( rule__Atom__Group_3_1__0 )* )
+            // InternalProblem.g:2591:2: ( rule__Atom__Group_3_1__0 )*
             {
              before(grammarAccess.getAtomAccess().getGroup_3_1()); 
-            // InternalProblem.g:2388:2: ( rule__Atom__Group_3_1__0 )*
-            loop28:
+            // InternalProblem.g:2592:2: ( rule__Atom__Group_3_1__0 )*
+            loop31:
             do {
-                int alt28=2;
-                int LA28_0 = input.LA(1);
+                int alt31=2;
+                int LA31_0 = input.LA(1);
 
-                if ( (LA28_0==25) ) {
-                    alt28=1;
+                if ( (LA31_0==25) ) {
+                    alt31=1;
                 }
 
 
-                switch (alt28) {
+                switch (alt31) {
                 case 1 :
-                    // InternalProblem.g:2388:3: rule__Atom__Group_3_1__0
+                    // InternalProblem.g:2592:3: rule__Atom__Group_3_1__0
                     {
-                    pushFollow(FOLLOW_7);
+                    pushFollow(FOLLOW_11);
                     rule__Atom__Group_3_1__0();
 
                     state._fsp--;
@@ -7560,7 +8192,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop28;
+                    break loop31;
                 }
             } while (true);
 
@@ -7587,14 +8219,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3_1__0"
-    // InternalProblem.g:2397:1: rule__Atom__Group_3_1__0 : rule__Atom__Group_3_1__0__Impl rule__Atom__Group_3_1__1 ;
+    // InternalProblem.g:2601: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:2401:1: ( rule__Atom__Group_3_1__0__Impl rule__Atom__Group_3_1__1 )
-            // InternalProblem.g:2402:2: rule__Atom__Group_3_1__0__Impl rule__Atom__Group_3_1__1
+            // InternalProblem.g:2605:1: ( rule__Atom__Group_3_1__0__Impl rule__Atom__Group_3_1__1 )
+            // InternalProblem.g:2606:2: rule__Atom__Group_3_1__0__Impl rule__Atom__Group_3_1__1
             {
             pushFollow(FOLLOW_5);
             rule__Atom__Group_3_1__0__Impl();
@@ -7625,17 +8257,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3_1__0__Impl"
-    // InternalProblem.g:2409:1: rule__Atom__Group_3_1__0__Impl : ( ',' ) ;
+    // InternalProblem.g:2613: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:2413:1: ( ( ',' ) )
-            // InternalProblem.g:2414:1: ( ',' )
+            // InternalProblem.g:2617:1: ( ( ',' ) )
+            // InternalProblem.g:2618:1: ( ',' )
             {
-            // InternalProblem.g:2414:1: ( ',' )
-            // InternalProblem.g:2415:2: ','
+            // InternalProblem.g:2618:1: ( ',' )
+            // InternalProblem.g:2619:2: ','
             {
              before(grammarAccess.getAtomAccess().getCommaKeyword_3_1_0()); 
             match(input,25,FOLLOW_2); 
@@ -7662,14 +8294,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3_1__1"
-    // InternalProblem.g:2424:1: rule__Atom__Group_3_1__1 : rule__Atom__Group_3_1__1__Impl ;
+    // InternalProblem.g:2628: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:2428:1: ( rule__Atom__Group_3_1__1__Impl )
-            // InternalProblem.g:2429:2: rule__Atom__Group_3_1__1__Impl
+            // InternalProblem.g:2632:1: ( rule__Atom__Group_3_1__1__Impl )
+            // InternalProblem.g:2633:2: rule__Atom__Group_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Atom__Group_3_1__1__Impl();
@@ -7695,21 +8327,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__Group_3_1__1__Impl"
-    // InternalProblem.g:2435:1: rule__Atom__Group_3_1__1__Impl : ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) ) ;
+    // InternalProblem.g:2639: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:2439:1: ( ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) ) )
-            // InternalProblem.g:2440:1: ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) )
+            // InternalProblem.g:2643:1: ( ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) ) )
+            // InternalProblem.g:2644:1: ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) )
             {
-            // InternalProblem.g:2440:1: ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) )
-            // InternalProblem.g:2441:2: ( rule__Atom__ArgumentsAssignment_3_1_1 )
+            // InternalProblem.g:2644:1: ( ( rule__Atom__ArgumentsAssignment_3_1_1 ) )
+            // InternalProblem.g:2645:2: ( rule__Atom__ArgumentsAssignment_3_1_1 )
             {
              before(grammarAccess.getAtomAccess().getArgumentsAssignment_3_1_1()); 
-            // InternalProblem.g:2442:2: ( rule__Atom__ArgumentsAssignment_3_1_1 )
-            // InternalProblem.g:2442:3: rule__Atom__ArgumentsAssignment_3_1_1
+            // InternalProblem.g:2646:2: ( rule__Atom__ArgumentsAssignment_3_1_1 )
+            // InternalProblem.g:2646:3: rule__Atom__ArgumentsAssignment_3_1_1
             {
             pushFollow(FOLLOW_2);
             rule__Atom__ArgumentsAssignment_3_1_1();
@@ -7742,16 +8374,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group__0"
-    // InternalProblem.g:2451:1: rule__Assertion__Group__0 : rule__Assertion__Group__0__Impl rule__Assertion__Group__1 ;
+    // InternalProblem.g:2655: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:2455:1: ( rule__Assertion__Group__0__Impl rule__Assertion__Group__1 )
-            // InternalProblem.g:2456:2: rule__Assertion__Group__0__Impl rule__Assertion__Group__1
+            // InternalProblem.g:2659:1: ( rule__Assertion__Group__0__Impl rule__Assertion__Group__1 )
+            // InternalProblem.g:2660:2: rule__Assertion__Group__0__Impl rule__Assertion__Group__1
             {
-            pushFollow(FOLLOW_24);
+            pushFollow(FOLLOW_6);
             rule__Assertion__Group__0__Impl();
 
             state._fsp--;
@@ -7780,21 +8412,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group__0__Impl"
-    // InternalProblem.g:2463:1: rule__Assertion__Group__0__Impl : ( ( rule__Assertion__Alternatives_0 ) ) ;
+    // InternalProblem.g:2667: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:2467:1: ( ( ( rule__Assertion__Alternatives_0 ) ) )
-            // InternalProblem.g:2468:1: ( ( rule__Assertion__Alternatives_0 ) )
+            // InternalProblem.g:2671:1: ( ( ( rule__Assertion__Alternatives_0 ) ) )
+            // InternalProblem.g:2672:1: ( ( rule__Assertion__Alternatives_0 ) )
             {
-            // InternalProblem.g:2468:1: ( ( rule__Assertion__Alternatives_0 ) )
-            // InternalProblem.g:2469:2: ( rule__Assertion__Alternatives_0 )
+            // InternalProblem.g:2672:1: ( ( rule__Assertion__Alternatives_0 ) )
+            // InternalProblem.g:2673:2: ( rule__Assertion__Alternatives_0 )
             {
              before(grammarAccess.getAssertionAccess().getAlternatives_0()); 
-            // InternalProblem.g:2470:2: ( rule__Assertion__Alternatives_0 )
-            // InternalProblem.g:2470:3: rule__Assertion__Alternatives_0
+            // InternalProblem.g:2674:2: ( rule__Assertion__Alternatives_0 )
+            // InternalProblem.g:2674:3: rule__Assertion__Alternatives_0
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Alternatives_0();
@@ -7827,14 +8459,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group__1"
-    // InternalProblem.g:2478:1: rule__Assertion__Group__1 : rule__Assertion__Group__1__Impl ;
+    // InternalProblem.g:2682: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:2482:1: ( rule__Assertion__Group__1__Impl )
-            // InternalProblem.g:2483:2: rule__Assertion__Group__1__Impl
+            // InternalProblem.g:2686:1: ( rule__Assertion__Group__1__Impl )
+            // InternalProblem.g:2687:2: rule__Assertion__Group__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group__1__Impl();
@@ -7860,20 +8492,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group__1__Impl"
-    // InternalProblem.g:2489:1: rule__Assertion__Group__1__Impl : ( '.' ) ;
+    // InternalProblem.g:2693:1: rule__Assertion__Group__1__Impl : ( '.' ) ;
     public final void rule__Assertion__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2493:1: ( ( '.' ) )
-            // InternalProblem.g:2494:1: ( '.' )
+            // InternalProblem.g:2697:1: ( ( '.' ) )
+            // InternalProblem.g:2698:1: ( '.' )
             {
-            // InternalProblem.g:2494:1: ( '.' )
-            // InternalProblem.g:2495:2: '.'
+            // InternalProblem.g:2698:1: ( '.' )
+            // InternalProblem.g:2699:2: '.'
             {
              before(grammarAccess.getAssertionAccess().getFullStopKeyword_1()); 
-            match(input,21,FOLLOW_2); 
+            match(input,12,FOLLOW_2); 
              after(grammarAccess.getAssertionAccess().getFullStopKeyword_1()); 
 
             }
@@ -7897,16 +8529,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__0"
-    // InternalProblem.g:2505:1: rule__Assertion__Group_0_0__0 : rule__Assertion__Group_0_0__0__Impl rule__Assertion__Group_0_0__1 ;
+    // InternalProblem.g:2709: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:2509:1: ( rule__Assertion__Group_0_0__0__Impl rule__Assertion__Group_0_0__1 )
-            // InternalProblem.g:2510:2: rule__Assertion__Group_0_0__0__Impl rule__Assertion__Group_0_0__1
+            // InternalProblem.g:2713:1: ( rule__Assertion__Group_0_0__0__Impl rule__Assertion__Group_0_0__1 )
+            // InternalProblem.g:2714:2: rule__Assertion__Group_0_0__0__Impl rule__Assertion__Group_0_0__1
             {
-            pushFollow(FOLLOW_16);
+            pushFollow(FOLLOW_19);
             rule__Assertion__Group_0_0__0__Impl();
 
             state._fsp--;
@@ -7935,21 +8567,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__0__Impl"
-    // InternalProblem.g:2517:1: rule__Assertion__Group_0_0__0__Impl : ( ( rule__Assertion__RelationAssignment_0_0_0 ) ) ;
+    // InternalProblem.g:2721: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:2521:1: ( ( ( rule__Assertion__RelationAssignment_0_0_0 ) ) )
-            // InternalProblem.g:2522:1: ( ( rule__Assertion__RelationAssignment_0_0_0 ) )
+            // InternalProblem.g:2725:1: ( ( ( rule__Assertion__RelationAssignment_0_0_0 ) ) )
+            // InternalProblem.g:2726:1: ( ( rule__Assertion__RelationAssignment_0_0_0 ) )
             {
-            // InternalProblem.g:2522:1: ( ( rule__Assertion__RelationAssignment_0_0_0 ) )
-            // InternalProblem.g:2523:2: ( rule__Assertion__RelationAssignment_0_0_0 )
+            // InternalProblem.g:2726:1: ( ( rule__Assertion__RelationAssignment_0_0_0 ) )
+            // InternalProblem.g:2727:2: ( rule__Assertion__RelationAssignment_0_0_0 )
             {
              before(grammarAccess.getAssertionAccess().getRelationAssignment_0_0_0()); 
-            // InternalProblem.g:2524:2: ( rule__Assertion__RelationAssignment_0_0_0 )
-            // InternalProblem.g:2524:3: rule__Assertion__RelationAssignment_0_0_0
+            // InternalProblem.g:2728:2: ( rule__Assertion__RelationAssignment_0_0_0 )
+            // InternalProblem.g:2728:3: rule__Assertion__RelationAssignment_0_0_0
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__RelationAssignment_0_0_0();
@@ -7982,16 +8614,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__1"
-    // InternalProblem.g:2532:1: rule__Assertion__Group_0_0__1 : rule__Assertion__Group_0_0__1__Impl rule__Assertion__Group_0_0__2 ;
+    // InternalProblem.g:2736: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:2536:1: ( rule__Assertion__Group_0_0__1__Impl rule__Assertion__Group_0_0__2 )
-            // InternalProblem.g:2537:2: rule__Assertion__Group_0_0__1__Impl rule__Assertion__Group_0_0__2
+            // InternalProblem.g:2740:1: ( rule__Assertion__Group_0_0__1__Impl rule__Assertion__Group_0_0__2 )
+            // InternalProblem.g:2741:2: rule__Assertion__Group_0_0__1__Impl rule__Assertion__Group_0_0__2
             {
-            pushFollow(FOLLOW_17);
+            pushFollow(FOLLOW_26);
             rule__Assertion__Group_0_0__1__Impl();
 
             state._fsp--;
@@ -8020,20 +8652,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__1__Impl"
-    // InternalProblem.g:2544:1: rule__Assertion__Group_0_0__1__Impl : ( '(' ) ;
+    // InternalProblem.g:2748: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:2548:1: ( ( '(' ) )
-            // InternalProblem.g:2549:1: ( '(' )
+            // InternalProblem.g:2752:1: ( ( '(' ) )
+            // InternalProblem.g:2753:1: ( '(' )
             {
-            // InternalProblem.g:2549:1: ( '(' )
-            // InternalProblem.g:2550:2: '('
+            // InternalProblem.g:2753:1: ( '(' )
+            // InternalProblem.g:2754:2: '('
             {
              before(grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_0_1()); 
-            match(input,27,FOLLOW_2); 
+            match(input,32,FOLLOW_2); 
              after(grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_0_1()); 
 
             }
@@ -8057,16 +8689,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__2"
-    // InternalProblem.g:2559:1: rule__Assertion__Group_0_0__2 : rule__Assertion__Group_0_0__2__Impl rule__Assertion__Group_0_0__3 ;
+    // InternalProblem.g:2763: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:2563:1: ( rule__Assertion__Group_0_0__2__Impl rule__Assertion__Group_0_0__3 )
-            // InternalProblem.g:2564:2: rule__Assertion__Group_0_0__2__Impl rule__Assertion__Group_0_0__3
+            // InternalProblem.g:2767:1: ( rule__Assertion__Group_0_0__2__Impl rule__Assertion__Group_0_0__3 )
+            // InternalProblem.g:2768:2: rule__Assertion__Group_0_0__2__Impl rule__Assertion__Group_0_0__3
             {
-            pushFollow(FOLLOW_17);
+            pushFollow(FOLLOW_26);
             rule__Assertion__Group_0_0__2__Impl();
 
             state._fsp--;
@@ -8095,29 +8727,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__2__Impl"
-    // InternalProblem.g:2571:1: rule__Assertion__Group_0_0__2__Impl : ( ( rule__Assertion__Group_0_0_2__0 )? ) ;
+    // InternalProblem.g:2775: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:2575:1: ( ( ( rule__Assertion__Group_0_0_2__0 )? ) )
-            // InternalProblem.g:2576:1: ( ( rule__Assertion__Group_0_0_2__0 )? )
+            // InternalProblem.g:2779:1: ( ( ( rule__Assertion__Group_0_0_2__0 )? ) )
+            // InternalProblem.g:2780:1: ( ( rule__Assertion__Group_0_0_2__0 )? )
             {
-            // InternalProblem.g:2576:1: ( ( rule__Assertion__Group_0_0_2__0 )? )
-            // InternalProblem.g:2577:2: ( rule__Assertion__Group_0_0_2__0 )?
+            // InternalProblem.g:2780:1: ( ( rule__Assertion__Group_0_0_2__0 )? )
+            // InternalProblem.g:2781:2: ( rule__Assertion__Group_0_0_2__0 )?
             {
              before(grammarAccess.getAssertionAccess().getGroup_0_0_2()); 
-            // InternalProblem.g:2578:2: ( rule__Assertion__Group_0_0_2__0 )?
-            int alt29=2;
-            int LA29_0 = input.LA(1);
+            // InternalProblem.g:2782:2: ( rule__Assertion__Group_0_0_2__0 )?
+            int alt32=2;
+            int LA32_0 = input.LA(1);
 
-            if ( (LA29_0==RULE_ID) ) {
-                alt29=1;
+            if ( ((LA32_0>=RULE_QUOTED_ID && LA32_0<=RULE_ID)) ) {
+                alt32=1;
             }
-            switch (alt29) {
+            switch (alt32) {
                 case 1 :
-                    // InternalProblem.g:2578:3: rule__Assertion__Group_0_0_2__0
+                    // InternalProblem.g:2782:3: rule__Assertion__Group_0_0_2__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Assertion__Group_0_0_2__0();
@@ -8153,16 +8785,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__3"
-    // InternalProblem.g:2586:1: rule__Assertion__Group_0_0__3 : rule__Assertion__Group_0_0__3__Impl rule__Assertion__Group_0_0__4 ;
+    // InternalProblem.g:2790: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:2590:1: ( rule__Assertion__Group_0_0__3__Impl rule__Assertion__Group_0_0__4 )
-            // InternalProblem.g:2591:2: rule__Assertion__Group_0_0__3__Impl rule__Assertion__Group_0_0__4
+            // InternalProblem.g:2794:1: ( rule__Assertion__Group_0_0__3__Impl rule__Assertion__Group_0_0__4 )
+            // InternalProblem.g:2795:2: rule__Assertion__Group_0_0__3__Impl rule__Assertion__Group_0_0__4
             {
-            pushFollow(FOLLOW_25);
+            pushFollow(FOLLOW_27);
             rule__Assertion__Group_0_0__3__Impl();
 
             state._fsp--;
@@ -8191,20 +8823,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__3__Impl"
-    // InternalProblem.g:2598:1: rule__Assertion__Group_0_0__3__Impl : ( ')' ) ;
+    // InternalProblem.g:2802: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:2602:1: ( ( ')' ) )
-            // InternalProblem.g:2603:1: ( ')' )
+            // InternalProblem.g:2806:1: ( ( ')' ) )
+            // InternalProblem.g:2807:1: ( ')' )
             {
-            // InternalProblem.g:2603:1: ( ')' )
-            // InternalProblem.g:2604:2: ')'
+            // InternalProblem.g:2807:1: ( ')' )
+            // InternalProblem.g:2808:2: ')'
             {
              before(grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_0_3()); 
-            match(input,28,FOLLOW_2); 
+            match(input,33,FOLLOW_2); 
              after(grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_0_3()); 
 
             }
@@ -8228,16 +8860,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__4"
-    // InternalProblem.g:2613:1: rule__Assertion__Group_0_0__4 : rule__Assertion__Group_0_0__4__Impl rule__Assertion__Group_0_0__5 ;
+    // InternalProblem.g:2817: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:2617:1: ( rule__Assertion__Group_0_0__4__Impl rule__Assertion__Group_0_0__5 )
-            // InternalProblem.g:2618:2: rule__Assertion__Group_0_0__4__Impl rule__Assertion__Group_0_0__5
+            // InternalProblem.g:2821:1: ( rule__Assertion__Group_0_0__4__Impl rule__Assertion__Group_0_0__5 )
+            // InternalProblem.g:2822:2: rule__Assertion__Group_0_0__4__Impl rule__Assertion__Group_0_0__5
             {
-            pushFollow(FOLLOW_26);
+            pushFollow(FOLLOW_28);
             rule__Assertion__Group_0_0__4__Impl();
 
             state._fsp--;
@@ -8266,20 +8898,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__4__Impl"
-    // InternalProblem.g:2625:1: rule__Assertion__Group_0_0__4__Impl : ( ':' ) ;
+    // InternalProblem.g:2829: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:2629:1: ( ( ':' ) )
-            // InternalProblem.g:2630:1: ( ':' )
+            // InternalProblem.g:2833:1: ( ( ':' ) )
+            // InternalProblem.g:2834:1: ( ':' )
             {
-            // InternalProblem.g:2630:1: ( ':' )
-            // InternalProblem.g:2631:2: ':'
+            // InternalProblem.g:2834:1: ( ':' )
+            // InternalProblem.g:2835:2: ':'
             {
              before(grammarAccess.getAssertionAccess().getColonKeyword_0_0_4()); 
-            match(input,31,FOLLOW_2); 
+            match(input,35,FOLLOW_2); 
              after(grammarAccess.getAssertionAccess().getColonKeyword_0_0_4()); 
 
             }
@@ -8303,14 +8935,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__5"
-    // InternalProblem.g:2640:1: rule__Assertion__Group_0_0__5 : rule__Assertion__Group_0_0__5__Impl ;
+    // InternalProblem.g:2844: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:2644:1: ( rule__Assertion__Group_0_0__5__Impl )
-            // InternalProblem.g:2645:2: rule__Assertion__Group_0_0__5__Impl
+            // InternalProblem.g:2848:1: ( rule__Assertion__Group_0_0__5__Impl )
+            // InternalProblem.g:2849:2: rule__Assertion__Group_0_0__5__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group_0_0__5__Impl();
@@ -8336,21 +8968,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0__5__Impl"
-    // InternalProblem.g:2651:1: rule__Assertion__Group_0_0__5__Impl : ( ( rule__Assertion__ValueAssignment_0_0_5 ) ) ;
+    // InternalProblem.g:2855: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:2655:1: ( ( ( rule__Assertion__ValueAssignment_0_0_5 ) ) )
-            // InternalProblem.g:2656:1: ( ( rule__Assertion__ValueAssignment_0_0_5 ) )
+            // InternalProblem.g:2859:1: ( ( ( rule__Assertion__ValueAssignment_0_0_5 ) ) )
+            // InternalProblem.g:2860:1: ( ( rule__Assertion__ValueAssignment_0_0_5 ) )
             {
-            // InternalProblem.g:2656:1: ( ( rule__Assertion__ValueAssignment_0_0_5 ) )
-            // InternalProblem.g:2657:2: ( rule__Assertion__ValueAssignment_0_0_5 )
+            // InternalProblem.g:2860:1: ( ( rule__Assertion__ValueAssignment_0_0_5 ) )
+            // InternalProblem.g:2861:2: ( rule__Assertion__ValueAssignment_0_0_5 )
             {
              before(grammarAccess.getAssertionAccess().getValueAssignment_0_0_5()); 
-            // InternalProblem.g:2658:2: ( rule__Assertion__ValueAssignment_0_0_5 )
-            // InternalProblem.g:2658:3: rule__Assertion__ValueAssignment_0_0_5
+            // InternalProblem.g:2862:2: ( rule__Assertion__ValueAssignment_0_0_5 )
+            // InternalProblem.g:2862:3: rule__Assertion__ValueAssignment_0_0_5
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__ValueAssignment_0_0_5();
@@ -8383,14 +9015,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2__0"
-    // InternalProblem.g:2667: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:2871: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:2671:1: ( rule__Assertion__Group_0_0_2__0__Impl rule__Assertion__Group_0_0_2__1 )
-            // InternalProblem.g:2672:2: rule__Assertion__Group_0_0_2__0__Impl rule__Assertion__Group_0_0_2__1
+            // InternalProblem.g:2875:1: ( rule__Assertion__Group_0_0_2__0__Impl rule__Assertion__Group_0_0_2__1 )
+            // InternalProblem.g:2876:2: rule__Assertion__Group_0_0_2__0__Impl rule__Assertion__Group_0_0_2__1
             {
             pushFollow(FOLLOW_10);
             rule__Assertion__Group_0_0_2__0__Impl();
@@ -8421,21 +9053,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2__0__Impl"
-    // InternalProblem.g:2679:1: rule__Assertion__Group_0_0_2__0__Impl : ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) ) ;
+    // InternalProblem.g:2883: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:2683:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) ) )
-            // InternalProblem.g:2684:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) )
+            // InternalProblem.g:2887:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) ) )
+            // InternalProblem.g:2888:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) )
             {
-            // InternalProblem.g:2684:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) )
-            // InternalProblem.g:2685:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_0 )
+            // InternalProblem.g:2888:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_0 ) )
+            // InternalProblem.g:2889:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_0 )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsAssignment_0_0_2_0()); 
-            // InternalProblem.g:2686:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_0 )
-            // InternalProblem.g:2686:3: rule__Assertion__ArgumentsAssignment_0_0_2_0
+            // InternalProblem.g:2890:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_0 )
+            // InternalProblem.g:2890:3: rule__Assertion__ArgumentsAssignment_0_0_2_0
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__ArgumentsAssignment_0_0_2_0();
@@ -8468,14 +9100,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2__1"
-    // InternalProblem.g:2694:1: rule__Assertion__Group_0_0_2__1 : rule__Assertion__Group_0_0_2__1__Impl ;
+    // InternalProblem.g:2898: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:2698:1: ( rule__Assertion__Group_0_0_2__1__Impl )
-            // InternalProblem.g:2699:2: rule__Assertion__Group_0_0_2__1__Impl
+            // InternalProblem.g:2902:1: ( rule__Assertion__Group_0_0_2__1__Impl )
+            // InternalProblem.g:2903:2: rule__Assertion__Group_0_0_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group_0_0_2__1__Impl();
@@ -8501,35 +9133,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2__1__Impl"
-    // InternalProblem.g:2705:1: rule__Assertion__Group_0_0_2__1__Impl : ( ( rule__Assertion__Group_0_0_2_1__0 )* ) ;
+    // InternalProblem.g:2909: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:2709:1: ( ( ( rule__Assertion__Group_0_0_2_1__0 )* ) )
-            // InternalProblem.g:2710:1: ( ( rule__Assertion__Group_0_0_2_1__0 )* )
+            // InternalProblem.g:2913:1: ( ( ( rule__Assertion__Group_0_0_2_1__0 )* ) )
+            // InternalProblem.g:2914:1: ( ( rule__Assertion__Group_0_0_2_1__0 )* )
             {
-            // InternalProblem.g:2710:1: ( ( rule__Assertion__Group_0_0_2_1__0 )* )
-            // InternalProblem.g:2711:2: ( rule__Assertion__Group_0_0_2_1__0 )*
+            // InternalProblem.g:2914:1: ( ( rule__Assertion__Group_0_0_2_1__0 )* )
+            // InternalProblem.g:2915:2: ( rule__Assertion__Group_0_0_2_1__0 )*
             {
              before(grammarAccess.getAssertionAccess().getGroup_0_0_2_1()); 
-            // InternalProblem.g:2712:2: ( rule__Assertion__Group_0_0_2_1__0 )*
-            loop30:
+            // InternalProblem.g:2916:2: ( rule__Assertion__Group_0_0_2_1__0 )*
+            loop33:
             do {
-                int alt30=2;
-                int LA30_0 = input.LA(1);
+                int alt33=2;
+                int LA33_0 = input.LA(1);
 
-                if ( (LA30_0==25) ) {
-                    alt30=1;
+                if ( (LA33_0==25) ) {
+                    alt33=1;
                 }
 
 
-                switch (alt30) {
+                switch (alt33) {
                 case 1 :
-                    // InternalProblem.g:2712:3: rule__Assertion__Group_0_0_2_1__0
+                    // InternalProblem.g:2916:3: rule__Assertion__Group_0_0_2_1__0
                     {
-                    pushFollow(FOLLOW_7);
+                    pushFollow(FOLLOW_11);
                     rule__Assertion__Group_0_0_2_1__0();
 
                     state._fsp--;
@@ -8539,7 +9171,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop30;
+                    break loop33;
                 }
             } while (true);
 
@@ -8566,16 +9198,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2_1__0"
-    // InternalProblem.g:2721: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:2925:1: rule__Assertion__Group_0_0_2_1__0 : rule__Assertion__Group_0_0_2_1__0__Impl rule__Assertion__Group_0_0_2_1__1 ;
     public final void rule__Assertion__Group_0_0_2_1__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2725:1: ( rule__Assertion__Group_0_0_2_1__0__Impl rule__Assertion__Group_0_0_2_1__1 )
-            // InternalProblem.g:2726:2: rule__Assertion__Group_0_0_2_1__0__Impl rule__Assertion__Group_0_0_2_1__1
+            // InternalProblem.g:2929:1: ( rule__Assertion__Group_0_0_2_1__0__Impl rule__Assertion__Group_0_0_2_1__1 )
+            // InternalProblem.g:2930:2: rule__Assertion__Group_0_0_2_1__0__Impl rule__Assertion__Group_0_0_2_1__1
             {
-            pushFollow(FOLLOW_5);
+            pushFollow(FOLLOW_9);
             rule__Assertion__Group_0_0_2_1__0__Impl();
 
             state._fsp--;
@@ -8604,17 +9236,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2_1__0__Impl"
-    // InternalProblem.g:2733:1: rule__Assertion__Group_0_0_2_1__0__Impl : ( ',' ) ;
+    // InternalProblem.g:2937: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:2737:1: ( ( ',' ) )
-            // InternalProblem.g:2738:1: ( ',' )
+            // InternalProblem.g:2941:1: ( ( ',' ) )
+            // InternalProblem.g:2942:1: ( ',' )
             {
-            // InternalProblem.g:2738:1: ( ',' )
-            // InternalProblem.g:2739:2: ','
+            // InternalProblem.g:2942:1: ( ',' )
+            // InternalProblem.g:2943:2: ','
             {
              before(grammarAccess.getAssertionAccess().getCommaKeyword_0_0_2_1_0()); 
             match(input,25,FOLLOW_2); 
@@ -8641,14 +9273,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2_1__1"
-    // InternalProblem.g:2748:1: rule__Assertion__Group_0_0_2_1__1 : rule__Assertion__Group_0_0_2_1__1__Impl ;
+    // InternalProblem.g:2952: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:2752:1: ( rule__Assertion__Group_0_0_2_1__1__Impl )
-            // InternalProblem.g:2753:2: rule__Assertion__Group_0_0_2_1__1__Impl
+            // InternalProblem.g:2956:1: ( rule__Assertion__Group_0_0_2_1__1__Impl )
+            // InternalProblem.g:2957:2: rule__Assertion__Group_0_0_2_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group_0_0_2_1__1__Impl();
@@ -8674,21 +9306,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_0_2_1__1__Impl"
-    // InternalProblem.g:2759:1: rule__Assertion__Group_0_0_2_1__1__Impl : ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) ) ;
+    // InternalProblem.g:2963: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:2763:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) ) )
-            // InternalProblem.g:2764:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) )
+            // InternalProblem.g:2967:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) ) )
+            // InternalProblem.g:2968:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) )
             {
-            // InternalProblem.g:2764:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) )
-            // InternalProblem.g:2765:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 )
+            // InternalProblem.g:2968:1: ( ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 ) )
+            // InternalProblem.g:2969:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsAssignment_0_0_2_1_1()); 
-            // InternalProblem.g:2766:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 )
-            // InternalProblem.g:2766:3: rule__Assertion__ArgumentsAssignment_0_0_2_1_1
+            // InternalProblem.g:2970:2: ( rule__Assertion__ArgumentsAssignment_0_0_2_1_1 )
+            // InternalProblem.g:2970:3: rule__Assertion__ArgumentsAssignment_0_0_2_1_1
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__ArgumentsAssignment_0_0_2_1_1();
@@ -8721,16 +9353,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__0"
-    // InternalProblem.g:2775:1: rule__Assertion__Group_0_1__0 : rule__Assertion__Group_0_1__0__Impl rule__Assertion__Group_0_1__1 ;
+    // InternalProblem.g:2979: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:2779:1: ( rule__Assertion__Group_0_1__0__Impl rule__Assertion__Group_0_1__1 )
-            // InternalProblem.g:2780:2: rule__Assertion__Group_0_1__0__Impl rule__Assertion__Group_0_1__1
+            // InternalProblem.g:2983:1: ( rule__Assertion__Group_0_1__0__Impl rule__Assertion__Group_0_1__1 )
+            // InternalProblem.g:2984:2: rule__Assertion__Group_0_1__0__Impl rule__Assertion__Group_0_1__1
             {
-            pushFollow(FOLLOW_27);
+            pushFollow(FOLLOW_29);
             rule__Assertion__Group_0_1__0__Impl();
 
             state._fsp--;
@@ -8759,29 +9391,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__0__Impl"
-    // InternalProblem.g:2787:1: rule__Assertion__Group_0_1__0__Impl : ( ( rule__Assertion__ValueAssignment_0_1_0 )? ) ;
+    // InternalProblem.g:2991: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:2791:1: ( ( ( rule__Assertion__ValueAssignment_0_1_0 )? ) )
-            // InternalProblem.g:2792:1: ( ( rule__Assertion__ValueAssignment_0_1_0 )? )
+            // InternalProblem.g:2995:1: ( ( ( rule__Assertion__ValueAssignment_0_1_0 )? ) )
+            // InternalProblem.g:2996:1: ( ( rule__Assertion__ValueAssignment_0_1_0 )? )
             {
-            // InternalProblem.g:2792:1: ( ( rule__Assertion__ValueAssignment_0_1_0 )? )
-            // InternalProblem.g:2793:2: ( rule__Assertion__ValueAssignment_0_1_0 )?
+            // InternalProblem.g:2996:1: ( ( rule__Assertion__ValueAssignment_0_1_0 )? )
+            // InternalProblem.g:2997:2: ( rule__Assertion__ValueAssignment_0_1_0 )?
             {
              before(grammarAccess.getAssertionAccess().getValueAssignment_0_1_0()); 
-            // InternalProblem.g:2794:2: ( rule__Assertion__ValueAssignment_0_1_0 )?
-            int alt31=2;
-            int LA31_0 = input.LA(1);
+            // InternalProblem.g:2998:2: ( rule__Assertion__ValueAssignment_0_1_0 )?
+            int alt34=2;
+            int LA34_0 = input.LA(1);
 
-            if ( ((LA31_0>=18 && LA31_0<=19)) ) {
-                alt31=1;
+            if ( ((LA34_0>=20 && LA34_0<=21)) ) {
+                alt34=1;
             }
-            switch (alt31) {
+            switch (alt34) {
                 case 1 :
-                    // InternalProblem.g:2794:3: rule__Assertion__ValueAssignment_0_1_0
+                    // InternalProblem.g:2998:3: rule__Assertion__ValueAssignment_0_1_0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Assertion__ValueAssignment_0_1_0();
@@ -8817,16 +9449,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__1"
-    // InternalProblem.g:2802:1: rule__Assertion__Group_0_1__1 : rule__Assertion__Group_0_1__1__Impl rule__Assertion__Group_0_1__2 ;
+    // InternalProblem.g:3006: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:2806:1: ( rule__Assertion__Group_0_1__1__Impl rule__Assertion__Group_0_1__2 )
-            // InternalProblem.g:2807:2: rule__Assertion__Group_0_1__1__Impl rule__Assertion__Group_0_1__2
+            // InternalProblem.g:3010:1: ( rule__Assertion__Group_0_1__1__Impl rule__Assertion__Group_0_1__2 )
+            // InternalProblem.g:3011:2: rule__Assertion__Group_0_1__1__Impl rule__Assertion__Group_0_1__2
             {
-            pushFollow(FOLLOW_16);
+            pushFollow(FOLLOW_19);
             rule__Assertion__Group_0_1__1__Impl();
 
             state._fsp--;
@@ -8855,21 +9487,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__1__Impl"
-    // InternalProblem.g:2814:1: rule__Assertion__Group_0_1__1__Impl : ( ( rule__Assertion__RelationAssignment_0_1_1 ) ) ;
+    // InternalProblem.g:3018: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:2818:1: ( ( ( rule__Assertion__RelationAssignment_0_1_1 ) ) )
-            // InternalProblem.g:2819:1: ( ( rule__Assertion__RelationAssignment_0_1_1 ) )
+            // InternalProblem.g:3022:1: ( ( ( rule__Assertion__RelationAssignment_0_1_1 ) ) )
+            // InternalProblem.g:3023:1: ( ( rule__Assertion__RelationAssignment_0_1_1 ) )
             {
-            // InternalProblem.g:2819:1: ( ( rule__Assertion__RelationAssignment_0_1_1 ) )
-            // InternalProblem.g:2820:2: ( rule__Assertion__RelationAssignment_0_1_1 )
+            // InternalProblem.g:3023:1: ( ( rule__Assertion__RelationAssignment_0_1_1 ) )
+            // InternalProblem.g:3024:2: ( rule__Assertion__RelationAssignment_0_1_1 )
             {
              before(grammarAccess.getAssertionAccess().getRelationAssignment_0_1_1()); 
-            // InternalProblem.g:2821:2: ( rule__Assertion__RelationAssignment_0_1_1 )
-            // InternalProblem.g:2821:3: rule__Assertion__RelationAssignment_0_1_1
+            // InternalProblem.g:3025:2: ( rule__Assertion__RelationAssignment_0_1_1 )
+            // InternalProblem.g:3025:3: rule__Assertion__RelationAssignment_0_1_1
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__RelationAssignment_0_1_1();
@@ -8902,16 +9534,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__2"
-    // InternalProblem.g:2829:1: rule__Assertion__Group_0_1__2 : rule__Assertion__Group_0_1__2__Impl rule__Assertion__Group_0_1__3 ;
+    // InternalProblem.g:3033: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:2833:1: ( rule__Assertion__Group_0_1__2__Impl rule__Assertion__Group_0_1__3 )
-            // InternalProblem.g:2834:2: rule__Assertion__Group_0_1__2__Impl rule__Assertion__Group_0_1__3
+            // InternalProblem.g:3037:1: ( rule__Assertion__Group_0_1__2__Impl rule__Assertion__Group_0_1__3 )
+            // InternalProblem.g:3038:2: rule__Assertion__Group_0_1__2__Impl rule__Assertion__Group_0_1__3
             {
-            pushFollow(FOLLOW_17);
+            pushFollow(FOLLOW_26);
             rule__Assertion__Group_0_1__2__Impl();
 
             state._fsp--;
@@ -8940,20 +9572,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__2__Impl"
-    // InternalProblem.g:2841:1: rule__Assertion__Group_0_1__2__Impl : ( '(' ) ;
+    // InternalProblem.g:3045: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:2845:1: ( ( '(' ) )
-            // InternalProblem.g:2846:1: ( '(' )
+            // InternalProblem.g:3049:1: ( ( '(' ) )
+            // InternalProblem.g:3050:1: ( '(' )
             {
-            // InternalProblem.g:2846:1: ( '(' )
-            // InternalProblem.g:2847:2: '('
+            // InternalProblem.g:3050:1: ( '(' )
+            // InternalProblem.g:3051:2: '('
             {
              before(grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_1_2()); 
-            match(input,27,FOLLOW_2); 
+            match(input,32,FOLLOW_2); 
              after(grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_1_2()); 
 
             }
@@ -8977,16 +9609,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__3"
-    // InternalProblem.g:2856:1: rule__Assertion__Group_0_1__3 : rule__Assertion__Group_0_1__3__Impl rule__Assertion__Group_0_1__4 ;
+    // InternalProblem.g:3060: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:2860:1: ( rule__Assertion__Group_0_1__3__Impl rule__Assertion__Group_0_1__4 )
-            // InternalProblem.g:2861:2: rule__Assertion__Group_0_1__3__Impl rule__Assertion__Group_0_1__4
+            // InternalProblem.g:3064:1: ( rule__Assertion__Group_0_1__3__Impl rule__Assertion__Group_0_1__4 )
+            // InternalProblem.g:3065:2: rule__Assertion__Group_0_1__3__Impl rule__Assertion__Group_0_1__4
             {
-            pushFollow(FOLLOW_17);
+            pushFollow(FOLLOW_26);
             rule__Assertion__Group_0_1__3__Impl();
 
             state._fsp--;
@@ -9015,29 +9647,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__3__Impl"
-    // InternalProblem.g:2868:1: rule__Assertion__Group_0_1__3__Impl : ( ( rule__Assertion__Group_0_1_3__0 )? ) ;
+    // InternalProblem.g:3072: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:2872:1: ( ( ( rule__Assertion__Group_0_1_3__0 )? ) )
-            // InternalProblem.g:2873:1: ( ( rule__Assertion__Group_0_1_3__0 )? )
+            // InternalProblem.g:3076:1: ( ( ( rule__Assertion__Group_0_1_3__0 )? ) )
+            // InternalProblem.g:3077:1: ( ( rule__Assertion__Group_0_1_3__0 )? )
             {
-            // InternalProblem.g:2873:1: ( ( rule__Assertion__Group_0_1_3__0 )? )
-            // InternalProblem.g:2874:2: ( rule__Assertion__Group_0_1_3__0 )?
+            // InternalProblem.g:3077:1: ( ( rule__Assertion__Group_0_1_3__0 )? )
+            // InternalProblem.g:3078:2: ( rule__Assertion__Group_0_1_3__0 )?
             {
              before(grammarAccess.getAssertionAccess().getGroup_0_1_3()); 
-            // InternalProblem.g:2875:2: ( rule__Assertion__Group_0_1_3__0 )?
-            int alt32=2;
-            int LA32_0 = input.LA(1);
+            // InternalProblem.g:3079:2: ( rule__Assertion__Group_0_1_3__0 )?
+            int alt35=2;
+            int LA35_0 = input.LA(1);
 
-            if ( (LA32_0==RULE_ID) ) {
-                alt32=1;
+            if ( ((LA35_0>=RULE_QUOTED_ID && LA35_0<=RULE_ID)) ) {
+                alt35=1;
             }
-            switch (alt32) {
+            switch (alt35) {
                 case 1 :
-                    // InternalProblem.g:2875:3: rule__Assertion__Group_0_1_3__0
+                    // InternalProblem.g:3079:3: rule__Assertion__Group_0_1_3__0
                     {
                     pushFollow(FOLLOW_2);
                     rule__Assertion__Group_0_1_3__0();
@@ -9073,14 +9705,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__4"
-    // InternalProblem.g:2883:1: rule__Assertion__Group_0_1__4 : rule__Assertion__Group_0_1__4__Impl ;
+    // InternalProblem.g:3087: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:2887:1: ( rule__Assertion__Group_0_1__4__Impl )
-            // InternalProblem.g:2888:2: rule__Assertion__Group_0_1__4__Impl
+            // InternalProblem.g:3091:1: ( rule__Assertion__Group_0_1__4__Impl )
+            // InternalProblem.g:3092:2: rule__Assertion__Group_0_1__4__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group_0_1__4__Impl();
@@ -9106,20 +9738,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1__4__Impl"
-    // InternalProblem.g:2894:1: rule__Assertion__Group_0_1__4__Impl : ( ')' ) ;
+    // InternalProblem.g:3098: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:2898:1: ( ( ')' ) )
-            // InternalProblem.g:2899:1: ( ')' )
+            // InternalProblem.g:3102:1: ( ( ')' ) )
+            // InternalProblem.g:3103:1: ( ')' )
             {
-            // InternalProblem.g:2899:1: ( ')' )
-            // InternalProblem.g:2900:2: ')'
+            // InternalProblem.g:3103:1: ( ')' )
+            // InternalProblem.g:3104:2: ')'
             {
              before(grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_1_4()); 
-            match(input,28,FOLLOW_2); 
+            match(input,33,FOLLOW_2); 
              after(grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_1_4()); 
 
             }
@@ -9143,14 +9775,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3__0"
-    // InternalProblem.g:2910: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:3114: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:2914:1: ( rule__Assertion__Group_0_1_3__0__Impl rule__Assertion__Group_0_1_3__1 )
-            // InternalProblem.g:2915:2: rule__Assertion__Group_0_1_3__0__Impl rule__Assertion__Group_0_1_3__1
+            // InternalProblem.g:3118:1: ( rule__Assertion__Group_0_1_3__0__Impl rule__Assertion__Group_0_1_3__1 )
+            // InternalProblem.g:3119:2: rule__Assertion__Group_0_1_3__0__Impl rule__Assertion__Group_0_1_3__1
             {
             pushFollow(FOLLOW_10);
             rule__Assertion__Group_0_1_3__0__Impl();
@@ -9181,21 +9813,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3__0__Impl"
-    // InternalProblem.g:2922:1: rule__Assertion__Group_0_1_3__0__Impl : ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) ) ;
+    // InternalProblem.g:3126: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:2926:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) ) )
-            // InternalProblem.g:2927:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) )
+            // InternalProblem.g:3130:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) ) )
+            // InternalProblem.g:3131:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) )
             {
-            // InternalProblem.g:2927:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) )
-            // InternalProblem.g:2928:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_0 )
+            // InternalProblem.g:3131:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_0 ) )
+            // InternalProblem.g:3132:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_0 )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsAssignment_0_1_3_0()); 
-            // InternalProblem.g:2929:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_0 )
-            // InternalProblem.g:2929:3: rule__Assertion__ArgumentsAssignment_0_1_3_0
+            // InternalProblem.g:3133:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_0 )
+            // InternalProblem.g:3133:3: rule__Assertion__ArgumentsAssignment_0_1_3_0
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__ArgumentsAssignment_0_1_3_0();
@@ -9228,14 +9860,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3__1"
-    // InternalProblem.g:2937:1: rule__Assertion__Group_0_1_3__1 : rule__Assertion__Group_0_1_3__1__Impl ;
+    // InternalProblem.g:3141: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:2941:1: ( rule__Assertion__Group_0_1_3__1__Impl )
-            // InternalProblem.g:2942:2: rule__Assertion__Group_0_1_3__1__Impl
+            // InternalProblem.g:3145:1: ( rule__Assertion__Group_0_1_3__1__Impl )
+            // InternalProblem.g:3146:2: rule__Assertion__Group_0_1_3__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group_0_1_3__1__Impl();
@@ -9261,35 +9893,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3__1__Impl"
-    // InternalProblem.g:2948:1: rule__Assertion__Group_0_1_3__1__Impl : ( ( rule__Assertion__Group_0_1_3_1__0 )* ) ;
+    // InternalProblem.g:3152: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:2952:1: ( ( ( rule__Assertion__Group_0_1_3_1__0 )* ) )
-            // InternalProblem.g:2953:1: ( ( rule__Assertion__Group_0_1_3_1__0 )* )
+            // InternalProblem.g:3156:1: ( ( ( rule__Assertion__Group_0_1_3_1__0 )* ) )
+            // InternalProblem.g:3157:1: ( ( rule__Assertion__Group_0_1_3_1__0 )* )
             {
-            // InternalProblem.g:2953:1: ( ( rule__Assertion__Group_0_1_3_1__0 )* )
-            // InternalProblem.g:2954:2: ( rule__Assertion__Group_0_1_3_1__0 )*
+            // InternalProblem.g:3157:1: ( ( rule__Assertion__Group_0_1_3_1__0 )* )
+            // InternalProblem.g:3158:2: ( rule__Assertion__Group_0_1_3_1__0 )*
             {
              before(grammarAccess.getAssertionAccess().getGroup_0_1_3_1()); 
-            // InternalProblem.g:2955:2: ( rule__Assertion__Group_0_1_3_1__0 )*
-            loop33:
+            // InternalProblem.g:3159:2: ( rule__Assertion__Group_0_1_3_1__0 )*
+            loop36:
             do {
-                int alt33=2;
-                int LA33_0 = input.LA(1);
+                int alt36=2;
+                int LA36_0 = input.LA(1);
 
-                if ( (LA33_0==25) ) {
-                    alt33=1;
+                if ( (LA36_0==25) ) {
+                    alt36=1;
                 }
 
 
-                switch (alt33) {
+                switch (alt36) {
                 case 1 :
-                    // InternalProblem.g:2955:3: rule__Assertion__Group_0_1_3_1__0
+                    // InternalProblem.g:3159:3: rule__Assertion__Group_0_1_3_1__0
                     {
-                    pushFollow(FOLLOW_7);
+                    pushFollow(FOLLOW_11);
                     rule__Assertion__Group_0_1_3_1__0();
 
                     state._fsp--;
@@ -9299,7 +9931,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop33;
+                    break loop36;
                 }
             } while (true);
 
@@ -9326,16 +9958,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3_1__0"
-    // InternalProblem.g:2964: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:3168:1: rule__Assertion__Group_0_1_3_1__0 : rule__Assertion__Group_0_1_3_1__0__Impl rule__Assertion__Group_0_1_3_1__1 ;
     public final void rule__Assertion__Group_0_1_3_1__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:2968:1: ( rule__Assertion__Group_0_1_3_1__0__Impl rule__Assertion__Group_0_1_3_1__1 )
-            // InternalProblem.g:2969:2: rule__Assertion__Group_0_1_3_1__0__Impl rule__Assertion__Group_0_1_3_1__1
+            // InternalProblem.g:3172:1: ( rule__Assertion__Group_0_1_3_1__0__Impl rule__Assertion__Group_0_1_3_1__1 )
+            // InternalProblem.g:3173:2: rule__Assertion__Group_0_1_3_1__0__Impl rule__Assertion__Group_0_1_3_1__1
             {
-            pushFollow(FOLLOW_5);
+            pushFollow(FOLLOW_9);
             rule__Assertion__Group_0_1_3_1__0__Impl();
 
             state._fsp--;
@@ -9364,17 +9996,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3_1__0__Impl"
-    // InternalProblem.g:2976:1: rule__Assertion__Group_0_1_3_1__0__Impl : ( ',' ) ;
+    // InternalProblem.g:3180: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:2980:1: ( ( ',' ) )
-            // InternalProblem.g:2981:1: ( ',' )
+            // InternalProblem.g:3184:1: ( ( ',' ) )
+            // InternalProblem.g:3185:1: ( ',' )
             {
-            // InternalProblem.g:2981:1: ( ',' )
-            // InternalProblem.g:2982:2: ','
+            // InternalProblem.g:3185:1: ( ',' )
+            // InternalProblem.g:3186:2: ','
             {
              before(grammarAccess.getAssertionAccess().getCommaKeyword_0_1_3_1_0()); 
             match(input,25,FOLLOW_2); 
@@ -9401,14 +10033,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3_1__1"
-    // InternalProblem.g:2991:1: rule__Assertion__Group_0_1_3_1__1 : rule__Assertion__Group_0_1_3_1__1__Impl ;
+    // InternalProblem.g:3195: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:2995:1: ( rule__Assertion__Group_0_1_3_1__1__Impl )
-            // InternalProblem.g:2996:2: rule__Assertion__Group_0_1_3_1__1__Impl
+            // InternalProblem.g:3199:1: ( rule__Assertion__Group_0_1_3_1__1__Impl )
+            // InternalProblem.g:3200:2: rule__Assertion__Group_0_1_3_1__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__Group_0_1_3_1__1__Impl();
@@ -9434,21 +10066,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__Group_0_1_3_1__1__Impl"
-    // InternalProblem.g:3002:1: rule__Assertion__Group_0_1_3_1__1__Impl : ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) ) ;
+    // InternalProblem.g:3206: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:3006:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) ) )
-            // InternalProblem.g:3007:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) )
+            // InternalProblem.g:3210:1: ( ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) ) )
+            // InternalProblem.g:3211:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) )
             {
-            // InternalProblem.g:3007:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) )
-            // InternalProblem.g:3008:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 )
+            // InternalProblem.g:3211:1: ( ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 ) )
+            // InternalProblem.g:3212:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsAssignment_0_1_3_1_1()); 
-            // InternalProblem.g:3009:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 )
-            // InternalProblem.g:3009:3: rule__Assertion__ArgumentsAssignment_0_1_3_1_1
+            // InternalProblem.g:3213:2: ( rule__Assertion__ArgumentsAssignment_0_1_3_1_1 )
+            // InternalProblem.g:3213:3: rule__Assertion__ArgumentsAssignment_0_1_3_1_1
             {
             pushFollow(FOLLOW_2);
             rule__Assertion__ArgumentsAssignment_0_1_3_1_1();
@@ -9481,14 +10113,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__0"
-    // InternalProblem.g:3018:1: rule__ScopeDeclaration__Group__0 : rule__ScopeDeclaration__Group__0__Impl rule__ScopeDeclaration__Group__1 ;
+    // InternalProblem.g:3222: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:3022:1: ( rule__ScopeDeclaration__Group__0__Impl rule__ScopeDeclaration__Group__1 )
-            // InternalProblem.g:3023:2: rule__ScopeDeclaration__Group__0__Impl rule__ScopeDeclaration__Group__1
+            // InternalProblem.g:3226:1: ( rule__ScopeDeclaration__Group__0__Impl rule__ScopeDeclaration__Group__1 )
+            // InternalProblem.g:3227:2: rule__ScopeDeclaration__Group__0__Impl rule__ScopeDeclaration__Group__1
             {
             pushFollow(FOLLOW_5);
             rule__ScopeDeclaration__Group__0__Impl();
@@ -9519,20 +10151,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__0__Impl"
-    // InternalProblem.g:3030:1: rule__ScopeDeclaration__Group__0__Impl : ( 'scope' ) ;
+    // InternalProblem.g:3234:1: rule__ScopeDeclaration__Group__0__Impl : ( 'scope' ) ;
     public final void rule__ScopeDeclaration__Group__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3034:1: ( ( 'scope' ) )
-            // InternalProblem.g:3035:1: ( 'scope' )
+            // InternalProblem.g:3238:1: ( ( 'scope' ) )
+            // InternalProblem.g:3239:1: ( 'scope' )
             {
-            // InternalProblem.g:3035:1: ( 'scope' )
-            // InternalProblem.g:3036:2: 'scope'
+            // InternalProblem.g:3239:1: ( 'scope' )
+            // InternalProblem.g:3240:2: 'scope'
             {
              before(grammarAccess.getScopeDeclarationAccess().getScopeKeyword_0()); 
-            match(input,32,FOLLOW_2); 
+            match(input,36,FOLLOW_2); 
              after(grammarAccess.getScopeDeclarationAccess().getScopeKeyword_0()); 
 
             }
@@ -9556,16 +10188,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__1"
-    // InternalProblem.g:3045:1: rule__ScopeDeclaration__Group__1 : rule__ScopeDeclaration__Group__1__Impl rule__ScopeDeclaration__Group__2 ;
+    // InternalProblem.g:3249: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:3049:1: ( rule__ScopeDeclaration__Group__1__Impl rule__ScopeDeclaration__Group__2 )
-            // InternalProblem.g:3050:2: rule__ScopeDeclaration__Group__1__Impl rule__ScopeDeclaration__Group__2
+            // InternalProblem.g:3253:1: ( rule__ScopeDeclaration__Group__1__Impl rule__ScopeDeclaration__Group__2 )
+            // InternalProblem.g:3254:2: rule__ScopeDeclaration__Group__1__Impl rule__ScopeDeclaration__Group__2
             {
-            pushFollow(FOLLOW_28);
+            pushFollow(FOLLOW_30);
             rule__ScopeDeclaration__Group__1__Impl();
 
             state._fsp--;
@@ -9594,21 +10226,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__1__Impl"
-    // InternalProblem.g:3057:1: rule__ScopeDeclaration__Group__1__Impl : ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) ) ;
+    // InternalProblem.g:3261: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:3061:1: ( ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) ) )
-            // InternalProblem.g:3062:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) )
+            // InternalProblem.g:3265:1: ( ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) ) )
+            // InternalProblem.g:3266:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) )
             {
-            // InternalProblem.g:3062:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) )
-            // InternalProblem.g:3063:2: ( rule__ScopeDeclaration__TypeScopesAssignment_1 )
+            // InternalProblem.g:3266:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_1 ) )
+            // InternalProblem.g:3267:2: ( rule__ScopeDeclaration__TypeScopesAssignment_1 )
             {
              before(grammarAccess.getScopeDeclarationAccess().getTypeScopesAssignment_1()); 
-            // InternalProblem.g:3064:2: ( rule__ScopeDeclaration__TypeScopesAssignment_1 )
-            // InternalProblem.g:3064:3: rule__ScopeDeclaration__TypeScopesAssignment_1
+            // InternalProblem.g:3268:2: ( rule__ScopeDeclaration__TypeScopesAssignment_1 )
+            // InternalProblem.g:3268:3: rule__ScopeDeclaration__TypeScopesAssignment_1
             {
             pushFollow(FOLLOW_2);
             rule__ScopeDeclaration__TypeScopesAssignment_1();
@@ -9641,16 +10273,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__2"
-    // InternalProblem.g:3072:1: rule__ScopeDeclaration__Group__2 : rule__ScopeDeclaration__Group__2__Impl rule__ScopeDeclaration__Group__3 ;
+    // InternalProblem.g:3276: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:3076:1: ( rule__ScopeDeclaration__Group__2__Impl rule__ScopeDeclaration__Group__3 )
-            // InternalProblem.g:3077:2: rule__ScopeDeclaration__Group__2__Impl rule__ScopeDeclaration__Group__3
+            // InternalProblem.g:3280:1: ( rule__ScopeDeclaration__Group__2__Impl rule__ScopeDeclaration__Group__3 )
+            // InternalProblem.g:3281:2: rule__ScopeDeclaration__Group__2__Impl rule__ScopeDeclaration__Group__3
             {
-            pushFollow(FOLLOW_28);
+            pushFollow(FOLLOW_30);
             rule__ScopeDeclaration__Group__2__Impl();
 
             state._fsp--;
@@ -9679,35 +10311,35 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__2__Impl"
-    // InternalProblem.g:3084:1: rule__ScopeDeclaration__Group__2__Impl : ( ( rule__ScopeDeclaration__Group_2__0 )* ) ;
+    // InternalProblem.g:3288: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:3088:1: ( ( ( rule__ScopeDeclaration__Group_2__0 )* ) )
-            // InternalProblem.g:3089:1: ( ( rule__ScopeDeclaration__Group_2__0 )* )
+            // InternalProblem.g:3292:1: ( ( ( rule__ScopeDeclaration__Group_2__0 )* ) )
+            // InternalProblem.g:3293:1: ( ( rule__ScopeDeclaration__Group_2__0 )* )
             {
-            // InternalProblem.g:3089:1: ( ( rule__ScopeDeclaration__Group_2__0 )* )
-            // InternalProblem.g:3090:2: ( rule__ScopeDeclaration__Group_2__0 )*
+            // InternalProblem.g:3293:1: ( ( rule__ScopeDeclaration__Group_2__0 )* )
+            // InternalProblem.g:3294:2: ( rule__ScopeDeclaration__Group_2__0 )*
             {
              before(grammarAccess.getScopeDeclarationAccess().getGroup_2()); 
-            // InternalProblem.g:3091:2: ( rule__ScopeDeclaration__Group_2__0 )*
-            loop34:
+            // InternalProblem.g:3295:2: ( rule__ScopeDeclaration__Group_2__0 )*
+            loop37:
             do {
-                int alt34=2;
-                int LA34_0 = input.LA(1);
+                int alt37=2;
+                int LA37_0 = input.LA(1);
 
-                if ( (LA34_0==25) ) {
-                    alt34=1;
+                if ( (LA37_0==25) ) {
+                    alt37=1;
                 }
 
 
-                switch (alt34) {
+                switch (alt37) {
                 case 1 :
-                    // InternalProblem.g:3091:3: rule__ScopeDeclaration__Group_2__0
+                    // InternalProblem.g:3295:3: rule__ScopeDeclaration__Group_2__0
                     {
-                    pushFollow(FOLLOW_7);
+                    pushFollow(FOLLOW_11);
                     rule__ScopeDeclaration__Group_2__0();
 
                     state._fsp--;
@@ -9717,7 +10349,7 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop34;
+                    break loop37;
                 }
             } while (true);
 
@@ -9744,14 +10376,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__3"
-    // InternalProblem.g:3099:1: rule__ScopeDeclaration__Group__3 : rule__ScopeDeclaration__Group__3__Impl ;
+    // InternalProblem.g:3303: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:3103:1: ( rule__ScopeDeclaration__Group__3__Impl )
-            // InternalProblem.g:3104:2: rule__ScopeDeclaration__Group__3__Impl
+            // InternalProblem.g:3307:1: ( rule__ScopeDeclaration__Group__3__Impl )
+            // InternalProblem.g:3308:2: rule__ScopeDeclaration__Group__3__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ScopeDeclaration__Group__3__Impl();
@@ -9777,20 +10409,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group__3__Impl"
-    // InternalProblem.g:3110:1: rule__ScopeDeclaration__Group__3__Impl : ( '.' ) ;
+    // InternalProblem.g:3314:1: rule__ScopeDeclaration__Group__3__Impl : ( '.' ) ;
     public final void rule__ScopeDeclaration__Group__3__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3114:1: ( ( '.' ) )
-            // InternalProblem.g:3115:1: ( '.' )
+            // InternalProblem.g:3318:1: ( ( '.' ) )
+            // InternalProblem.g:3319:1: ( '.' )
             {
-            // InternalProblem.g:3115:1: ( '.' )
-            // InternalProblem.g:3116:2: '.'
+            // InternalProblem.g:3319:1: ( '.' )
+            // InternalProblem.g:3320:2: '.'
             {
              before(grammarAccess.getScopeDeclarationAccess().getFullStopKeyword_3()); 
-            match(input,21,FOLLOW_2); 
+            match(input,12,FOLLOW_2); 
              after(grammarAccess.getScopeDeclarationAccess().getFullStopKeyword_3()); 
 
             }
@@ -9814,14 +10446,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group_2__0"
-    // InternalProblem.g:3126:1: rule__ScopeDeclaration__Group_2__0 : rule__ScopeDeclaration__Group_2__0__Impl rule__ScopeDeclaration__Group_2__1 ;
+    // InternalProblem.g:3330: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:3130:1: ( rule__ScopeDeclaration__Group_2__0__Impl rule__ScopeDeclaration__Group_2__1 )
-            // InternalProblem.g:3131:2: rule__ScopeDeclaration__Group_2__0__Impl rule__ScopeDeclaration__Group_2__1
+            // InternalProblem.g:3334:1: ( rule__ScopeDeclaration__Group_2__0__Impl rule__ScopeDeclaration__Group_2__1 )
+            // InternalProblem.g:3335:2: rule__ScopeDeclaration__Group_2__0__Impl rule__ScopeDeclaration__Group_2__1
             {
             pushFollow(FOLLOW_5);
             rule__ScopeDeclaration__Group_2__0__Impl();
@@ -9852,17 +10484,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group_2__0__Impl"
-    // InternalProblem.g:3138:1: rule__ScopeDeclaration__Group_2__0__Impl : ( ',' ) ;
+    // InternalProblem.g:3342:1: rule__ScopeDeclaration__Group_2__0__Impl : ( ',' ) ;
     public final void rule__ScopeDeclaration__Group_2__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3142:1: ( ( ',' ) )
-            // InternalProblem.g:3143:1: ( ',' )
+            // InternalProblem.g:3346:1: ( ( ',' ) )
+            // InternalProblem.g:3347:1: ( ',' )
             {
-            // InternalProblem.g:3143:1: ( ',' )
-            // InternalProblem.g:3144:2: ','
+            // InternalProblem.g:3347:1: ( ',' )
+            // InternalProblem.g:3348:2: ','
             {
              before(grammarAccess.getScopeDeclarationAccess().getCommaKeyword_2_0()); 
             match(input,25,FOLLOW_2); 
@@ -9889,14 +10521,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group_2__1"
-    // InternalProblem.g:3153:1: rule__ScopeDeclaration__Group_2__1 : rule__ScopeDeclaration__Group_2__1__Impl ;
+    // InternalProblem.g:3357: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:3157:1: ( rule__ScopeDeclaration__Group_2__1__Impl )
-            // InternalProblem.g:3158:2: rule__ScopeDeclaration__Group_2__1__Impl
+            // InternalProblem.g:3361:1: ( rule__ScopeDeclaration__Group_2__1__Impl )
+            // InternalProblem.g:3362:2: rule__ScopeDeclaration__Group_2__1__Impl
             {
             pushFollow(FOLLOW_2);
             rule__ScopeDeclaration__Group_2__1__Impl();
@@ -9922,21 +10554,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__Group_2__1__Impl"
-    // InternalProblem.g:3164:1: rule__ScopeDeclaration__Group_2__1__Impl : ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) ) ;
+    // InternalProblem.g:3368: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:3168:1: ( ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) ) )
-            // InternalProblem.g:3169:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) )
+            // InternalProblem.g:3372:1: ( ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) ) )
+            // InternalProblem.g:3373:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) )
             {
-            // InternalProblem.g:3169:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) )
-            // InternalProblem.g:3170:2: ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 )
+            // InternalProblem.g:3373:1: ( ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 ) )
+            // InternalProblem.g:3374:2: ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 )
             {
              before(grammarAccess.getScopeDeclarationAccess().getTypeScopesAssignment_2_1()); 
-            // InternalProblem.g:3171:2: ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 )
-            // InternalProblem.g:3171:3: rule__ScopeDeclaration__TypeScopesAssignment_2_1
+            // InternalProblem.g:3375:2: ( rule__ScopeDeclaration__TypeScopesAssignment_2_1 )
+            // InternalProblem.g:3375:3: rule__ScopeDeclaration__TypeScopesAssignment_2_1
             {
             pushFollow(FOLLOW_2);
             rule__ScopeDeclaration__TypeScopesAssignment_2_1();
@@ -9969,16 +10601,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Group__0"
-    // InternalProblem.g:3180:1: rule__TypeScope__Group__0 : rule__TypeScope__Group__0__Impl rule__TypeScope__Group__1 ;
+    // InternalProblem.g:3384: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:3184:1: ( rule__TypeScope__Group__0__Impl rule__TypeScope__Group__1 )
-            // InternalProblem.g:3185:2: rule__TypeScope__Group__0__Impl rule__TypeScope__Group__1
+            // InternalProblem.g:3388:1: ( rule__TypeScope__Group__0__Impl rule__TypeScope__Group__1 )
+            // InternalProblem.g:3389:2: rule__TypeScope__Group__0__Impl rule__TypeScope__Group__1
             {
-            pushFollow(FOLLOW_29);
+            pushFollow(FOLLOW_31);
             rule__TypeScope__Group__0__Impl();
 
             state._fsp--;
@@ -10007,21 +10639,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Group__0__Impl"
-    // InternalProblem.g:3192:1: rule__TypeScope__Group__0__Impl : ( ( rule__TypeScope__TargetTypeAssignment_0 ) ) ;
+    // InternalProblem.g:3396: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:3196:1: ( ( ( rule__TypeScope__TargetTypeAssignment_0 ) ) )
-            // InternalProblem.g:3197:1: ( ( rule__TypeScope__TargetTypeAssignment_0 ) )
+            // InternalProblem.g:3400:1: ( ( ( rule__TypeScope__TargetTypeAssignment_0 ) ) )
+            // InternalProblem.g:3401:1: ( ( rule__TypeScope__TargetTypeAssignment_0 ) )
             {
-            // InternalProblem.g:3197:1: ( ( rule__TypeScope__TargetTypeAssignment_0 ) )
-            // InternalProblem.g:3198:2: ( rule__TypeScope__TargetTypeAssignment_0 )
+            // InternalProblem.g:3401:1: ( ( rule__TypeScope__TargetTypeAssignment_0 ) )
+            // InternalProblem.g:3402:2: ( rule__TypeScope__TargetTypeAssignment_0 )
             {
              before(grammarAccess.getTypeScopeAccess().getTargetTypeAssignment_0()); 
-            // InternalProblem.g:3199:2: ( rule__TypeScope__TargetTypeAssignment_0 )
-            // InternalProblem.g:3199:3: rule__TypeScope__TargetTypeAssignment_0
+            // InternalProblem.g:3403:2: ( rule__TypeScope__TargetTypeAssignment_0 )
+            // InternalProblem.g:3403:3: rule__TypeScope__TargetTypeAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__TypeScope__TargetTypeAssignment_0();
@@ -10054,16 +10686,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Group__1"
-    // InternalProblem.g:3207:1: rule__TypeScope__Group__1 : rule__TypeScope__Group__1__Impl rule__TypeScope__Group__2 ;
+    // InternalProblem.g:3411: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:3211:1: ( rule__TypeScope__Group__1__Impl rule__TypeScope__Group__2 )
-            // InternalProblem.g:3212:2: rule__TypeScope__Group__1__Impl rule__TypeScope__Group__2
+            // InternalProblem.g:3415:1: ( rule__TypeScope__Group__1__Impl rule__TypeScope__Group__2 )
+            // InternalProblem.g:3416:2: rule__TypeScope__Group__1__Impl rule__TypeScope__Group__2
             {
-            pushFollow(FOLLOW_13);
+            pushFollow(FOLLOW_17);
             rule__TypeScope__Group__1__Impl();
 
             state._fsp--;
@@ -10092,21 +10724,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Group__1__Impl"
-    // InternalProblem.g:3219:1: rule__TypeScope__Group__1__Impl : ( ( rule__TypeScope__Alternatives_1 ) ) ;
+    // InternalProblem.g:3423: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:3223:1: ( ( ( rule__TypeScope__Alternatives_1 ) ) )
-            // InternalProblem.g:3224:1: ( ( rule__TypeScope__Alternatives_1 ) )
+            // InternalProblem.g:3427:1: ( ( ( rule__TypeScope__Alternatives_1 ) ) )
+            // InternalProblem.g:3428:1: ( ( rule__TypeScope__Alternatives_1 ) )
             {
-            // InternalProblem.g:3224:1: ( ( rule__TypeScope__Alternatives_1 ) )
-            // InternalProblem.g:3225:2: ( rule__TypeScope__Alternatives_1 )
+            // InternalProblem.g:3428:1: ( ( rule__TypeScope__Alternatives_1 ) )
+            // InternalProblem.g:3429:2: ( rule__TypeScope__Alternatives_1 )
             {
              before(grammarAccess.getTypeScopeAccess().getAlternatives_1()); 
-            // InternalProblem.g:3226:2: ( rule__TypeScope__Alternatives_1 )
-            // InternalProblem.g:3226:3: rule__TypeScope__Alternatives_1
+            // InternalProblem.g:3430:2: ( rule__TypeScope__Alternatives_1 )
+            // InternalProblem.g:3430:3: rule__TypeScope__Alternatives_1
             {
             pushFollow(FOLLOW_2);
             rule__TypeScope__Alternatives_1();
@@ -10139,14 +10771,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Group__2"
-    // InternalProblem.g:3234:1: rule__TypeScope__Group__2 : rule__TypeScope__Group__2__Impl ;
+    // InternalProblem.g:3438: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:3238:1: ( rule__TypeScope__Group__2__Impl )
-            // InternalProblem.g:3239:2: rule__TypeScope__Group__2__Impl
+            // InternalProblem.g:3442:1: ( rule__TypeScope__Group__2__Impl )
+            // InternalProblem.g:3443:2: rule__TypeScope__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__TypeScope__Group__2__Impl();
@@ -10172,21 +10804,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__Group__2__Impl"
-    // InternalProblem.g:3245:1: rule__TypeScope__Group__2__Impl : ( ( rule__TypeScope__MultiplicityAssignment_2 ) ) ;
+    // InternalProblem.g:3449: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:3249:1: ( ( ( rule__TypeScope__MultiplicityAssignment_2 ) ) )
-            // InternalProblem.g:3250:1: ( ( rule__TypeScope__MultiplicityAssignment_2 ) )
+            // InternalProblem.g:3453:1: ( ( ( rule__TypeScope__MultiplicityAssignment_2 ) ) )
+            // InternalProblem.g:3454:1: ( ( rule__TypeScope__MultiplicityAssignment_2 ) )
             {
-            // InternalProblem.g:3250:1: ( ( rule__TypeScope__MultiplicityAssignment_2 ) )
-            // InternalProblem.g:3251:2: ( rule__TypeScope__MultiplicityAssignment_2 )
+            // InternalProblem.g:3454:1: ( ( rule__TypeScope__MultiplicityAssignment_2 ) )
+            // InternalProblem.g:3455:2: ( rule__TypeScope__MultiplicityAssignment_2 )
             {
              before(grammarAccess.getTypeScopeAccess().getMultiplicityAssignment_2()); 
-            // InternalProblem.g:3252:2: ( rule__TypeScope__MultiplicityAssignment_2 )
-            // InternalProblem.g:3252:3: rule__TypeScope__MultiplicityAssignment_2
+            // InternalProblem.g:3456:2: ( rule__TypeScope__MultiplicityAssignment_2 )
+            // InternalProblem.g:3456:3: rule__TypeScope__MultiplicityAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__TypeScope__MultiplicityAssignment_2();
@@ -10219,16 +10851,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__Group__0"
-    // InternalProblem.g:3261:1: rule__RangeMultiplicity__Group__0 : rule__RangeMultiplicity__Group__0__Impl rule__RangeMultiplicity__Group__1 ;
+    // InternalProblem.g:3465: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:3265:1: ( rule__RangeMultiplicity__Group__0__Impl rule__RangeMultiplicity__Group__1 )
-            // InternalProblem.g:3266:2: rule__RangeMultiplicity__Group__0__Impl rule__RangeMultiplicity__Group__1
+            // InternalProblem.g:3469:1: ( rule__RangeMultiplicity__Group__0__Impl rule__RangeMultiplicity__Group__1 )
+            // InternalProblem.g:3470:2: rule__RangeMultiplicity__Group__0__Impl rule__RangeMultiplicity__Group__1
             {
-            pushFollow(FOLLOW_30);
+            pushFollow(FOLLOW_32);
             rule__RangeMultiplicity__Group__0__Impl();
 
             state._fsp--;
@@ -10257,21 +10889,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__Group__0__Impl"
-    // InternalProblem.g:3273:1: rule__RangeMultiplicity__Group__0__Impl : ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) ) ;
+    // InternalProblem.g:3477: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:3277:1: ( ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) ) )
-            // InternalProblem.g:3278:1: ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) )
+            // InternalProblem.g:3481:1: ( ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) ) )
+            // InternalProblem.g:3482:1: ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) )
             {
-            // InternalProblem.g:3278:1: ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) )
-            // InternalProblem.g:3279:2: ( rule__RangeMultiplicity__LowerBoundAssignment_0 )
+            // InternalProblem.g:3482:1: ( ( rule__RangeMultiplicity__LowerBoundAssignment_0 ) )
+            // InternalProblem.g:3483:2: ( rule__RangeMultiplicity__LowerBoundAssignment_0 )
             {
              before(grammarAccess.getRangeMultiplicityAccess().getLowerBoundAssignment_0()); 
-            // InternalProblem.g:3280:2: ( rule__RangeMultiplicity__LowerBoundAssignment_0 )
-            // InternalProblem.g:3280:3: rule__RangeMultiplicity__LowerBoundAssignment_0
+            // InternalProblem.g:3484:2: ( rule__RangeMultiplicity__LowerBoundAssignment_0 )
+            // InternalProblem.g:3484:3: rule__RangeMultiplicity__LowerBoundAssignment_0
             {
             pushFollow(FOLLOW_2);
             rule__RangeMultiplicity__LowerBoundAssignment_0();
@@ -10304,16 +10936,16 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__Group__1"
-    // InternalProblem.g:3288:1: rule__RangeMultiplicity__Group__1 : rule__RangeMultiplicity__Group__1__Impl rule__RangeMultiplicity__Group__2 ;
+    // InternalProblem.g:3492: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:3292:1: ( rule__RangeMultiplicity__Group__1__Impl rule__RangeMultiplicity__Group__2 )
-            // InternalProblem.g:3293:2: rule__RangeMultiplicity__Group__1__Impl rule__RangeMultiplicity__Group__2
+            // InternalProblem.g:3496:1: ( rule__RangeMultiplicity__Group__1__Impl rule__RangeMultiplicity__Group__2 )
+            // InternalProblem.g:3497:2: rule__RangeMultiplicity__Group__1__Impl rule__RangeMultiplicity__Group__2
             {
-            pushFollow(FOLLOW_31);
+            pushFollow(FOLLOW_33);
             rule__RangeMultiplicity__Group__1__Impl();
 
             state._fsp--;
@@ -10342,20 +10974,20 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__Group__1__Impl"
-    // InternalProblem.g:3300:1: rule__RangeMultiplicity__Group__1__Impl : ( '..' ) ;
+    // InternalProblem.g:3504:1: rule__RangeMultiplicity__Group__1__Impl : ( '..' ) ;
     public final void rule__RangeMultiplicity__Group__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3304:1: ( ( '..' ) )
-            // InternalProblem.g:3305:1: ( '..' )
+            // InternalProblem.g:3508:1: ( ( '..' ) )
+            // InternalProblem.g:3509:1: ( '..' )
             {
-            // InternalProblem.g:3305:1: ( '..' )
-            // InternalProblem.g:3306:2: '..'
+            // InternalProblem.g:3509:1: ( '..' )
+            // InternalProblem.g:3510:2: '..'
             {
              before(grammarAccess.getRangeMultiplicityAccess().getFullStopFullStopKeyword_1()); 
-            match(input,33,FOLLOW_2); 
+            match(input,37,FOLLOW_2); 
              after(grammarAccess.getRangeMultiplicityAccess().getFullStopFullStopKeyword_1()); 
 
             }
@@ -10379,14 +11011,14 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__Group__2"
-    // InternalProblem.g:3315:1: rule__RangeMultiplicity__Group__2 : rule__RangeMultiplicity__Group__2__Impl ;
+    // InternalProblem.g:3519: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:3319:1: ( rule__RangeMultiplicity__Group__2__Impl )
-            // InternalProblem.g:3320:2: rule__RangeMultiplicity__Group__2__Impl
+            // InternalProblem.g:3523:1: ( rule__RangeMultiplicity__Group__2__Impl )
+            // InternalProblem.g:3524:2: rule__RangeMultiplicity__Group__2__Impl
             {
             pushFollow(FOLLOW_2);
             rule__RangeMultiplicity__Group__2__Impl();
@@ -10412,21 +11044,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__Group__2__Impl"
-    // InternalProblem.g:3326:1: rule__RangeMultiplicity__Group__2__Impl : ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) ) ;
+    // InternalProblem.g:3530: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:3330:1: ( ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) ) )
-            // InternalProblem.g:3331:1: ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) )
+            // InternalProblem.g:3534:1: ( ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) ) )
+            // InternalProblem.g:3535:1: ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) )
             {
-            // InternalProblem.g:3331:1: ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) )
-            // InternalProblem.g:3332:2: ( rule__RangeMultiplicity__UpperBoundAssignment_2 )
+            // InternalProblem.g:3535:1: ( ( rule__RangeMultiplicity__UpperBoundAssignment_2 ) )
+            // InternalProblem.g:3536:2: ( rule__RangeMultiplicity__UpperBoundAssignment_2 )
             {
              before(grammarAccess.getRangeMultiplicityAccess().getUpperBoundAssignment_2()); 
-            // InternalProblem.g:3333:2: ( rule__RangeMultiplicity__UpperBoundAssignment_2 )
-            // InternalProblem.g:3333:3: rule__RangeMultiplicity__UpperBoundAssignment_2
+            // InternalProblem.g:3537:2: ( rule__RangeMultiplicity__UpperBoundAssignment_2 )
+            // InternalProblem.g:3537:3: rule__RangeMultiplicity__UpperBoundAssignment_2
             {
             pushFollow(FOLLOW_2);
             rule__RangeMultiplicity__UpperBoundAssignment_2();
@@ -10458,23 +11090,23 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__RangeMultiplicity__Group__2__Impl"
 
 
-    // $ANTLR start "rule__QualifiedName__Group__0"
-    // InternalProblem.g:3342:1: rule__QualifiedName__Group__0 : rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 ;
-    public final void rule__QualifiedName__Group__0() throws RecognitionException {
+    // $ANTLR start "rule__QualifiedName__Group_1__0"
+    // InternalProblem.g:3546:1: rule__QualifiedName__Group_1__0 : rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 ;
+    public final void rule__QualifiedName__Group_1__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3346:1: ( rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1 )
-            // InternalProblem.g:3347:2: rule__QualifiedName__Group__0__Impl rule__QualifiedName__Group__1
+            // InternalProblem.g:3550:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
+            // InternalProblem.g:3551:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
             {
-            pushFollow(FOLLOW_32);
-            rule__QualifiedName__Group__0__Impl();
+            pushFollow(FOLLOW_27);
+            rule__QualifiedName__Group_1__0__Impl();
 
             state._fsp--;
 
             pushFollow(FOLLOW_2);
-            rule__QualifiedName__Group__1();
+            rule__QualifiedName__Group_1__1();
 
             state._fsp--;
 
@@ -10493,25 +11125,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__QualifiedName__Group__0"
+    // $ANTLR end "rule__QualifiedName__Group_1__0"
 
 
-    // $ANTLR start "rule__QualifiedName__Group__0__Impl"
-    // InternalProblem.g:3354:1: rule__QualifiedName__Group__0__Impl : ( RULE_ID ) ;
-    public final void rule__QualifiedName__Group__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__QualifiedName__Group_1__0__Impl"
+    // InternalProblem.g:3558:1: rule__QualifiedName__Group_1__0__Impl : ( RULE_ID ) ;
+    public final void rule__QualifiedName__Group_1__0__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3358:1: ( ( RULE_ID ) )
-            // InternalProblem.g:3359:1: ( RULE_ID )
+            // InternalProblem.g:3562:1: ( ( RULE_ID ) )
+            // InternalProblem.g:3563:1: ( RULE_ID )
             {
-            // InternalProblem.g:3359:1: ( RULE_ID )
-            // InternalProblem.g:3360:2: RULE_ID
+            // InternalProblem.g:3563:1: ( RULE_ID )
+            // InternalProblem.g:3564:2: RULE_ID
             {
-             before(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_0()); 
+             before(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_0()); 
             match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_0()); 
+             after(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_0()); 
 
             }
 
@@ -10530,21 +11162,26 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__QualifiedName__Group__0__Impl"
+    // $ANTLR end "rule__QualifiedName__Group_1__0__Impl"
 
 
-    // $ANTLR start "rule__QualifiedName__Group__1"
-    // InternalProblem.g:3369:1: rule__QualifiedName__Group__1 : rule__QualifiedName__Group__1__Impl ;
-    public final void rule__QualifiedName__Group__1() throws RecognitionException {
+    // $ANTLR start "rule__QualifiedName__Group_1__1"
+    // InternalProblem.g:3573:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl rule__QualifiedName__Group_1__2 ;
+    public final void rule__QualifiedName__Group_1__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3373:1: ( rule__QualifiedName__Group__1__Impl )
-            // InternalProblem.g:3374:2: rule__QualifiedName__Group__1__Impl
+            // InternalProblem.g:3577:1: ( rule__QualifiedName__Group_1__1__Impl rule__QualifiedName__Group_1__2 )
+            // InternalProblem.g:3578:2: rule__QualifiedName__Group_1__1__Impl rule__QualifiedName__Group_1__2
             {
+            pushFollow(FOLLOW_27);
+            rule__QualifiedName__Group_1__1__Impl();
+
+            state._fsp--;
+
             pushFollow(FOLLOW_2);
-            rule__QualifiedName__Group__1__Impl();
+            rule__QualifiedName__Group_1__2();
 
             state._fsp--;
 
@@ -10563,40 +11200,46 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__QualifiedName__Group__1"
+    // $ANTLR end "rule__QualifiedName__Group_1__1"
 
 
-    // $ANTLR start "rule__QualifiedName__Group__1__Impl"
-    // InternalProblem.g:3380:1: rule__QualifiedName__Group__1__Impl : ( ( rule__QualifiedName__Group_1__0 )* ) ;
-    public final void rule__QualifiedName__Group__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__QualifiedName__Group_1__1__Impl"
+    // InternalProblem.g:3585: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:3384:1: ( ( ( rule__QualifiedName__Group_1__0 )* ) )
-            // InternalProblem.g:3385:1: ( ( rule__QualifiedName__Group_1__0 )* )
+            // InternalProblem.g:3589:1: ( ( ( rule__QualifiedName__Group_1_1__0 )* ) )
+            // InternalProblem.g:3590:1: ( ( rule__QualifiedName__Group_1_1__0 )* )
             {
-            // InternalProblem.g:3385:1: ( ( rule__QualifiedName__Group_1__0 )* )
-            // InternalProblem.g:3386:2: ( rule__QualifiedName__Group_1__0 )*
+            // InternalProblem.g:3590:1: ( ( rule__QualifiedName__Group_1_1__0 )* )
+            // InternalProblem.g:3591:2: ( rule__QualifiedName__Group_1_1__0 )*
             {
-             before(grammarAccess.getQualifiedNameAccess().getGroup_1()); 
-            // InternalProblem.g:3387:2: ( rule__QualifiedName__Group_1__0 )*
-            loop35:
+             before(grammarAccess.getQualifiedNameAccess().getGroup_1_1()); 
+            // InternalProblem.g:3592:2: ( rule__QualifiedName__Group_1_1__0 )*
+            loop38:
             do {
-                int alt35=2;
-                int LA35_0 = input.LA(1);
+                int alt38=2;
+                int LA38_0 = input.LA(1);
+
+                if ( (LA38_0==35) ) {
+                    int LA38_1 = input.LA(2);
+
+                    if ( (LA38_1==RULE_ID) ) {
+                        alt38=1;
+                    }
+
 
-                if ( (LA35_0==34) ) {
-                    alt35=1;
                 }
 
 
-                switch (alt35) {
+                switch (alt38) {
                 case 1 :
-                    // InternalProblem.g:3387:3: rule__QualifiedName__Group_1__0
+                    // InternalProblem.g:3592:3: rule__QualifiedName__Group_1_1__0
                     {
-                    pushFollow(FOLLOW_33);
-                    rule__QualifiedName__Group_1__0();
+                    pushFollow(FOLLOW_34);
+                    rule__QualifiedName__Group_1_1__0();
 
                     state._fsp--;
 
@@ -10605,11 +11248,11 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
                     break;
 
                 default :
-                    break loop35;
+                    break loop38;
                 }
             } while (true);
 
-             after(grammarAccess.getQualifiedNameAccess().getGroup_1()); 
+             after(grammarAccess.getQualifiedNameAccess().getGroup_1_1()); 
 
             }
 
@@ -10628,26 +11271,117 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__QualifiedName__Group__1__Impl"
+    // $ANTLR end "rule__QualifiedName__Group_1__1__Impl"
 
 
-    // $ANTLR start "rule__QualifiedName__Group_1__0"
-    // InternalProblem.g:3396: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 {
+    // $ANTLR start "rule__QualifiedName__Group_1__2"
+    // InternalProblem.g:3600:1: rule__QualifiedName__Group_1__2 : rule__QualifiedName__Group_1__2__Impl ;
+    public final void rule__QualifiedName__Group_1__2() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:3604:1: ( rule__QualifiedName__Group_1__2__Impl )
+            // InternalProblem.g:3605:2: rule__QualifiedName__Group_1__2__Impl
+            {
+            pushFollow(FOLLOW_2);
+            rule__QualifiedName__Group_1__2__Impl();
+
+            state._fsp--;
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__QualifiedName__Group_1__2"
+
+
+    // $ANTLR start "rule__QualifiedName__Group_1__2__Impl"
+    // InternalProblem.g:3611: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:3400:1: ( rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1 )
-            // InternalProblem.g:3401:2: rule__QualifiedName__Group_1__0__Impl rule__QualifiedName__Group_1__1
+            // InternalProblem.g:3615:1: ( ( ( rule__QualifiedName__Group_1_2__0 )? ) )
+            // InternalProblem.g:3616:1: ( ( rule__QualifiedName__Group_1_2__0 )? )
+            {
+            // InternalProblem.g:3616:1: ( ( rule__QualifiedName__Group_1_2__0 )? )
+            // InternalProblem.g:3617:2: ( rule__QualifiedName__Group_1_2__0 )?
+            {
+             before(grammarAccess.getQualifiedNameAccess().getGroup_1_2()); 
+            // InternalProblem.g:3618:2: ( rule__QualifiedName__Group_1_2__0 )?
+            int alt39=2;
+            int LA39_0 = input.LA(1);
+
+            if ( (LA39_0==35) ) {
+                alt39=1;
+            }
+            switch (alt39) {
+                case 1 :
+                    // InternalProblem.g:3618:3: rule__QualifiedName__Group_1_2__0
+                    {
+                    pushFollow(FOLLOW_2);
+                    rule__QualifiedName__Group_1_2__0();
+
+                    state._fsp--;
+
+
+                    }
+                    break;
+
+            }
+
+             after(grammarAccess.getQualifiedNameAccess().getGroup_1_2()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__QualifiedName__Group_1__2__Impl"
+
+
+    // $ANTLR start "rule__QualifiedName__Group_1_1__0"
+    // InternalProblem.g:3627:1: rule__QualifiedName__Group_1_1__0 : rule__QualifiedName__Group_1_1__0__Impl rule__QualifiedName__Group_1_1__1 ;
+    public final void rule__QualifiedName__Group_1_1__0() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:3631:1: ( rule__QualifiedName__Group_1_1__0__Impl rule__QualifiedName__Group_1_1__1 )
+            // InternalProblem.g:3632:2: rule__QualifiedName__Group_1_1__0__Impl rule__QualifiedName__Group_1_1__1
             {
             pushFollow(FOLLOW_5);
-            rule__QualifiedName__Group_1__0__Impl();
+            rule__QualifiedName__Group_1_1__0__Impl();
 
             state._fsp--;
 
             pushFollow(FOLLOW_2);
-            rule__QualifiedName__Group_1__1();
+            rule__QualifiedName__Group_1_1__1();
 
             state._fsp--;
 
@@ -10666,25 +11400,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__QualifiedName__Group_1__0"
+    // $ANTLR end "rule__QualifiedName__Group_1_1__0"
 
 
-    // $ANTLR start "rule__QualifiedName__Group_1__0__Impl"
-    // InternalProblem.g:3408:1: rule__QualifiedName__Group_1__0__Impl : ( '::' ) ;
-    public final void rule__QualifiedName__Group_1__0__Impl() throws RecognitionException {
+    // $ANTLR start "rule__QualifiedName__Group_1_1__0__Impl"
+    // InternalProblem.g:3639: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:3412:1: ( ( '::' ) )
-            // InternalProblem.g:3413:1: ( '::' )
+            // InternalProblem.g:3643:1: ( ( ':' ) )
+            // InternalProblem.g:3644:1: ( ':' )
             {
-            // InternalProblem.g:3413:1: ( '::' )
-            // InternalProblem.g:3414:2: '::'
+            // InternalProblem.g:3644:1: ( ':' )
+            // InternalProblem.g:3645:2: ':'
             {
-             before(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1_0()); 
-            match(input,34,FOLLOW_2); 
-             after(grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1_0()); 
+             before(grammarAccess.getQualifiedNameAccess().getColonKeyword_1_1_0()); 
+            match(input,35,FOLLOW_2); 
+             after(grammarAccess.getQualifiedNameAccess().getColonKeyword_1_1_0()); 
 
             }
 
@@ -10703,21 +11437,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__QualifiedName__Group_1__0__Impl"
+    // $ANTLR end "rule__QualifiedName__Group_1_1__0__Impl"
 
 
-    // $ANTLR start "rule__QualifiedName__Group_1__1"
-    // InternalProblem.g:3423:1: rule__QualifiedName__Group_1__1 : rule__QualifiedName__Group_1__1__Impl ;
-    public final void rule__QualifiedName__Group_1__1() throws RecognitionException {
+    // $ANTLR start "rule__QualifiedName__Group_1_1__1"
+    // InternalProblem.g:3654:1: rule__QualifiedName__Group_1_1__1 : rule__QualifiedName__Group_1_1__1__Impl ;
+    public final void rule__QualifiedName__Group_1_1__1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3427:1: ( rule__QualifiedName__Group_1__1__Impl )
-            // InternalProblem.g:3428:2: rule__QualifiedName__Group_1__1__Impl
+            // InternalProblem.g:3658:1: ( rule__QualifiedName__Group_1_1__1__Impl )
+            // InternalProblem.g:3659:2: rule__QualifiedName__Group_1_1__1__Impl
             {
             pushFollow(FOLLOW_2);
-            rule__QualifiedName__Group_1__1__Impl();
+            rule__QualifiedName__Group_1_1__1__Impl();
 
             state._fsp--;
 
@@ -10736,25 +11470,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__QualifiedName__Group_1__1"
+    // $ANTLR end "rule__QualifiedName__Group_1_1__1"
 
 
-    // $ANTLR start "rule__QualifiedName__Group_1__1__Impl"
-    // InternalProblem.g:3434:1: rule__QualifiedName__Group_1__1__Impl : ( RULE_ID ) ;
-    public final void rule__QualifiedName__Group_1__1__Impl() throws RecognitionException {
+    // $ANTLR start "rule__QualifiedName__Group_1_1__1__Impl"
+    // InternalProblem.g:3665:1: rule__QualifiedName__Group_1_1__1__Impl : ( RULE_ID ) ;
+    public final void rule__QualifiedName__Group_1_1__1__Impl() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3438:1: ( ( RULE_ID ) )
-            // InternalProblem.g:3439:1: ( RULE_ID )
+            // InternalProblem.g:3669:1: ( ( RULE_ID ) )
+            // InternalProblem.g:3670:1: ( RULE_ID )
             {
-            // InternalProblem.g:3439:1: ( RULE_ID )
-            // InternalProblem.g:3440:2: RULE_ID
+            // InternalProblem.g:3670:1: ( RULE_ID )
+            // InternalProblem.g:3671:2: RULE_ID
             {
-             before(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1()); 
+             before(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1_1()); 
             match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1()); 
+             after(grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1_1()); 
 
             }
 
@@ -10773,31 +11507,28 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__QualifiedName__Group_1__1__Impl"
+    // $ANTLR end "rule__QualifiedName__Group_1_1__1__Impl"
 
 
-    // $ANTLR start "rule__Problem__StatementsAssignment"
-    // InternalProblem.g:3450:1: rule__Problem__StatementsAssignment : ( ruleStatement ) ;
-    public final void rule__Problem__StatementsAssignment() throws RecognitionException {
+    // $ANTLR start "rule__QualifiedName__Group_1_2__0"
+    // InternalProblem.g:3681:1: rule__QualifiedName__Group_1_2__0 : rule__QualifiedName__Group_1_2__0__Impl rule__QualifiedName__Group_1_2__1 ;
+    public final void rule__QualifiedName__Group_1_2__0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3454:1: ( ( ruleStatement ) )
-            // InternalProblem.g:3455:2: ( ruleStatement )
-            {
-            // InternalProblem.g:3455:2: ( ruleStatement )
-            // InternalProblem.g:3456:3: ruleStatement
+            // InternalProblem.g:3685:1: ( rule__QualifiedName__Group_1_2__0__Impl rule__QualifiedName__Group_1_2__1 )
+            // InternalProblem.g:3686:2: rule__QualifiedName__Group_1_2__0__Impl rule__QualifiedName__Group_1_2__1
             {
-             before(grammarAccess.getProblemAccess().getStatementsStatementParserRuleCall_0()); 
-            pushFollow(FOLLOW_2);
-            ruleStatement();
+            pushFollow(FOLLOW_35);
+            rule__QualifiedName__Group_1_2__0__Impl();
 
             state._fsp--;
 
-             after(grammarAccess.getProblemAccess().getStatementsStatementParserRuleCall_0()); 
+            pushFollow(FOLLOW_2);
+            rule__QualifiedName__Group_1_2__1();
 
-            }
+            state._fsp--;
 
 
             }
@@ -10814,36 +11545,61 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__Problem__StatementsAssignment"
+    // $ANTLR end "rule__QualifiedName__Group_1_2__0"
 
 
-    // $ANTLR start "rule__ClassDeclaration__AbstractAssignment_0"
-    // InternalProblem.g:3465:1: rule__ClassDeclaration__AbstractAssignment_0 : ( ( 'abstract' ) ) ;
-    public final void rule__ClassDeclaration__AbstractAssignment_0() throws RecognitionException {
+    // $ANTLR start "rule__QualifiedName__Group_1_2__0__Impl"
+    // InternalProblem.g:3693: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:3469:1: ( ( ( 'abstract' ) ) )
-            // InternalProblem.g:3470:2: ( ( 'abstract' ) )
-            {
-            // InternalProblem.g:3470:2: ( ( 'abstract' ) )
-            // InternalProblem.g:3471:3: ( 'abstract' )
+            // InternalProblem.g:3697:1: ( ( ':' ) )
+            // InternalProblem.g:3698:1: ( ':' )
             {
-             before(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); 
-            // InternalProblem.g:3472:3: ( 'abstract' )
-            // InternalProblem.g:3473:4: 'abstract'
+            // InternalProblem.g:3698:1: ( ':' )
+            // InternalProblem.g:3699:2: ':'
             {
-             before(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); 
+             before(grammarAccess.getQualifiedNameAccess().getColonKeyword_1_2_0()); 
             match(input,35,FOLLOW_2); 
-             after(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); 
+             after(grammarAccess.getQualifiedNameAccess().getColonKeyword_1_2_0()); 
 
             }
 
-             after(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); 
 
             }
 
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__QualifiedName__Group_1_2__0__Impl"
+
+
+    // $ANTLR start "rule__QualifiedName__Group_1_2__1"
+    // InternalProblem.g:3708:1: rule__QualifiedName__Group_1_2__1 : rule__QualifiedName__Group_1_2__1__Impl ;
+    public final void rule__QualifiedName__Group_1_2__1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:3712:1: ( rule__QualifiedName__Group_1_2__1__Impl )
+            // InternalProblem.g:3713:2: rule__QualifiedName__Group_1_2__1__Impl
+            {
+            pushFollow(FOLLOW_2);
+            rule__QualifiedName__Group_1_2__1__Impl();
+
+            state._fsp--;
+
 
             }
 
@@ -10859,25 +11615,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__AbstractAssignment_0"
+    // $ANTLR end "rule__QualifiedName__Group_1_2__1"
 
 
-    // $ANTLR start "rule__ClassDeclaration__NameAssignment_2"
-    // InternalProblem.g:3484:1: rule__ClassDeclaration__NameAssignment_2 : ( RULE_ID ) ;
-    public final void rule__ClassDeclaration__NameAssignment_2() throws RecognitionException {
+    // $ANTLR start "rule__QualifiedName__Group_1_2__1__Impl"
+    // InternalProblem.g:3719: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:3488:1: ( ( RULE_ID ) )
-            // InternalProblem.g:3489:2: ( RULE_ID )
+            // InternalProblem.g:3723:1: ( ( RULE_QUOTED_ID ) )
+            // InternalProblem.g:3724:1: ( RULE_QUOTED_ID )
             {
-            // InternalProblem.g:3489:2: ( RULE_ID )
-            // InternalProblem.g:3490:3: RULE_ID
+            // InternalProblem.g:3724:1: ( RULE_QUOTED_ID )
+            // InternalProblem.g:3725:2: RULE_QUOTED_ID
             {
-             before(grammarAccess.getClassDeclarationAccess().getNameIDTerminalRuleCall_2_0()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getClassDeclarationAccess().getNameIDTerminalRuleCall_2_0()); 
+             before(grammarAccess.getQualifiedNameAccess().getQUOTED_IDTerminalRuleCall_1_2_1()); 
+            match(input,RULE_QUOTED_ID,FOLLOW_2); 
+             after(grammarAccess.getQualifiedNameAccess().getQUOTED_IDTerminalRuleCall_1_2_1()); 
 
             }
 
@@ -10896,33 +11652,66 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__NameAssignment_2"
+    // $ANTLR end "rule__QualifiedName__Group_1_2__1__Impl"
 
 
-    // $ANTLR start "rule__ClassDeclaration__SuperTypesAssignment_3_0_1_0"
-    // InternalProblem.g:3499:1: rule__ClassDeclaration__SuperTypesAssignment_3_0_1_0 : ( ( RULE_ID ) ) ;
-    public final void rule__ClassDeclaration__SuperTypesAssignment_3_0_1_0() throws RecognitionException {
+    // $ANTLR start "rule__Problem__NameAssignment_0_1"
+    // InternalProblem.g:3735:1: rule__Problem__NameAssignment_0_1 : ( RULE_ID ) ;
+    public final void rule__Problem__NameAssignment_0_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3503:1: ( ( ( RULE_ID ) ) )
-            // InternalProblem.g:3504:2: ( ( RULE_ID ) )
-            {
-            // InternalProblem.g:3504:2: ( ( RULE_ID ) )
-            // InternalProblem.g:3505:3: ( RULE_ID )
+            // InternalProblem.g:3739:1: ( ( RULE_ID ) )
+            // InternalProblem.g:3740:2: ( RULE_ID )
             {
-             before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_0_1_0_0()); 
-            // InternalProblem.g:3506:3: ( RULE_ID )
-            // InternalProblem.g:3507:4: RULE_ID
+            // InternalProblem.g:3740:2: ( RULE_ID )
+            // InternalProblem.g:3741:3: RULE_ID
             {
-             before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_0_0_1()); 
+             before(grammarAccess.getProblemAccess().getNameIDTerminalRuleCall_0_1_0()); 
             match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_0_0_1()); 
+             after(grammarAccess.getProblemAccess().getNameIDTerminalRuleCall_0_1_0()); 
 
             }
 
-             after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_0_1_0_0()); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Problem__NameAssignment_0_1"
+
+
+    // $ANTLR start "rule__Problem__StatementsAssignment_1"
+    // InternalProblem.g:3750:1: rule__Problem__StatementsAssignment_1 : ( ruleStatement ) ;
+    public final void rule__Problem__StatementsAssignment_1() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:3754:1: ( ( ruleStatement ) )
+            // InternalProblem.g:3755:2: ( ruleStatement )
+            {
+            // InternalProblem.g:3755:2: ( ruleStatement )
+            // InternalProblem.g:3756:3: ruleStatement
+            {
+             before(grammarAccess.getProblemAccess().getStatementsStatementParserRuleCall_1_0()); 
+            pushFollow(FOLLOW_2);
+            ruleStatement();
+
+            state._fsp--;
+
+             after(grammarAccess.getProblemAccess().getStatementsStatementParserRuleCall_1_0()); 
 
             }
 
@@ -10941,33 +11730,70 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__SuperTypesAssignment_3_0_1_0"
+    // $ANTLR end "rule__Problem__StatementsAssignment_1"
 
 
-    // $ANTLR start "rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_0"
-    // InternalProblem.g:3518:1: rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_0 : ( ( RULE_ID ) ) ;
-    public final void rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_0() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__AbstractAssignment_0"
+    // InternalProblem.g:3765:1: rule__ClassDeclaration__AbstractAssignment_0 : ( ( 'abstract' ) ) ;
+    public final void rule__ClassDeclaration__AbstractAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3522:1: ( ( ( RULE_ID ) ) )
-            // InternalProblem.g:3523:2: ( ( RULE_ID ) )
+            // InternalProblem.g:3769:1: ( ( ( 'abstract' ) ) )
+            // InternalProblem.g:3770:2: ( ( 'abstract' ) )
             {
-            // InternalProblem.g:3523:2: ( ( RULE_ID ) )
-            // InternalProblem.g:3524:3: ( RULE_ID )
+            // InternalProblem.g:3770:2: ( ( 'abstract' ) )
+            // InternalProblem.g:3771:3: ( 'abstract' )
             {
-             before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_0_1_1_1_0_0()); 
-            // InternalProblem.g:3525:3: ( RULE_ID )
-            // InternalProblem.g:3526:4: RULE_ID
+             before(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); 
+            // InternalProblem.g:3772:3: ( 'abstract' )
+            // InternalProblem.g:3773:4: 'abstract'
             {
-             before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_1_1_0_0_1()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_1_1_0_0_1()); 
+             before(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); 
+            match(input,38,FOLLOW_2); 
+             after(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); 
+
+            }
+
+             after(grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0()); 
 
             }
 
-             after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_0_1_1_1_0_0()); 
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__ClassDeclaration__AbstractAssignment_0"
+
+
+    // $ANTLR start "rule__ClassDeclaration__NameAssignment_2"
+    // InternalProblem.g:3784:1: rule__ClassDeclaration__NameAssignment_2 : ( RULE_ID ) ;
+    public final void rule__ClassDeclaration__NameAssignment_2() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:3788:1: ( ( RULE_ID ) )
+            // InternalProblem.g:3789:2: ( RULE_ID )
+            {
+            // InternalProblem.g:3789:2: ( RULE_ID )
+            // InternalProblem.g:3790:3: RULE_ID
+            {
+             before(grammarAccess.getClassDeclarationAccess().getNameIDTerminalRuleCall_2_0()); 
+            match(input,RULE_ID,FOLLOW_2); 
+             after(grammarAccess.getClassDeclarationAccess().getNameIDTerminalRuleCall_2_0()); 
 
             }
 
@@ -10986,33 +11812,37 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_0"
+    // $ANTLR end "rule__ClassDeclaration__NameAssignment_2"
 
 
-    // $ANTLR start "rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_1_1"
-    // InternalProblem.g:3537:1: rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_1_1 : ( ( RULE_ID ) ) ;
-    public final void rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_1_1() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__SuperTypesAssignment_3_1"
+    // InternalProblem.g:3799:1: rule__ClassDeclaration__SuperTypesAssignment_3_1 : ( ( ruleQualifiedName ) ) ;
+    public final void rule__ClassDeclaration__SuperTypesAssignment_3_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3541:1: ( ( ( RULE_ID ) ) )
-            // InternalProblem.g:3542:2: ( ( RULE_ID ) )
+            // InternalProblem.g:3803:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:3804:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:3542:2: ( ( RULE_ID ) )
-            // InternalProblem.g:3543:3: ( RULE_ID )
+            // InternalProblem.g:3804:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:3805:3: ( ruleQualifiedName )
             {
-             before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_0_1_1_1_1_1_0()); 
-            // InternalProblem.g:3544:3: ( RULE_ID )
-            // InternalProblem.g:3545:4: RULE_ID
+             before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_1_0()); 
+            // InternalProblem.g:3806:3: ( ruleQualifiedName )
+            // InternalProblem.g:3807:4: ruleQualifiedName
             {
-             before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_1_1_1_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_1_1_1_1_0_1()); 
+             before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_1_0_1()); 
+            pushFollow(FOLLOW_2);
+            ruleQualifiedName();
+
+            state._fsp--;
+
+             after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_1_0_1()); 
 
             }
 
-             after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_0_1_1_1_1_1_0()); 
+             after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_1_0()); 
 
             }
 
@@ -11031,29 +11861,37 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__SuperTypesAssignment_3_0_1_1_1_1_1"
+    // $ANTLR end "rule__ClassDeclaration__SuperTypesAssignment_3_1"
 
 
-    // $ANTLR start "rule__ClassDeclaration__ReferenceDeclarationsAssignment_3_1"
-    // InternalProblem.g:3556:1: rule__ClassDeclaration__ReferenceDeclarationsAssignment_3_1 : ( ruleReferenceDeclaration ) ;
-    public final void rule__ClassDeclaration__ReferenceDeclarationsAssignment_3_1() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__SuperTypesAssignment_3_2_1"
+    // InternalProblem.g:3818: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:3560:1: ( ( ruleReferenceDeclaration ) )
-            // InternalProblem.g:3561:2: ( ruleReferenceDeclaration )
+            // InternalProblem.g:3822:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:3823:2: ( ( ruleQualifiedName ) )
+            {
+            // InternalProblem.g:3823:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:3824:3: ( ruleQualifiedName )
             {
-            // InternalProblem.g:3561:2: ( ruleReferenceDeclaration )
-            // InternalProblem.g:3562:3: ruleReferenceDeclaration
+             before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_2_1_0()); 
+            // InternalProblem.g:3825:3: ( ruleQualifiedName )
+            // InternalProblem.g:3826:4: ruleQualifiedName
             {
-             before(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_3_1_0()); 
+             before(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_2_1_0_1()); 
             pushFollow(FOLLOW_2);
-            ruleReferenceDeclaration();
+            ruleQualifiedName();
 
             state._fsp--;
 
-             after(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_3_1_0()); 
+             after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_2_1_0_1()); 
+
+            }
+
+             after(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_2_1_0()); 
 
             }
 
@@ -11072,29 +11910,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__ReferenceDeclarationsAssignment_3_1"
+    // $ANTLR end "rule__ClassDeclaration__SuperTypesAssignment_3_2_1"
 
 
-    // $ANTLR start "rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_1"
-    // InternalProblem.g:3571:1: rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_1 : ( ruleReferenceDeclaration ) ;
-    public final void rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_1() throws RecognitionException {
+    // $ANTLR start "rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0"
+    // InternalProblem.g:3837: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:3575:1: ( ( ruleReferenceDeclaration ) )
-            // InternalProblem.g:3576:2: ( ruleReferenceDeclaration )
+            // InternalProblem.g:3841:1: ( ( ruleReferenceDeclaration ) )
+            // InternalProblem.g:3842:2: ( ruleReferenceDeclaration )
             {
-            // InternalProblem.g:3576:2: ( ruleReferenceDeclaration )
-            // InternalProblem.g:3577:3: ruleReferenceDeclaration
+            // InternalProblem.g:3842:2: ( ruleReferenceDeclaration )
+            // InternalProblem.g:3843:3: ruleReferenceDeclaration
             {
-             before(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_1_0()); 
+             before(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_0_1_0_0()); 
             pushFollow(FOLLOW_2);
             ruleReferenceDeclaration();
 
             state._fsp--;
 
-             after(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_1_0()); 
+             after(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_0_1_0_0()); 
 
             }
 
@@ -11113,28 +11951,28 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_1"
+    // $ANTLR end "rule__ClassDeclaration__ReferenceDeclarationsAssignment_4_0_1_0"
 
 
     // $ANTLR start "rule__ReferenceDeclaration__ContainmentAssignment_0_0"
-    // InternalProblem.g:3586:1: rule__ReferenceDeclaration__ContainmentAssignment_0_0 : ( ( 'contains' ) ) ;
+    // InternalProblem.g:3852:1: rule__ReferenceDeclaration__ContainmentAssignment_0_0 : ( ( 'contains' ) ) ;
     public final void rule__ReferenceDeclaration__ContainmentAssignment_0_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3590:1: ( ( ( 'contains' ) ) )
-            // InternalProblem.g:3591:2: ( ( 'contains' ) )
+            // InternalProblem.g:3856:1: ( ( ( 'contains' ) ) )
+            // InternalProblem.g:3857:2: ( ( 'contains' ) )
             {
-            // InternalProblem.g:3591:2: ( ( 'contains' ) )
-            // InternalProblem.g:3592:3: ( 'contains' )
+            // InternalProblem.g:3857:2: ( ( 'contains' ) )
+            // InternalProblem.g:3858:3: ( 'contains' )
             {
              before(grammarAccess.getReferenceDeclarationAccess().getContainmentContainsKeyword_0_0_0()); 
-            // InternalProblem.g:3593:3: ( 'contains' )
-            // InternalProblem.g:3594:4: 'contains'
+            // InternalProblem.g:3859:3: ( 'contains' )
+            // InternalProblem.g:3860:4: 'contains'
             {
              before(grammarAccess.getReferenceDeclarationAccess().getContainmentContainsKeyword_0_0_0()); 
-            match(input,36,FOLLOW_2); 
+            match(input,39,FOLLOW_2); 
              after(grammarAccess.getReferenceDeclarationAccess().getContainmentContainsKeyword_0_0_0()); 
 
             }
@@ -11162,25 +12000,29 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ReferenceDeclaration__ReferenceTypeAssignment_1"
-    // InternalProblem.g:3605:1: rule__ReferenceDeclaration__ReferenceTypeAssignment_1 : ( ( RULE_ID ) ) ;
+    // InternalProblem.g:3871:1: rule__ReferenceDeclaration__ReferenceTypeAssignment_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__ReferenceDeclaration__ReferenceTypeAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3609:1: ( ( ( RULE_ID ) ) )
-            // InternalProblem.g:3610:2: ( ( RULE_ID ) )
+            // InternalProblem.g:3875:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:3876:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:3610:2: ( ( RULE_ID ) )
-            // InternalProblem.g:3611:3: ( RULE_ID )
+            // InternalProblem.g:3876:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:3877:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationCrossReference_1_0()); 
-            // InternalProblem.g:3612:3: ( RULE_ID )
-            // InternalProblem.g:3613:4: RULE_ID
+            // InternalProblem.g:3878:3: ( ruleQualifiedName )
+            // InternalProblem.g:3879:4: ruleQualifiedName
             {
-             before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationIDTerminalRuleCall_1_0_1()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationIDTerminalRuleCall_1_0_1()); 
+             before(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationQualifiedNameParserRuleCall_1_0_1()); 
+            pushFollow(FOLLOW_2);
+            ruleQualifiedName();
+
+            state._fsp--;
+
+             after(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationQualifiedNameParserRuleCall_1_0_1()); 
 
             }
 
@@ -11206,26 +12048,26 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // $ANTLR end "rule__ReferenceDeclaration__ReferenceTypeAssignment_1"
 
 
-    // $ANTLR start "rule__ReferenceDeclaration__MultiplicityAssignment_3"
-    // InternalProblem.g:3624:1: rule__ReferenceDeclaration__MultiplicityAssignment_3 : ( ruleMultiplicity ) ;
-    public final void rule__ReferenceDeclaration__MultiplicityAssignment_3() throws RecognitionException {
+    // $ANTLR start "rule__ReferenceDeclaration__MultiplicityAssignment_2_1"
+    // InternalProblem.g:3890:1: rule__ReferenceDeclaration__MultiplicityAssignment_2_1 : ( ruleMultiplicity ) ;
+    public final void rule__ReferenceDeclaration__MultiplicityAssignment_2_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3628:1: ( ( ruleMultiplicity ) )
-            // InternalProblem.g:3629:2: ( ruleMultiplicity )
+            // InternalProblem.g:3894:1: ( ( ruleMultiplicity ) )
+            // InternalProblem.g:3895:2: ( ruleMultiplicity )
             {
-            // InternalProblem.g:3629:2: ( ruleMultiplicity )
-            // InternalProblem.g:3630:3: ruleMultiplicity
+            // InternalProblem.g:3895:2: ( ruleMultiplicity )
+            // InternalProblem.g:3896:3: ruleMultiplicity
             {
-             before(grammarAccess.getReferenceDeclarationAccess().getMultiplicityMultiplicityParserRuleCall_3_0()); 
+             before(grammarAccess.getReferenceDeclarationAccess().getMultiplicityMultiplicityParserRuleCall_2_1_0()); 
             pushFollow(FOLLOW_2);
             ruleMultiplicity();
 
             state._fsp--;
 
-             after(grammarAccess.getReferenceDeclarationAccess().getMultiplicityMultiplicityParserRuleCall_3_0()); 
+             after(grammarAccess.getReferenceDeclarationAccess().getMultiplicityMultiplicityParserRuleCall_2_1_0()); 
 
             }
 
@@ -11244,25 +12086,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ReferenceDeclaration__MultiplicityAssignment_3"
+    // $ANTLR end "rule__ReferenceDeclaration__MultiplicityAssignment_2_1"
 
 
-    // $ANTLR start "rule__ReferenceDeclaration__NameAssignment_5"
-    // InternalProblem.g:3639:1: rule__ReferenceDeclaration__NameAssignment_5 : ( RULE_ID ) ;
-    public final void rule__ReferenceDeclaration__NameAssignment_5() throws RecognitionException {
+    // $ANTLR start "rule__ReferenceDeclaration__NameAssignment_3"
+    // InternalProblem.g:3905:1: rule__ReferenceDeclaration__NameAssignment_3 : ( RULE_ID ) ;
+    public final void rule__ReferenceDeclaration__NameAssignment_3() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3643:1: ( ( RULE_ID ) )
-            // InternalProblem.g:3644:2: ( RULE_ID )
+            // InternalProblem.g:3909:1: ( ( RULE_ID ) )
+            // InternalProblem.g:3910:2: ( RULE_ID )
             {
-            // InternalProblem.g:3644:2: ( RULE_ID )
-            // InternalProblem.g:3645:3: RULE_ID
+            // InternalProblem.g:3910:2: ( RULE_ID )
+            // InternalProblem.g:3911:3: RULE_ID
             {
-             before(grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_5_0()); 
+             before(grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_3_0()); 
             match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_5_0()); 
+             after(grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_3_0()); 
 
             }
 
@@ -11281,37 +12123,37 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ReferenceDeclaration__NameAssignment_5"
+    // $ANTLR end "rule__ReferenceDeclaration__NameAssignment_3"
 
 
-    // $ANTLR start "rule__ReferenceDeclaration__OppositeAssignment_6_1"
-    // InternalProblem.g:3654:1: rule__ReferenceDeclaration__OppositeAssignment_6_1 : ( ( ruleQualifiedName ) ) ;
-    public final void rule__ReferenceDeclaration__OppositeAssignment_6_1() throws RecognitionException {
+    // $ANTLR start "rule__ReferenceDeclaration__OppositeAssignment_4_1"
+    // InternalProblem.g:3920:1: rule__ReferenceDeclaration__OppositeAssignment_4_1 : ( ( ruleQualifiedName ) ) ;
+    public final void rule__ReferenceDeclaration__OppositeAssignment_4_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3658:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:3659:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:3924:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:3925:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:3659:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:3660:3: ( ruleQualifiedName )
+            // InternalProblem.g:3925:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:3926:3: ( ruleQualifiedName )
             {
-             before(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationCrossReference_6_1_0()); 
-            // InternalProblem.g:3661:3: ( ruleQualifiedName )
-            // InternalProblem.g:3662:4: ruleQualifiedName
+             before(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationCrossReference_4_1_0()); 
+            // InternalProblem.g:3927:3: ( ruleQualifiedName )
+            // InternalProblem.g:3928:4: ruleQualifiedName
             {
-             before(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationQualifiedNameParserRuleCall_6_1_0_1()); 
+             before(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationQualifiedNameParserRuleCall_4_1_0_1()); 
             pushFollow(FOLLOW_2);
             ruleQualifiedName();
 
             state._fsp--;
 
-             after(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationQualifiedNameParserRuleCall_6_1_0_1()); 
+             after(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationQualifiedNameParserRuleCall_4_1_0_1()); 
 
             }
 
-             after(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationCrossReference_6_1_0()); 
+             after(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationCrossReference_4_1_0()); 
 
             }
 
@@ -11330,28 +12172,28 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__ReferenceDeclaration__OppositeAssignment_6_1"
+    // $ANTLR end "rule__ReferenceDeclaration__OppositeAssignment_4_1"
 
 
     // $ANTLR start "rule__PredicateDefinition__ErrorAssignment_0_0_0"
-    // InternalProblem.g:3673:1: rule__PredicateDefinition__ErrorAssignment_0_0_0 : ( ( 'error' ) ) ;
+    // InternalProblem.g:3939: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:3677:1: ( ( ( 'error' ) ) )
-            // InternalProblem.g:3678:2: ( ( 'error' ) )
+            // InternalProblem.g:3943:1: ( ( ( 'error' ) ) )
+            // InternalProblem.g:3944:2: ( ( 'error' ) )
             {
-            // InternalProblem.g:3678:2: ( ( 'error' ) )
-            // InternalProblem.g:3679:3: ( 'error' )
+            // InternalProblem.g:3944:2: ( ( 'error' ) )
+            // InternalProblem.g:3945:3: ( 'error' )
             {
              before(grammarAccess.getPredicateDefinitionAccess().getErrorErrorKeyword_0_0_0_0()); 
-            // InternalProblem.g:3680:3: ( 'error' )
-            // InternalProblem.g:3681:4: 'error'
+            // InternalProblem.g:3946:3: ( 'error' )
+            // InternalProblem.g:3947:4: 'error'
             {
              before(grammarAccess.getPredicateDefinitionAccess().getErrorErrorKeyword_0_0_0_0()); 
-            match(input,37,FOLLOW_2); 
+            match(input,40,FOLLOW_2); 
              after(grammarAccess.getPredicateDefinitionAccess().getErrorErrorKeyword_0_0_0_0()); 
 
             }
@@ -11379,17 +12221,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__NameAssignment_1"
-    // InternalProblem.g:3692:1: rule__PredicateDefinition__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalProblem.g:3958:1: rule__PredicateDefinition__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__PredicateDefinition__NameAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3696:1: ( ( RULE_ID ) )
-            // InternalProblem.g:3697:2: ( RULE_ID )
+            // InternalProblem.g:3962:1: ( ( RULE_ID ) )
+            // InternalProblem.g:3963:2: ( RULE_ID )
             {
-            // InternalProblem.g:3697:2: ( RULE_ID )
-            // InternalProblem.g:3698:3: RULE_ID
+            // InternalProblem.g:3963:2: ( RULE_ID )
+            // InternalProblem.g:3964:3: RULE_ID
             {
              before(grammarAccess.getPredicateDefinitionAccess().getNameIDTerminalRuleCall_1_0()); 
             match(input,RULE_ID,FOLLOW_2); 
@@ -11416,17 +12258,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__ParametersAssignment_3_0"
-    // InternalProblem.g:3707:1: rule__PredicateDefinition__ParametersAssignment_3_0 : ( ruleParameter ) ;
+    // InternalProblem.g:3973:1: rule__PredicateDefinition__ParametersAssignment_3_0 : ( ruleParameter ) ;
     public final void rule__PredicateDefinition__ParametersAssignment_3_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3711:1: ( ( ruleParameter ) )
-            // InternalProblem.g:3712:2: ( ruleParameter )
+            // InternalProblem.g:3977:1: ( ( ruleParameter ) )
+            // InternalProblem.g:3978:2: ( ruleParameter )
             {
-            // InternalProblem.g:3712:2: ( ruleParameter )
-            // InternalProblem.g:3713:3: ruleParameter
+            // InternalProblem.g:3978:2: ( ruleParameter )
+            // InternalProblem.g:3979:3: ruleParameter
             {
              before(grammarAccess.getPredicateDefinitionAccess().getParametersParameterParserRuleCall_3_0_0()); 
             pushFollow(FOLLOW_2);
@@ -11457,17 +12299,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__ParametersAssignment_3_1_1"
-    // InternalProblem.g:3722:1: rule__PredicateDefinition__ParametersAssignment_3_1_1 : ( ruleParameter ) ;
+    // InternalProblem.g:3988: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:3726:1: ( ( ruleParameter ) )
-            // InternalProblem.g:3727:2: ( ruleParameter )
+            // InternalProblem.g:3992:1: ( ( ruleParameter ) )
+            // InternalProblem.g:3993:2: ( ruleParameter )
             {
-            // InternalProblem.g:3727:2: ( ruleParameter )
-            // InternalProblem.g:3728:3: ruleParameter
+            // InternalProblem.g:3993:2: ( ruleParameter )
+            // InternalProblem.g:3994:3: ruleParameter
             {
              before(grammarAccess.getPredicateDefinitionAccess().getParametersParameterParserRuleCall_3_1_1_0()); 
             pushFollow(FOLLOW_2);
@@ -11498,17 +12340,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__BodiesAssignment_5_1"
-    // InternalProblem.g:3737:1: rule__PredicateDefinition__BodiesAssignment_5_1 : ( ruleConjunction ) ;
+    // InternalProblem.g:4003:1: rule__PredicateDefinition__BodiesAssignment_5_1 : ( ruleConjunction ) ;
     public final void rule__PredicateDefinition__BodiesAssignment_5_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3741:1: ( ( ruleConjunction ) )
-            // InternalProblem.g:3742:2: ( ruleConjunction )
+            // InternalProblem.g:4007:1: ( ( ruleConjunction ) )
+            // InternalProblem.g:4008:2: ( ruleConjunction )
             {
-            // InternalProblem.g:3742:2: ( ruleConjunction )
-            // InternalProblem.g:3743:3: ruleConjunction
+            // InternalProblem.g:4008:2: ( ruleConjunction )
+            // InternalProblem.g:4009:3: ruleConjunction
             {
              before(grammarAccess.getPredicateDefinitionAccess().getBodiesConjunctionParserRuleCall_5_1_0()); 
             pushFollow(FOLLOW_2);
@@ -11539,17 +12381,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__PredicateDefinition__BodiesAssignment_5_2_1"
-    // InternalProblem.g:3752:1: rule__PredicateDefinition__BodiesAssignment_5_2_1 : ( ruleConjunction ) ;
+    // InternalProblem.g:4018: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:3756:1: ( ( ruleConjunction ) )
-            // InternalProblem.g:3757:2: ( ruleConjunction )
+            // InternalProblem.g:4022:1: ( ( ruleConjunction ) )
+            // InternalProblem.g:4023:2: ( ruleConjunction )
             {
-            // InternalProblem.g:3757:2: ( ruleConjunction )
-            // InternalProblem.g:3758:3: ruleConjunction
+            // InternalProblem.g:4023:2: ( ruleConjunction )
+            // InternalProblem.g:4024:3: ruleConjunction
             {
              before(grammarAccess.getPredicateDefinitionAccess().getBodiesConjunctionParserRuleCall_5_2_1_0()); 
             pushFollow(FOLLOW_2);
@@ -11580,21 +12422,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Parameter__ParameterTypeAssignment_0"
-    // InternalProblem.g:3767:1: rule__Parameter__ParameterTypeAssignment_0 : ( ( RULE_ID ) ) ;
+    // InternalProblem.g:4033:1: rule__Parameter__ParameterTypeAssignment_0 : ( ( RULE_ID ) ) ;
     public final void rule__Parameter__ParameterTypeAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3771:1: ( ( ( RULE_ID ) ) )
-            // InternalProblem.g:3772:2: ( ( RULE_ID ) )
+            // InternalProblem.g:4037:1: ( ( ( RULE_ID ) ) )
+            // InternalProblem.g:4038:2: ( ( RULE_ID ) )
             {
-            // InternalProblem.g:3772:2: ( ( RULE_ID ) )
-            // InternalProblem.g:3773:3: ( RULE_ID )
+            // InternalProblem.g:4038:2: ( ( RULE_ID ) )
+            // InternalProblem.g:4039:3: ( RULE_ID )
             {
              before(grammarAccess.getParameterAccess().getParameterTypeClassDeclarationCrossReference_0_0()); 
-            // InternalProblem.g:3774:3: ( RULE_ID )
-            // InternalProblem.g:3775:4: RULE_ID
+            // InternalProblem.g:4040:3: ( RULE_ID )
+            // InternalProblem.g:4041:4: RULE_ID
             {
              before(grammarAccess.getParameterAccess().getParameterTypeClassDeclarationIDTerminalRuleCall_0_0_1()); 
             match(input,RULE_ID,FOLLOW_2); 
@@ -11625,17 +12467,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Parameter__NameAssignment_1"
-    // InternalProblem.g:3786:1: rule__Parameter__NameAssignment_1 : ( RULE_ID ) ;
+    // InternalProblem.g:4052:1: rule__Parameter__NameAssignment_1 : ( RULE_ID ) ;
     public final void rule__Parameter__NameAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3790:1: ( ( RULE_ID ) )
-            // InternalProblem.g:3791:2: ( RULE_ID )
+            // InternalProblem.g:4056:1: ( ( RULE_ID ) )
+            // InternalProblem.g:4057:2: ( RULE_ID )
             {
-            // InternalProblem.g:3791:2: ( RULE_ID )
-            // InternalProblem.g:3792:3: RULE_ID
+            // InternalProblem.g:4057:2: ( RULE_ID )
+            // InternalProblem.g:4058:3: RULE_ID
             {
              before(grammarAccess.getParameterAccess().getNameIDTerminalRuleCall_1_0()); 
             match(input,RULE_ID,FOLLOW_2); 
@@ -11662,17 +12504,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__LiteralsAssignment_0"
-    // InternalProblem.g:3801:1: rule__Conjunction__LiteralsAssignment_0 : ( ruleLiteral ) ;
+    // InternalProblem.g:4067:1: rule__Conjunction__LiteralsAssignment_0 : ( ruleLiteral ) ;
     public final void rule__Conjunction__LiteralsAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3805:1: ( ( ruleLiteral ) )
-            // InternalProblem.g:3806:2: ( ruleLiteral )
+            // InternalProblem.g:4071:1: ( ( ruleLiteral ) )
+            // InternalProblem.g:4072:2: ( ruleLiteral )
             {
-            // InternalProblem.g:3806:2: ( ruleLiteral )
-            // InternalProblem.g:3807:3: ruleLiteral
+            // InternalProblem.g:4072:2: ( ruleLiteral )
+            // InternalProblem.g:4073:3: ruleLiteral
             {
              before(grammarAccess.getConjunctionAccess().getLiteralsLiteralParserRuleCall_0_0()); 
             pushFollow(FOLLOW_2);
@@ -11703,17 +12545,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Conjunction__LiteralsAssignment_1_1"
-    // InternalProblem.g:3816:1: rule__Conjunction__LiteralsAssignment_1_1 : ( ruleLiteral ) ;
+    // InternalProblem.g:4082:1: rule__Conjunction__LiteralsAssignment_1_1 : ( ruleLiteral ) ;
     public final void rule__Conjunction__LiteralsAssignment_1_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3820:1: ( ( ruleLiteral ) )
-            // InternalProblem.g:3821:2: ( ruleLiteral )
+            // InternalProblem.g:4086:1: ( ( ruleLiteral ) )
+            // InternalProblem.g:4087:2: ( ruleLiteral )
             {
-            // InternalProblem.g:3821:2: ( ruleLiteral )
-            // InternalProblem.g:3822:3: ruleLiteral
+            // InternalProblem.g:4087:2: ( ruleLiteral )
+            // InternalProblem.g:4088:3: ruleLiteral
             {
              before(grammarAccess.getConjunctionAccess().getLiteralsLiteralParserRuleCall_1_1_0()); 
             pushFollow(FOLLOW_2);
@@ -11744,17 +12586,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__NegativeLiteral__AtomAssignment_1"
-    // InternalProblem.g:3831:1: rule__NegativeLiteral__AtomAssignment_1 : ( ruleAtom ) ;
+    // InternalProblem.g:4097:1: rule__NegativeLiteral__AtomAssignment_1 : ( ruleAtom ) ;
     public final void rule__NegativeLiteral__AtomAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3835:1: ( ( ruleAtom ) )
-            // InternalProblem.g:3836:2: ( ruleAtom )
+            // InternalProblem.g:4101:1: ( ( ruleAtom ) )
+            // InternalProblem.g:4102:2: ( ruleAtom )
             {
-            // InternalProblem.g:3836:2: ( ruleAtom )
-            // InternalProblem.g:3837:3: ruleAtom
+            // InternalProblem.g:4102:2: ( ruleAtom )
+            // InternalProblem.g:4103:3: ruleAtom
             {
              before(grammarAccess.getNegativeLiteralAccess().getAtomAtomParserRuleCall_1_0()); 
             pushFollow(FOLLOW_2);
@@ -11785,21 +12627,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__RelationAssignment_0"
-    // InternalProblem.g:3846:1: rule__Atom__RelationAssignment_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:4112:1: rule__Atom__RelationAssignment_0 : ( ( ruleQualifiedName ) ) ;
     public final void rule__Atom__RelationAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3850:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:3851:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4116:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4117:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:3851:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:3852:3: ( ruleQualifiedName )
+            // InternalProblem.g:4117:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4118:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getAtomAccess().getRelationRelationCrossReference_0_0()); 
-            // InternalProblem.g:3853:3: ( ruleQualifiedName )
-            // InternalProblem.g:3854:4: ruleQualifiedName
+            // InternalProblem.g:4119:3: ( ruleQualifiedName )
+            // InternalProblem.g:4120:4: ruleQualifiedName
             {
              before(grammarAccess.getAtomAccess().getRelationRelationQualifiedNameParserRuleCall_0_0_1()); 
             pushFollow(FOLLOW_2);
@@ -11834,24 +12676,24 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__TransitiveClosureAssignment_1"
-    // InternalProblem.g:3865:1: rule__Atom__TransitiveClosureAssignment_1 : ( ( '+' ) ) ;
+    // InternalProblem.g:4131:1: rule__Atom__TransitiveClosureAssignment_1 : ( ( '+' ) ) ;
     public final void rule__Atom__TransitiveClosureAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3869:1: ( ( ( '+' ) ) )
-            // InternalProblem.g:3870:2: ( ( '+' ) )
+            // InternalProblem.g:4135:1: ( ( ( '+' ) ) )
+            // InternalProblem.g:4136:2: ( ( '+' ) )
             {
-            // InternalProblem.g:3870:2: ( ( '+' ) )
-            // InternalProblem.g:3871:3: ( '+' )
+            // InternalProblem.g:4136:2: ( ( '+' ) )
+            // InternalProblem.g:4137:3: ( '+' )
             {
              before(grammarAccess.getAtomAccess().getTransitiveClosurePlusSignKeyword_1_0()); 
-            // InternalProblem.g:3872:3: ( '+' )
-            // InternalProblem.g:3873:4: '+'
+            // InternalProblem.g:4138:3: ( '+' )
+            // InternalProblem.g:4139:4: '+'
             {
              before(grammarAccess.getAtomAccess().getTransitiveClosurePlusSignKeyword_1_0()); 
-            match(input,38,FOLLOW_2); 
+            match(input,41,FOLLOW_2); 
              after(grammarAccess.getAtomAccess().getTransitiveClosurePlusSignKeyword_1_0()); 
 
             }
@@ -11879,29 +12721,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__ArgumentsAssignment_3_0"
-    // InternalProblem.g:3884:1: rule__Atom__ArgumentsAssignment_3_0 : ( ( RULE_ID ) ) ;
+    // InternalProblem.g:4150:1: rule__Atom__ArgumentsAssignment_3_0 : ( ruleArgument ) ;
     public final void rule__Atom__ArgumentsAssignment_3_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3888:1: ( ( ( RULE_ID ) ) )
-            // InternalProblem.g:3889:2: ( ( RULE_ID ) )
+            // InternalProblem.g:4154:1: ( ( ruleArgument ) )
+            // InternalProblem.g:4155:2: ( ruleArgument )
             {
-            // InternalProblem.g:3889:2: ( ( RULE_ID ) )
-            // InternalProblem.g:3890:3: ( RULE_ID )
+            // InternalProblem.g:4155:2: ( ruleArgument )
+            // InternalProblem.g:4156:3: ruleArgument
             {
-             before(grammarAccess.getAtomAccess().getArgumentsVariableCrossReference_3_0_0()); 
-            // InternalProblem.g:3891:3: ( RULE_ID )
-            // InternalProblem.g:3892:4: RULE_ID
-            {
-             before(grammarAccess.getAtomAccess().getArgumentsVariableIDTerminalRuleCall_3_0_0_1()); 
-            match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getAtomAccess().getArgumentsVariableIDTerminalRuleCall_3_0_0_1()); 
+             before(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_0_0()); 
+            pushFollow(FOLLOW_2);
+            ruleArgument();
 
-            }
+            state._fsp--;
 
-             after(grammarAccess.getAtomAccess().getArgumentsVariableCrossReference_3_0_0()); 
+             after(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_0_0()); 
 
             }
 
@@ -11924,29 +12762,70 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Atom__ArgumentsAssignment_3_1_1"
-    // InternalProblem.g:3903:1: rule__Atom__ArgumentsAssignment_3_1_1 : ( ( RULE_ID ) ) ;
+    // InternalProblem.g:4165: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:3907:1: ( ( ( RULE_ID ) ) )
-            // InternalProblem.g:3908:2: ( ( RULE_ID ) )
+            // InternalProblem.g:4169:1: ( ( ruleArgument ) )
+            // InternalProblem.g:4170:2: ( ruleArgument )
             {
-            // InternalProblem.g:3908:2: ( ( RULE_ID ) )
-            // InternalProblem.g:3909:3: ( RULE_ID )
+            // InternalProblem.g:4170:2: ( ruleArgument )
+            // InternalProblem.g:4171:3: ruleArgument
             {
-             before(grammarAccess.getAtomAccess().getArgumentsVariableCrossReference_3_1_1_0()); 
-            // InternalProblem.g:3910:3: ( RULE_ID )
-            // InternalProblem.g:3911:4: RULE_ID
+             before(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_1_1_0()); 
+            pushFollow(FOLLOW_2);
+            ruleArgument();
+
+            state._fsp--;
+
+             after(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_1_1_0()); 
+
+            }
+
+
+            }
+
+        }
+        catch (RecognitionException re) {
+            reportError(re);
+            recover(input,re);
+        }
+        finally {
+
+                restoreStackSize(stackSize);
+
+        }
+        return ;
+    }
+    // $ANTLR end "rule__Atom__ArgumentsAssignment_3_1_1"
+
+
+    // $ANTLR start "rule__Argument__VariableAssignment"
+    // InternalProblem.g:4180:1: rule__Argument__VariableAssignment : ( ( RULE_ID ) ) ;
+    public final void rule__Argument__VariableAssignment() throws RecognitionException {
+
+                        int stackSize = keepStackSize();
+                
+        try {
+            // InternalProblem.g:4184:1: ( ( ( RULE_ID ) ) )
+            // InternalProblem.g:4185:2: ( ( RULE_ID ) )
             {
-             before(grammarAccess.getAtomAccess().getArgumentsVariableIDTerminalRuleCall_3_1_1_0_1()); 
+            // InternalProblem.g:4185:2: ( ( RULE_ID ) )
+            // InternalProblem.g:4186:3: ( RULE_ID )
+            {
+             before(grammarAccess.getArgumentAccess().getVariableVariableCrossReference_0()); 
+            // InternalProblem.g:4187:3: ( RULE_ID )
+            // InternalProblem.g:4188:4: RULE_ID
+            {
+             before(grammarAccess.getArgumentAccess().getVariableVariableIDTerminalRuleCall_0_1()); 
             match(input,RULE_ID,FOLLOW_2); 
-             after(grammarAccess.getAtomAccess().getArgumentsVariableIDTerminalRuleCall_3_1_1_0_1()); 
+             after(grammarAccess.getArgumentAccess().getVariableVariableIDTerminalRuleCall_0_1()); 
 
             }
 
-             after(grammarAccess.getAtomAccess().getArgumentsVariableCrossReference_3_1_1_0()); 
+             after(grammarAccess.getArgumentAccess().getVariableVariableCrossReference_0()); 
 
             }
 
@@ -11965,25 +12844,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
         }
         return ;
     }
-    // $ANTLR end "rule__Atom__ArgumentsAssignment_3_1_1"
+    // $ANTLR end "rule__Argument__VariableAssignment"
 
 
     // $ANTLR start "rule__Assertion__RelationAssignment_0_0_0"
-    // InternalProblem.g:3922:1: rule__Assertion__RelationAssignment_0_0_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:4199: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:3926:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:3927:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4203:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4204:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:3927:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:3928:3: ( ruleQualifiedName )
+            // InternalProblem.g:4204:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4205:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getAssertionAccess().getRelationRelationCrossReference_0_0_0_0()); 
-            // InternalProblem.g:3929:3: ( ruleQualifiedName )
-            // InternalProblem.g:3930:4: ruleQualifiedName
+            // InternalProblem.g:4206:3: ( ruleQualifiedName )
+            // InternalProblem.g:4207:4: ruleQualifiedName
             {
              before(grammarAccess.getAssertionAccess().getRelationRelationQualifiedNameParserRuleCall_0_0_0_0_1()); 
             pushFollow(FOLLOW_2);
@@ -12018,21 +12897,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__ArgumentsAssignment_0_0_2_0"
-    // InternalProblem.g:3941:1: rule__Assertion__ArgumentsAssignment_0_0_2_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:4218:1: rule__Assertion__ArgumentsAssignment_0_0_2_0 : ( ( ruleQualifiedName ) ) ;
     public final void rule__Assertion__ArgumentsAssignment_0_0_2_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3945:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:3946:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4222:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4223:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:3946:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:3947:3: ( ruleQualifiedName )
+            // InternalProblem.g:4223:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4224:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_0_0()); 
-            // InternalProblem.g:3948:3: ( ruleQualifiedName )
-            // InternalProblem.g:3949:4: ruleQualifiedName
+            // InternalProblem.g:4225:3: ( ruleQualifiedName )
+            // InternalProblem.g:4226:4: ruleQualifiedName
             {
              before(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_0_2_0_0_1()); 
             pushFollow(FOLLOW_2);
@@ -12067,21 +12946,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__ArgumentsAssignment_0_0_2_1_1"
-    // InternalProblem.g:3960:1: rule__Assertion__ArgumentsAssignment_0_0_2_1_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:4237:1: rule__Assertion__ArgumentsAssignment_0_0_2_1_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__Assertion__ArgumentsAssignment_0_0_2_1_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:3964:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:3965:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4241:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4242:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:3965:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:3966:3: ( ruleQualifiedName )
+            // InternalProblem.g:4242:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4243:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_1_1_0()); 
-            // InternalProblem.g:3967:3: ( ruleQualifiedName )
-            // InternalProblem.g:3968:4: ruleQualifiedName
+            // InternalProblem.g:4244:3: ( ruleQualifiedName )
+            // InternalProblem.g:4245:4: ruleQualifiedName
             {
              before(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_0_2_1_1_0_1()); 
             pushFollow(FOLLOW_2);
@@ -12116,17 +12995,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__ValueAssignment_0_0_5"
-    // InternalProblem.g:3979:1: rule__Assertion__ValueAssignment_0_0_5 : ( ruleLogicValue ) ;
+    // InternalProblem.g:4256: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:3983:1: ( ( ruleLogicValue ) )
-            // InternalProblem.g:3984:2: ( ruleLogicValue )
+            // InternalProblem.g:4260:1: ( ( ruleLogicValue ) )
+            // InternalProblem.g:4261:2: ( ruleLogicValue )
             {
-            // InternalProblem.g:3984:2: ( ruleLogicValue )
-            // InternalProblem.g:3985:3: ruleLogicValue
+            // InternalProblem.g:4261:2: ( ruleLogicValue )
+            // InternalProblem.g:4262:3: ruleLogicValue
             {
              before(grammarAccess.getAssertionAccess().getValueLogicValueEnumRuleCall_0_0_5_0()); 
             pushFollow(FOLLOW_2);
@@ -12157,17 +13036,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__ValueAssignment_0_1_0"
-    // InternalProblem.g:3994:1: rule__Assertion__ValueAssignment_0_1_0 : ( ruleShortLogicValue ) ;
+    // InternalProblem.g:4271: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:3998:1: ( ( ruleShortLogicValue ) )
-            // InternalProblem.g:3999:2: ( ruleShortLogicValue )
+            // InternalProblem.g:4275:1: ( ( ruleShortLogicValue ) )
+            // InternalProblem.g:4276:2: ( ruleShortLogicValue )
             {
-            // InternalProblem.g:3999:2: ( ruleShortLogicValue )
-            // InternalProblem.g:4000:3: ruleShortLogicValue
+            // InternalProblem.g:4276:2: ( ruleShortLogicValue )
+            // InternalProblem.g:4277:3: ruleShortLogicValue
             {
              before(grammarAccess.getAssertionAccess().getValueShortLogicValueEnumRuleCall_0_1_0_0()); 
             pushFollow(FOLLOW_2);
@@ -12198,21 +13077,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__RelationAssignment_0_1_1"
-    // InternalProblem.g:4009:1: rule__Assertion__RelationAssignment_0_1_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:4286: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:4013:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4014:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4290:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4291:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4014:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4015:3: ( ruleQualifiedName )
+            // InternalProblem.g:4291:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4292:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getAssertionAccess().getRelationRelationCrossReference_0_1_1_0()); 
-            // InternalProblem.g:4016:3: ( ruleQualifiedName )
-            // InternalProblem.g:4017:4: ruleQualifiedName
+            // InternalProblem.g:4293:3: ( ruleQualifiedName )
+            // InternalProblem.g:4294:4: ruleQualifiedName
             {
              before(grammarAccess.getAssertionAccess().getRelationRelationQualifiedNameParserRuleCall_0_1_1_0_1()); 
             pushFollow(FOLLOW_2);
@@ -12247,21 +13126,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__ArgumentsAssignment_0_1_3_0"
-    // InternalProblem.g:4028:1: rule__Assertion__ArgumentsAssignment_0_1_3_0 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:4305:1: rule__Assertion__ArgumentsAssignment_0_1_3_0 : ( ( ruleQualifiedName ) ) ;
     public final void rule__Assertion__ArgumentsAssignment_0_1_3_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4032:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4033:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4309:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4310:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4033:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4034:3: ( ruleQualifiedName )
+            // InternalProblem.g:4310:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4311:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_0_0()); 
-            // InternalProblem.g:4035:3: ( ruleQualifiedName )
-            // InternalProblem.g:4036:4: ruleQualifiedName
+            // InternalProblem.g:4312:3: ( ruleQualifiedName )
+            // InternalProblem.g:4313:4: ruleQualifiedName
             {
              before(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_1_3_0_0_1()); 
             pushFollow(FOLLOW_2);
@@ -12296,21 +13175,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__Assertion__ArgumentsAssignment_0_1_3_1_1"
-    // InternalProblem.g:4047:1: rule__Assertion__ArgumentsAssignment_0_1_3_1_1 : ( ( ruleQualifiedName ) ) ;
+    // InternalProblem.g:4324:1: rule__Assertion__ArgumentsAssignment_0_1_3_1_1 : ( ( ruleQualifiedName ) ) ;
     public final void rule__Assertion__ArgumentsAssignment_0_1_3_1_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4051:1: ( ( ( ruleQualifiedName ) ) )
-            // InternalProblem.g:4052:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4328:1: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:4329:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:4052:2: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:4053:3: ( ruleQualifiedName )
+            // InternalProblem.g:4329:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:4330:3: ( ruleQualifiedName )
             {
              before(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_1_1_0()); 
-            // InternalProblem.g:4054:3: ( ruleQualifiedName )
-            // InternalProblem.g:4055:4: ruleQualifiedName
+            // InternalProblem.g:4331:3: ( ruleQualifiedName )
+            // InternalProblem.g:4332:4: ruleQualifiedName
             {
              before(grammarAccess.getAssertionAccess().getArgumentsNodeQualifiedNameParserRuleCall_0_1_3_1_1_0_1()); 
             pushFollow(FOLLOW_2);
@@ -12345,17 +13224,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__TypeScopesAssignment_1"
-    // InternalProblem.g:4066:1: rule__ScopeDeclaration__TypeScopesAssignment_1 : ( ruleTypeScope ) ;
+    // InternalProblem.g:4343:1: rule__ScopeDeclaration__TypeScopesAssignment_1 : ( ruleTypeScope ) ;
     public final void rule__ScopeDeclaration__TypeScopesAssignment_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4070:1: ( ( ruleTypeScope ) )
-            // InternalProblem.g:4071:2: ( ruleTypeScope )
+            // InternalProblem.g:4347:1: ( ( ruleTypeScope ) )
+            // InternalProblem.g:4348:2: ( ruleTypeScope )
             {
-            // InternalProblem.g:4071:2: ( ruleTypeScope )
-            // InternalProblem.g:4072:3: ruleTypeScope
+            // InternalProblem.g:4348:2: ( ruleTypeScope )
+            // InternalProblem.g:4349:3: ruleTypeScope
             {
              before(grammarAccess.getScopeDeclarationAccess().getTypeScopesTypeScopeParserRuleCall_1_0()); 
             pushFollow(FOLLOW_2);
@@ -12386,17 +13265,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ScopeDeclaration__TypeScopesAssignment_2_1"
-    // InternalProblem.g:4081:1: rule__ScopeDeclaration__TypeScopesAssignment_2_1 : ( ruleTypeScope ) ;
+    // InternalProblem.g:4358:1: rule__ScopeDeclaration__TypeScopesAssignment_2_1 : ( ruleTypeScope ) ;
     public final void rule__ScopeDeclaration__TypeScopesAssignment_2_1() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4085:1: ( ( ruleTypeScope ) )
-            // InternalProblem.g:4086:2: ( ruleTypeScope )
+            // InternalProblem.g:4362:1: ( ( ruleTypeScope ) )
+            // InternalProblem.g:4363:2: ( ruleTypeScope )
             {
-            // InternalProblem.g:4086:2: ( ruleTypeScope )
-            // InternalProblem.g:4087:3: ruleTypeScope
+            // InternalProblem.g:4363:2: ( ruleTypeScope )
+            // InternalProblem.g:4364:3: ruleTypeScope
             {
              before(grammarAccess.getScopeDeclarationAccess().getTypeScopesTypeScopeParserRuleCall_2_1_0()); 
             pushFollow(FOLLOW_2);
@@ -12427,21 +13306,21 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__TargetTypeAssignment_0"
-    // InternalProblem.g:4096:1: rule__TypeScope__TargetTypeAssignment_0 : ( ( RULE_ID ) ) ;
+    // InternalProblem.g:4373:1: rule__TypeScope__TargetTypeAssignment_0 : ( ( RULE_ID ) ) ;
     public final void rule__TypeScope__TargetTypeAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4100:1: ( ( ( RULE_ID ) ) )
-            // InternalProblem.g:4101:2: ( ( RULE_ID ) )
+            // InternalProblem.g:4377:1: ( ( ( RULE_ID ) ) )
+            // InternalProblem.g:4378:2: ( ( RULE_ID ) )
             {
-            // InternalProblem.g:4101:2: ( ( RULE_ID ) )
-            // InternalProblem.g:4102:3: ( RULE_ID )
+            // InternalProblem.g:4378:2: ( ( RULE_ID ) )
+            // InternalProblem.g:4379:3: ( RULE_ID )
             {
              before(grammarAccess.getTypeScopeAccess().getTargetTypeClassDeclarationCrossReference_0_0()); 
-            // InternalProblem.g:4103:3: ( RULE_ID )
-            // InternalProblem.g:4104:4: RULE_ID
+            // InternalProblem.g:4380:3: ( RULE_ID )
+            // InternalProblem.g:4381:4: RULE_ID
             {
              before(grammarAccess.getTypeScopeAccess().getTargetTypeClassDeclarationIDTerminalRuleCall_0_0_1()); 
             match(input,RULE_ID,FOLLOW_2); 
@@ -12472,24 +13351,24 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__IncrementAssignment_1_0"
-    // InternalProblem.g:4115:1: rule__TypeScope__IncrementAssignment_1_0 : ( ( '+=' ) ) ;
+    // InternalProblem.g:4392:1: rule__TypeScope__IncrementAssignment_1_0 : ( ( '+=' ) ) ;
     public final void rule__TypeScope__IncrementAssignment_1_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4119:1: ( ( ( '+=' ) ) )
-            // InternalProblem.g:4120:2: ( ( '+=' ) )
+            // InternalProblem.g:4396:1: ( ( ( '+=' ) ) )
+            // InternalProblem.g:4397:2: ( ( '+=' ) )
             {
-            // InternalProblem.g:4120:2: ( ( '+=' ) )
-            // InternalProblem.g:4121:3: ( '+=' )
+            // InternalProblem.g:4397:2: ( ( '+=' ) )
+            // InternalProblem.g:4398:3: ( '+=' )
             {
              before(grammarAccess.getTypeScopeAccess().getIncrementPlusSignEqualsSignKeyword_1_0_0()); 
-            // InternalProblem.g:4122:3: ( '+=' )
-            // InternalProblem.g:4123:4: '+='
+            // InternalProblem.g:4399:3: ( '+=' )
+            // InternalProblem.g:4400:4: '+='
             {
              before(grammarAccess.getTypeScopeAccess().getIncrementPlusSignEqualsSignKeyword_1_0_0()); 
-            match(input,39,FOLLOW_2); 
+            match(input,42,FOLLOW_2); 
              after(grammarAccess.getTypeScopeAccess().getIncrementPlusSignEqualsSignKeyword_1_0_0()); 
 
             }
@@ -12517,25 +13396,25 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__TypeScope__MultiplicityAssignment_2"
-    // InternalProblem.g:4134:1: rule__TypeScope__MultiplicityAssignment_2 : ( ruleMultiplicity ) ;
+    // InternalProblem.g:4411:1: rule__TypeScope__MultiplicityAssignment_2 : ( ruleDefiniteMultiplicity ) ;
     public final void rule__TypeScope__MultiplicityAssignment_2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4138:1: ( ( ruleMultiplicity ) )
-            // InternalProblem.g:4139:2: ( ruleMultiplicity )
+            // InternalProblem.g:4415:1: ( ( ruleDefiniteMultiplicity ) )
+            // InternalProblem.g:4416:2: ( ruleDefiniteMultiplicity )
             {
-            // InternalProblem.g:4139:2: ( ruleMultiplicity )
-            // InternalProblem.g:4140:3: ruleMultiplicity
+            // InternalProblem.g:4416:2: ( ruleDefiniteMultiplicity )
+            // InternalProblem.g:4417:3: ruleDefiniteMultiplicity
             {
-             before(grammarAccess.getTypeScopeAccess().getMultiplicityMultiplicityParserRuleCall_2_0()); 
+             before(grammarAccess.getTypeScopeAccess().getMultiplicityDefiniteMultiplicityParserRuleCall_2_0()); 
             pushFollow(FOLLOW_2);
-            ruleMultiplicity();
+            ruleDefiniteMultiplicity();
 
             state._fsp--;
 
-             after(grammarAccess.getTypeScopeAccess().getMultiplicityMultiplicityParserRuleCall_2_0()); 
+             after(grammarAccess.getTypeScopeAccess().getMultiplicityDefiniteMultiplicityParserRuleCall_2_0()); 
 
             }
 
@@ -12558,17 +13437,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__LowerBoundAssignment_0"
-    // InternalProblem.g:4149:1: rule__RangeMultiplicity__LowerBoundAssignment_0 : ( RULE_INT ) ;
+    // InternalProblem.g:4426:1: rule__RangeMultiplicity__LowerBoundAssignment_0 : ( RULE_INT ) ;
     public final void rule__RangeMultiplicity__LowerBoundAssignment_0() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4153:1: ( ( RULE_INT ) )
-            // InternalProblem.g:4154:2: ( RULE_INT )
+            // InternalProblem.g:4430:1: ( ( RULE_INT ) )
+            // InternalProblem.g:4431:2: ( RULE_INT )
             {
-            // InternalProblem.g:4154:2: ( RULE_INT )
-            // InternalProblem.g:4155:3: RULE_INT
+            // InternalProblem.g:4431:2: ( RULE_INT )
+            // InternalProblem.g:4432:3: RULE_INT
             {
              before(grammarAccess.getRangeMultiplicityAccess().getLowerBoundINTTerminalRuleCall_0_0()); 
             match(input,RULE_INT,FOLLOW_2); 
@@ -12595,17 +13474,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__RangeMultiplicity__UpperBoundAssignment_2"
-    // InternalProblem.g:4164:1: rule__RangeMultiplicity__UpperBoundAssignment_2 : ( ruleUpperBound ) ;
+    // InternalProblem.g:4441:1: rule__RangeMultiplicity__UpperBoundAssignment_2 : ( ruleUpperBound ) ;
     public final void rule__RangeMultiplicity__UpperBoundAssignment_2() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4168:1: ( ( ruleUpperBound ) )
-            // InternalProblem.g:4169:2: ( ruleUpperBound )
+            // InternalProblem.g:4445:1: ( ( ruleUpperBound ) )
+            // InternalProblem.g:4446:2: ( ruleUpperBound )
             {
-            // InternalProblem.g:4169:2: ( ruleUpperBound )
-            // InternalProblem.g:4170:3: ruleUpperBound
+            // InternalProblem.g:4446:2: ( ruleUpperBound )
+            // InternalProblem.g:4447:3: ruleUpperBound
             {
              before(grammarAccess.getRangeMultiplicityAccess().getUpperBoundUpperBoundParserRuleCall_2_0()); 
             pushFollow(FOLLOW_2);
@@ -12636,17 +13515,17 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
 
 
     // $ANTLR start "rule__ExactMultiplicity__ExactValueAssignment"
-    // InternalProblem.g:4179:1: rule__ExactMultiplicity__ExactValueAssignment : ( RULE_INT ) ;
+    // InternalProblem.g:4456:1: rule__ExactMultiplicity__ExactValueAssignment : ( RULE_INT ) ;
     public final void rule__ExactMultiplicity__ExactValueAssignment() throws RecognitionException {
 
                         int stackSize = keepStackSize();
                 
         try {
-            // InternalProblem.g:4183:1: ( ( RULE_INT ) )
-            // InternalProblem.g:4184:2: ( RULE_INT )
+            // InternalProblem.g:4460:1: ( ( RULE_INT ) )
+            // InternalProblem.g:4461:2: ( RULE_INT )
             {
-            // InternalProblem.g:4184:2: ( RULE_INT )
-            // InternalProblem.g:4185:3: RULE_INT
+            // InternalProblem.g:4461:2: ( RULE_INT )
+            // InternalProblem.g:4462:3: RULE_INT
             {
              before(grammarAccess.getExactMultiplicityAccess().getExactValueINTTerminalRuleCall_0()); 
             match(input,RULE_INT,FOLLOW_2); 
@@ -12674,28 +13553,34 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
     // Delegated rules
 
 
-    protected DFA8 dfa8 = new DFA8(this);
-    static final String dfa_1s = "\17\uffff";
-    static final String dfa_2s = "\1\5\1\33\1\uffff\2\5\1\33\1\31\1\25\2\5\1\uffff\2\31\1\5\1\31";
-    static final String dfa_3s = "\1\23\1\42\1\uffff\1\5\1\34\2\42\1\37\2\5\1\uffff\2\42\1\5\1\42";
-    static final String dfa_4s = "\2\uffff\1\2\7\uffff\1\1\4\uffff";
-    static final String dfa_5s = "\17\uffff}>";
+    protected DFA6 dfa6 = new DFA6(this);
+    static final String dfa_1s = "\25\uffff";
+    static final String dfa_2s = "\1\5\2\40\1\uffff\2\5\2\31\1\14\2\40\2\5\1\uffff\4\31\1\5\2\31";
+    static final String dfa_3s = "\1\25\1\40\1\43\1\uffff\1\41\1\6\1\41\3\43\1\40\2\6\1\uffff\1\41\2\43\1\41\1\6\1\43\1\41";
+    static final String dfa_4s = "\3\uffff\1\2\11\uffff\1\1\7\uffff";
+    static final String dfa_5s = "\25\uffff}>";
     static final String[] dfa_6s = {
-            "\1\1\14\uffff\2\2",
-            "\1\4\6\uffff\1\3",
+            "\1\1\1\2\15\uffff\2\3",
+            "\1\4",
+            "\1\4\2\uffff\1\5",
             "",
-            "\1\5",
-            "\1\6\26\uffff\1\7",
-            "\1\4\6\uffff\1\3",
-            "\1\11\2\uffff\1\7\5\uffff\1\10",
-            "\1\2\11\uffff\1\12",
-            "\1\13",
-            "\1\14",
+            "\1\6\1\7\32\uffff\1\10",
+            "\1\12\1\11",
+            "\1\13\7\uffff\1\10",
+            "\1\13\7\uffff\1\10\1\uffff\1\14",
+            "\1\3\26\uffff\1\15",
+            "\1\4\2\uffff\1\5",
+            "\1\4",
+            "\1\16\1\17",
+            "\1\21\1\20",
             "",
-            "\1\11\2\uffff\1\7\5\uffff\1\10",
-            "\1\11\2\uffff\1\7\5\uffff\1\15",
-            "\1\16",
-            "\1\11\2\uffff\1\7\5\uffff\1\15"
+            "\1\13\7\uffff\1\10",
+            "\1\13\7\uffff\1\10\1\uffff\1\22",
+            "\1\13\7\uffff\1\10\1\uffff\1\14",
+            "\1\13\7\uffff\1\10",
+            "\1\24\1\23",
+            "\1\13\7\uffff\1\10\1\uffff\1\22",
+            "\1\13\7\uffff\1\10"
     };
 
     static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
@@ -12705,11 +13590,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 DFA6 extends DFA {
 
-        public DFA8(BaseRecognizer recognizer) {
+        public DFA6(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 8;
+            this.decisionNumber = 6;
             this.eot = dfa_1;
             this.eof = dfa_1;
             this.min = dfa_2;
@@ -12719,43 +13604,45 @@ public class InternalProblemParser extends AbstractInternalContentAssistParser {
             this.transition = dfa_6;
         }
         public String getDescription() {
-            return "672:1: rule__Assertion__Alternatives_0 : ( ( ( rule__Assertion__Group_0_0__0 ) ) | ( ( rule__Assertion__Group_0_1__0 ) ) );";
+            return "726: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[]{0x00000029001C1022L});
-    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000800100000L});
-    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000001002600800L});
-    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000002000002L});
-    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000800020L});
-    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000001000020L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000015000B04060L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000015000B04062L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000001000L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000004000800000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000005001000L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000000060L});
     public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000002000000L});
-    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000001000400800L});
-    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000004000000L});
-    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000008000000L});
-    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000010000020L});
-    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000020200000L});
-    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000000001000L});
-    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000000040020L});
-    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000040000000L});
-    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000040000002L});
-    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000004008000000L});
-    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000000200000L});
-    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000080000000L});
-    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000000038000L});
-    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x00000000000C0020L});
-    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000002200000L});
-    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000008000002000L});
-    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000000004010L});
-    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000400000000L});
-    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000400000002L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000002000002L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000008008002000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000008000002002L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000020000040L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000080000000L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000040000000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000100000000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000200000040L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000400001000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000000100060L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000010000002L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000020100000000L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000200000060L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000800000000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x00000000000E0000L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000000300060L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000002001000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000040000008000L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000010010L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000000800000002L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000000000000020L});
 
 }
\ No newline at end of file
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/.classpath b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/.classpath
index 7d85f131..68ef59f4 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/.classpath
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/.classpath
@@ -14,5 +14,6 @@
         </classpathentry>
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
         <classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
         <classpathentry kind="output" path="bin/default"/>
 </classpath>
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/problem.aird b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/problem.aird
index 7a8e3134..1769c224 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/problem.aird
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/problem.aird
@@ -5,7 +5,7 @@
     <semanticResources>src/main/resources/model/problem.genmodel</semanticResources>
     <ownedViews xmi:type="viewpoint:DView" uid="_CsAAYKA4EeuqkpDnuik1sg">
       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_CsYa4KA4EeuqkpDnuik1sg" name="problem" repPath="#_CsUwgKA4EeuqkpDnuik1sg" changeId="9f99ef6f-bc34-43eb-b9d0-926a0eee892e">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_CsYa4KA4EeuqkpDnuik1sg" name="problem" repPath="#_CsUwgKA4EeuqkpDnuik1sg" changeId="21ccbdb3-d7f2-4782-aa2a-5fc2003467bb">
         <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>
@@ -21,7 +21,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_D1FIUqA4EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_D1D6MaA4EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1D6MqA4EeuqkpDnuik1sg" x="624" y="24" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1D6MqA4EeuqkpDnuik1sg" x="804" y="180" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_EfWNUKA4EeuqkpDnuik1sg" type="2003" element="_EfNqcKA4EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_EfXbcKA4EeuqkpDnuik1sg" type="5007"/>
@@ -30,7 +30,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_EfXbc6A4EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_EfWNUaA4EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfWNUqA4EeuqkpDnuik1sg" x="444" y="372" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EfWNUqA4EeuqkpDnuik1sg" x="624" y="528" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_JT0o8KA4EeuqkpDnuik1sg" type="2003" element="_JTstIKA4EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_JT1QAKA4EeuqkpDnuik1sg" type="5007"/>
@@ -43,7 +43,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_JT13EqA4EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_JT0o8aA4EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JT0o8qA4EeuqkpDnuik1sg" x="492" y="564" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JT0o8qA4EeuqkpDnuik1sg" x="672" y="720" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_c-HCQKA4EeuqkpDnuik1sg" type="2003" element="_c-A7oKA4EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_c-HCQ6A4EeuqkpDnuik1sg" type="5007"/>
@@ -56,7 +56,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_c-HCRqA4EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_c-HCQaA4EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c-HCQqA4EeuqkpDnuik1sg" x="408" y="804" width="147" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_c-HCQqA4EeuqkpDnuik1sg" x="588" y="960" width="147" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_RzZA0KA5EeuqkpDnuik1sg" type="2003" element="_RzK-YKA5EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_RzZn4KA5EeuqkpDnuik1sg" type="5007"/>
@@ -69,7 +69,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_RzZn46A5EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_RzZA0aA5EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RzZA0qA5EeuqkpDnuik1sg" x="444" y="180" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RzZA0qA5EeuqkpDnuik1sg" x="1056" y="24" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_fit3kKA5EeuqkpDnuik1sg" type="2003" element="_fihqUKA5EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_fit3k6A5EeuqkpDnuik1sg" type="5007"/>
@@ -82,7 +82,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_fit3lqA5EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_fit3kaA5EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fit3kqA5EeuqkpDnuik1sg" x="1056" y="564" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fit3kqA5EeuqkpDnuik1sg" x="1236" y="720" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_QKLK0KA6EeuqkpDnuik1sg" type="2003" element="_QKD2EKA6EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_QKLK06A6EeuqkpDnuik1sg" type="5007"/>
@@ -91,7 +91,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_QKLK1qA6EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_QKLK0aA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QKLK0qA6EeuqkpDnuik1sg" x="888" y="804" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QKLK0qA6EeuqkpDnuik1sg" x="1068" y="960" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_jP6FkKA6EeuqkpDnuik1sg" type="2003" element="_jPpm4KA6EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_jP6soKA6EeuqkpDnuik1sg" type="5007"/>
@@ -100,7 +100,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_jP6so6A6EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_jP6FkaA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jP6FkqA6EeuqkpDnuik1sg" x="876" y="564" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jP6FkqA6EeuqkpDnuik1sg" x="1056" y="720" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_sdPX0KA6EeuqkpDnuik1sg" type="2003" element="_sc_gMKA6EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_sdP-4KA6EeuqkpDnuik1sg" type="5007"/>
@@ -109,7 +109,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_sdP-46A6EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_sdPX0aA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sdPX0qA6EeuqkpDnuik1sg" x="1056" y="804" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sdPX0qA6EeuqkpDnuik1sg" x="1236" y="960" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_4k5GIKA6EeuqkpDnuik1sg" type="2003" element="_4k00sKA6EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_4k5GI6A6EeuqkpDnuik1sg" type="5007"/>
@@ -118,7 +118,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_4k5GJqA6EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_4k5GIaA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4k5GIqA6EeuqkpDnuik1sg" x="1056" y="972" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4k5GIqA6EeuqkpDnuik1sg" x="1236" y="1128" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_6KEUMKA6EeuqkpDnuik1sg" type="2003" element="_6J_bsKA6EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_6KEUM6A6EeuqkpDnuik1sg" type="5007"/>
@@ -131,7 +131,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_6KEUNqA6EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_6KEUMaA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KEUMqA6EeuqkpDnuik1sg" x="984" y="1128" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KEUMqA6EeuqkpDnuik1sg" x="1164" y="1284" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_-O-UEKA6EeuqkpDnuik1sg" type="2003" element="_-O6CoKA6EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_-O-7IKA6EeuqkpDnuik1sg" type="5007"/>
@@ -140,7 +140,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_-O-7I6A6EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_-O-UEaA6EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-O-UEqA6EeuqkpDnuik1sg" x="1284" y="804" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-O-UEqA6EeuqkpDnuik1sg" x="1464" y="960" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_V6pfMKA7EeuqkpDnuik1sg" type="2003" element="_V6YZcKA7EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_V6qGQKA7EeuqkpDnuik1sg" type="5007"/>
@@ -149,7 +149,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_V6qGQ6A7EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_V6pfMaA7EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V6pfMqA7EeuqkpDnuik1sg" x="1188" y="1128" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V6pfMqA7EeuqkpDnuik1sg" x="1368" y="1284" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_rRhWIKA7EeuqkpDnuik1sg" type="2003" element="_rRcdoKA7EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_rRh9MKA7EeuqkpDnuik1sg" type="5007"/>
@@ -158,7 +158,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_rRh9M6A7EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_rRhWIaA7EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rRhWIqA7EeuqkpDnuik1sg" x="1270" y="564" width="147" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rRhWIqA7EeuqkpDnuik1sg" x="1450" y="720" width="147" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_p9wywKA8EeuqkpDnuik1sg" type="2003" element="_p9d30KA8EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_p9xZ0KA8EeuqkpDnuik1sg" type="5007"/>
@@ -171,7 +171,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_p9xZ06A8EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_p9wywaA8EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p9wywqA8EeuqkpDnuik1sg" x="1284" y="372" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p9wywqA8EeuqkpDnuik1sg" x="1464" y="528" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_xsq_MKA8EeuqkpDnuik1sg" type="2003" element="_xsYrUKA8EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_xsrmQKA8EeuqkpDnuik1sg" type="5007"/>
@@ -180,7 +180,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_xsrmQ6A8EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_xsq_MaA8EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xsq_MqA8EeuqkpDnuik1sg" x="1512" y="372" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xsq_MqA8EeuqkpDnuik1sg" x="1692" y="528" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_BMfjMKA9EeuqkpDnuik1sg" type="2003" element="_BMXnYKA9EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_BMfjM6A9EeuqkpDnuik1sg" type="5007"/>
@@ -201,7 +201,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_BMfjNqA9EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_BMfjMaA9EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BMfjMqA9EeuqkpDnuik1sg" x="1512" y="564" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BMfjMqA9EeuqkpDnuik1sg" x="1692" y="720" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_QUDYMKA9EeuqkpDnuik1sg" type="2003" element="_QTzgkKA9EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_QUDYM6A9EeuqkpDnuik1sg" type="5007"/>
@@ -210,7 +210,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_QUDYNqA9EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_QUDYMaA9EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QUDYMqA9EeuqkpDnuik1sg" x="156" y="372" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QUDYMqA9EeuqkpDnuik1sg" x="336" y="528" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_e73WIKA9EeuqkpDnuik1sg" type="2003" element="_e7ydoKA9EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_e73WI6A9EeuqkpDnuik1sg" type="5007"/>
@@ -219,7 +219,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_e73WJqA9EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_e73WIaA9EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e73WIqA9EeuqkpDnuik1sg" x="624" y="180" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e73WIqA9EeuqkpDnuik1sg" x="804" y="336" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_zaq8oKA9EeuqkpDnuik1sg" type="2003" element="_zac6MKA9EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_zarjsKA9EeuqkpDnuik1sg" type="5007"/>
@@ -232,7 +232,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_zarjs6A9EeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_zaq8oaA9EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zaq8oqA9EeuqkpDnuik1sg" x="156" y="564" width="120" height="99"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zaq8oqA9EeuqkpDnuik1sg" x="336" y="720" width="120" height="99"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_Ren3cKBJEeuqkpDnuik1sg" type="2003" element="_ReiX4KBJEeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_Ren3c6BJEeuqkpDnuik1sg" type="5007"/>
@@ -241,7 +241,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_Ren3dqBJEeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_Ren3caBJEeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ren3cqBJEeuqkpDnuik1sg" x="156" y="804" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ren3cqBJEeuqkpDnuik1sg" x="336" y="960" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_Tx6IsKBJEeuqkpDnuik1sg" type="2003" element="_Tx0CEKBJEeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_Tx6Is6BJEeuqkpDnuik1sg" type="5007"/>
@@ -258,7 +258,7 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_Tx6ItqBJEeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_Tx6IsaBJEeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tx6IsqBJEeuqkpDnuik1sg" x="48" y="972" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tx6IsqBJEeuqkpDnuik1sg" x="240" y="1128" width="120" height="100"/>
         </children>
         <children xmi:type="notation:Node" xmi:id="_aPNjUKBJEeuqkpDnuik1sg" type="2003" element="_aPIDwKBJEeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_aPOKYKBJEeuqkpDnuik1sg" type="5007"/>
@@ -271,7 +271,25 @@
             <styles xmi:type="notation:FilteringStyle" xmi:id="_aPOKY6BJEeuqkpDnuik1sg"/>
           </children>
           <styles xmi:type="notation:ShapeStyle" xmi:id="_aPNjUaBJEeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aPNjUqBJEeuqkpDnuik1sg" x="228" y="972" width="120" height="100"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aPNjUqBJEeuqkpDnuik1sg" x="408" y="1128" width="120" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_D-lH8NYBEeuF_d0WEhR3Xw" type="2003" element="_D9_5INYBEeuF_d0WEhR3Xw">
+          <children xmi:type="notation:Node" xmi:id="_D-lvANYBEeuF_d0WEhR3Xw" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_D-lvAdYBEeuF_d0WEhR3Xw" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_D-lvAtYBEeuF_d0WEhR3Xw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_D-lvA9YBEeuF_d0WEhR3Xw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_D-lH8dYBEeuF_d0WEhR3Xw" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D-lH8tYBEeuF_d0WEhR3Xw" x="48" y="1128" width="147" height="100"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_IwsqwNYPEeuF_d0WEhR3Xw" type="2003" element="_IwJ4MNYPEeuF_d0WEhR3Xw">
+          <children xmi:type="notation:Node" xmi:id="_IwtR0NYPEeuF_d0WEhR3Xw" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_IwtR0dYPEeuF_d0WEhR3Xw" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_IwtR0tYPEeuF_d0WEhR3Xw"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_IwtR09YPEeuF_d0WEhR3Xw"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_IwsqwdYPEeuF_d0WEhR3Xw" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IwsqwtYPEeuF_d0WEhR3Xw" x="996" y="1476" width="120" height="100"/>
         </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">
@@ -420,7 +438,7 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_Z7WJ8KA6EeuqkpDnuik1sg" type="4001" element="_Z7FrQKA6EeuqkpDnuik1sg" source="_QKLK0KA6EeuqkpDnuik1sg" target="_JT0o8KA4EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_Z7WJ9KA6EeuqkpDnuik1sg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z7WJ9aA6EeuqkpDnuik1sg" x="-49" y="125"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z7WJ9aA6EeuqkpDnuik1sg" x="-49" y="113"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_Z7WJ9qA6EeuqkpDnuik1sg" type="6002">
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z7WJ96A6EeuqkpDnuik1sg" x="104" y="113"/>
@@ -591,41 +609,25 @@
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_D9xNcaA8EeuqkpDnuik1sg" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_D9xNcqA8EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
           <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_D9xNc6A8EeuqkpDnuik1sg" points="[0, 0, -72, 58]$[72, -58, 0, 0]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D9x0hqA8EeuqkpDnuik1sg" id="(0.3050847457627119,0.0)"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D9x0hqA8EeuqkpDnuik1sg" id="(0.3728813559322034,0.02040816326530612)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_D9x0h6A8EeuqkpDnuik1sg" id="(0.4067796610169492,0.0)"/>
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_Vj1sQKA8EeuqkpDnuik1sg" type="4001" element="_VjwMzqA8EeuqkpDnuik1sg" source="_6KEUMKA6EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_Vj1sRKA8EeuqkpDnuik1sg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vj1sRaA8EeuqkpDnuik1sg" x="-103" y="500"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vj1sRaA8EeuqkpDnuik1sg" x="-79" y="526"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_Vj1sRqA8EeuqkpDnuik1sg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vj1sR6A8EeuqkpDnuik1sg" x="105" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vj1sR6A8EeuqkpDnuik1sg" x="113" y="-10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_Vj1sSKA8EeuqkpDnuik1sg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vj1sSaA8EeuqkpDnuik1sg" x="-55" y="10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vj1sSaA8EeuqkpDnuik1sg" x="-62" y="10"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_Vj1sQaA8EeuqkpDnuik1sg" routing="Rectilinear"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_Vj1sQqA8EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Vj1sQ6A8EeuqkpDnuik1sg" points="[-48, 72, 481, 730]$[-648, 72, -119, 730]$[-648, -708, -119, -50]$[-588, -708, -59, -50]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Vj1sQ6A8EeuqkpDnuik1sg" points="[-48, 24, 481, 682]$[-648, 24, -119, 682]$[-648, -708, -119, -50]$[-588, -708, -59, -50]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Vj1sSqA8EeuqkpDnuik1sg" id="(0.4067796610169492,0.0)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Vj1sS6A8EeuqkpDnuik1sg" id="(0.5,1.0)"/>
         </edges>
-        <edges xmi:type="notation:Edge" xmi:id="_ktTlwKA8EeuqkpDnuik1sg" type="4001" element="_ktEVOaA8EeuqkpDnuik1sg" source="_6KEUMKA6EeuqkpDnuik1sg" target="_jP6FkKA6EeuqkpDnuik1sg">
-          <children xmi:type="notation:Node" xmi:id="_ktUM0KA8EeuqkpDnuik1sg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ktUM0aA8EeuqkpDnuik1sg" x="-205" y="202"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_ktUM0qA8EeuqkpDnuik1sg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ktUM06A8EeuqkpDnuik1sg" x="100" y="122"/>
-          </children>
-          <children xmi:type="notation:Node" xmi:id="_ktUM1KA8EeuqkpDnuik1sg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ktUM1aA8EeuqkpDnuik1sg" x="9" y="137"/>
-          </children>
-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_ktTlwaA8EeuqkpDnuik1sg" routing="Rectilinear"/>
-          <styles xmi:type="notation:FontStyle" xmi:id="_ktTlwqA8EeuqkpDnuik1sg" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ktTlw6A8EeuqkpDnuik1sg" points="[-12, 36, 96, 502]$[-264, 36, -156, 502]$[-264, -516, -156, -50]$[-120, -516, -12, -50]"/>
-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ktUM1qA8EeuqkpDnuik1sg" id="(0.1016949152542373,0.0)"/>
-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ktUM16A8EeuqkpDnuik1sg" id="(0.1016949152542373,1.0)"/>
-        </edges>
         <edges xmi:type="notation:Edge" xmi:id="_w-zMkKA8EeuqkpDnuik1sg" type="4001" element="_w-iG36A8EeuqkpDnuik1sg" source="_p9wywKA8EeuqkpDnuik1sg" target="_EfWNUKA4EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_w-zMlKA8EeuqkpDnuik1sg" type="6001">
             <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w-zMlaA8EeuqkpDnuik1sg" x="174" y="-10"/>
@@ -644,17 +646,17 @@
         </edges>
         <edges xmi:type="notation:Edge" xmi:id="_2VC4gKA8EeuqkpDnuik1sg" type="4001" element="_2U4ggqA8EeuqkpDnuik1sg" source="_xsq_MKA8EeuqkpDnuik1sg" target="_RzZA0KA5EeuqkpDnuik1sg">
           <children xmi:type="notation:Node" xmi:id="_2VC4hKA8EeuqkpDnuik1sg" type="6001">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2VC4haA8EeuqkpDnuik1sg" x="-172" y="-10"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2VC4haA8EeuqkpDnuik1sg" x="-328" y="-10"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_2VC4hqA8EeuqkpDnuik1sg" type="6002">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2VC4h6A8EeuqkpDnuik1sg" x="-110" y="-20"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2VC4h6A8EeuqkpDnuik1sg" x="-125" y="-38"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_2VC4iKA8EeuqkpDnuik1sg" type="6003">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2VC4iaA8EeuqkpDnuik1sg" x="-63" y="99"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2VC4iaA8EeuqkpDnuik1sg" x="-17" y="103"/>
           </children>
           <styles xmi:type="notation:ConnectorStyle" xmi:id="_2VC4gaA8EeuqkpDnuik1sg" routing="Tree"/>
           <styles xmi:type="notation:FontStyle" xmi:id="_2VC4gqA8EeuqkpDnuik1sg" fontName="Noto Sans" fontHeight="8"/>
-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2VC4g6A8EeuqkpDnuik1sg" points="[0, -6, 1048, 143]$[0, -78, 1048, 71]$[-1047, -78, 1, 71]$[-1047, -100, 1, 49]"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2VC4g6A8EeuqkpDnuik1sg" points="[0, -6, 1048, 455]$[0, -78, 1048, 383]$[-1047, -78, 1, 383]$[-1047, -412, 1, 49]"/>
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2VC4iqA8EeuqkpDnuik1sg" id="(0.3305084745762712,0.061224489795918366)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2VC4i6A8EeuqkpDnuik1sg" id="(0.5,0.5)"/>
         </edges>
@@ -882,6 +884,102 @@
           <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_p1c4ZqBJEeuqkpDnuik1sg" id="(0.0,0.5918367346938775)"/>
           <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_p1c4Z6BJEeuqkpDnuik1sg" id="(1.0,0.5918367346938775)"/>
         </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_m_tfgNXtEeuF_d0WEhR3Xw" type="4001" element="_m-6OTNXtEeuF_d0WEhR3Xw" source="_D1D6MKA4EeuqkpDnuik1sg" target="_RzZA0KA5EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_m_wi0NXtEeuF_d0WEhR3Xw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m_wi0dXtEeuF_d0WEhR3Xw" x="73" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_m_xJ4NXtEeuF_d0WEhR3Xw" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m_xJ4dXtEeuF_d0WEhR3Xw" x="-5" y="-9"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_m_xw8NXtEeuF_d0WEhR3Xw" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_m_xw8dXtEeuF_d0WEhR3Xw" x="-4" y="24"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_m_tfgdXtEeuF_d0WEhR3Xw" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_m_tfgtXtEeuF_d0WEhR3Xw" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_m_tfg9XtEeuF_d0WEhR3Xw" points="[0, 0, 205, 107]$[0, -24, 205, 83]$[-204, -24, 1, 83]$[-204, -58, 1, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m_00QNXtEeuF_d0WEhR3Xw" id="(0.711864406779661,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_m_00QdXtEeuF_d0WEhR3Xw" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_HUhwENYBEeuF_d0WEhR3Xw" type="4001" element="_HUJ8o9YBEeuF_d0WEhR3Xw" source="_D-lH8NYBEeuF_d0WEhR3Xw" target="_Ren3cKBJEeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_HUhwFNYBEeuF_d0WEhR3Xw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HUhwFdYBEeuF_d0WEhR3Xw" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_HUhwFtYBEeuF_d0WEhR3Xw" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HUhwF9YBEeuF_d0WEhR3Xw" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_HUhwGNYBEeuF_d0WEhR3Xw" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HUhwGdYBEeuF_d0WEhR3Xw" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_HUhwEdYBEeuF_d0WEhR3Xw" routing="Tree"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_HUhwEtYBEeuF_d0WEhR3Xw" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HUhwE9YBEeuF_d0WEhR3Xw" points="[0, 0, -228, 144]$[228, -144, 0, 0]"/>
+          <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="-23" y="-60"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_KnHZ0tYPEeuF_d0WEhR3Xw" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KnHZ09YPEeuF_d0WEhR3Xw" x="1" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_KnHZ1NYPEeuF_d0WEhR3Xw" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KnHZ1dYPEeuF_d0WEhR3Xw" x="-1" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_KnGywdYPEeuF_d0WEhR3Xw" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_KnGywtYPEeuF_d0WEhR3Xw" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KnGyw9YPEeuF_d0WEhR3Xw" points="[0, 0, 89, -138]$[-110, 0, -21, -138]$[-110, 132, -21, -6]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KnHZ1tYPEeuF_d0WEhR3Xw" id="(0.0,0.6122448979591837)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_KnHZ19YPEeuF_d0WEhR3Xw" id="(0.6694915254237288,0.061224489795918366)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_T1qNANYPEeuF_d0WEhR3Xw" type="4001" element="_T1fN5tYPEeuF_d0WEhR3Xw" source="_IwsqwNYPEeuF_d0WEhR3Xw" target="_jP6FkKA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_T1qNBNYPEeuF_d0WEhR3Xw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T1qNBdYPEeuF_d0WEhR3Xw" x="-390" y="43"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_T1qNBtYPEeuF_d0WEhR3Xw" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T1qNB9YPEeuF_d0WEhR3Xw" x="94" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_T1qNCNYPEeuF_d0WEhR3Xw" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T1qNCdYPEeuF_d0WEhR3Xw" x="-154" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_T1qNAdYPEeuF_d0WEhR3Xw" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_T1qNAtYPEeuF_d0WEhR3Xw" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_T1qNA9YPEeuF_d0WEhR3Xw" points="[-36, 50, -96, 708]$[-120, 50, -180, 708]$[-120, -708, -180, -50]$[24, -708, -36, -50]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T1qNCtYPEeuF_d0WEhR3Xw" id="(0.3050847457627119,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_T1qNC9YPEeuF_d0WEhR3Xw" id="(0.3050847457627119,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_byTTcNYPEeuF_d0WEhR3Xw" type="4001" element="_bx-jYtYPEeuF_d0WEhR3Xw" source="_IwsqwNYPEeuF_d0WEhR3Xw" target="_-O-UEKA6EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_byTTdNYPEeuF_d0WEhR3Xw" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_byTTddYPEeuF_d0WEhR3Xw" x="-18" y="-246"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_byTTdtYPEeuF_d0WEhR3Xw" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_byTTd9YPEeuF_d0WEhR3Xw" x="-2" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_byTTeNYPEeuF_d0WEhR3Xw" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_byTTedYPEeuF_d0WEhR3Xw" x="-1" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_byTTcdYPEeuF_d0WEhR3Xw" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_byTTctYPEeuF_d0WEhR3Xw" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_byTTc9YPEeuF_d0WEhR3Xw" points="[70, 48, -398, 466]$[480, 48, 12, 466]$[480, -418, 12, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_byT6gNYPEeuF_d0WEhR3Xw" id="(0.4067796610169492,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_byT6gdYPEeuF_d0WEhR3Xw" id="(0.4067796610169492,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_-X6xcNawEeuymriYTNxK2g" type="4001" element="_-XLKltawEeuymriYTNxK2g" source="_JT0o8KA4EeuqkpDnuik1sg" target="_xsq_MKA8EeuqkpDnuik1sg">
+          <children xmi:type="notation:Node" xmi:id="_-X_C4NawEeuymriYTNxK2g" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-X_C4dawEeuymriYTNxK2g" x="-421" y="79"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_-X_p8NawEeuymriYTNxK2g" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-X_p8dawEeuymriYTNxK2g" x="-71" y="82"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_-YARANawEeuymriYTNxK2g" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-YARAdawEeuymriYTNxK2g" x="-90" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_-X6xcdawEeuymriYTNxK2g" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_-X6xctawEeuymriYTNxK2g" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-X6xc9awEeuymriYTNxK2g" points="[0, 0, -902, 144]$[50, 0, -852, 144]$[50, -72, -852, 72]$[962, -72, 60, 72]$[962, -106, 60, 38]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-YCtQNawEeuymriYTNxK2g" id="(1.0,0.12244897959183673)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-YCtQdawEeuymriYTNxK2g" id="(0.0,0.6122448979591837)"/>
+        </edges>
       </data>
     </ownedAnnotationEntries>
     <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_Csiy8KA4EeuqkpDnuik1sg" source="DANNOTATION_CUSTOMIZATION_KEY">
@@ -897,7 +995,7 @@
         </computedStyleDescriptions>
       </data>
     </ownedAnnotationEntries>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_D05iIKA4EeuqkpDnuik1sg" name="Problem" tooltipText="" outgoingEdges="_4eU5TqA8EeuqkpDnuik1sg _hU64ZqA9EeuqkpDnuik1sg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_D05iIKA4EeuqkpDnuik1sg" name="Problem" tooltipText="" outgoingEdges="_4eU5TqA8EeuqkpDnuik1sg _hU64ZqA9EeuqkpDnuik1sg _m-6OTNXtEeuF_d0WEhR3Xw" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Problem"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Problem"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -920,7 +1018,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_JTstIKA4EeuqkpDnuik1sg" name="ClassDeclaration" tooltipText="" outgoingEdges="_ODPlcKA4EeuqkpDnuik1sg _VtPctqA4EeuqkpDnuik1sg _jk6-PKA4EeuqkpDnuik1sg _plK3JqA9EeuqkpDnuik1sg" incomingEdges="_VtPctqA4EeuqkpDnuik1sg _ufJ3IKA4EeuqkpDnuik1sg _Z7FrQKA6EeuqkpDnuik1sg _2kWqbKA9EeuqkpDnuik1sg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_JTstIKA4EeuqkpDnuik1sg" name="ClassDeclaration" tooltipText="" outgoingEdges="_ODPlcKA4EeuqkpDnuik1sg _VtPctqA4EeuqkpDnuik1sg _jk6-PKA4EeuqkpDnuik1sg _plK3JqA9EeuqkpDnuik1sg _-XLKltawEeuymriYTNxK2g" incomingEdges="_VtPctqA4EeuqkpDnuik1sg _ufJ3IKA4EeuqkpDnuik1sg _Z7FrQKA6EeuqkpDnuik1sg _2kWqbKA9EeuqkpDnuik1sg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ClassDeclaration"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ClassDeclaration"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -1037,7 +1135,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_RzK-YKA5EeuqkpDnuik1sg" name="NamedElement" tooltipText="" incomingEdges="_XWbypqA5EeuqkpDnuik1sg _l7apoqA6EeuqkpDnuik1sg _2U4ggqA8EeuqkpDnuik1sg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_RzK-YKA5EeuqkpDnuik1sg" name="NamedElement" tooltipText="" incomingEdges="_XWbypqA5EeuqkpDnuik1sg _l7apoqA6EeuqkpDnuik1sg _2U4ggqA8EeuqkpDnuik1sg _m-6OTNXtEeuF_d0WEhR3Xw" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NamedElement"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//NamedElement"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -1138,7 +1236,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_jPpm4KA6EeuqkpDnuik1sg" name="Variable" tooltipText="" outgoingEdges="_l7apoqA6EeuqkpDnuik1sg" incomingEdges="_oni4rKA6EeuqkpDnuik1sg _BVyUAKA7EeuqkpDnuik1sg _ktEVOaA8EeuqkpDnuik1sg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_jPpm4KA6EeuqkpDnuik1sg" name="Variable" tooltipText="" outgoingEdges="_l7apoqA6EeuqkpDnuik1sg" incomingEdges="_oni4rKA6EeuqkpDnuik1sg _BVyUAKA7EeuqkpDnuik1sg _T1fN5tYPEeuF_d0WEhR3Xw" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Variable"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Variable"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -1210,7 +1308,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="_6J_bsKA6EeuqkpDnuik1sg" name="Atom" tooltipText="" outgoingEdges="_D9lnQKA8EeuqkpDnuik1sg _VjwMzqA8EeuqkpDnuik1sg _ktEVOaA8EeuqkpDnuik1sg" incomingEdges="_UJJy0qBDEeuqkpDnuik1sg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_6J_bsKA6EeuqkpDnuik1sg" name="Atom" tooltipText="" outgoingEdges="_D9lnQKA8EeuqkpDnuik1sg _VjwMzqA8EeuqkpDnuik1sg _KmxbkNYPEeuF_d0WEhR3Xw" incomingEdges="_UJJy0qBDEeuqkpDnuik1sg" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Atom"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Atom"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -1229,7 +1327,7 @@
         <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="_-O6CoKA6EeuqkpDnuik1sg" name="ImplicitVariable" tooltipText="" outgoingEdges="_BVyUAKA7EeuqkpDnuik1sg" incomingEdges="_0UtN5qA7EeuqkpDnuik1sg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_-O6CoKA6EeuqkpDnuik1sg" name="ImplicitVariable" tooltipText="" outgoingEdges="_BVyUAKA7EeuqkpDnuik1sg" incomingEdges="_0UtN5qA7EeuqkpDnuik1sg _bx-jYtYPEeuF_d0WEhR3Xw" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ImplicitVariable"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//ImplicitVariable"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -1363,20 +1461,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="_ktEVOaA8EeuqkpDnuik1sg" name="[0..*] arguments" sourceNode="_6J_bsKA6EeuqkpDnuik1sg" targetNode="_jPpm4KA6EeuqkpDnuik1sg">
-      <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="_ktE8QKA8EeuqkpDnuik1sg" 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="_ktE8QqA8EeuqkpDnuik1sg" showIcon="false">
-          <customFeatures>labelSize</customFeatures>
-        </centerLabelStyle>
-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_ktE8QaA8EeuqkpDnuik1sg" 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="_p9d30KA8EeuqkpDnuik1sg" name="Assertion" tooltipText="" outgoingEdges="_w-iG36A8EeuqkpDnuik1sg _79nqlqA8EeuqkpDnuik1sg _mQFKsqA9EeuqkpDnuik1sg" 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"/>
@@ -1410,7 +1494,7 @@
       </ownedStyle>
       <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
     </ownedDiagramElements>
-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_xsYrUKA8EeuqkpDnuik1sg" name="Node" tooltipText="" outgoingEdges="_2U4ggqA8EeuqkpDnuik1sg" incomingEdges="_4eU5TqA8EeuqkpDnuik1sg _79nqlqA8EeuqkpDnuik1sg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_xsYrUKA8EeuqkpDnuik1sg" name="Node" tooltipText="" outgoingEdges="_2U4ggqA8EeuqkpDnuik1sg" incomingEdges="_4eU5TqA8EeuqkpDnuik1sg _79nqlqA8EeuqkpDnuik1sg _-XLKltawEeuymriYTNxK2g" 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>
@@ -1638,7 +1722,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="_ReiX4KBJEeuqkpDnuik1sg" name="Multiplicity" tooltipText="" incomingEdges="_c_boQqBJEeuqkpDnuik1sg _dn26MqBJEeuqkpDnuik1sg _n5fiHqBJEeuqkpDnuik1sg _p1JWcqBJEeuqkpDnuik1sg" width="12" height="10">
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_ReiX4KBJEeuqkpDnuik1sg" name="Multiplicity" tooltipText="" incomingEdges="_c_boQqBJEeuqkpDnuik1sg _dn26MqBJEeuqkpDnuik1sg _n5fiHqBJEeuqkpDnuik1sg _p1JWcqBJEeuqkpDnuik1sg _HUJ8o9YBEeuF_d0WEhR3Xw" width="12" height="10">
       <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Multiplicity"/>
       <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Multiplicity"/>
       <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -1746,6 +1830,97 @@
       </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="_m-6OTNXtEeuF_d0WEhR3Xw" sourceNode="_D05iIKA4EeuqkpDnuik1sg" targetNode="_RzK-YKA5EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Problem"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//Problem"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_m-61UNXtEeuF_d0WEhR3Xw" 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="_m-61UdXtEeuF_d0WEhR3Xw" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_m-61UtXtEeuF_d0WEhR3Xw" 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="_D9_5INYBEeuF_d0WEhR3Xw" name="UnboundedMultiplicity" tooltipText="" outgoingEdges="_HUJ8o9YBEeuF_d0WEhR3Xw" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//UnboundedMultiplicity"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//UnboundedMultiplicity"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_D-DjgNYBEeuF_d0WEhR3Xw" 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="_HUJ8o9YBEeuF_d0WEhR3Xw" sourceNode="_D9_5INYBEeuF_d0WEhR3Xw" targetNode="_ReiX4KBJEeuqkpDnuik1sg">
+      <target xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//UnboundedMultiplicity"/>
+      <semanticElements xmi:type="ecore:EClass" href="src/main/resources/model/problem.ecore#//UnboundedMultiplicity"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_HUKjsNYBEeuF_d0WEhR3Xw" 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="_HUKjsdYBEeuF_d0WEhR3Xw" showIcon="false">
+          <labelFormat>italic</labelFormat>
+        </beginLabelStyle>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_HUKjstYBEeuF_d0WEhR3Xw" 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="_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"/>
+      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_IwLtYNYPEeuF_d0WEhR3Xw" 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="_KmxbkNYPEeuF_d0WEhR3Xw" name="[0..*] arguments" sourceNode="_6J_bsKA6EeuqkpDnuik1sg" targetNode="_IwJ4MNYPEeuF_d0WEhR3Xw">
+      <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"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_T1fN5tYPEeuF_d0WEhR3Xw" name="[0..1] variable" sourceNode="_IwJ4MNYPEeuF_d0WEhR3Xw" targetNode="_jPpm4KA6EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Argument/variable"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//Argument/variable"/>
+      <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">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_T1fN6NYPEeuF_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="_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"/>
+      <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"/>
+      </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="_-XLKltawEeuymriYTNxK2g" name="[0..1] newNode" sourceNode="_JTstIKA4EeuqkpDnuik1sg" targetNode="_xsYrUKA8EeuqkpDnuik1sg">
+      <target xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ClassDeclaration/newNode"/>
+      <semanticElements xmi:type="ecore:EReference" href="src/main/resources/model/problem.ecore#//ClassDeclaration/newNode"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_-XMYsNawEeuymriYTNxK2g" description="_L-JhMKA4EeuqkpDnuik1sg" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_-XMYstawEeuymriYTNxK2g" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_-XMYsdawEeuymriYTNxK2g" 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/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Argument.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Argument.java
new file mode 100644
index 00000000..5442f8e0
--- /dev/null
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Argument.java
@@ -0,0 +1,69 @@
+/**
+ */
+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>Argument</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.Argument#getVariable <em>Variable</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.Argument#getSingletonVariable <em>Singleton Variable</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getArgument()
+ * @model
+ * @generated
+ */
+public interface Argument extends EObject {
+        /**
+         * Returns the value of the '<em><b>Variable</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Variable</em>' reference.
+         * @see #setVariable(Variable)
+         * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getArgument_Variable()
+         * @model
+         * @generated
+         */
+        Variable getVariable();
+
+        /**
+         * Sets the value of the '{@link org.eclipse.viatra.solver.language.model.problem.Argument#getVariable <em>Variable</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Variable</em>' reference.
+         * @see #getVariable()
+         * @generated
+         */
+        void setVariable(Variable 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/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Atom.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Atom.java
index bee08d8d..d1b4d3fe 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Atom.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Atom.java
@@ -14,8 +14,8 @@ import org.eclipse.emf.common.util.EList;
  * </p>
  * <ul>
  *   <li>{@link org.eclipse.viatra.solver.language.model.problem.Atom#getRelation <em>Relation</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.model.problem.Atom#getArguments <em>Arguments</em>}</li>
  *   <li>{@link org.eclipse.viatra.solver.language.model.problem.Atom#isTransitiveClosure <em>Transitive Closure</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.Atom#getArguments <em>Arguments</em>}</li>
  * </ul>
  *
  * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getAtom()
@@ -46,16 +46,16 @@ public interface Atom extends Literal {
         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.Variable}.
+         * 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.Argument}.
          * <!-- 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#getAtom_Arguments()
-         * @model
+         * @model containment="true"
          * @generated
          */
-        EList<Variable> getArguments();
+        EList<Argument> getArguments();
 
         /**
          * Returns the value of the '<em><b>Transitive Closure</b></em>' attribute.
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ClassDeclaration.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ClassDeclaration.java
index 7212d006..1387575a 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ClassDeclaration.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ClassDeclaration.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.common.util.EList;
  *   <li>{@link org.eclipse.viatra.solver.language.model.problem.ClassDeclaration#isAbstract <em>Abstract</em>}</li>
  *   <li>{@link org.eclipse.viatra.solver.language.model.problem.ClassDeclaration#getSuperTypes <em>Super Types</em>}</li>
  *   <li>{@link org.eclipse.viatra.solver.language.model.problem.ClassDeclaration#getReferenceDeclarations <em>Reference Declarations</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.ClassDeclaration#getNewNode <em>New Node</em>}</li>
  * </ul>
  *
  * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getClassDeclaration()
@@ -69,4 +70,26 @@ public interface ClassDeclaration extends Relation, Statement {
          */
         EList<ReferenceDeclaration> getReferenceDeclarations();
 
+        /**
+         * Returns the value of the '<em><b>New Node</b></em>' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>New Node</em>' containment reference.
+         * @see #setNewNode(Node)
+         * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getClassDeclaration_NewNode()
+         * @model containment="true"
+         * @generated
+         */
+        Node getNewNode();
+
+        /**
+         * Sets the value of the '{@link org.eclipse.viatra.solver.language.model.problem.ClassDeclaration#getNewNode <em>New Node</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>New Node</em>' containment reference.
+         * @see #getNewNode()
+         * @generated
+         */
+        void setNewNode(Node value);
+
 } // ClassDeclaration
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Problem.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Problem.java
index 3342767d..7e19bd22 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Problem.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/Problem.java
@@ -4,8 +4,6 @@ package org.eclipse.viatra.solver.language.model.problem;
 
 import org.eclipse.emf.common.util.EList;
 
-import org.eclipse.emf.ecore.EObject;
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Problem</b></em>'.
@@ -23,7 +21,7 @@ import org.eclipse.emf.ecore.EObject;
  * @model
  * @generated
  */
-public interface Problem extends EObject {
+public interface Problem extends NamedElement {
         /**
          * Returns the value of the '<em><b>Nodes</b></em>' containment reference list.
          * The list contents are of type {@link org.eclipse.viatra.solver.language.model.problem.Node}.
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemFactory.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemFactory.java
index 301f7cce..bdfc326b 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemFactory.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemFactory.java
@@ -157,6 +157,24 @@ public interface ProblemFactory extends EFactory {
         ExactMultiplicity createExactMultiplicity();
 
         /**
+         * Returns a new object of class '<em>Unbounded Multiplicity</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Unbounded Multiplicity</em>'.
+         * @generated
+         */
+        UnboundedMultiplicity createUnboundedMultiplicity();
+
+        /**
+         * Returns a new object of class '<em>Argument</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Argument</em>'.
+         * @generated
+         */
+        Argument createArgument();
+
+        /**
          * Returns the package supported by this factory.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemPackage.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemPackage.java
index 59906b1f..1358eaeb 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemPackage.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/ProblemPackage.java
@@ -58,87 +58,96 @@ public interface ProblemPackage extends EPackage {
         ProblemPackage eINSTANCE = org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl.init();
 
         /**
-         * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.ProblemImpl <em>Problem</em>}' class.
+         * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.NamedElementImpl <em>Named Element</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemImpl
-         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getProblem()
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.NamedElementImpl
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getNamedElement()
          * @generated
          */
-        int PROBLEM = 0;
+        int NAMED_ELEMENT = 4;
 
         /**
-         * The feature id for the '<em><b>Nodes</b></em>' containment reference list.
+         * The feature id for the '<em><b>Name</b></em>' attribute.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int PROBLEM__NODES = 0;
+        int NAMED_ELEMENT__NAME = 0;
 
         /**
-         * The feature id for the '<em><b>Statements</b></em>' containment reference list.
+         * The number of structural features of the '<em>Named Element</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int PROBLEM__STATEMENTS = 1;
+        int NAMED_ELEMENT_FEATURE_COUNT = 1;
 
         /**
-         * The number of structural features of the '<em>Problem</em>' class.
+         * The number of operations of the '<em>Named Element</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int PROBLEM_FEATURE_COUNT = 2;
+        int NAMED_ELEMENT_OPERATION_COUNT = 0;
 
         /**
-         * The number of operations of the '<em>Problem</em>' class.
+         * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.ProblemImpl <em>Problem</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemImpl
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getProblem()
+         * @generated
+         */
+        int PROBLEM = 0;
+
+        /**
+         * The feature id for the '<em><b>Name</b></em>' attribute.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int PROBLEM_OPERATION_COUNT = 0;
+        int PROBLEM__NAME = NAMED_ELEMENT__NAME;
 
         /**
-         * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.NamedElementImpl <em>Named Element</em>}' class.
+         * The feature id for the '<em><b>Nodes</b></em>' containment reference list.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see org.eclipse.viatra.solver.language.model.problem.impl.NamedElementImpl
-         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getNamedElement()
          * @generated
+         * @ordered
          */
-        int NAMED_ELEMENT = 4;
+        int PROBLEM__NODES = NAMED_ELEMENT_FEATURE_COUNT + 0;
 
         /**
-         * The feature id for the '<em><b>Name</b></em>' attribute.
+         * The feature id for the '<em><b>Statements</b></em>' containment reference list.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int NAMED_ELEMENT__NAME = 0;
+        int PROBLEM__STATEMENTS = NAMED_ELEMENT_FEATURE_COUNT + 1;
 
         /**
-         * The number of structural features of the '<em>Named Element</em>' class.
+         * The number of structural features of the '<em>Problem</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int NAMED_ELEMENT_FEATURE_COUNT = 1;
+        int PROBLEM_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 2;
 
         /**
-         * The number of operations of the '<em>Named Element</em>' class.
+         * The number of operations of the '<em>Problem</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int NAMED_ELEMENT_OPERATION_COUNT = 0;
+        int PROBLEM_OPERATION_COUNT = NAMED_ELEMENT_OPERATION_COUNT + 0;
 
         /**
          * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.RelationImpl <em>Relation</em>}' class.
@@ -224,13 +233,22 @@ public interface ProblemPackage extends EPackage {
         int CLASS_DECLARATION__REFERENCE_DECLARATIONS = RELATION_FEATURE_COUNT + 2;
 
         /**
+         * The feature id for the '<em><b>New Node</b></em>' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CLASS_DECLARATION__NEW_NODE = RELATION_FEATURE_COUNT + 3;
+
+        /**
          * The number of structural features of the '<em>Class Declaration</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int CLASS_DECLARATION_FEATURE_COUNT = RELATION_FEATURE_COUNT + 3;
+        int CLASS_DECLARATION_FEATURE_COUNT = RELATION_FEATURE_COUNT + 4;
 
         /**
          * The number of operations of the '<em>Class Declaration</em>' class.
@@ -592,22 +610,22 @@ public interface ProblemPackage extends EPackage {
         int ATOM__RELATION = LITERAL_FEATURE_COUNT + 0;
 
         /**
-         * The feature id for the '<em><b>Arguments</b></em>' reference list.
+         * The feature id for the '<em><b>Transitive Closure</b></em>' attribute.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int ATOM__ARGUMENTS = LITERAL_FEATURE_COUNT + 1;
+        int ATOM__TRANSITIVE_CLOSURE = LITERAL_FEATURE_COUNT + 1;
 
         /**
-         * The feature id for the '<em><b>Transitive Closure</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 ATOM__TRANSITIVE_CLOSURE = LITERAL_FEATURE_COUNT + 2;
+        int ATOM__ARGUMENTS = LITERAL_FEATURE_COUNT + 2;
 
         /**
          * The number of structural features of the '<em>Atom</em>' class.
@@ -1034,6 +1052,80 @@ public interface ProblemPackage extends EPackage {
         int EXACT_MULTIPLICITY_OPERATION_COUNT = MULTIPLICITY_OPERATION_COUNT + 0;
 
         /**
+         * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.UnboundedMultiplicityImpl <em>Unbounded Multiplicity</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.UnboundedMultiplicityImpl
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getUnboundedMultiplicity()
+         * @generated
+         */
+        int UNBOUNDED_MULTIPLICITY = 22;
+
+        /**
+         * The number of structural features of the '<em>Unbounded Multiplicity</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int UNBOUNDED_MULTIPLICITY_FEATURE_COUNT = MULTIPLICITY_FEATURE_COUNT + 0;
+
+        /**
+         * The number of operations of the '<em>Unbounded Multiplicity</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int UNBOUNDED_MULTIPLICITY_OPERATION_COUNT = MULTIPLICITY_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.ArgumentImpl <em>Argument</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ArgumentImpl
+         * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getArgument()
+         * @generated
+         */
+        int ARGUMENT = 23;
+
+        /**
+         * The feature id for the '<em><b>Variable</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int ARGUMENT__VARIABLE = 0;
+
+        /**
+         * The feature id for the '<em><b>Singleton Variable</b></em>' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int ARGUMENT__SINGLETON_VARIABLE = 1;
+
+        /**
+         * The number of structural features of the '<em>Argument</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int ARGUMENT_FEATURE_COUNT = 2;
+
+        /**
+         * 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.LogicValue <em>Logic Value</em>}' enum.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -1041,7 +1133,7 @@ public interface ProblemPackage extends EPackage {
          * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getLogicValue()
          * @generated
          */
-        int LOGIC_VALUE = 22;
+        int LOGIC_VALUE = 24;
 
         /**
          * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.Problem <em>Problem</em>}'.
@@ -1129,6 +1221,17 @@ public interface ProblemPackage extends EPackage {
         EReference getClassDeclaration_ReferenceDeclarations();
 
         /**
+         * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.model.problem.ClassDeclaration#getNewNode <em>New Node</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference '<em>New Node</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.ClassDeclaration#getNewNode()
+         * @see #getClassDeclaration()
+         * @generated
+         */
+        EReference getClassDeclaration_NewNode();
+
+        /**
          * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.ReferenceDeclaration <em>Reference Declaration</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -1330,10 +1433,10 @@ public interface ProblemPackage extends EPackage {
         EReference getAtom_Relation();
 
         /**
-         * Returns the meta object for the reference list '{@link org.eclipse.viatra.solver.language.model.problem.Atom#getArguments <em>Arguments</em>}'.
+         * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.model.problem.Atom#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.Atom#getArguments()
          * @see #getAtom()
          * @generated
@@ -1594,6 +1697,48 @@ public interface ProblemPackage extends EPackage {
         EAttribute getExactMultiplicity_ExactValue();
 
         /**
+         * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.UnboundedMultiplicity <em>Unbounded Multiplicity</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Unbounded Multiplicity</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.UnboundedMultiplicity
+         * @generated
+         */
+        EClass getUnboundedMultiplicity();
+
+        /**
+         * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.model.problem.Argument <em>Argument</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Argument</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.Argument
+         * @generated
+         */
+        EClass getArgument();
+
+        /**
+         * Returns the meta object for the reference '{@link org.eclipse.viatra.solver.language.model.problem.Argument#getVariable <em>Variable</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference '<em>Variable</em>'.
+         * @see org.eclipse.viatra.solver.language.model.problem.Argument#getVariable()
+         * @see #getArgument()
+         * @generated
+         */
+        EReference getArgument_Variable();
+
+        /**
+         * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.model.problem.Argument#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.Argument#getSingletonVariable()
+         * @see #getArgument()
+         * @generated
+         */
+        EReference getArgument_SingletonVariable();
+
+        /**
          * 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 -->
@@ -1697,6 +1842,14 @@ public interface ProblemPackage extends EPackage {
                 EReference CLASS_DECLARATION__REFERENCE_DECLARATIONS = eINSTANCE.getClassDeclaration_ReferenceDeclarations();
 
                 /**
+                 * The meta object literal for the '<em><b>New Node</b></em>' containment reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference CLASS_DECLARATION__NEW_NODE = eINSTANCE.getClassDeclaration_NewNode();
+
+                /**
                  * The meta object literal for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.ReferenceDeclarationImpl <em>Reference Declaration</em>}' class.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
@@ -1865,7 +2018,7 @@ public interface ProblemPackage extends EPackage {
                 EReference ATOM__RELATION = eINSTANCE.getAtom_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
@@ -2087,6 +2240,42 @@ public interface ProblemPackage extends EPackage {
                 EAttribute EXACT_MULTIPLICITY__EXACT_VALUE = eINSTANCE.getExactMultiplicity_ExactValue();
 
                 /**
+                 * The meta object literal for the '{@link org.eclipse.viatra.solver.language.model.problem.impl.UnboundedMultiplicityImpl <em>Unbounded Multiplicity</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.UnboundedMultiplicityImpl
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getUnboundedMultiplicity()
+                 * @generated
+                 */
+                EClass UNBOUNDED_MULTIPLICITY = eINSTANCE.getUnboundedMultiplicity();
+
+                /**
+                 * 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 -->
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.ArgumentImpl
+                 * @see org.eclipse.viatra.solver.language.model.problem.impl.ProblemPackageImpl#getArgument()
+                 * @generated
+                 */
+                EClass ARGUMENT = eINSTANCE.getArgument();
+
+                /**
+                 * The meta object literal for the '<em><b>Variable</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference ARGUMENT__VARIABLE = eINSTANCE.getArgument_Variable();
+
+                /**
+                 * The meta object literal for the '<em><b>Singleton Variable</b></em>' containment reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference ARGUMENT__SINGLETON_VARIABLE = eINSTANCE.getArgument_SingletonVariable();
+
+                /**
                  * The meta object literal for the '{@link org.eclipse.viatra.solver.language.model.problem.LogicValue <em>Logic Value</em>}' enum.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/UnboundedMultiplicity.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/UnboundedMultiplicity.java
new file mode 100644
index 00000000..725311a4
--- /dev/null
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/UnboundedMultiplicity.java
@@ -0,0 +1,16 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Unbounded Multiplicity</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.viatra.solver.language.model.problem.ProblemPackage#getUnboundedMultiplicity()
+ * @model
+ * @generated
+ */
+public interface UnboundedMultiplicity extends Multiplicity {
+} // UnboundedMultiplicity
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ArgumentImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ArgumentImpl.java
new file mode 100644
index 00000000..9f6bc7ae
--- /dev/null
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ArgumentImpl.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.Argument;
+import org.eclipse.viatra.solver.language.model.problem.ImplicitVariable;
+import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
+import org.eclipse.viatra.solver.language.model.problem.Variable;
+
+/**
+ * <!-- 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#getVariable <em>Variable</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 #getVariable() <em>Variable</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getVariable()
+         * @generated
+         * @ordered
+         */
+        protected Variable variable;
+
+        /**
+         * 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 ArgumentImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return ProblemPackage.Literals.ARGUMENT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Variable getVariable() {
+                if (variable != null && variable.eIsProxy()) {
+                        InternalEObject oldVariable = (InternalEObject) variable;
+                        variable = (Variable) eResolveProxy(oldVariable);
+                        if (variable != oldVariable) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, ProblemPackage.ARGUMENT__VARIABLE,
+                                                        oldVariable, variable));
+                        }
+                }
+                return variable;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Variable basicGetVariable() {
+                return variable;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setVariable(Variable newVariable) {
+                Variable oldVariable = variable;
+                variable = newVariable;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, ProblemPackage.ARGUMENT__VARIABLE, oldVariable,
+                                        variable));
+        }
+
+        /**
+         * <!-- 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:
+                        if (resolve)
+                                return getVariable();
+                        return basicGetVariable();
+                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:
+                        setVariable((Variable) 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:
+                        setVariable((Variable) 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:
+                        return variable != null;
+                case ProblemPackage.ARGUMENT__SINGLETON_VARIABLE:
+                        return singletonVariable != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //ArgumentImpl
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/AtomImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/AtomImpl.java
index 4571db14..d70fe90b 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/AtomImpl.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/AtomImpl.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;
@@ -13,12 +14,12 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
-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.Argument;
 import org.eclipse.viatra.solver.language.model.problem.Atom;
 import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
 import org.eclipse.viatra.solver.language.model.problem.Relation;
-import org.eclipse.viatra.solver.language.model.problem.Variable;
 
 /**
  * <!-- begin-user-doc -->
@@ -29,8 +30,8 @@ import org.eclipse.viatra.solver.language.model.problem.Variable;
  * </p>
  * <ul>
  *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.AtomImpl#getRelation <em>Relation</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.AtomImpl#getArguments <em>Arguments</em>}</li>
  *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.AtomImpl#isTransitiveClosure <em>Transitive Closure</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.AtomImpl#getArguments <em>Arguments</em>}</li>
  * </ul>
  *
  * @generated
@@ -47,34 +48,34 @@ public class AtomImpl extends LiteralImpl implements Atom {
         protected Relation relation;
 
         /**
-         * The cached value of the '{@link #getArguments() <em>Arguments</em>}' reference list.
+         * The default value of the '{@link #isTransitiveClosure() <em>Transitive Closure</em>}' attribute.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see #getArguments()
+         * @see #isTransitiveClosure()
          * @generated
          * @ordered
          */
-        protected EList<Variable> arguments;
+        protected static final boolean TRANSITIVE_CLOSURE_EDEFAULT = false;
 
         /**
-         * The default value of the '{@link #isTransitiveClosure() <em>Transitive Closure</em>}' attribute.
+         * The cached value of the '{@link #isTransitiveClosure() <em>Transitive Closure</em>}' attribute.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @see #isTransitiveClosure()
          * @generated
          * @ordered
          */
-        protected static final boolean TRANSITIVE_CLOSURE_EDEFAULT = false;
+        protected boolean transitiveClosure = TRANSITIVE_CLOSURE_EDEFAULT;
 
         /**
-         * The cached value of the '{@link #isTransitiveClosure() <em>Transitive Closure</em>}' attribute.
+         * The cached value of the '{@link #getArguments() <em>Arguments</em>}' containment reference list.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @see #isTransitiveClosure()
+         * @see #getArguments()
          * @generated
          * @ordered
          */
-        protected boolean transitiveClosure = TRANSITIVE_CLOSURE_EDEFAULT;
+        protected EList<Argument> arguments;
 
         /**
          * <!-- begin-user-doc -->
@@ -140,9 +141,9 @@ public class AtomImpl extends LiteralImpl implements Atom {
          * <!-- end-user-doc -->
          * @generated
          */
-        public EList<Variable> getArguments() {
+        public EList<Argument> getArguments() {
                 if (arguments == null) {
-                        arguments = new EObjectResolvingEList<Variable>(Variable.class, this, ProblemPackage.ATOM__ARGUMENTS);
+                        arguments = new EObjectContainmentEList<Argument>(Argument.class, this, ProblemPackage.ATOM__ARGUMENTS);
                 }
                 return arguments;
         }
@@ -175,16 +176,30 @@ public class AtomImpl extends LiteralImpl implements Atom {
          * @generated
          */
         @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case ProblemPackage.ATOM__ARGUMENTS:
+                        return ((InternalEList<?>) getArguments()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
         public Object eGet(int featureID, boolean resolve, boolean coreType) {
                 switch (featureID) {
                 case ProblemPackage.ATOM__RELATION:
                         if (resolve)
                                 return getRelation();
                         return basicGetRelation();
-                case ProblemPackage.ATOM__ARGUMENTS:
-                        return getArguments();
                 case ProblemPackage.ATOM__TRANSITIVE_CLOSURE:
                         return isTransitiveClosure();
+                case ProblemPackage.ATOM__ARGUMENTS:
+                        return getArguments();
                 }
                 return super.eGet(featureID, resolve, coreType);
         }
@@ -201,13 +216,13 @@ public class AtomImpl extends LiteralImpl implements Atom {
                 case ProblemPackage.ATOM__RELATION:
                         setRelation((Relation) newValue);
                         return;
-                case ProblemPackage.ATOM__ARGUMENTS:
-                        getArguments().clear();
-                        getArguments().addAll((Collection<? extends Variable>) newValue);
-                        return;
                 case ProblemPackage.ATOM__TRANSITIVE_CLOSURE:
                         setTransitiveClosure((Boolean) newValue);
                         return;
+                case ProblemPackage.ATOM__ARGUMENTS:
+                        getArguments().clear();
+                        getArguments().addAll((Collection<? extends Argument>) newValue);
+                        return;
                 }
                 super.eSet(featureID, newValue);
         }
@@ -223,12 +238,12 @@ public class AtomImpl extends LiteralImpl implements Atom {
                 case ProblemPackage.ATOM__RELATION:
                         setRelation((Relation) null);
                         return;
-                case ProblemPackage.ATOM__ARGUMENTS:
-                        getArguments().clear();
-                        return;
                 case ProblemPackage.ATOM__TRANSITIVE_CLOSURE:
                         setTransitiveClosure(TRANSITIVE_CLOSURE_EDEFAULT);
                         return;
+                case ProblemPackage.ATOM__ARGUMENTS:
+                        getArguments().clear();
+                        return;
                 }
                 super.eUnset(featureID);
         }
@@ -243,10 +258,10 @@ public class AtomImpl extends LiteralImpl implements Atom {
                 switch (featureID) {
                 case ProblemPackage.ATOM__RELATION:
                         return relation != null;
-                case ProblemPackage.ATOM__ARGUMENTS:
-                        return arguments != null && !arguments.isEmpty();
                 case ProblemPackage.ATOM__TRANSITIVE_CLOSURE:
                         return transitiveClosure != TRANSITIVE_CLOSURE_EDEFAULT;
+                case ProblemPackage.ATOM__ARGUMENTS:
+                        return arguments != null && !arguments.isEmpty();
                 }
                 return super.eIsSet(featureID);
         }
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ClassDeclarationImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ClassDeclarationImpl.java
index e1d07071..89de4d01 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ClassDeclarationImpl.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ClassDeclarationImpl.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
 import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration;
+import org.eclipse.viatra.solver.language.model.problem.Node;
 import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
 import org.eclipse.viatra.solver.language.model.problem.ReferenceDeclaration;
 
@@ -33,6 +34,7 @@ import org.eclipse.viatra.solver.language.model.problem.ReferenceDeclaration;
  *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.ClassDeclarationImpl#isAbstract <em>Abstract</em>}</li>
  *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.ClassDeclarationImpl#getSuperTypes <em>Super Types</em>}</li>
  *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.ClassDeclarationImpl#getReferenceDeclarations <em>Reference Declarations</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.model.problem.impl.ClassDeclarationImpl#getNewNode <em>New Node</em>}</li>
  * </ul>
  *
  * @generated
@@ -79,6 +81,16 @@ public class ClassDeclarationImpl extends RelationImpl implements ClassDeclarati
         protected EList<ReferenceDeclaration> referenceDeclarations;
 
         /**
+         * The cached value of the '{@link #getNewNode() <em>New Node</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getNewNode()
+         * @generated
+         * @ordered
+         */
+        protected Node newNode;
+
+        /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -150,11 +162,63 @@ public class ClassDeclarationImpl extends RelationImpl implements ClassDeclarati
          * <!-- end-user-doc -->
          * @generated
          */
+        public Node getNewNode() {
+                return newNode;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetNewNode(Node newNewNode, NotificationChain msgs) {
+                Node oldNewNode = newNode;
+                newNode = newNewNode;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+                                        ProblemPackage.CLASS_DECLARATION__NEW_NODE, oldNewNode, newNewNode);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setNewNode(Node newNewNode) {
+                if (newNewNode != newNode) {
+                        NotificationChain msgs = null;
+                        if (newNode != null)
+                                msgs = ((InternalEObject) newNode).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - ProblemPackage.CLASS_DECLARATION__NEW_NODE, null, msgs);
+                        if (newNewNode != null)
+                                msgs = ((InternalEObject) newNewNode).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - ProblemPackage.CLASS_DECLARATION__NEW_NODE, null, msgs);
+                        msgs = basicSetNewNode(newNewNode, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, ProblemPackage.CLASS_DECLARATION__NEW_NODE,
+                                        newNewNode, newNewNode));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         @Override
         public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
                 switch (featureID) {
                 case ProblemPackage.CLASS_DECLARATION__REFERENCE_DECLARATIONS:
                         return ((InternalEList<?>) getReferenceDeclarations()).basicRemove(otherEnd, msgs);
+                case ProblemPackage.CLASS_DECLARATION__NEW_NODE:
+                        return basicSetNewNode(null, msgs);
                 }
                 return super.eInverseRemove(otherEnd, featureID, msgs);
         }
@@ -173,6 +237,8 @@ public class ClassDeclarationImpl extends RelationImpl implements ClassDeclarati
                         return getSuperTypes();
                 case ProblemPackage.CLASS_DECLARATION__REFERENCE_DECLARATIONS:
                         return getReferenceDeclarations();
+                case ProblemPackage.CLASS_DECLARATION__NEW_NODE:
+                        return getNewNode();
                 }
                 return super.eGet(featureID, resolve, coreType);
         }
@@ -197,6 +263,9 @@ public class ClassDeclarationImpl extends RelationImpl implements ClassDeclarati
                         getReferenceDeclarations().clear();
                         getReferenceDeclarations().addAll((Collection<? extends ReferenceDeclaration>) newValue);
                         return;
+                case ProblemPackage.CLASS_DECLARATION__NEW_NODE:
+                        setNewNode((Node) newValue);
+                        return;
                 }
                 super.eSet(featureID, newValue);
         }
@@ -218,6 +287,9 @@ public class ClassDeclarationImpl extends RelationImpl implements ClassDeclarati
                 case ProblemPackage.CLASS_DECLARATION__REFERENCE_DECLARATIONS:
                         getReferenceDeclarations().clear();
                         return;
+                case ProblemPackage.CLASS_DECLARATION__NEW_NODE:
+                        setNewNode((Node) null);
+                        return;
                 }
                 super.eUnset(featureID);
         }
@@ -236,6 +308,8 @@ public class ClassDeclarationImpl extends RelationImpl implements ClassDeclarati
                         return superTypes != null && !superTypes.isEmpty();
                 case ProblemPackage.CLASS_DECLARATION__REFERENCE_DECLARATIONS:
                         return referenceDeclarations != null && !referenceDeclarations.isEmpty();
+                case ProblemPackage.CLASS_DECLARATION__NEW_NODE:
+                        return newNode != null;
                 }
                 return super.eIsSet(featureID);
         }
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ConjunctionImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ConjunctionImpl.java
index 3bdf887f..72258cc1 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ConjunctionImpl.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ConjunctionImpl.java
@@ -45,6 +45,7 @@ public class ConjunctionImpl extends MinimalEObjectImpl.Container implements Con
          * @ordered
          */
         protected EList<ImplicitVariable> implicitVariables;
+
         /**
          * The cached value of the '{@link #getLiterals() <em>Literals</em>}' containment reference list.
          * <!-- begin-user-doc -->
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/NegativeLiteralImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/NegativeLiteralImpl.java
index 5295406b..857a779d 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/NegativeLiteralImpl.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/NegativeLiteralImpl.java
@@ -47,6 +47,7 @@ public class NegativeLiteralImpl extends MinimalEObjectImpl.Container implements
          * @ordered
          */
         protected EList<ImplicitVariable> implicitVariables;
+
         /**
          * The cached value of the '{@link #getAtom() <em>Atom</em>}' containment reference.
          * <!-- begin-user-doc -->
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemFactoryImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemFactoryImpl.java
index 563f8b05..3bb50cfe 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemFactoryImpl.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemFactoryImpl.java
@@ -87,6 +87,10 @@ public class ProblemFactoryImpl extends EFactoryImpl implements ProblemFactory {
                         return createRangeMultiplicity();
                 case ProblemPackage.EXACT_MULTIPLICITY:
                         return createExactMultiplicity();
+                case ProblemPackage.UNBOUNDED_MULTIPLICITY:
+                        return createUnboundedMultiplicity();
+                case ProblemPackage.ARGUMENT:
+                        return createArgument();
                 default:
                         throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
                 }
@@ -277,6 +281,26 @@ public class ProblemFactoryImpl extends EFactoryImpl implements ProblemFactory {
          * <!-- end-user-doc -->
          * @generated
          */
+        public UnboundedMultiplicity createUnboundedMultiplicity() {
+                UnboundedMultiplicityImpl unboundedMultiplicity = new UnboundedMultiplicityImpl();
+                return unboundedMultiplicity;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Argument createArgument() {
+                ArgumentImpl argument = new ArgumentImpl();
+                return argument;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         public LogicValue createLogicValueFromString(EDataType eDataType, String initialValue) {
                 LogicValue result = LogicValue.get(initialValue);
                 if (result == null)
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemImpl.java
index 32bba265..191021c4 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemImpl.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemImpl.java
@@ -11,8 +11,6 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
@@ -35,7 +33,7 @@ import org.eclipse.viatra.solver.language.model.problem.Statement;
  *
  * @generated
  */
-public class ProblemImpl extends MinimalEObjectImpl.Container implements Problem {
+public class ProblemImpl extends NamedElementImpl implements Problem {
         /**
          * The cached value of the '{@link #getNodes() <em>Nodes</em>}' containment reference list.
          * <!-- begin-user-doc -->
@@ -45,6 +43,7 @@ public class ProblemImpl extends MinimalEObjectImpl.Container implements Problem
          * @ordered
          */
         protected EList<Node> nodes;
+
         /**
          * The cached value of the '{@link #getStatements() <em>Statements</em>}' containment reference list.
          * <!-- begin-user-doc -->
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemPackageImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemPackageImpl.java
index de0aa595..f412addc 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemPackageImpl.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/ProblemPackageImpl.java
@@ -10,6 +10,7 @@ import org.eclipse.emf.ecore.EReference;
 
 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.Atom;
 import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration;
@@ -34,6 +35,7 @@ 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.TypeScope;
+import org.eclipse.viatra.solver.language.model.problem.UnboundedMultiplicity;
 import org.eclipse.viatra.solver.language.model.problem.Variable;
 
 /**
@@ -202,6 +204,20 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
          * <!-- end-user-doc -->
          * @generated
          */
+        private EClass unboundedMultiplicityEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass argumentEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         private EEnum logicValueEEnum = null;
 
         /**
@@ -345,6 +361,15 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
          * <!-- end-user-doc -->
          * @generated
          */
+        public EReference getClassDeclaration_NewNode() {
+                return (EReference) classDeclarationEClass.getEStructuralFeatures().get(3);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         public EClass getReferenceDeclaration() {
                 return referenceDeclarationEClass;
         }
@@ -517,7 +542,7 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
          * @generated
          */
         public EReference getAtom_Arguments() {
-                return (EReference) atomEClass.getEStructuralFeatures().get(1);
+                return (EReference) atomEClass.getEStructuralFeatures().get(2);
         }
 
         /**
@@ -526,7 +551,7 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
          * @generated
          */
         public EAttribute getAtom_TransitiveClosure() {
-                return (EAttribute) atomEClass.getEStructuralFeatures().get(2);
+                return (EAttribute) atomEClass.getEStructuralFeatures().get(1);
         }
 
         /**
@@ -741,6 +766,42 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
          * <!-- end-user-doc -->
          * @generated
          */
+        public EClass getUnboundedMultiplicity() {
+                return unboundedMultiplicityEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getArgument() {
+                return argumentEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getArgument_Variable() {
+                return (EReference) argumentEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getArgument_SingletonVariable() {
+                return (EReference) argumentEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         public EEnum getLogicValue() {
                 return logicValueEEnum;
         }
@@ -784,6 +845,7 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
                 createEAttribute(classDeclarationEClass, CLASS_DECLARATION__ABSTRACT);
                 createEReference(classDeclarationEClass, CLASS_DECLARATION__SUPER_TYPES);
                 createEReference(classDeclarationEClass, CLASS_DECLARATION__REFERENCE_DECLARATIONS);
+                createEReference(classDeclarationEClass, CLASS_DECLARATION__NEW_NODE);
 
                 referenceDeclarationEClass = createEClass(REFERENCE_DECLARATION);
                 createEReference(referenceDeclarationEClass, REFERENCE_DECLARATION__REFERENCE_TYPE);
@@ -811,8 +873,8 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
 
                 atomEClass = createEClass(ATOM);
                 createEReference(atomEClass, ATOM__RELATION);
-                createEReference(atomEClass, ATOM__ARGUMENTS);
                 createEAttribute(atomEClass, ATOM__TRANSITIVE_CLOSURE);
+                createEReference(atomEClass, ATOM__ARGUMENTS);
 
                 implicitVariableEClass = createEClass(IMPLICIT_VARIABLE);
 
@@ -848,6 +910,12 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
                 exactMultiplicityEClass = createEClass(EXACT_MULTIPLICITY);
                 createEAttribute(exactMultiplicityEClass, EXACT_MULTIPLICITY__EXACT_VALUE);
 
+                unboundedMultiplicityEClass = createEClass(UNBOUNDED_MULTIPLICITY);
+
+                argumentEClass = createEClass(ARGUMENT);
+                createEReference(argumentEClass, ARGUMENT__VARIABLE);
+                createEReference(argumentEClass, ARGUMENT__SINGLETON_VARIABLE);
+
                 // Create enums
                 logicValueEEnum = createEEnum(LOGIC_VALUE);
         }
@@ -881,6 +949,7 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
                 // Set bounds for type parameters
 
                 // Add supertypes to classes
+                problemEClass.getESuperTypes().add(this.getNamedElement());
                 relationEClass.getESuperTypes().add(this.getNamedElement());
                 classDeclarationEClass.getESuperTypes().add(this.getRelation());
                 classDeclarationEClass.getESuperTypes().add(this.getStatement());
@@ -899,6 +968,7 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
                 scopeDeclarationEClass.getESuperTypes().add(this.getStatement());
                 rangeMultiplicityEClass.getESuperTypes().add(this.getMultiplicity());
                 exactMultiplicityEClass.getESuperTypes().add(this.getMultiplicity());
+                unboundedMultiplicityEClass.getESuperTypes().add(this.getMultiplicity());
 
                 // Initialize classes, features, and operations; add parameters
                 initEClass(problemEClass, Problem.class, "Problem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -922,6 +992,9 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
                 initEReference(getClassDeclaration_ReferenceDeclarations(), this.getReferenceDeclaration(), null,
                                 "referenceDeclarations", null, 0, -1, ClassDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE,
                                 IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getClassDeclaration_NewNode(), this.getNode(), null, "newNode", null, 0, 1,
+                                ClassDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
                 initEClass(referenceDeclarationEClass, ReferenceDeclaration.class, "ReferenceDeclaration", !IS_ABSTRACT,
                                 !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -975,12 +1048,12 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
                 initEReference(getAtom_Relation(), this.getRelation(), null, "relation", null, 0, 1, Atom.class, !IS_TRANSIENT,
                                 !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
                                 IS_ORDERED);
-                initEReference(getAtom_Arguments(), this.getVariable(), null, "arguments", null, 0, -1, Atom.class,
-                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEAttribute(getAtom_TransitiveClosure(), ecorePackage.getEBoolean(), "transitiveClosure", null, 0, 1,
                                 Atom.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
                                 IS_ORDERED);
+                initEReference(getAtom_Arguments(), this.getArgument(), null, "arguments", null, 0, -1, Atom.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
                 initEClass(implicitVariableEClass, ImplicitVariable.class, "ImplicitVariable", !IS_ABSTRACT, !IS_INTERFACE,
                                 IS_GENERATED_INSTANCE_CLASS);
@@ -1048,6 +1121,18 @@ public class ProblemPackageImpl extends EPackageImpl implements ProblemPackage {
                                 ExactMultiplicity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
                                 !IS_DERIVED, IS_ORDERED);
 
+                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_Variable(), this.getVariable(), null, "variable", null, 0, 1, Argument.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getArgument_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);
+
                 // Initialize enums and add enum literals
                 initEEnum(logicValueEEnum, LogicValue.class, "LogicValue");
                 addEEnumLiteral(logicValueEEnum, LogicValue.TRUE);
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/UnboundedMultiplicityImpl.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/UnboundedMultiplicityImpl.java
new file mode 100644
index 00000000..34283189
--- /dev/null
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/impl/UnboundedMultiplicityImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.model.problem.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
+import org.eclipse.viatra.solver.language.model.problem.UnboundedMultiplicity;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Unbounded Multiplicity</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class UnboundedMultiplicityImpl extends MultiplicityImpl implements UnboundedMultiplicity {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected UnboundedMultiplicityImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return ProblemPackage.Literals.UNBOUNDED_MULTIPLICITY;
+        }
+
+} //UnboundedMultiplicityImpl
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemAdapterFactory.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemAdapterFactory.java
index f228f54a..c41a4034 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemAdapterFactory.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemAdapterFactory.java
@@ -177,6 +177,16 @@ public class ProblemAdapterFactory extends AdapterFactoryImpl {
                 }
 
                 @Override
+                public Adapter caseUnboundedMultiplicity(UnboundedMultiplicity object) {
+                        return createUnboundedMultiplicityAdapter();
+                }
+
+                @Override
+                public Adapter caseArgument(Argument object) {
+                        return createArgumentAdapter();
+                }
+
+                @Override
                 public Adapter defaultCase(EObject object) {
                         return createEObjectAdapter();
                 }
@@ -504,6 +514,34 @@ public class ProblemAdapterFactory extends AdapterFactoryImpl {
         }
 
         /**
+         * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.model.problem.UnboundedMultiplicity <em>Unbounded Multiplicity</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.UnboundedMultiplicity
+         * @generated
+         */
+        public Adapter createUnboundedMultiplicityAdapter() {
+                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;
+         * 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.Argument
+         * @generated
+         */
+        public Adapter createArgumentAdapter() {
+                return null;
+        }
+
+        /**
          * Creates a new adapter for the default case.
          * <!-- begin-user-doc -->
          * This default implementation returns null.
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemSwitch.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemSwitch.java
index a9e1455b..361b663c 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemSwitch.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/emf-gen/org/eclipse/viatra/solver/language/model/problem/util/ProblemSwitch.java
@@ -70,6 +70,8 @@ public class ProblemSwitch<T> extends Switch<T> {
                         Problem problem = (Problem) theEObject;
                         T result = caseProblem(problem);
                         if (result == null)
+                                result = caseNamedElement(problem);
+                        if (result == null)
                                 result = defaultCase(theEObject);
                         return result;
                 }
@@ -266,6 +268,22 @@ public class ProblemSwitch<T> extends Switch<T> {
                                 result = defaultCase(theEObject);
                         return result;
                 }
+                case ProblemPackage.UNBOUNDED_MULTIPLICITY: {
+                        UnboundedMultiplicity unboundedMultiplicity = (UnboundedMultiplicity) theEObject;
+                        T result = caseUnboundedMultiplicity(unboundedMultiplicity);
+                        if (result == null)
+                                result = caseMultiplicity(unboundedMultiplicity);
+                        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;
+                }
                 default:
                         return defaultCase(theEObject);
                 }
@@ -602,6 +620,36 @@ public class ProblemSwitch<T> extends Switch<T> {
         }
 
         /**
+         * Returns the result of interpreting the object as an instance of '<em>Unbounded Multiplicity</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>Unbounded Multiplicity</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseUnboundedMultiplicity(UnboundedMultiplicity object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>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>Argument</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseArgument(Argument object) {
+                return null;
+        }
+
+        /**
          * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
          * <!-- begin-user-doc -->
          * This implementation returns null;
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.ecore b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.ecore
index 9b87280d..dd52134b 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.ecore
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.ecore
@@ -2,7 +2,7 @@
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="problem" nsURI="http://www.eclipse.org/viatra/solver/language/model/Problem"
     nsPrefix="problem">
-  <eClassifiers xsi:type="ecore:EClass" name="Problem">
+  <eClassifiers xsi:type="ecore:EClass" name="Problem" eSuperTypes="#//NamedElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
         eType="#//Node" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="statements" upperBound="-1"
@@ -15,6 +15,8 @@
         eType="#//ClassDeclaration"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="referenceDeclarations"
         upperBound="-1" eType="#//ReferenceDeclaration" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="newNode" eType="#//Node"
+        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ReferenceDeclaration" eSuperTypes="#//Relation">
     <eStructuralFeatures xsi:type="ecore:EReference" name="referenceType" eType="#//ClassDeclaration"/>
@@ -44,9 +46,9 @@
   <eClassifiers xsi:type="ecore:EClass" name="Literal" abstract="true"/>
   <eClassifiers xsi:type="ecore:EClass" name="Atom" eSuperTypes="#//Literal">
     <eStructuralFeatures xsi:type="ecore:EReference" name="relation" eType="#//Relation"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1"
-        eType="#//Variable"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="transitiveClosure" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1"
+        eType="#//Argument" containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ImplicitVariable" eSuperTypes="#//Variable"/>
   <eClassifiers xsi:type="ecore:EClass" name="NegativeLiteral" eSuperTypes="#//ExistentialQuantifier #//Literal">
@@ -91,4 +93,10 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="exactValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
         defaultValueLiteral="1"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="UnboundedMultiplicity" eSuperTypes="#//Multiplicity"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Argument">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="variable" eType="#//Variable"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="singletonVariable" eType="#//ImplicitVariable"
+        containment="true"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.genmodel b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.genmodel
index 2dfe62e6..379cb028 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.genmodel
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.model/src/main/resources/model/problem.genmodel
@@ -25,6 +25,7 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//ClassDeclaration/abstract"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//ClassDeclaration/superTypes"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ClassDeclaration/referenceDeclarations"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference problem.ecore#//ClassDeclaration/newNode"/>
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//ReferenceDeclaration">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//ReferenceDeclaration/referenceType"/>
@@ -50,8 +51,8 @@
     <genClasses ecoreClass="problem.ecore#//Literal"/>
     <genClasses ecoreClass="problem.ecore#//Atom">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Atom/relation"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Atom/arguments"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute problem.ecore#//Atom/transitiveClosure"/>
+      <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Atom/arguments"/>
     </genClasses>
     <genClasses ecoreClass="problem.ecore#//ImplicitVariable"/>
     <genClasses ecoreClass="problem.ecore#//NegativeLiteral">
@@ -83,5 +84,10 @@
     <genClasses ecoreClass="problem.ecore#//ExactMultiplicity">
       <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/variable"/>
+      <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference problem.ecore#//Argument/singletonVariable"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/.classpath b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/.classpath
index 659559e1..82e9aceb 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/.classpath
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/.classpath
@@ -6,19 +6,19 @@
                         <attribute name="gradle_used_by_scope" value="main,test"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="src" output="bin/main" path="src/main/resources">
+        <classpathentry kind="src" output="bin/main" path="src/main/xtext-gen">
                 <attributes>
                         <attribute name="gradle_scope" value="main"/>
                         <attribute name="gradle_used_by_scope" value="main,test"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="src" output="bin/main" path="src/main/xtext-gen">
+        <classpathentry kind="src" output="bin/main" path="src/main/xtend-gen">
                 <attributes>
                         <attribute name="gradle_scope" value="main"/>
                         <attribute name="gradle_used_by_scope" value="main,test"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="src" output="bin/main" path="src/main/xtend-gen">
+        <classpathentry kind="src" output="bin/main" path="src/main/resources">
                 <attributes>
                         <attribute name="gradle_scope" value="main"/>
                         <attribute name="gradle_used_by_scope" value="main,test"/>
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7adc0fb9..00000000
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,10 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/build.gradle b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/build.gradle
index a3bfc039..495b1339 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/build.gradle
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/build.gradle
@@ -11,7 +11,9 @@ dependencies {
         compile "org.webjars:requirejs:2.3.6"
         compile "org.webjars:requirejs-text:2.0.15"
         compile "org.webjars:jquery:3.6.0"
-        compile "org.webjars:codemirror:5.41.0"
+        // CodeMirror 5.53.0 and later is incompatible with Xtext due to
+        // https://github.com/codemirror/CodeMirror/commit/b2d26b4ccb1d0994ae84d18ad8b84018de176da9#commitcomment-41525744
+        compile "org.webjars.npm:codemirror:5.52.2"
         providedCompile "org.eclipse.jetty:jetty-annotations:9.4.42.v20210604"
         providedCompile "org.eclipse.jetty:jetty-rewrite:9.4.42.v20210604"
         providedCompile "org.slf4j:slf4j-simple:1.7.31"
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/index.html b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/index.html
index bf55f237..112adb74 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/index.html
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/index.html
@@ -2,8 +2,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta http-equiv="Content-Language" content="en-us">
 <title>Example Web Editor</title>
-<link rel="stylesheet" type="text/css" href="webjars/codemirror/5.41.0/lib/codemirror.css" />
-<link rel="stylesheet" type="text/css" href="webjars/codemirror/5.41.0/addon/hint/show-hint.css" />
+<link rel="stylesheet" type="text/css" href="webjars/codemirror/5.52.2/lib/codemirror.css" />
+<link rel="stylesheet" type="text/css" href="webjars/codemirror/5.52.2/addon/hint/show-hint.css" />
 <link rel="stylesheet" type="text/css" href="xtext/2.26.0.M1/xtext-codemirror.css" />
 <link rel="stylesheet" type="text/css" href="style.css" />
 <body>
@@ -16,22 +16,24 @@
                  data-editor-xtext-lang="problem"
                  data-editor-enable-formatting-action="true"
                  data-editor-send-full-text="false"
-            ><pre>class Family
-    contains Person[0..*] members.
+            ><pre>class Family {
+    contains Person[] members
+}
 
-class Person
-    refers Person[0..*] children opposite parent,
-    refers Person[0..1] parent opposite children.
+class Person {
+    refers Person[] children opposite parent
+    refers Person parent opposite children
+}
 
-error loop(Person p) := children+(p, p).
+error loop(Person p) :- children+(p, p).
 
-error multipleRoots(Person p, Person q) :=
+error multipleRoots(Person p, Person q) :-
     !equals(p, q), !parent(p, _), !parent(q, _).
 
-Family(family).
-members(family, anne).
-members(family, bob).
-members(family, ciri).
+Family('family').
+members('family', anne).
+members('family', bob).
+members('family', ciri).
 children(anne, ciri).
 ?children(bob, ciri).
 
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/script.js b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/script.js
index fcaca4a4..dced7eca 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/script.js
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/script.js
@@ -11,7 +11,7 @@ require.config({
     },
     packages: [{
         name: "codemirror",
-        location: "webjars/codemirror/5.41.0",
+        location: "webjars/codemirror/5.52.2",
         main: "lib/codemirror"
     }]
 });
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/style.css b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/style.css
index f1551c3d..b24610f4 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/style.css
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/style.css
@@ -70,22 +70,30 @@ a:hover {
         color: #8b8816;
 }
 
-.problem-reference, .problem-containment, .problem-predicate {
+.problem-reference {
         color: #0000c0;
 }
 
-.problem-error {
-        color: #ab3000;
+.problem-containment {
+        font-weight: bold;
 }
 
-.problem-containment {
+.problem-node {
+        color: inherit !important;
+}
+
+.problem-enum-node {
         font-weight: bold;
 }
 
-.problem-parameter, .problem-variable {
+.problem-new-node {
+        font-style: italic;
+}
+
+.problem-variable {
         color: #6a3e3e;
 }
 
-.problem-node {
-        text-decoration: underline;
+.problem-singleton-variable {
+        opacity: 0.7;
 }
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/xtext-resources/generated/mode-problem.js b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/xtext-resources/generated/mode-problem.js
index ab748b03..0abfa5ee 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/xtext-resources/generated/mode-problem.js
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language.web/src/main/webapp/xtext-resources/generated/mode-problem.js
@@ -1,5 +1,5 @@
 define(["codemirror", "codemirror/addon/mode/simple"], function(CodeMirror, SimpleMode) {
-        var keywords = "abstract|class|contains|error|extends|false|opposite|pred|refers|scope|true|unknown";
+        var keywords = "abstract|class|contains|error|extends|false|opposite|pred|problem|refers|scope|true|unknown";
         CodeMirror.defineSimpleMode("xtext/problem", {
                 start: [
                         {token: "comment", regex: "\\/\\/.*$"},
@@ -7,8 +7,8 @@ define(["codemirror", "codemirror/addon/mode/simple"], function(CodeMirror, Simp
                         {token: "string", regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},
                         {token: "string", regex: "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},
                         {token: "constant.numeric", regex: "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},
-                        {token: "lparen", regex: "[\\[(]"},
-                        {token: "rparen", regex: "[\\])]"},
+                        {token: "lparen", regex: "[\\[({]"},
+                        {token: "rparen", regex: "[\\])}]"},
                         {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"}
                 ],
                 comment: [
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/.classpath b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/.classpath
index 01bce195..032f6f94 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/.classpath
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/.classpath
@@ -6,19 +6,20 @@
                         <attribute name="gradle_used_by_scope" value="main,test"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="src" output="bin/main" path="src/main/resources">
+        <classpathentry kind="src" output="bin/main" path="src/main/xtext-gen">
                 <attributes>
+                        <attribute name="ignore_optional_problems" value="true"/>
                         <attribute name="gradle_scope" value="main"/>
                         <attribute name="gradle_used_by_scope" value="main,test"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="src" output="bin/main" path="src/main/xtext-gen">
+        <classpathentry kind="src" output="bin/main" path="src/main/xtend-gen">
                 <attributes>
                         <attribute name="gradle_scope" value="main"/>
                         <attribute name="gradle_used_by_scope" value="main,test"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="src" output="bin/main" path="src/main/xtend-gen">
+        <classpathentry kind="src" output="bin/main" path="src/main/resources">
                 <attributes>
                         <attribute name="gradle_scope" value="main"/>
                         <attribute name="gradle_used_by_scope" value="main,test"/>
@@ -31,21 +32,21 @@
                         <attribute name="test" value="true"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="src" output="bin/test" path="src/test/resources">
+        <classpathentry kind="src" output="bin/test" path="src/test/xtext-gen">
                 <attributes>
                         <attribute name="gradle_scope" value="test"/>
                         <attribute name="gradle_used_by_scope" value="test"/>
                         <attribute name="test" value="true"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="src" output="bin/test" path="src/test/xtext-gen">
+        <classpathentry kind="src" output="bin/test" path="src/test/xtend-gen">
                 <attributes>
                         <attribute name="gradle_scope" value="test"/>
                         <attribute name="gradle_used_by_scope" value="test"/>
                         <attribute name="test" value="true"/>
                 </attributes>
         </classpathentry>
-        <classpathentry kind="src" output="bin/test" path="src/test/xtend-gen">
+        <classpathentry kind="src" output="bin/test" path="src/test/resources">
                 <attributes>
                         <attribute name="gradle_scope" value="test"/>
                         <attribute name="gradle_used_by_scope" value="test"/>
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7adc0fb9..00000000
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,10 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext
index 81c18d0d..2d4eb1b9 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/Problem.xtext
@@ -4,6 +4,7 @@ import "http://www.eclipse.org/emf/2002/Ecore" as ecore
 import "http://www.eclipse.org/viatra/solver/language/model/Problem"
 
 Problem:
+        ("problem" name=ID ".")?
         statements+=Statement*;
 
 Statement:
@@ -12,16 +13,13 @@ Statement:
 ClassDeclaration:
         abstract?="abstract"? "class"
         name=ID
-        ("extends" (superTypes+=[ClassDeclaration] |
-        "[" (superTypes+=[ClassDeclaration] ("," superTypes+=[ClassDeclaration])*)? "]") |
-        referenceDeclarations+=ReferenceDeclaration)?
-        ("," referenceDeclarations+=ReferenceDeclaration)*
-        ".";
+        ("extends" superTypes+=[ClassDeclaration|QualifiedName] ("," superTypes+=[ClassDeclaration|QualifiedName])*)?
+        ("{" (referenceDeclarations+=ReferenceDeclaration ";"?)* "}" | ".");
 
 ReferenceDeclaration:
         (containment?="contains" | "refers")
-        referenceType=[ClassDeclaration]
-        "[" multiplicity=Multiplicity "]"
+        referenceType=[ClassDeclaration|QualifiedName]
+        ("[" multiplicity=Multiplicity "]")?
         name=ID
         ("opposite" opposite=[ReferenceDeclaration|QualifiedName])?;
 
@@ -29,7 +27,7 @@ PredicateDefinition:
         (error?="error" "pred"? | "pred")
         name=ID
         "(" (parameters+=Parameter ("," parameters+=Parameter)*)? ")"
-        (":=" bodies+=Conjunction (";" bodies+=Conjunction)*)?
+        (":-" bodies+=Conjunction (";" bodies+=Conjunction)*)?
         ".";
 
 Parameter:
@@ -47,7 +45,10 @@ NegativeLiteral:
 Atom:
         relation=[Relation|QualifiedName]
         transitiveClosure?="+"?
-        "(" (arguments+=[Variable] ("," arguments+=[Variable])*)? ")";
+        "(" (arguments+=Argument ("," arguments+=Argument)*)? ")";
+
+Argument:
+        variable=[Variable];
 
 Assertion:
         (relation=[Relation|QualifiedName]
@@ -70,11 +71,17 @@ ScopeDeclaration:
 TypeScope:
         targetType=[ClassDeclaration]
         (increment?="+=" | "=")
-        multiplicity=Multiplicity;
+        multiplicity=DefiniteMultiplicity;
 
 Multiplicity:
+        UnboundedMultiplicity | DefiniteMultiplicity;
+
+DefiniteMultiplicity returns Multiplicity:
         RangeMultiplicity | ExactMultiplicity;
 
+UnboundedMultiplicity:
+        {UnboundedMultiplicity};
+
 RangeMultiplicity:
         lowerBound=INT ".." upperBound=UpperBound;
 
@@ -85,4 +92,9 @@ UpperBound returns ecore::EInt:
         INT | "*";
 
 QualifiedName:
-        ID ("::" ID)*;
+        QUOTED_ID | ID (":" ID)* (":" QUOTED_ID)?;
+
+@Override
+terminal STRING: '"' ( '\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\'|'"') )* '"';
+
+terminal QUOTED_ID: "'" ( '\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\'|"'") )* "'";
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/ProblemRuntimeModule.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/ProblemRuntimeModule.java
index b2a3218c..eb9ddd77 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/ProblemRuntimeModule.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/ProblemRuntimeModule.java
@@ -5,14 +5,13 @@ package org.eclipse.viatra.solver.language;
 
 import org.eclipse.viatra.solver.language.conversion.ProblemValueConverterService;
 import org.eclipse.viatra.solver.language.naming.ProblemQualifiedNameConverter;
-import org.eclipse.viatra.solver.language.naming.ProblemQualifiedNameProvider;
 import org.eclipse.viatra.solver.language.resource.ProblemDerivedStateComputer;
 import org.eclipse.viatra.solver.language.resource.ProblemLocationInFileProvider;
 import org.eclipse.viatra.solver.language.resource.ProblemResourceDescriptionStrategy;
 import org.eclipse.viatra.solver.language.scoping.ProblemGlobalScopeProvider;
+import org.eclipse.viatra.solver.language.scoping.ProblemLocalScopeProvider;
 import org.eclipse.xtext.conversion.IValueConverterService;
 import org.eclipse.xtext.naming.IQualifiedNameConverter;
-import org.eclipse.xtext.naming.IQualifiedNameProvider;
 import org.eclipse.xtext.resource.DerivedStateAwareResource;
 import org.eclipse.xtext.resource.DerivedStateAwareResourceDescriptionManager;
 import org.eclipse.xtext.resource.IDefaultResourceDescriptionStrategy;
@@ -23,7 +22,6 @@ import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.scoping.IGlobalScopeProvider;
 import org.eclipse.xtext.scoping.IScopeProvider;
 import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider;
-import org.eclipse.xtext.scoping.impl.SimpleLocalScopeProvider;
 import org.eclipse.xtext.validation.IResourceValidator;
 import org.eclipse.xtext.xbase.annotations.validation.DerivedStateAwareResourceValidator;
 
@@ -39,10 +37,6 @@ public class ProblemRuntimeModule extends AbstractProblemRuntimeModule {
                 return ProblemQualifiedNameConverter.class;
         }
 
-        public Class<? extends IQualifiedNameProvider> bindIQualifiedNameProvider() {
-                return ProblemQualifiedNameProvider.class;
-        }
-
         public Class<? extends IDefaultResourceDescriptionStrategy> bindIDefaultResourceDescriptionStrategy() {
                 return ProblemResourceDescriptionStrategy.class;
         }
@@ -51,19 +45,19 @@ public class ProblemRuntimeModule extends AbstractProblemRuntimeModule {
         public Class<? extends IValueConverterService> bindIValueConverterService() {
                 return ProblemValueConverterService.class;
         }
-        
-        @Override
-        public void configureIScopeProviderDelegate(Binder binder) {
-                binder.bind(IScopeProvider.class).annotatedWith(Names.named(AbstractDeclarativeScopeProvider.NAMED_DELEGATE))
-                                .to(SimpleLocalScopeProvider.class);
-        }
-        
+
         @Override
         public Class<? extends IGlobalScopeProvider> bindIGlobalScopeProvider() {
                 return ProblemGlobalScopeProvider.class;
         }
 
         @Override
+        public void configureIScopeProviderDelegate(Binder binder) {
+                binder.bind(IScopeProvider.class).annotatedWith(Names.named(AbstractDeclarativeScopeProvider.NAMED_DELEGATE))
+                                .to(ProblemLocalScopeProvider.class);
+        }
+
+        @Override
         public Class<? extends XtextResource> bindXtextResource() {
                 return DerivedStateAwareResource.class;
         }
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java
new file mode 100644
index 00000000..0151e0c0
--- /dev/null
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/ProblemUtil.java
@@ -0,0 +1,31 @@
+package org.eclipse.viatra.solver.language;
+
+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.Variable;
+
+import com.google.inject.Singleton;
+
+@Singleton
+public class ProblemUtil {
+        public static final String SINGLETON_VARIABLE_PREFIX = "_";
+
+        public static final String ENUM_NODE_NAME_QUOTE = "'";
+
+        public static boolean isSingletonVariableName(String name) {
+                return name != null && name.startsWith(SINGLETON_VARIABLE_PREFIX);
+        }
+
+        public static boolean isSingletonVariable(Variable variable) {
+                return variable.eContainingFeature() == ProblemPackage.Literals.ARGUMENT__SINGLETON_VARIABLE;
+        }
+
+        public static boolean isEnumNode(Node node) {
+                String name = node.getName();
+                return name != null && name.startsWith(ENUM_NODE_NAME_QUOTE) && name.endsWith(ENUM_NODE_NAME_QUOTE);
+        }
+
+        public static boolean isNewNode(Node node) {
+                return node.eContainingFeature() == ProblemPackage.Literals.CLASS_DECLARATION__NEW_NODE;
+        }
+}
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameConverter.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameConverter.java
index ebb7e7b4..3cee31f3 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameConverter.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameConverter.java
@@ -6,8 +6,10 @@ import com.google.inject.Singleton;
 
 @Singleton
 public class ProblemQualifiedNameConverter extends IQualifiedNameConverter.DefaultImpl {
+        public static final String DELIMITER = ":";
+        
         @Override
         public String getDelimiter() {
-                return "::";
+                return DELIMITER;
         }
 }
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameProvider.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameProvider.java
deleted file mode 100644
index 81365724..00000000
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/naming/ProblemQualifiedNameProvider.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.eclipse.viatra.solver.language.naming;
-
-import org.eclipse.viatra.solver.language.model.problem.Node;
-import org.eclipse.xtext.naming.DefaultDeclarativeQualifiedNameProvider;
-import org.eclipse.xtext.naming.QualifiedName;
-
-public class ProblemQualifiedNameProvider extends DefaultDeclarativeQualifiedNameProvider {
-        public QualifiedName qualifiedName(Node node) {
-                String name = node.getName();
-                if (name == null || name.isEmpty()) {
-                        return null;
-                }
-                return getConverter().toQualifiedName(name);
-        }
-}
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java
index 571b5745..c161de22 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemDerivedStateComputer.java
@@ -6,6 +6,8 @@ import java.util.Set;
 import java.util.regex.Pattern;
 
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.viatra.solver.language.ProblemUtil;
+import org.eclipse.viatra.solver.language.model.problem.Argument;
 import org.eclipse.viatra.solver.language.model.problem.Assertion;
 import org.eclipse.viatra.solver.language.model.problem.Atom;
 import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration;
@@ -39,12 +41,7 @@ import com.google.inject.Singleton;
 public class ProblemDerivedStateComputer implements IDerivedStateComputer {
         public static final String NEW_NODE = "new";
 
-        private static final String ID_REGEX_STRING = "[_a-zA-Z][_0-9a-zA-Z]*";
-
-        private static final Pattern ID_REGEX = Pattern.compile(ID_REGEX_STRING);
-
-        private static final Pattern QUALIFIED_NAME_REGEX = Pattern
-                        .compile(ID_REGEX_STRING + "(::" + ID_REGEX_STRING + ")*");
+        private static final Pattern ID_REGEX = Pattern.compile("[_a-zA-Z][_0-9a-zA-Z]*|'(\\\\.|[^\\'])*'");
 
         @Inject
         private LinkingHelper linkingHelper;
@@ -65,7 +62,7 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
         }
 
         protected void installDerivedProblemState(Problem problem, boolean preLinkingPhase) {
-                Set<String> nodeNames = new HashSet<>();
+                installNewNodes(problem);
                 if (!preLinkingPhase) {
                         installDerivedNodes(problem);
                 }
@@ -75,31 +72,24 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
                                 installDerivedPredicateDefinitionState(definition);
                         }
                 }
-                List<Node> grapNodes = problem.getNodes();
-                for (String nodeName : nodeNames) {
-                        Node graphNode = ProblemFactory.eINSTANCE.createNode();
-                        graphNode.setName(nodeName);
-                        grapNodes.add(graphNode);
-                }
         }
 
-        protected void installDerivedNodes(Problem problem) {
-                IScope nodeScope = scopeProvider.getScope(problem.eResource(), ProblemPackage.Literals.ASSERTION__ARGUMENTS,
-                                Predicates.alwaysTrue());
-                Set<String> nodeNames = new HashSet<>();
+        protected void installNewNodes(Problem problem) {
                 for (Statement statement : problem.getStatements()) {
                         if (statement instanceof ClassDeclaration) {
                                 ClassDeclaration declaration = (ClassDeclaration) statement;
                                 if (!declaration.isAbstract()) {
-                                        String className = declaration.getName();
-                                        if (validId(className)) {
-                                                QualifiedName qualifiedName = QualifiedName.create(className, NEW_NODE);
-                                                String nodeName = qualifiedNameConverter.toString(qualifiedName);
-                                                nodeNames.add(nodeName);
-                                        }
+                                        Node newNode = createNode(NEW_NODE);
+                                        declaration.setNewNode(newNode);
                                 }
                         }
                 }
+        }
+
+        protected void installDerivedNodes(Problem problem) {
+                IScope nodeScope = scopeProvider.getScope(problem.eResource(), ProblemPackage.Literals.ASSERTION__ARGUMENTS,
+                                Predicates.alwaysTrue());
+                Set<String> nodeNames = new HashSet<>();
                 for (Statement statement : problem.getStatements()) {
                         if (statement instanceof Assertion) {
                                 Assertion assertion = (Assertion) statement;
@@ -107,9 +97,9 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
                                                 ProblemPackage.Literals.ASSERTION__ARGUMENTS);
                                 for (INode node : nodes) {
                                         String nodeName = linkingHelper.getCrossRefNodeAsString(node, true);
-                                        if (validQualifiedName(nodeName)) {
+                                        if (validId(nodeName)) {
                                                 QualifiedName qualifiedName = qualifiedNameConverter.toQualifiedName(nodeName);
-                                                if (nodeScope.getSingleElement(qualifiedName) == null) {
+                                                if (!nodeNames.contains(nodeName) && nodeScope.getSingleElement(qualifiedName) == null) {
                                                         nodeNames.add(nodeName);
                                                 }
                                         }
@@ -118,12 +108,17 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
                 }
                 List<Node> grapNodes = problem.getNodes();
                 for (String nodeName : nodeNames) {
-                        Node graphNode = ProblemFactory.eINSTANCE.createNode();
-                        graphNode.setName(nodeName);
+                        Node graphNode = createNode(nodeName);
                         grapNodes.add(graphNode);
                 }
         }
 
+        protected Node createNode(String name) {
+                Node node = ProblemFactory.eINSTANCE.createNode();
+                node.setName(name);
+                return node;
+        }
+
         protected void installDerivedPredicateDefinitionState(PredicateDefinition definition) {
                 Set<String> parameterNames = new HashSet<>();
                 for (Parameter parameter : definition.getParameters()) {
@@ -142,7 +137,7 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
                 for (Literal literal : conjunction.getLiterals()) {
                         if (literal instanceof Atom) {
                                 Atom atom = (Atom) literal;
-                                collectVariables(atom, knownVariables, newVariables);
+                                createSigletonVariablesAndCollectVariables(atom, knownVariables, newVariables);
                         }
                 }
                 createVariables(conjunction, newVariables);
@@ -157,14 +152,25 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
 
         protected void installDeriveNegativeLiteralState(NegativeLiteral negativeLiteral, Set<String> knownVariables) {
                 Set<String> newVariables = new HashSet<>();
-                collectVariables(negativeLiteral.getAtom(), knownVariables, newVariables);
+                createSigletonVariablesAndCollectVariables(negativeLiteral.getAtom(), knownVariables, newVariables);
                 createVariables(negativeLiteral, newVariables);
         }
 
-        protected void collectVariables(Atom atom, Set<String> knownVariables, Set<String> newVariables) {
+        protected void createSigletonVariablesAndCollectVariables(Atom atom, Set<String> knownVariables,
+                        Set<String> newVariables) {
                 List<INode> nodes = NodeModelUtils.findNodesForFeature(atom, ProblemPackage.Literals.ATOM__ARGUMENTS);
-                for (INode node : nodes) {
+                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 (ProblemUtil.isSingletonVariableName(variableName)) {
+                                if (i < argumentsSize) {
+                                        createSingletonVariable(arguments.get(i), variableName);
+                                }
+                                continue;
+                        }
                         if (!knownVariables.contains(variableName)) {
                                 newVariables.add(variableName);
                         }
@@ -173,14 +179,30 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
 
         protected void createVariables(ExistentialQuantifier quantifier, Set<String> newVariables) {
                 for (String variableName : newVariables) {
-                        if (validId(variableName)) {
-                                ImplicitVariable variable = ProblemFactory.eINSTANCE.createImplicitVariable();
-                                variable.setName(variableName);
-                                quantifier.getImplicitVariables().add(variable);
-                        }
+                        createVariable(quantifier, variableName);
+                }
+        }
+
+        protected void createVariable(ExistentialQuantifier quantifier, String variableName) {
+                if (validId(variableName)) {
+                        ImplicitVariable variable = createNamedVariable(variableName);
+                        quantifier.getImplicitVariables().add(variable);
                 }
         }
 
+        protected void createSingletonVariable(Argument argument, String variableName) {
+                if (validId(variableName)) {
+                        ImplicitVariable variable = createNamedVariable(variableName);
+                        argument.setSingletonVariable(variable);
+                }
+        }
+
+        protected ImplicitVariable createNamedVariable(String variableName) {
+                ImplicitVariable variable = ProblemFactory.eINSTANCE.createImplicitVariable();
+                variable.setName(variableName);
+                return variable;
+        }
+
         @Override
         public void discardDerivedState(DerivedStateAwareResource resource) {
                 for (EObject object : resource.getContents()) {
@@ -193,7 +215,10 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
         protected void discardDerivedProblemState(Problem problem) {
                 problem.getNodes().clear();
                 for (Statement statement : problem.getStatements()) {
-                        if (statement instanceof PredicateDefinition) {
+                        if (statement instanceof ClassDeclaration) {
+                                ClassDeclaration classDeclaration = (ClassDeclaration) statement;
+                                classDeclaration.setNewNode(null);
+                        } else if (statement instanceof PredicateDefinition) {
                                 PredicateDefinition definition = (PredicateDefinition) statement;
                                 for (Conjunction body : definition.getBodies()) {
                                         body.getImplicitVariables().clear();
@@ -211,8 +236,4 @@ public class ProblemDerivedStateComputer implements IDerivedStateComputer {
         protected static boolean validId(String name) {
                 return name != null && ID_REGEX.matcher(name).matches();
         }
-        
-        protected static boolean validQualifiedName(String name) {
-                return name != null && QUALIFIED_NAME_REGEX.matcher(name).matches();
-        }
 }
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java
index dfffc7ef..d3976ec5 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemLocationInFileProvider.java
@@ -3,6 +3,8 @@ package org.eclipse.viatra.solver.language.resource;
 import java.util.Iterator;
 
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.viatra.solver.language.ProblemUtil;
+import org.eclipse.viatra.solver.language.model.problem.Argument;
 import org.eclipse.viatra.solver.language.model.problem.Assertion;
 import org.eclipse.viatra.solver.language.model.problem.Atom;
 import org.eclipse.viatra.solver.language.model.problem.Conjunction;
@@ -14,23 +16,10 @@ import org.eclipse.viatra.solver.language.model.problem.Problem;
 import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
 import org.eclipse.viatra.solver.language.model.problem.Statement;
 import org.eclipse.xtext.EcoreUtil2;
-import org.eclipse.xtext.naming.IQualifiedNameProvider;
-import org.eclipse.xtext.naming.QualifiedName;
 import org.eclipse.xtext.resource.DefaultLocationInFileProvider;
-import org.eclipse.xtext.resource.IEObjectDescription;
-import org.eclipse.xtext.scoping.IScope;
-import org.eclipse.xtext.scoping.IScopeProvider;
 import org.eclipse.xtext.util.ITextRegion;
 
-import com.google.inject.Inject;
-
 public class ProblemLocationInFileProvider extends DefaultLocationInFileProvider {
-        @Inject
-        private IQualifiedNameProvider qualifiedNameProvider;
-
-        @Inject
-        private IScopeProvider scopeProvider;
-
         @Override
         protected ITextRegion doGetTextRegion(EObject obj, RegionDescription query) {
                 if (obj instanceof Node) {
@@ -51,21 +40,9 @@ public class ProblemLocationInFileProvider extends DefaultLocationInFileProvider
         }
         
         protected ITextRegion getNewNodeTextRegion(Node node, RegionDescription query) {
-                QualifiedName nodeName = qualifiedNameProvider.getFullyQualifiedName(node);
-                if (nodeName == null || nodeName.getSegmentCount() <= 1) {
-                        return null;
-                }
-                if (ProblemDerivedStateComputer.NEW_NODE.equals(nodeName.getLastSegment())) {
-                        QualifiedName className = nodeName.skipLast(1);
-                        IScope classScope = scopeProvider.getScope(node, ProblemPackage.Literals.ASSERTION__RELATION);
-                        IEObjectDescription description = classScope.getSingleElement(className);
-                        if (description == null) {
-                                return null;
-                        }
-                        EObject classDeclaration = description.getEObjectOrProxy();
-                        if (!classDeclaration.eIsProxy()) {
-                                return doGetTextRegion(classDeclaration, query);
-                        }
+                if (ProblemUtil.isNewNode(node)) {
+                        EObject container = node.eContainer();
+                        return doGetTextRegion(container, query);
                 }
                 return null;
         }
@@ -90,6 +67,9 @@ public class ProblemLocationInFileProvider extends DefaultLocationInFileProvider
 
         protected ITextRegion getVariableTextRegion(ImplicitVariable variable, RegionDescription query) {
                 EObject container = variable.eContainer();
+                if (container instanceof Argument) {
+                        return getArgumentTextRegion((Argument) container, query);
+                }
                 if (container instanceof Conjunction) {
                         return getFirstReferenceToVariableInConjunction(variable, (Conjunction) container, query);
                 }
@@ -121,10 +101,15 @@ public class ProblemLocationInFileProvider extends DefaultLocationInFileProvider
 
         protected ITextRegion getFirstReferenceToVariableInAtom(ImplicitVariable variable, Atom atom,
                         RegionDescription query) {
-                int index = atom.getArguments().indexOf(variable);
-                if (index >= 0) {
-                        return doGetLocationOfFeature(atom, ProblemPackage.Literals.ATOM__ARGUMENTS, index, query);
+                for (Argument argument : atom.getArguments()) {
+                        if (argument.getVariable().equals(variable)) {
+                                return getArgumentTextRegion(argument, query);
+                        }
                 }
                 return ITextRegion.EMPTY_REGION;
         }
+        
+        protected ITextRegion getArgumentTextRegion(Argument argument, RegionDescription query) {
+                return doGetLocationOfFeature(argument, ProblemPackage.Literals.ARGUMENT__VARIABLE, 0, query);
+        }
 }
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemResourceDescriptionStrategy.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemResourceDescriptionStrategy.java
index 7b37ffd6..95a9fe6b 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemResourceDescriptionStrategy.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/resource/ProblemResourceDescriptionStrategy.java
@@ -1,39 +1,84 @@
 package org.eclipse.viatra.solver.language.resource;
 
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.viatra.solver.language.model.problem.ReferenceDeclaration;
+import org.eclipse.viatra.solver.language.model.problem.NamedElement;
+import org.eclipse.viatra.solver.language.model.problem.Problem;
 import org.eclipse.viatra.solver.language.model.problem.Variable;
+import org.eclipse.xtext.EcoreUtil2;
+import org.eclipse.xtext.naming.IQualifiedNameConverter;
 import org.eclipse.xtext.naming.QualifiedName;
+import org.eclipse.xtext.resource.EObjectDescription;
 import org.eclipse.xtext.resource.IEObjectDescription;
-import org.eclipse.xtext.resource.impl.AliasedEObjectDescription;
 import org.eclipse.xtext.resource.impl.DefaultResourceDescriptionStrategy;
 import org.eclipse.xtext.util.IAcceptor;
 
+import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
 @Singleton
 public class ProblemResourceDescriptionStrategy extends DefaultResourceDescriptionStrategy {
+        @Inject
+        private IQualifiedNameConverter qualifiedNameConverter;
+
         @Override
         public boolean createEObjectDescriptions(EObject eObject, IAcceptor<IEObjectDescription> acceptor) {
-                IAcceptor<IEObjectDescription> wrappedAcceptor;
                 if (eObject instanceof Variable) {
                         return false;
                 }
-                if (eObject instanceof ReferenceDeclaration) {
-                        wrappedAcceptor = new IAcceptor<IEObjectDescription>() {
-                                public void accept(IEObjectDescription description) {
-                                        acceptor.accept(description);
-                                        QualifiedName qualifiedName = description.getQualifiedName();
-                                        if (qualifiedName.getSegmentCount() >= 2) {
-                                                QualifiedName simpleName = QualifiedName.create(qualifiedName.getLastSegment());
-                                                IEObjectDescription aliasedDescription = new AliasedEObjectDescription(simpleName, description);
-                                                acceptor.accept(aliasedDescription);
+                if (eObject instanceof NamedElement) {
+                        NamedElement namedElement = (NamedElement) eObject;
+                        String name = namedElement.getName();
+                        if (name == null || name.isEmpty()) {
+                                return true;
+                        }
+                        Problem problem = EcoreUtil2.getContainerOfType(namedElement, Problem.class);
+                        QualifiedName problemQualifiedName = null;
+                        if (problem != null) {
+                                String problemName = problem.getName();
+                                if (problemName != null && !problemName.isEmpty()) {
+                                        problemQualifiedName = qualifiedNameConverter.toQualifiedName(problemName);
+                                }
+                        }
+                        QualifiedName qualifiedName = qualifiedNameConverter.toQualifiedName(namedElement.getName());
+                        boolean nameExported;
+                        if (shouldExportSimpleName(namedElement)) {
+                                acceptEObjectDescription(namedElement, problemQualifiedName, qualifiedName, acceptor);
+                                nameExported = true;
+                        } else {
+                                nameExported = false;
+                        }
+                        EObject parent = namedElement.eContainer();
+                        while (parent != null && parent != problem) {
+                                if (parent instanceof NamedElement) {
+                                        NamedElement namedParent = (NamedElement) parent;
+                                        String parentName = namedParent.getName();
+                                        if (parentName != null || !name.isEmpty()) {
+                                                QualifiedName parentQualifiedName = qualifiedNameConverter.toQualifiedName(parentName);
+                                                qualifiedName = parentQualifiedName.append(qualifiedName);
+                                                if (shouldExportSimpleName(parent)) {
+                                                        acceptEObjectDescription(namedElement, problemQualifiedName, qualifiedName, acceptor);
+                                                        nameExported = true;
+                                                } else {
+                                                        nameExported = false;
+                                                }
                                         }
-                                };
-                        };
-                } else {
-                        wrappedAcceptor = acceptor;
+                                }
+                                parent = parent.eContainer();
+                        }
+                        if (!nameExported) {
+                                acceptEObjectDescription(namedElement, problemQualifiedName, qualifiedName, acceptor);
+                        }
                 }
-                return super.createEObjectDescriptions(eObject, wrappedAcceptor);
+                return true;
+        }
+
+        protected boolean shouldExportSimpleName(EObject eObject) {
+                return true;
+        }
+
+        private void acceptEObjectDescription(EObject eObject, QualifiedName prefix, QualifiedName qualifiedName,
+                        IAcceptor<IEObjectDescription> acceptor) {
+                QualifiedName qualifiedNameWithPrefix = prefix == null ? qualifiedName : prefix.append(qualifiedName);
+                acceptor.accept(EObjectDescription.create(qualifiedNameWithPrefix, eObject));
         }
 }
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemGlobalScopeProvider.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemGlobalScopeProvider.java
index cf01999a..05da277a 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemGlobalScopeProvider.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemGlobalScopeProvider.java
@@ -7,13 +7,19 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.xtext.scoping.impl.ImportUriGlobalScopeProvider;
 
 public class ProblemGlobalScopeProvider extends ImportUriGlobalScopeProvider {
-        public static final URI LIBRARY_URI = URI.createURI(ProblemGlobalScopeProvider.class.getClassLoader()
-                        .getResource("org/eclipse/viatra/solver/language/library.problem").toString());
+        public static final String BUILTIN_LIBRARY_NAME = "builtin";
+
+        public static final URI BULTIN_LIBRARY_URI = getLibraryUri(BUILTIN_LIBRARY_NAME);
 
         @Override
         protected LinkedHashSet<URI> getImportedUris(Resource resource) {
-                LinkedHashSet<URI> importedUris = super.getImportedUris(resource);
-                importedUris.add(LIBRARY_URI);
+                LinkedHashSet<URI> importedUris = new LinkedHashSet<>();
+                importedUris.add(BULTIN_LIBRARY_URI);
                 return importedUris;
         }
+
+        private static URI getLibraryUri(String libraryName) {
+                return URI.createURI(ProblemGlobalScopeProvider.class.getClassLoader()
+                                .getResource("org/eclipse/viatra/solver/language/" + libraryName + ".problem").toString());
+        }
 }
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemLocalScopeProvider.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemLocalScopeProvider.java
new file mode 100644
index 00000000..e832bb09
--- /dev/null
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemLocalScopeProvider.java
@@ -0,0 +1,40 @@
+package org.eclipse.viatra.solver.language.scoping;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.xtext.naming.QualifiedName;
+import org.eclipse.xtext.resource.IResourceDescriptions;
+import org.eclipse.xtext.resource.IResourceDescriptionsProvider;
+import org.eclipse.xtext.resource.ISelectable;
+import org.eclipse.xtext.scoping.impl.ImportNormalizer;
+import org.eclipse.xtext.scoping.impl.ImportedNamespaceAwareLocalScopeProvider;
+
+import com.google.inject.Inject;
+
+public class ProblemLocalScopeProvider extends ImportedNamespaceAwareLocalScopeProvider {
+        private static final QualifiedName BUILTIN_LIBRARY_QUALIFIED_NAME = QualifiedName
+                        .create(ProblemGlobalScopeProvider.BUILTIN_LIBRARY_NAME);
+
+        @Inject
+        private IResourceDescriptionsProvider resourceDescriptionsProvider;
+
+        @Override
+        protected List<ImportNormalizer> getImplicitImports(boolean ignoreCase) {
+                return List.of(doCreateImportNormalizer(BUILTIN_LIBRARY_QUALIFIED_NAME, true, ignoreCase));
+        }
+
+        @Override
+        protected List<ImportNormalizer> getImportedNamespaceResolvers(EObject context, boolean ignoreCase) {
+                return List.of();
+        }
+
+        @Override
+        protected ISelectable internalGetAllDescriptions(Resource resource) {
+                // Force the use of ProblemResourceDescriptionStrategy to include all QualifiedNames of objects.
+                IResourceDescriptions resourceDescriptions = resourceDescriptionsProvider
+                                .getResourceDescriptions(resource.getResourceSet());
+                return resourceDescriptions.getResourceDescription(resource.getURI());
+        }
+}
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java
index 254284a8..1849e647 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/java/org/eclipse/viatra/solver/language/scoping/ProblemScopeProvider.java
@@ -8,21 +8,14 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.viatra.solver.language.model.problem.ClassDeclaration;
+import org.eclipse.viatra.solver.language.model.problem.Argument;
 import org.eclipse.viatra.solver.language.model.problem.ExistentialQuantifier;
 import org.eclipse.viatra.solver.language.model.problem.PredicateDefinition;
-import org.eclipse.viatra.solver.language.model.problem.Problem;
 import org.eclipse.viatra.solver.language.model.problem.ProblemPackage;
-import org.eclipse.viatra.solver.language.model.problem.ReferenceDeclaration;
-import org.eclipse.viatra.solver.language.model.problem.Statement;
 import org.eclipse.viatra.solver.language.model.problem.Variable;
-import org.eclipse.xtext.EcoreUtil2;
-import org.eclipse.xtext.naming.QualifiedName;
 import org.eclipse.xtext.scoping.IScope;
 import org.eclipse.xtext.scoping.Scopes;
 
-import com.google.common.collect.ImmutableList;
-
 /**
  * This class contains custom scoping description.
  * 
@@ -35,22 +28,8 @@ public class ProblemScopeProvider extends AbstractProblemScopeProvider {
         @Override
         public IScope getScope(EObject context, EReference reference) {
                 IScope scope = super.getScope(context, reference);
-                if (reference == ProblemPackage.Literals.ATOM__ARGUMENTS) {
+                if (reference == ProblemPackage.Literals.ARGUMENT__VARIABLE) {
                         return getVariableScope(context, scope);
-                } else if (EcoreUtil2.isAssignableFrom(reference.getEReferenceType(),
-                                ProblemPackage.Literals.REFERENCE_DECLARATION)) {
-                        Problem problem = EcoreUtil2.getContainerOfType(context, Problem.class);
-                        if (problem == null) {
-                                return scope;
-                        }
-                        ImmutableList.Builder<ReferenceDeclaration> builder = ImmutableList.builder();
-                        for (Statement statement : problem.getStatements()) {
-                                if (statement instanceof ClassDeclaration) {
-                                        ClassDeclaration classDeclaration = (ClassDeclaration) statement;
-                                        builder.addAll(classDeclaration.getReferenceDeclarations());
-                                }
-                        }
-                        return Scopes.scopeFor(builder.build(), scope);
                 }
                 return scope;
         }
@@ -58,6 +37,13 @@ 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;
+                        Variable singletonVariable = argument.getSingletonVariable();
+                        if (singletonVariable != null) {
+                                variables.add(singletonVariable);
+                        }
+                }
                 while (currentContext != null && !(currentContext instanceof PredicateDefinition)) {
                         if (currentContext instanceof ExistentialQuantifier) {
                                 ExistentialQuantifier quantifier = (ExistentialQuantifier) currentContext;
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/resources/org/eclipse/viatra/solver/language/builtin.problem b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/resources/org/eclipse/viatra/solver/language/builtin.problem
new file mode 100644
index 00000000..4975dad6
--- /dev/null
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/resources/org/eclipse/viatra/solver/language/builtin.problem
@@ -0,0 +1,7 @@
+problem builtin.
+
+abstract class node {
+        refers node[0..*] equals opposite equals
+}
+
+predicate exists(node node).
\ No newline at end of file
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/resources/org/eclipse/viatra/solver/language/library.problem b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/resources/org/eclipse/viatra/solver/language/library.problem
deleted file mode 100644
index 77f26b70..00000000
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/resources/org/eclipse/viatra/solver/language/library.problem
+++ /dev/null
@@ -1,4 +0,0 @@
-abstract class node
-        refers node[0..*] equals opposite equals.
-
-predicate exists(node node).
\ No newline at end of file
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/Problem.xtextbin b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/Problem.xtextbin
index d16365d7..6b594f53 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/Problem.xtextbin
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/Problem.xtextbin
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.g b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.g
index 61b76835..bbce5660 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.g
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.g
@@ -78,23 +78,53 @@ ruleProblem returns [EObject current=null]
 }:
         (
                 (
+                        otherlv_0='problem'
                         {
-                                newCompositeNode(grammarAccess.getProblemAccess().getStatementsStatementParserRuleCall_0());
+                                newLeafNode(otherlv_0, grammarAccess.getProblemAccess().getProblemKeyword_0_0());
                         }
-                        lv_statements_0_0=ruleStatement
+                        (
+                                (
+                                        lv_name_1_0=RULE_ID
+                                        {
+                                                newLeafNode(lv_name_1_0, grammarAccess.getProblemAccess().getNameIDTerminalRuleCall_0_1_0());
+                                        }
+                                        {
+                                                if ($current==null) {
+                                                        $current = createModelElement(grammarAccess.getProblemRule());
+                                                }
+                                                setWithLastConsumed(
+                                                        $current,
+                                                        "name",
+                                                        lv_name_1_0,
+                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                        }
+                                )
+                        )
+                        otherlv_2='.'
                         {
-                                if ($current==null) {
-                                        $current = createModelElementForParent(grammarAccess.getProblemRule());
-                                }
-                                add(
-                                        $current,
-                                        "statements",
-                                        lv_statements_0_0,
-                                        "org.eclipse.viatra.solver.language.Problem.Statement");
-                                afterParserOrEnumRuleCall();
+                                newLeafNode(otherlv_2, grammarAccess.getProblemAccess().getFullStopKeyword_0_2());
                         }
-                )
-        )*
+                )?
+                (
+                        (
+                                {
+                                        newCompositeNode(grammarAccess.getProblemAccess().getStatementsStatementParserRuleCall_1_0());
+                                }
+                                lv_statements_3_0=ruleStatement
+                                {
+                                        if ($current==null) {
+                                                $current = createModelElementForParent(grammarAccess.getProblemRule());
+                                        }
+                                        add(
+                                                $current,
+                                                "statements",
+                                                lv_statements_3_0,
+                                                "org.eclipse.viatra.solver.language.Problem.Statement");
+                                        afterParserOrEnumRuleCall();
+                                }
+                        )
+                )*
+        )
 ;
 
 // Entry rule entryRuleStatement
@@ -204,122 +234,93 @@ ruleClassDeclaration returns [EObject current=null]
                         )
                 )
                 (
+                        otherlv_3='extends'
+                        {
+                                newLeafNode(otherlv_3, grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0());
+                        }
+                        (
+                                (
+                                        {
+                                                if ($current==null) {
+                                                        $current = createModelElement(grammarAccess.getClassDeclarationRule());
+                                                }
+                                        }
+                                        {
+                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_1_0());
+                                        }
+                                        ruleQualifiedName
+                                        {
+                                                afterParserOrEnumRuleCall();
+                                        }
+                                )
+                        )
+                        (
+                                otherlv_5=','
+                                {
+                                        newLeafNode(otherlv_5, grammarAccess.getClassDeclarationAccess().getCommaKeyword_3_2_0());
+                                }
+                                (
+                                        (
+                                                {
+                                                        if ($current==null) {
+                                                                $current = createModelElement(grammarAccess.getClassDeclarationRule());
+                                                        }
+                                                }
+                                                {
+                                                        newCompositeNode(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_2_1_0());
+                                                }
+                                                ruleQualifiedName
+                                                {
+                                                        afterParserOrEnumRuleCall();
+                                                }
+                                        )
+                                )
+                        )*
+                )?
+                (
                         (
-                                otherlv_3='extends'
+                                otherlv_7='{'
                                 {
-                                        newLeafNode(otherlv_3, grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0_0());
+                                        newLeafNode(otherlv_7, grammarAccess.getClassDeclarationAccess().getLeftCurlyBracketKeyword_4_0_0());
                                 }
                                 (
                                         (
                                                 (
                                                         {
-                                                                if ($current==null) {
-                                                                        $current = createModelElement(grammarAccess.getClassDeclarationRule());
-                                                                }
+                                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_0_1_0_0());
                                                         }
-                                                        otherlv_4=RULE_ID
+                                                        lv_referenceDeclarations_8_0=ruleReferenceDeclaration
                                                         {
-                                                                newLeafNode(otherlv_4, grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_0_1_0_0());
+                                                                if ($current==null) {
+                                                                        $current = createModelElementForParent(grammarAccess.getClassDeclarationRule());
+                                                                }
+                                                                add(
+                                                                        $current,
+                                                                        "referenceDeclarations",
+                                                                        lv_referenceDeclarations_8_0,
+                                                                        "org.eclipse.viatra.solver.language.Problem.ReferenceDeclaration");
+                                                                afterParserOrEnumRuleCall();
                                                         }
                                                 )
                                         )
-                                            |
                                         (
-                                                otherlv_5='['
+                                                otherlv_9=';'
                                                 {
-                                                        newLeafNode(otherlv_5, grammarAccess.getClassDeclarationAccess().getLeftSquareBracketKeyword_3_0_1_1_0());
+                                                        newLeafNode(otherlv_9, grammarAccess.getClassDeclarationAccess().getSemicolonKeyword_4_0_1_1());
                                                 }
-                                                (
-                                                        (
-                                                                (
-                                                                        {
-                                                                                if ($current==null) {
-                                                                                        $current = createModelElement(grammarAccess.getClassDeclarationRule());
-                                                                                }
-                                                                        }
-                                                                        otherlv_6=RULE_ID
-                                                                        {
-                                                                                newLeafNode(otherlv_6, grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_0_1_1_1_0_0());
-                                                                        }
-                                                                )
-                                                        )
-                                                        (
-                                                                otherlv_7=','
-                                                                {
-                                                                        newLeafNode(otherlv_7, grammarAccess.getClassDeclarationAccess().getCommaKeyword_3_0_1_1_1_1_0());
-                                                                }
-                                                                (
-                                                                        (
-                                                                                {
-                                                                                        if ($current==null) {
-                                                                                                $current = createModelElement(grammarAccess.getClassDeclarationRule());
-                                                                                        }
-                                                                                }
-                                                                                otherlv_8=RULE_ID
-                                                                                {
-                                                                                        newLeafNode(otherlv_8, grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_0_1_1_1_1_1_0());
-                                                                                }
-                                                                        )
-                                                                )
-                                                        )*
-                                                )?
-                                                otherlv_9=']'
-                                                {
-                                                        newLeafNode(otherlv_9, grammarAccess.getClassDeclarationAccess().getRightSquareBracketKeyword_3_0_1_1_2());
-                                                }
-                                        )
-                                )
+                                        )?
+                                )*
+                                otherlv_10='}'
+                                {
+                                        newLeafNode(otherlv_10, grammarAccess.getClassDeclarationAccess().getRightCurlyBracketKeyword_4_0_2());
+                                }
                         )
                             |
-                        (
-                                (
-                                        {
-                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_3_1_0());
-                                        }
-                                        lv_referenceDeclarations_10_0=ruleReferenceDeclaration
-                                        {
-                                                if ($current==null) {
-                                                        $current = createModelElementForParent(grammarAccess.getClassDeclarationRule());
-                                                }
-                                                add(
-                                                        $current,
-                                                        "referenceDeclarations",
-                                                        lv_referenceDeclarations_10_0,
-                                                        "org.eclipse.viatra.solver.language.Problem.ReferenceDeclaration");
-                                                afterParserOrEnumRuleCall();
-                                        }
-                                )
-                        )
-                )?
-                (
-                        otherlv_11=','
+                        otherlv_11='.'
                         {
-                                newLeafNode(otherlv_11, grammarAccess.getClassDeclarationAccess().getCommaKeyword_4_0());
+                                newLeafNode(otherlv_11, grammarAccess.getClassDeclarationAccess().getFullStopKeyword_4_1());
                         }
-                        (
-                                (
-                                        {
-                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_1_0());
-                                        }
-                                        lv_referenceDeclarations_12_0=ruleReferenceDeclaration
-                                        {
-                                                if ($current==null) {
-                                                        $current = createModelElementForParent(grammarAccess.getClassDeclarationRule());
-                                                }
-                                                add(
-                                                        $current,
-                                                        "referenceDeclarations",
-                                                        lv_referenceDeclarations_12_0,
-                                                        "org.eclipse.viatra.solver.language.Problem.ReferenceDeclaration");
-                                                afterParserOrEnumRuleCall();
-                                        }
-                                )
-                        )
-                )*
-                otherlv_13='.'
-                {
-                        newLeafNode(otherlv_13, grammarAccess.getClassDeclarationAccess().getFullStopKeyword_5());
-                }
+                )
         )
 ;
 
@@ -367,44 +368,49 @@ ruleReferenceDeclaration returns [EObject current=null]
                                                 $current = createModelElement(grammarAccess.getReferenceDeclarationRule());
                                         }
                                 }
-                                otherlv_2=RULE_ID
                                 {
-                                        newLeafNode(otherlv_2, grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationCrossReference_1_0());
+                                        newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationCrossReference_1_0());
+                                }
+                                ruleQualifiedName
+                                {
+                                        afterParserOrEnumRuleCall();
                                 }
                         )
                 )
-                otherlv_3='['
-                {
-                        newLeafNode(otherlv_3, grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2());
-                }
                 (
+                        otherlv_3='['
+                        {
+                                newLeafNode(otherlv_3, grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2_0());
+                        }
                         (
-                                {
-                                        newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getMultiplicityMultiplicityParserRuleCall_3_0());
-                                }
-                                lv_multiplicity_4_0=ruleMultiplicity
-                                {
-                                        if ($current==null) {
-                                                $current = createModelElementForParent(grammarAccess.getReferenceDeclarationRule());
+                                (
+                                        {
+                                                newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getMultiplicityMultiplicityParserRuleCall_2_1_0());
                                         }
-                                        set(
-                                                $current,
-                                                "multiplicity",
-                                                lv_multiplicity_4_0,
-                                                "org.eclipse.viatra.solver.language.Problem.Multiplicity");
-                                        afterParserOrEnumRuleCall();
-                                }
+                                        lv_multiplicity_4_0=ruleMultiplicity
+                                        {
+                                                if ($current==null) {
+                                                        $current = createModelElementForParent(grammarAccess.getReferenceDeclarationRule());
+                                                }
+                                                set(
+                                                        $current,
+                                                        "multiplicity",
+                                                        lv_multiplicity_4_0,
+                                                        "org.eclipse.viatra.solver.language.Problem.Multiplicity");
+                                                afterParserOrEnumRuleCall();
+                                        }
+                                )
                         )
-                )
-                otherlv_5=']'
-                {
-                        newLeafNode(otherlv_5, grammarAccess.getReferenceDeclarationAccess().getRightSquareBracketKeyword_4());
-                }
+                        otherlv_5=']'
+                        {
+                                newLeafNode(otherlv_5, grammarAccess.getReferenceDeclarationAccess().getRightSquareBracketKeyword_2_2());
+                        }
+                )?
                 (
                         (
                                 lv_name_6_0=RULE_ID
                                 {
-                                        newLeafNode(lv_name_6_0, grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_5_0());
+                                        newLeafNode(lv_name_6_0, grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_3_0());
                                 }
                                 {
                                         if ($current==null) {
@@ -421,7 +427,7 @@ ruleReferenceDeclaration returns [EObject current=null]
                 (
                         otherlv_7='opposite'
                         {
-                                newLeafNode(otherlv_7, grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_6_0());
+                                newLeafNode(otherlv_7, grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_4_0());
                         }
                         (
                                 (
@@ -431,7 +437,7 @@ ruleReferenceDeclaration returns [EObject current=null]
                                                 }
                                         }
                                         {
-                                                newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationCrossReference_6_1_0());
+                                                newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationCrossReference_4_1_0());
                                         }
                                         ruleQualifiedName
                                         {
@@ -561,9 +567,9 @@ rulePredicateDefinition returns [EObject current=null]
                         newLeafNode(otherlv_8, grammarAccess.getPredicateDefinitionAccess().getRightParenthesisKeyword_4());
                 }
                 (
-                        otherlv_9=':='
+                        otherlv_9=':-'
                         {
-                                newLeafNode(otherlv_9, grammarAccess.getPredicateDefinitionAccess().getColonEqualsSignKeyword_5_0());
+                                newLeafNode(otherlv_9, grammarAccess.getPredicateDefinitionAccess().getColonHyphenMinusKeyword_5_0());
                         }
                         (
                                 (
@@ -862,13 +868,19 @@ ruleAtom returns [EObject current=null]
                         (
                                 (
                                         {
-                                                if ($current==null) {
-                                                        $current = createModelElement(grammarAccess.getAtomRule());
-                                                }
+                                                newCompositeNode(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_0_0());
                                         }
-                                        otherlv_3=RULE_ID
+                                        lv_arguments_3_0=ruleArgument
                                         {
-                                                newLeafNode(otherlv_3, grammarAccess.getAtomAccess().getArgumentsVariableCrossReference_3_0_0());
+                                                if ($current==null) {
+                                                        $current = createModelElementForParent(grammarAccess.getAtomRule());
+                                                }
+                                                add(
+                                                        $current,
+                                                        "arguments",
+                                                        lv_arguments_3_0,
+                                                        "org.eclipse.viatra.solver.language.Problem.Argument");
+                                                afterParserOrEnumRuleCall();
                                         }
                                 )
                         )
@@ -880,13 +892,19 @@ ruleAtom returns [EObject current=null]
                                 (
                                         (
                                                 {
-                                                        if ($current==null) {
-                                                                $current = createModelElement(grammarAccess.getAtomRule());
-                                                        }
+                                                        newCompositeNode(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_1_1_0());
                                                 }
-                                                otherlv_5=RULE_ID
+                                                lv_arguments_5_0=ruleArgument
                                                 {
-                                                        newLeafNode(otherlv_5, grammarAccess.getAtomAccess().getArgumentsVariableCrossReference_3_1_1_0());
+                                                        if ($current==null) {
+                                                                $current = createModelElementForParent(grammarAccess.getAtomRule());
+                                                        }
+                                                        add(
+                                                                $current,
+                                                                "arguments",
+                                                                lv_arguments_5_0,
+                                                                "org.eclipse.viatra.solver.language.Problem.Argument");
+                                                        afterParserOrEnumRuleCall();
                                                 }
                                         )
                                 )
@@ -899,6 +917,36 @@ ruleAtom returns [EObject current=null]
         )
 ;
 
+// Entry rule entryRuleArgument
+entryRuleArgument returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getArgumentRule()); }
+        iv_ruleArgument=ruleArgument
+        { $current=$iv_ruleArgument.current; }
+        EOF;
+
+// Rule Argument
+ruleArgument returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                (
+                        {
+                                if ($current==null) {
+                                        $current = createModelElement(grammarAccess.getArgumentRule());
+                                }
+                        }
+                        otherlv_0=RULE_ID
+                        {
+                                newLeafNode(otherlv_0, grammarAccess.getArgumentAccess().getVariableVariableCrossReference_0());
+                        }
+                )
+        )
+;
+
 // Entry rule entryRuleAssertion
 entryRuleAssertion returns [EObject current=null]:
         { newCompositeNode(grammarAccess.getAssertionRule()); }
@@ -1223,9 +1271,9 @@ ruleTypeScope returns [EObject current=null]
                 (
                         (
                                 {
-                                        newCompositeNode(grammarAccess.getTypeScopeAccess().getMultiplicityMultiplicityParserRuleCall_2_0());
+                                        newCompositeNode(grammarAccess.getTypeScopeAccess().getMultiplicityDefiniteMultiplicityParserRuleCall_2_0());
                                 }
-                                lv_multiplicity_3_0=ruleMultiplicity
+                                lv_multiplicity_3_0=ruleDefiniteMultiplicity
                                 {
                                         if ($current==null) {
                                                 $current = createModelElementForParent(grammarAccess.getTypeScopeRule());
@@ -1234,7 +1282,7 @@ ruleTypeScope returns [EObject current=null]
                                                 $current,
                                                 "multiplicity",
                                                 lv_multiplicity_3_0,
-                                                "org.eclipse.viatra.solver.language.Problem.Multiplicity");
+                                                "org.eclipse.viatra.solver.language.Problem.DefiniteMultiplicity");
                                         afterParserOrEnumRuleCall();
                                 }
                         )
@@ -1259,7 +1307,43 @@ ruleMultiplicity returns [EObject current=null]
 }:
         (
                 {
-                        newCompositeNode(grammarAccess.getMultiplicityAccess().getRangeMultiplicityParserRuleCall_0());
+                        newCompositeNode(grammarAccess.getMultiplicityAccess().getUnboundedMultiplicityParserRuleCall_0());
+                }
+                this_UnboundedMultiplicity_0=ruleUnboundedMultiplicity
+                {
+                        $current = $this_UnboundedMultiplicity_0.current;
+                        afterParserOrEnumRuleCall();
+                }
+                    |
+                {
+                        newCompositeNode(grammarAccess.getMultiplicityAccess().getDefiniteMultiplicityParserRuleCall_1());
+                }
+                this_DefiniteMultiplicity_1=ruleDefiniteMultiplicity
+                {
+                        $current = $this_DefiniteMultiplicity_1.current;
+                        afterParserOrEnumRuleCall();
+                }
+        )
+;
+
+// Entry rule entryRuleDefiniteMultiplicity
+entryRuleDefiniteMultiplicity returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getDefiniteMultiplicityRule()); }
+        iv_ruleDefiniteMultiplicity=ruleDefiniteMultiplicity
+        { $current=$iv_ruleDefiniteMultiplicity.current; }
+        EOF;
+
+// Rule DefiniteMultiplicity
+ruleDefiniteMultiplicity returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                {
+                        newCompositeNode(grammarAccess.getDefiniteMultiplicityAccess().getRangeMultiplicityParserRuleCall_0());
                 }
                 this_RangeMultiplicity_0=ruleRangeMultiplicity
                 {
@@ -1268,7 +1352,7 @@ ruleMultiplicity returns [EObject current=null]
                 }
                     |
                 {
-                        newCompositeNode(grammarAccess.getMultiplicityAccess().getExactMultiplicityParserRuleCall_1());
+                        newCompositeNode(grammarAccess.getDefiniteMultiplicityAccess().getExactMultiplicityParserRuleCall_1());
                 }
                 this_ExactMultiplicity_1=ruleExactMultiplicity
                 {
@@ -1278,6 +1362,30 @@ ruleMultiplicity returns [EObject current=null]
         )
 ;
 
+// Entry rule entryRuleUnboundedMultiplicity
+entryRuleUnboundedMultiplicity returns [EObject current=null]:
+        { newCompositeNode(grammarAccess.getUnboundedMultiplicityRule()); }
+        iv_ruleUnboundedMultiplicity=ruleUnboundedMultiplicity
+        { $current=$iv_ruleUnboundedMultiplicity.current; }
+        EOF;
+
+// Rule UnboundedMultiplicity
+ruleUnboundedMultiplicity returns [EObject current=null]
+@init {
+        enterRule();
+}
+@after {
+        leaveRule();
+}:
+        (
+                {
+                        $current = forceCreateModelElement(
+                                grammarAccess.getUnboundedMultiplicityAccess().getUnboundedMultiplicityAction(),
+                                $current);
+                }
+        )
+;
+
 // Entry rule entryRuleRangeMultiplicity
 entryRuleRangeMultiplicity returns [EObject current=null]:
         { newCompositeNode(grammarAccess.getRangeMultiplicityRule()); }
@@ -1421,27 +1529,51 @@ ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleT
         leaveRule();
 }:
         (
-                this_ID_0=RULE_ID
+                this_QUOTED_ID_0=RULE_QUOTED_ID
                 {
-                        $current.merge(this_ID_0);
+                        $current.merge(this_QUOTED_ID_0);
                 }
                 {
-                        newLeafNode(this_ID_0, grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_0());
+                        newLeafNode(this_QUOTED_ID_0, grammarAccess.getQualifiedNameAccess().getQUOTED_IDTerminalRuleCall_0());
                 }
+                    |
                 (
-                        kw='::'
+                        this_ID_1=RULE_ID
                         {
-                                $current.merge(kw);
-                                newLeafNode(kw, grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1_0());
+                                $current.merge(this_ID_1);
                         }
-                        this_ID_2=RULE_ID
                         {
-                                $current.merge(this_ID_2);
+                                newLeafNode(this_ID_1, grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_0());
                         }
-                        {
-                                newLeafNode(this_ID_2, grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1());
-                        }
-                )*
+                        (
+                                kw=':'
+                                {
+                                        $current.merge(kw);
+                                        newLeafNode(kw, grammarAccess.getQualifiedNameAccess().getColonKeyword_1_1_0());
+                                }
+                                this_ID_3=RULE_ID
+                                {
+                                        $current.merge(this_ID_3);
+                                }
+                                {
+                                        newLeafNode(this_ID_3, grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1_1());
+                                }
+                        )*
+                        (
+                                kw=':'
+                                {
+                                        $current.merge(kw);
+                                        newLeafNode(kw, grammarAccess.getQualifiedNameAccess().getColonKeyword_1_2_0());
+                                }
+                                this_QUOTED_ID_5=RULE_QUOTED_ID
+                                {
+                                        $current.merge(this_QUOTED_ID_5);
+                                }
+                                {
+                                        newLeafNode(this_QUOTED_ID_5, grammarAccess.getQualifiedNameAccess().getQUOTED_IDTerminalRuleCall_1_2_1());
+                                }
+                        )?
+                )
         )
 ;
 
@@ -1507,12 +1639,14 @@ ruleShortLogicValue returns [Enumerator current=null]
         )
 ;
 
+RULE_STRING : '"' ('\\' .|~(('\\'|'"')))* '"';
+
+RULE_QUOTED_ID : '\'' ('\\' .|~(('\\'|'\'')))* '\'';
+
 RULE_ID : '^'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
 
 RULE_INT : ('0'..'9')+;
 
-RULE_STRING : ('"' ('\\' .|~(('\\'|'"')))* '"'|'\'' ('\\' .|~(('\\'|'\'')))* '\'');
-
 RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
 
 RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.tokens b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.tokens
index 22ef662c..862a9a36 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.tokens
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblem.tokens
@@ -1,40 +1,42 @@
-'!'=27
-'('=23
-')'=24
-'*'=34
-'+'=28
-'+='=31
-','=15
-'.'=17
-'..'=33
-':'=29
-'::'=35
-':='=25
-';'=26
-'='=32
-'?'=39
-'['=14
-']'=16
-'abstract'=11
-'class'=12
-'contains'=18
-'error'=21
-'extends'=13
-'false'=37
-'opposite'=20
-'pred'=22
-'refers'=19
-'scope'=30
-'true'=36
-'unknown'=38
-RULE_ANY_OTHER=10
+'!'=31
+'('=28
+')'=29
+'*'=38
+'+'=32
+'+='=35
+','=17
+'.'=13
+'..'=37
+':'=33
+':-'=30
+';'=19
+'='=36
+'?'=42
+'['=23
+']'=24
+'abstract'=14
+'class'=15
+'contains'=21
+'error'=26
+'extends'=16
+'false'=40
+'opposite'=25
+'pred'=27
+'problem'=12
+'refers'=22
+'scope'=34
+'true'=39
+'unknown'=41
+'{'=18
+'}'=20
+RULE_ANY_OTHER=11
 RULE_ID=4
 RULE_INT=5
-RULE_ML_COMMENT=7
-RULE_SL_COMMENT=8
-RULE_STRING=6
-RULE_WS=9
-T__11=11
+RULE_ML_COMMENT=8
+RULE_QUOTED_ID=6
+RULE_SL_COMMENT=9
+RULE_STRING=7
+RULE_WS=10
 T__12=12
 T__13=13
 T__14=14
@@ -63,3 +65,6 @@ T__36=36
 T__37=37
 T__38=38
 T__39=39
+T__40=40
+T__41=41
+T__42=42
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemLexer.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemLexer.java
index a0b530c8..a1703c93 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemLexer.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemLexer.java
@@ -12,8 +12,8 @@ import java.util.ArrayList;
 
 @SuppressWarnings("all")
 public class InternalProblemLexer extends Lexer {
-    public static final int RULE_STRING=6;
-    public static final int RULE_SL_COMMENT=8;
+    public static final int RULE_STRING=7;
+    public static final int RULE_SL_COMMENT=9;
     public static final int T__19=19;
     public static final int T__15=15;
     public static final int T__37=37;
@@ -22,7 +22,6 @@ public class InternalProblemLexer extends Lexer {
     public static final int T__17=17;
     public static final int T__39=39;
     public static final int T__18=18;
-    public static final int T__11=11;
     public static final int T__33=33;
     public static final int T__12=12;
     public static final int T__34=34;
@@ -35,19 +34,23 @@ public class InternalProblemLexer extends Lexer {
     public static final int T__31=31;
     public static final int T__32=32;
     public static final int RULE_ID=4;
-    public static final int RULE_WS=9;
-    public static final int RULE_ANY_OTHER=10;
+    public static final int RULE_WS=10;
+    public static final int RULE_QUOTED_ID=6;
+    public static final int RULE_ANY_OTHER=11;
     public static final int T__26=26;
     public static final int T__27=27;
     public static final int T__28=28;
     public static final int RULE_INT=5;
     public static final int T__29=29;
     public static final int T__22=22;
-    public static final int RULE_ML_COMMENT=7;
+    public static final int RULE_ML_COMMENT=8;
     public static final int T__23=23;
     public static final int T__24=24;
     public static final int T__25=25;
+    public static final int T__40=40;
+    public static final int T__41=41;
     public static final int T__20=20;
+    public static final int T__42=42;
     public static final int T__21=21;
 
     // delegates
@@ -63,36 +66,15 @@ public class InternalProblemLexer extends Lexer {
     }
     public String getGrammarFileName() { return "InternalProblem.g"; }
 
-    // $ANTLR start "T__11"
-    public final void mT__11() throws RecognitionException {
-        try {
-            int _type = T__11;
-            int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:11:7: ( 'abstract' )
-            // InternalProblem.g:11:9: 'abstract'
-            {
-            match("abstract"); 
-
-
-            }
-
-            state.type = _type;
-            state.channel = _channel;
-        }
-        finally {
-        }
-    }
-    // $ANTLR end "T__11"
-
     // $ANTLR start "T__12"
     public final void mT__12() throws RecognitionException {
         try {
             int _type = T__12;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:12:7: ( 'class' )
-            // InternalProblem.g:12:9: 'class'
+            // InternalProblem.g:11:7: ( 'problem' )
+            // InternalProblem.g:11:9: 'problem'
             {
-            match("class"); 
+            match("problem"); 
 
 
             }
@@ -110,11 +92,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__13;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:13:7: ( 'extends' )
-            // InternalProblem.g:13:9: 'extends'
+            // InternalProblem.g:12:7: ( '.' )
+            // InternalProblem.g:12:9: '.'
             {
-            match("extends"); 
-
+            match('.'); 
 
             }
 
@@ -131,10 +112,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__14;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:14:7: ( '[' )
-            // InternalProblem.g:14:9: '['
+            // InternalProblem.g:13:7: ( 'abstract' )
+            // InternalProblem.g:13:9: 'abstract'
             {
-            match('['); 
+            match("abstract"); 
+
 
             }
 
@@ -151,10 +133,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__15;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:15:7: ( ',' )
-            // InternalProblem.g:15:9: ','
+            // InternalProblem.g:14:7: ( 'class' )
+            // InternalProblem.g:14:9: 'class'
             {
-            match(','); 
+            match("class"); 
+
 
             }
 
@@ -171,10 +154,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__16;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:16:7: ( ']' )
-            // InternalProblem.g:16:9: ']'
+            // InternalProblem.g:15:7: ( 'extends' )
+            // InternalProblem.g:15:9: 'extends'
             {
-            match(']'); 
+            match("extends"); 
+
 
             }
 
@@ -191,10 +175,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__17;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:17:7: ( '.' )
-            // InternalProblem.g:17:9: '.'
+            // InternalProblem.g:16:7: ( ',' )
+            // InternalProblem.g:16:9: ','
             {
-            match('.'); 
+            match(','); 
 
             }
 
@@ -211,11 +195,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__18;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:18:7: ( 'contains' )
-            // InternalProblem.g:18:9: 'contains'
+            // InternalProblem.g:17:7: ( '{' )
+            // InternalProblem.g:17:9: '{'
             {
-            match("contains"); 
-
+            match('{'); 
 
             }
 
@@ -232,11 +215,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__19;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:19:7: ( 'refers' )
-            // InternalProblem.g:19:9: 'refers'
+            // InternalProblem.g:18:7: ( ';' )
+            // InternalProblem.g:18:9: ';'
             {
-            match("refers"); 
-
+            match(';'); 
 
             }
 
@@ -253,11 +235,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__20;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:20:7: ( 'opposite' )
-            // InternalProblem.g:20:9: 'opposite'
+            // InternalProblem.g:19:7: ( '}' )
+            // InternalProblem.g:19:9: '}'
             {
-            match("opposite"); 
-
+            match('}'); 
 
             }
 
@@ -274,10 +255,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__21;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:21:7: ( 'error' )
-            // InternalProblem.g:21:9: 'error'
+            // InternalProblem.g:20:7: ( 'contains' )
+            // InternalProblem.g:20:9: 'contains'
             {
-            match("error"); 
+            match("contains"); 
 
 
             }
@@ -295,10 +276,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__22;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:22:7: ( 'pred' )
-            // InternalProblem.g:22:9: 'pred'
+            // InternalProblem.g:21:7: ( 'refers' )
+            // InternalProblem.g:21:9: 'refers'
             {
-            match("pred"); 
+            match("refers"); 
 
 
             }
@@ -316,10 +297,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__23;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:23:7: ( '(' )
-            // InternalProblem.g:23:9: '('
+            // InternalProblem.g:22:7: ( '[' )
+            // InternalProblem.g:22:9: '['
             {
-            match('('); 
+            match('['); 
 
             }
 
@@ -336,10 +317,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__24;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:24:7: ( ')' )
-            // InternalProblem.g:24:9: ')'
+            // InternalProblem.g:23:7: ( ']' )
+            // InternalProblem.g:23:9: ']'
             {
-            match(')'); 
+            match(']'); 
 
             }
 
@@ -356,10 +337,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__25;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:25:7: ( ':=' )
-            // InternalProblem.g:25:9: ':='
+            // InternalProblem.g:24:7: ( 'opposite' )
+            // InternalProblem.g:24:9: 'opposite'
             {
-            match(":="); 
+            match("opposite"); 
 
 
             }
@@ -377,10 +358,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__26;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:26:7: ( ';' )
-            // InternalProblem.g:26:9: ';'
+            // InternalProblem.g:25:7: ( 'error' )
+            // InternalProblem.g:25:9: 'error'
             {
-            match(';'); 
+            match("error"); 
+
 
             }
 
@@ -397,10 +379,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__27;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:27:7: ( '!' )
-            // InternalProblem.g:27:9: '!'
+            // InternalProblem.g:26:7: ( 'pred' )
+            // InternalProblem.g:26:9: 'pred'
             {
-            match('!'); 
+            match("pred"); 
+
 
             }
 
@@ -417,10 +400,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__28;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:28:7: ( '+' )
-            // InternalProblem.g:28:9: '+'
+            // InternalProblem.g:27:7: ( '(' )
+            // InternalProblem.g:27:9: '('
             {
-            match('+'); 
+            match('('); 
 
             }
 
@@ -437,10 +420,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__29;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:29:7: ( ':' )
-            // InternalProblem.g:29:9: ':'
+            // InternalProblem.g:28:7: ( ')' )
+            // InternalProblem.g:28:9: ')'
             {
-            match(':'); 
+            match(')'); 
 
             }
 
@@ -457,10 +440,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__30;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:30:7: ( 'scope' )
-            // InternalProblem.g:30:9: 'scope'
+            // InternalProblem.g:29:7: ( ':-' )
+            // InternalProblem.g:29:9: ':-'
             {
-            match("scope"); 
+            match(":-"); 
 
 
             }
@@ -478,11 +461,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__31;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:31:7: ( '+=' )
-            // InternalProblem.g:31:9: '+='
+            // InternalProblem.g:30:7: ( '!' )
+            // InternalProblem.g:30:9: '!'
             {
-            match("+="); 
-
+            match('!'); 
 
             }
 
@@ -499,10 +481,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__32;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:32:7: ( '=' )
-            // InternalProblem.g:32:9: '='
+            // InternalProblem.g:31:7: ( '+' )
+            // InternalProblem.g:31:9: '+'
             {
-            match('='); 
+            match('+'); 
 
             }
 
@@ -519,11 +501,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__33;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:33:7: ( '..' )
-            // InternalProblem.g:33:9: '..'
+            // InternalProblem.g:32:7: ( ':' )
+            // InternalProblem.g:32:9: ':'
             {
-            match(".."); 
-
+            match(':'); 
 
             }
 
@@ -540,10 +521,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__34;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:34:7: ( '*' )
-            // InternalProblem.g:34:9: '*'
+            // InternalProblem.g:33:7: ( 'scope' )
+            // InternalProblem.g:33:9: 'scope'
             {
-            match('*'); 
+            match("scope"); 
+
 
             }
 
@@ -560,10 +542,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__35;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:35:7: ( '::' )
-            // InternalProblem.g:35:9: '::'
+            // InternalProblem.g:34:7: ( '+=' )
+            // InternalProblem.g:34:9: '+='
             {
-            match("::"); 
+            match("+="); 
 
 
             }
@@ -581,11 +563,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__36;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:36:7: ( 'true' )
-            // InternalProblem.g:36:9: 'true'
+            // InternalProblem.g:35:7: ( '=' )
+            // InternalProblem.g:35:9: '='
             {
-            match("true"); 
-
+            match('='); 
 
             }
 
@@ -602,10 +583,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__37;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:37:7: ( 'false' )
-            // InternalProblem.g:37:9: 'false'
+            // InternalProblem.g:36:7: ( '..' )
+            // InternalProblem.g:36:9: '..'
             {
-            match("false"); 
+            match(".."); 
 
 
             }
@@ -623,11 +604,10 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__38;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:38:7: ( 'unknown' )
-            // InternalProblem.g:38:9: 'unknown'
+            // InternalProblem.g:37:7: ( '*' )
+            // InternalProblem.g:37:9: '*'
             {
-            match("unknown"); 
-
+            match('*'); 
 
             }
 
@@ -644,10 +624,11 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = T__39;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:39:7: ( '?' )
-            // InternalProblem.g:39:9: '?'
+            // InternalProblem.g:38:7: ( 'true' )
+            // InternalProblem.g:38:9: 'true'
             {
-            match('?'); 
+            match("true"); 
+
 
             }
 
@@ -659,57 +640,104 @@ public class InternalProblemLexer extends Lexer {
     }
     // $ANTLR end "T__39"
 
-    // $ANTLR start "RULE_ID"
-    public final void mRULE_ID() throws RecognitionException {
+    // $ANTLR start "T__40"
+    public final void mT__40() throws RecognitionException {
         try {
-            int _type = RULE_ID;
+            int _type = T__40;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1510:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
-            // InternalProblem.g:1510:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // InternalProblem.g:39:7: ( 'false' )
+            // InternalProblem.g:39:9: 'false'
             {
-            // InternalProblem.g:1510:11: ( '^' )?
-            int alt1=2;
-            int LA1_0 = input.LA(1);
+            match("false"); 
+
 
-            if ( (LA1_0=='^') ) {
-                alt1=1;
             }
-            switch (alt1) {
-                case 1 :
-                    // InternalProblem.g:1510:11: '^'
-                    {
-                    match('^'); 
 
-                    }
-                    break;
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__40"
+
+    // $ANTLR start "T__41"
+    public final void mT__41() throws RecognitionException {
+        try {
+            int _type = T__41;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:40:7: ( 'unknown' )
+            // InternalProblem.g:40:9: 'unknown'
+            {
+            match("unknown"); 
+
 
             }
 
-            if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
-                input.consume();
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__41"
+
+    // $ANTLR start "T__42"
+    public final void mT__42() throws RecognitionException {
+        try {
+            int _type = T__42;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:41:7: ( '?' )
+            // InternalProblem.g:41:9: '?'
+            {
+            match('?'); 
 
             }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
 
-            // InternalProblem.g:1510:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
-            loop2:
+            state.type = _type;
+            state.channel = _channel;
+        }
+        finally {
+        }
+    }
+    // $ANTLR end "T__42"
+
+    // $ANTLR start "RULE_STRING"
+    public final void mRULE_STRING() throws RecognitionException {
+        try {
+            int _type = RULE_STRING;
+            int _channel = DEFAULT_TOKEN_CHANNEL;
+            // InternalProblem.g:1642:13: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' )
+            // InternalProblem.g:1642:15: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+            {
+            match('\"'); 
+            // InternalProblem.g:1642:19: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
+            loop1:
             do {
-                int alt2=2;
-                int LA2_0 = input.LA(1);
+                int alt1=3;
+                int LA1_0 = input.LA(1);
 
-                if ( ((LA2_0>='0' && LA2_0<='9')||(LA2_0>='A' && LA2_0<='Z')||LA2_0=='_'||(LA2_0>='a' && LA2_0<='z')) ) {
-                    alt2=1;
+                if ( (LA1_0=='\\') ) {
+                    alt1=1;
+                }
+                else if ( ((LA1_0>='\u0000' && LA1_0<='!')||(LA1_0>='#' && LA1_0<='[')||(LA1_0>=']' && LA1_0<='\uFFFF')) ) {
+                    alt1=2;
                 }
 
 
-                switch (alt2) {
+                switch (alt1) {
                 case 1 :
-                    // InternalProblem.g:
+                    // InternalProblem.g:1642:20: '\\\\' .
                     {
-                    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') ) {
+                    match('\\'); 
+                    matchAny(); 
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:1642:27: ~ ( ( '\\\\' | '\"' ) )
+                    {
+                    if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
 
                     }
@@ -723,10 +751,11 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    break loop2;
+                    break loop1;
                 }
             } while (true);
 
+            match('\"'); 
 
             }
 
@@ -736,46 +765,62 @@ public class InternalProblemLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end "RULE_ID"
+    // $ANTLR end "RULE_STRING"
 
-    // $ANTLR start "RULE_INT"
-    public final void mRULE_INT() throws RecognitionException {
+    // $ANTLR start "RULE_QUOTED_ID"
+    public final void mRULE_QUOTED_ID() throws RecognitionException {
         try {
-            int _type = RULE_INT;
+            int _type = RULE_QUOTED_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1512:10: ( ( '0' .. '9' )+ )
-            // InternalProblem.g:1512:12: ( '0' .. '9' )+
+            // InternalProblem.g:1644:16: ( '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalProblem.g:1644:18: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
             {
-            // InternalProblem.g:1512:12: ( '0' .. '9' )+
-            int cnt3=0;
-            loop3:
+            match('\''); 
+            // InternalProblem.g:1644:23: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
+            loop2:
             do {
-                int alt3=2;
-                int LA3_0 = input.LA(1);
+                int alt2=3;
+                int LA2_0 = input.LA(1);
 
-                if ( ((LA3_0>='0' && LA3_0<='9')) ) {
-                    alt3=1;
+                if ( (LA2_0=='\\') ) {
+                    alt2=1;
+                }
+                else if ( ((LA2_0>='\u0000' && LA2_0<='&')||(LA2_0>='(' && LA2_0<='[')||(LA2_0>=']' && LA2_0<='\uFFFF')) ) {
+                    alt2=2;
                 }
 
 
-                switch (alt3) {
+                switch (alt2) {
                 case 1 :
-                    // InternalProblem.g:1512:13: '0' .. '9'
+                    // InternalProblem.g:1644:24: '\\\\' .
                     {
-                    matchRange('0','9'); 
+                    match('\\'); 
+                    matchAny(); 
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:1644:31: ~ ( ( '\\\\' | '\\'' ) )
+                    {
+                    if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
+                        input.consume();
+
+                    }
+                    else {
+                        MismatchedSetException mse = new MismatchedSetException(null,input);
+                        recover(mse);
+                        throw mse;}
+
 
                     }
                     break;
 
                 default :
-                    if ( cnt3 >= 1 ) break loop3;
-                        EarlyExitException eee =
-                            new EarlyExitException(3, input);
-                        throw eee;
+                    break loop2;
                 }
-                cnt3++;
             } while (true);
 
+            match('\''); 
 
             }
 
@@ -785,140 +830,125 @@ public class InternalProblemLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end "RULE_INT"
+    // $ANTLR end "RULE_QUOTED_ID"
 
-    // $ANTLR start "RULE_STRING"
-    public final void mRULE_STRING() throws RecognitionException {
+    // $ANTLR start "RULE_ID"
+    public final void mRULE_ID() throws RecognitionException {
         try {
-            int _type = RULE_STRING;
+            int _type = RULE_ID;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1514:13: ( ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' ) )
-            // InternalProblem.g:1514:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
+            // InternalProblem.g:1646:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )
+            // InternalProblem.g:1646:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
             {
-            // InternalProblem.g:1514:15: ( '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"' | '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\'' )
-            int alt6=2;
-            int LA6_0 = input.LA(1);
-
-            if ( (LA6_0=='\"') ) {
-                alt6=1;
-            }
-            else if ( (LA6_0=='\'') ) {
-                alt6=2;
-            }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("", 6, 0, input);
+            // InternalProblem.g:1646:11: ( '^' )?
+            int alt3=2;
+            int LA3_0 = input.LA(1);
 
-                throw nvae;
+            if ( (LA3_0=='^') ) {
+                alt3=1;
             }
-            switch (alt6) {
+            switch (alt3) {
                 case 1 :
-                    // InternalProblem.g:1514:16: '\"' ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )* '\"'
+                    // InternalProblem.g:1646:11: '^'
                     {
-                    match('\"'); 
-                    // InternalProblem.g:1514:20: ( '\\\\' . | ~ ( ( '\\\\' | '\"' ) ) )*
-                    loop4:
-                    do {
-                        int alt4=3;
-                        int LA4_0 = input.LA(1);
-
-                        if ( (LA4_0=='\\') ) {
-                            alt4=1;
-                        }
-                        else if ( ((LA4_0>='\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=']' && LA4_0<='\uFFFF')) ) {
-                            alt4=2;
-                        }
-
-
-                        switch (alt4) {
-                        case 1 :
-                            // InternalProblem.g:1514:21: '\\\\' .
-                            {
-                            match('\\'); 
-                            matchAny(); 
-
-                            }
-                            break;
-                        case 2 :
-                            // InternalProblem.g:1514:28: ~ ( ( '\\\\' | '\"' ) )
-                            {
-                            if ( (input.LA(1)>='\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
-                                input.consume();
-
-                            }
-                            else {
-                                MismatchedSetException mse = new MismatchedSetException(null,input);
-                                recover(mse);
-                                throw mse;}
-
-
-                            }
-                            break;
-
-                        default :
-                            break loop4;
-                        }
-                    } while (true);
-
-                    match('\"'); 
+                    match('^'); 
 
                     }
                     break;
-                case 2 :
-                    // InternalProblem.g:1514:48: '\\'' ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )* '\\''
-                    {
-                    match('\''); 
-                    // InternalProblem.g:1514:53: ( '\\\\' . | ~ ( ( '\\\\' | '\\'' ) ) )*
-                    loop5:
-                    do {
-                        int alt5=3;
-                        int LA5_0 = input.LA(1);
-
-                        if ( (LA5_0=='\\') ) {
-                            alt5=1;
-                        }
-                        else if ( ((LA5_0>='\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=']' && LA5_0<='\uFFFF')) ) {
-                            alt5=2;
-                        }
-
-
-                        switch (alt5) {
-                        case 1 :
-                            // InternalProblem.g:1514:54: '\\\\' .
-                            {
-                            match('\\'); 
-                            matchAny(); 
-
-                            }
-                            break;
-                        case 2 :
-                            // InternalProblem.g:1514:61: ~ ( ( '\\\\' | '\\'' ) )
-                            {
-                            if ( (input.LA(1)>='\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\uFFFF') ) {
-                                input.consume();
-
-                            }
-                            else {
-                                MismatchedSetException mse = new MismatchedSetException(null,input);
-                                recover(mse);
-                                throw mse;}
-
-
-                            }
-                            break;
-
-                        default :
-                            break loop5;
-                        }
-                    } while (true);
-
-                    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:1646:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            loop4:
+            do {
+                int alt4=2;
+                int LA4_0 = input.LA(1);
+
+                if ( ((LA4_0>='0' && LA4_0<='9')||(LA4_0>='A' && LA4_0<='Z')||LA4_0=='_'||(LA4_0>='a' && LA4_0<='z')) ) {
+                    alt4=1;
+                }
+
+
+                switch (alt4) {
+                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 loop4;
+                }
+            } 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:1648:10: ( ( '0' .. '9' )+ )
+            // InternalProblem.g:1648:12: ( '0' .. '9' )+
+            {
+            // InternalProblem.g:1648:12: ( '0' .. '9' )+
+            int cnt5=0;
+            loop5:
+            do {
+                int alt5=2;
+                int LA5_0 = input.LA(1);
+
+                if ( ((LA5_0>='0' && LA5_0<='9')) ) {
+                    alt5=1;
+                }
+
+
+                switch (alt5) {
+                case 1 :
+                    // InternalProblem.g:1648:13: '0' .. '9'
+                    {
+                    matchRange('0','9'); 
+
+                    }
+                    break;
+
+                default :
+                    if ( cnt5 >= 1 ) break loop5;
+                        EarlyExitException eee =
+                            new EarlyExitException(5, input);
+                        throw eee;
+                }
+                cnt5++;
+            } while (true);
+
 
             }
 
@@ -928,44 +958,44 @@ public class InternalProblemLexer extends Lexer {
         finally {
         }
     }
-    // $ANTLR end "RULE_STRING"
+    // $ANTLR end "RULE_INT"
 
     // $ANTLR start "RULE_ML_COMMENT"
     public final void mRULE_ML_COMMENT() throws RecognitionException {
         try {
             int _type = RULE_ML_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1516:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
-            // InternalProblem.g:1516:19: '/*' ( options {greedy=false; } : . )* '*/'
+            // InternalProblem.g:1650:17: ( '/*' ( options {greedy=false; } : . )* '*/' )
+            // InternalProblem.g:1650:19: '/*' ( options {greedy=false; } : . )* '*/'
             {
             match("/*"); 
 
-            // InternalProblem.g:1516:24: ( options {greedy=false; } : . )*
-            loop7:
+            // InternalProblem.g:1650:24: ( options {greedy=false; } : . )*
+            loop6:
             do {
-                int alt7=2;
-                int LA7_0 = input.LA(1);
+                int alt6=2;
+                int LA6_0 = input.LA(1);
 
-                if ( (LA7_0=='*') ) {
-                    int LA7_1 = input.LA(2);
+                if ( (LA6_0=='*') ) {
+                    int LA6_1 = input.LA(2);
 
-                    if ( (LA7_1=='/') ) {
-                        alt7=2;
+                    if ( (LA6_1=='/') ) {
+                        alt6=2;
                     }
-                    else if ( ((LA7_1>='\u0000' && LA7_1<='.')||(LA7_1>='0' && LA7_1<='\uFFFF')) ) {
-                        alt7=1;
+                    else if ( ((LA6_1>='\u0000' && LA6_1<='.')||(LA6_1>='0' && LA6_1<='\uFFFF')) ) {
+                        alt6=1;
                     }
 
 
                 }
-                else if ( ((LA7_0>='\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\uFFFF')) ) {
-                    alt7=1;
+                else if ( ((LA6_0>='\u0000' && LA6_0<=')')||(LA6_0>='+' && LA6_0<='\uFFFF')) ) {
+                    alt6=1;
                 }
 
 
-                switch (alt7) {
+                switch (alt6) {
                 case 1 :
-                    // InternalProblem.g:1516:52: .
+                    // InternalProblem.g:1650:52: .
                     {
                     matchAny(); 
 
@@ -973,7 +1003,7 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    break loop7;
+                    break loop6;
                 }
             } while (true);
 
@@ -995,25 +1025,25 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_SL_COMMENT;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1518:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
-            // InternalProblem.g:1518:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
+            // InternalProblem.g:1652:17: ( '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )? )
+            // InternalProblem.g:1652:19: '//' (~ ( ( '\\n' | '\\r' ) ) )* ( ( '\\r' )? '\\n' )?
             {
             match("//"); 
 
-            // InternalProblem.g:1518:24: (~ ( ( '\\n' | '\\r' ) ) )*
-            loop8:
+            // InternalProblem.g:1652:24: (~ ( ( '\\n' | '\\r' ) ) )*
+            loop7:
             do {
-                int alt8=2;
-                int LA8_0 = input.LA(1);
+                int alt7=2;
+                int LA7_0 = input.LA(1);
 
-                if ( ((LA8_0>='\u0000' && LA8_0<='\t')||(LA8_0>='\u000B' && LA8_0<='\f')||(LA8_0>='\u000E' && LA8_0<='\uFFFF')) ) {
-                    alt8=1;
+                if ( ((LA7_0>='\u0000' && LA7_0<='\t')||(LA7_0>='\u000B' && LA7_0<='\f')||(LA7_0>='\u000E' && LA7_0<='\uFFFF')) ) {
+                    alt7=1;
                 }
 
 
-                switch (alt8) {
+                switch (alt7) {
                 case 1 :
-                    // InternalProblem.g:1518:24: ~ ( ( '\\n' | '\\r' ) )
+                    // InternalProblem.g:1652:24: ~ ( ( '\\n' | '\\r' ) )
                     {
                     if ( (input.LA(1)>='\u0000' && input.LA(1)<='\t')||(input.LA(1)>='\u000B' && input.LA(1)<='\f')||(input.LA(1)>='\u000E' && input.LA(1)<='\uFFFF') ) {
                         input.consume();
@@ -1029,31 +1059,31 @@ public class InternalProblemLexer extends Lexer {
                     break;
 
                 default :
-                    break loop8;
+                    break loop7;
                 }
             } while (true);
 
-            // InternalProblem.g:1518:40: ( ( '\\r' )? '\\n' )?
-            int alt10=2;
-            int LA10_0 = input.LA(1);
+            // InternalProblem.g:1652:40: ( ( '\\r' )? '\\n' )?
+            int alt9=2;
+            int LA9_0 = input.LA(1);
 
-            if ( (LA10_0=='\n'||LA10_0=='\r') ) {
-                alt10=1;
+            if ( (LA9_0=='\n'||LA9_0=='\r') ) {
+                alt9=1;
             }
-            switch (alt10) {
+            switch (alt9) {
                 case 1 :
-                    // InternalProblem.g:1518:41: ( '\\r' )? '\\n'
+                    // InternalProblem.g:1652:41: ( '\\r' )? '\\n'
                     {
-                    // InternalProblem.g:1518:41: ( '\\r' )?
-                    int alt9=2;
-                    int LA9_0 = input.LA(1);
+                    // InternalProblem.g:1652:41: ( '\\r' )?
+                    int alt8=2;
+                    int LA8_0 = input.LA(1);
 
-                    if ( (LA9_0=='\r') ) {
-                        alt9=1;
+                    if ( (LA8_0=='\r') ) {
+                        alt8=1;
                     }
-                    switch (alt9) {
+                    switch (alt8) {
                         case 1 :
-                            // InternalProblem.g:1518:41: '\\r'
+                            // InternalProblem.g:1652:41: '\\r'
                             {
                             match('\r'); 
 
@@ -1085,22 +1115,22 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_WS;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1520:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
-            // InternalProblem.g:1520:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
+            // InternalProblem.g:1654:9: ( ( ' ' | '\\t' | '\\r' | '\\n' )+ )
+            // InternalProblem.g:1654:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
             {
-            // InternalProblem.g:1520:11: ( ' ' | '\\t' | '\\r' | '\\n' )+
-            int cnt11=0;
-            loop11:
+            // InternalProblem.g:1654: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:
                     {
@@ -1118,12 +1148,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);
 
 
@@ -1142,8 +1172,8 @@ public class InternalProblemLexer extends Lexer {
         try {
             int _type = RULE_ANY_OTHER;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // InternalProblem.g:1522:16: ( . )
-            // InternalProblem.g:1522:18: .
+            // InternalProblem.g:1656:16: ( . )
+            // InternalProblem.g:1656:18: .
             {
             matchAny(); 
 
@@ -1158,257 +1188,278 @@ public class InternalProblemLexer extends Lexer {
     // $ANTLR end "RULE_ANY_OTHER"
 
     public void mTokens() throws RecognitionException {
-        // InternalProblem.g:1:8: ( T__11 | 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 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
-        int alt12=36;
-        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 | RULE_STRING | RULE_QUOTED_ID | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER )
+        int alt11=39;
+        alt11 = dfa11.predict(input);
+        switch (alt11) {
             case 1 :
-                // InternalProblem.g:1:10: T__11
+                // InternalProblem.g:1:10: T__12
                 {
-                mT__11(); 
+                mT__12(); 
 
                 }
                 break;
             case 2 :
-                // InternalProblem.g:1:16: T__12
+                // InternalProblem.g:1:16: T__13
                 {
-                mT__12(); 
+                mT__13(); 
 
                 }
                 break;
             case 3 :
-                // InternalProblem.g:1:22: T__13
+                // InternalProblem.g:1:22: T__14
                 {
-                mT__13(); 
+                mT__14(); 
 
                 }
                 break;
             case 4 :
-                // InternalProblem.g:1:28: T__14
+                // InternalProblem.g:1:28: T__15
                 {
-                mT__14(); 
+                mT__15(); 
 
                 }
                 break;
             case 5 :
-                // InternalProblem.g:1:34: T__15
+                // InternalProblem.g:1:34: T__16
                 {
-                mT__15(); 
+                mT__16(); 
 
                 }
                 break;
             case 6 :
-                // InternalProblem.g:1:40: T__16
+                // InternalProblem.g:1:40: T__17
                 {
-                mT__16(); 
+                mT__17(); 
 
                 }
                 break;
             case 7 :
-                // InternalProblem.g:1:46: T__17
+                // InternalProblem.g:1:46: T__18
                 {
-                mT__17(); 
+                mT__18(); 
 
                 }
                 break;
             case 8 :
-                // InternalProblem.g:1:52: T__18
+                // InternalProblem.g:1:52: T__19
                 {
-                mT__18(); 
+                mT__19(); 
 
                 }
                 break;
             case 9 :
-                // InternalProblem.g:1:58: T__19
+                // InternalProblem.g:1:58: T__20
                 {
-                mT__19(); 
+                mT__20(); 
 
                 }
                 break;
             case 10 :
-                // InternalProblem.g:1:64: T__20
+                // InternalProblem.g:1:64: T__21
                 {
-                mT__20(); 
+                mT__21(); 
 
                 }
                 break;
             case 11 :
-                // InternalProblem.g:1:70: T__21
+                // InternalProblem.g:1:70: T__22
                 {
-                mT__21(); 
+                mT__22(); 
 
                 }
                 break;
             case 12 :
-                // InternalProblem.g:1:76: T__22
+                // InternalProblem.g:1:76: T__23
                 {
-                mT__22(); 
+                mT__23(); 
 
                 }
                 break;
             case 13 :
-                // InternalProblem.g:1:82: T__23
+                // InternalProblem.g:1:82: T__24
                 {
-                mT__23(); 
+                mT__24(); 
 
                 }
                 break;
             case 14 :
-                // InternalProblem.g:1:88: T__24
+                // InternalProblem.g:1:88: T__25
                 {
-                mT__24(); 
+                mT__25(); 
 
                 }
                 break;
             case 15 :
-                // InternalProblem.g:1:94: T__25
+                // InternalProblem.g:1:94: T__26
                 {
-                mT__25(); 
+                mT__26(); 
 
                 }
                 break;
             case 16 :
-                // InternalProblem.g:1:100: T__26
+                // InternalProblem.g:1:100: T__27
                 {
-                mT__26(); 
+                mT__27(); 
 
                 }
                 break;
             case 17 :
-                // InternalProblem.g:1:106: T__27
+                // InternalProblem.g:1:106: T__28
                 {
-                mT__27(); 
+                mT__28(); 
 
                 }
                 break;
             case 18 :
-                // InternalProblem.g:1:112: T__28
+                // InternalProblem.g:1:112: T__29
                 {
-                mT__28(); 
+                mT__29(); 
 
                 }
                 break;
             case 19 :
-                // InternalProblem.g:1:118: T__29
+                // InternalProblem.g:1:118: T__30
                 {
-                mT__29(); 
+                mT__30(); 
 
                 }
                 break;
             case 20 :
-                // InternalProblem.g:1:124: T__30
+                // InternalProblem.g:1:124: T__31
                 {
-                mT__30(); 
+                mT__31(); 
 
                 }
                 break;
             case 21 :
-                // InternalProblem.g:1:130: T__31
+                // InternalProblem.g:1:130: T__32
                 {
-                mT__31(); 
+                mT__32(); 
 
                 }
                 break;
             case 22 :
-                // InternalProblem.g:1:136: T__32
+                // InternalProblem.g:1:136: T__33
                 {
-                mT__32(); 
+                mT__33(); 
 
                 }
                 break;
             case 23 :
-                // InternalProblem.g:1:142: T__33
+                // InternalProblem.g:1:142: T__34
                 {
-                mT__33(); 
+                mT__34(); 
 
                 }
                 break;
             case 24 :
-                // InternalProblem.g:1:148: T__34
+                // InternalProblem.g:1:148: T__35
                 {
-                mT__34(); 
+                mT__35(); 
 
                 }
                 break;
             case 25 :
-                // InternalProblem.g:1:154: T__35
+                // InternalProblem.g:1:154: T__36
                 {
-                mT__35(); 
+                mT__36(); 
 
                 }
                 break;
             case 26 :
-                // InternalProblem.g:1:160: T__36
+                // InternalProblem.g:1:160: T__37
                 {
-                mT__36(); 
+                mT__37(); 
 
                 }
                 break;
             case 27 :
-                // InternalProblem.g:1:166: T__37
+                // InternalProblem.g:1:166: T__38
                 {
-                mT__37(); 
+                mT__38(); 
 
                 }
                 break;
             case 28 :
-                // InternalProblem.g:1:172: T__38
+                // InternalProblem.g:1:172: T__39
                 {
-                mT__38(); 
+                mT__39(); 
 
                 }
                 break;
             case 29 :
-                // InternalProblem.g:1:178: T__39
+                // InternalProblem.g:1:178: T__40
                 {
-                mT__39(); 
+                mT__40(); 
 
                 }
                 break;
             case 30 :
-                // InternalProblem.g:1:184: RULE_ID
+                // InternalProblem.g:1:184: T__41
                 {
-                mRULE_ID(); 
+                mT__41(); 
 
                 }
                 break;
             case 31 :
-                // InternalProblem.g:1:192: RULE_INT
+                // InternalProblem.g:1:190: T__42
                 {
-                mRULE_INT(); 
+                mT__42(); 
 
                 }
                 break;
             case 32 :
-                // InternalProblem.g:1:201: RULE_STRING
+                // InternalProblem.g:1:196: RULE_STRING
                 {
                 mRULE_STRING(); 
 
                 }
                 break;
             case 33 :
-                // InternalProblem.g:1:213: RULE_ML_COMMENT
+                // InternalProblem.g:1:208: RULE_QUOTED_ID
                 {
-                mRULE_ML_COMMENT(); 
+                mRULE_QUOTED_ID(); 
 
                 }
                 break;
             case 34 :
-                // InternalProblem.g:1:229: RULE_SL_COMMENT
+                // InternalProblem.g:1:223: RULE_ID
                 {
-                mRULE_SL_COMMENT(); 
+                mRULE_ID(); 
 
                 }
                 break;
             case 35 :
-                // InternalProblem.g:1:245: RULE_WS
+                // InternalProblem.g:1:231: RULE_INT
                 {
-                mRULE_WS(); 
+                mRULE_INT(); 
 
                 }
                 break;
             case 36 :
-                // InternalProblem.g:1:253: RULE_ANY_OTHER
+                // InternalProblem.g:1:240: RULE_ML_COMMENT
+                {
+                mRULE_ML_COMMENT(); 
+
+                }
+                break;
+            case 37 :
+                // InternalProblem.g:1:256: RULE_SL_COMMENT
+                {
+                mRULE_SL_COMMENT(); 
+
+                }
+                break;
+            case 38 :
+                // InternalProblem.g:1:272: RULE_WS
+                {
+                mRULE_WS(); 
+
+                }
+                break;
+            case 39 :
+                // InternalProblem.g:1:280: RULE_ANY_OTHER
                 {
                 mRULE_ANY_OTHER(); 
 
@@ -1420,92 +1471,91 @@ public class InternalProblemLexer extends Lexer {
     }
 
 
-    protected DFA12 dfa12 = new DFA12(this);
-    static final String DFA12_eotS =
-        "\1\uffff\3\41\3\uffff\1\52\3\41\2\uffff\1\62\2\uffff\1\66\1\41\2\uffff\3\41\1\uffff\1\37\2\uffff\3\37\2\uffff\1\41\1\uffff\4\41\5\uffff\3\41\11\uffff\1\41\2\uffff\3\41\6\uffff\23\41\1\142\1\41\1\144\3\41\1\150\2\41\1\153\2\41\1\uffff\1\156\1\uffff\1\157\2\41\1\uffff\2\41\1\uffff\1\164\1\41\2\uffff\3\41\1\171\1\uffff\1\41\1\173\1\174\1\175\1\uffff\1\176\4\uffff";
-    static final String DFA12_eofS =
-        "\177\uffff";
-    static final String DFA12_minS =
-        "\1\0\1\142\1\154\1\162\3\uffff\1\56\1\145\1\160\1\162\2\uffff\1\72\2\uffff\1\75\1\143\2\uffff\1\162\1\141\1\156\1\uffff\1\101\2\uffff\2\0\1\52\2\uffff\1\163\1\uffff\1\141\1\156\1\164\1\162\5\uffff\1\146\1\160\1\145\11\uffff\1\157\2\uffff\1\165\1\154\1\153\6\uffff\1\164\1\163\1\164\1\145\1\157\1\145\1\157\1\144\1\160\1\145\1\163\1\156\1\162\1\163\1\141\1\156\2\162\1\163\1\60\1\145\1\60\1\145\1\157\1\141\1\60\1\151\1\144\1\60\1\163\1\151\1\uffff\1\60\1\uffff\1\60\1\167\1\143\1\uffff\1\156\1\163\1\uffff\1\60\1\164\2\uffff\1\156\1\164\1\163\1\60\1\uffff\1\145\3\60\1\uffff\1\60\4\uffff";
-    static final String DFA12_maxS =
-        "\1\uffff\1\142\1\157\1\170\3\uffff\1\56\1\145\1\160\1\162\2\uffff\1\75\2\uffff\1\75\1\143\2\uffff\1\162\1\141\1\156\1\uffff\1\172\2\uffff\2\uffff\1\57\2\uffff\1\163\1\uffff\1\141\1\156\1\164\1\162\5\uffff\1\146\1\160\1\145\11\uffff\1\157\2\uffff\1\165\1\154\1\153\6\uffff\1\164\1\163\1\164\1\145\1\157\1\145\1\157\1\144\1\160\1\145\1\163\1\156\1\162\1\163\1\141\1\156\2\162\1\163\1\172\1\145\1\172\1\145\1\157\1\141\1\172\1\151\1\144\1\172\1\163\1\151\1\uffff\1\172\1\uffff\1\172\1\167\1\143\1\uffff\1\156\1\163\1\uffff\1\172\1\164\2\uffff\1\156\1\164\1\163\1\172\1\uffff\1\145\3\172\1\uffff\1\172\4\uffff";
-    static final String DFA12_acceptS =
-        "\4\uffff\1\4\1\5\1\6\4\uffff\1\15\1\16\1\uffff\1\20\1\21\2\uffff\1\26\1\30\3\uffff\1\35\1\uffff\1\36\1\37\3\uffff\1\43\1\44\1\uffff\1\36\4\uffff\1\4\1\5\1\6\1\27\1\7\3\uffff\1\15\1\16\1\17\1\31\1\23\1\20\1\21\1\25\1\22\1\uffff\1\26\1\30\3\uffff\1\35\1\37\1\40\1\41\1\42\1\43\37\uffff\1\14\1\uffff\1\32\3\uffff\1\2\2\uffff\1\13\2\uffff\1\24\1\33\4\uffff\1\11\4\uffff\1\3\1\uffff\1\34\1\1\1\10\1\12";
-    static final String DFA12_specialS =
-        "\1\1\32\uffff\1\2\1\0\142\uffff}>";
-    static final String[] DFA12_transitionS = {
-            "\11\37\2\36\2\37\1\36\22\37\1\36\1\17\1\33\4\37\1\34\1\13\1\14\1\23\1\20\1\5\1\37\1\7\1\35\12\32\1\15\1\16\1\37\1\22\1\37\1\27\1\37\32\31\1\4\1\37\1\6\1\30\1\31\1\37\1\1\1\31\1\2\1\31\1\3\1\25\10\31\1\11\1\12\1\31\1\10\1\21\1\24\1\26\5\31\uff85\37",
-            "\1\40",
-            "\1\42\2\uffff\1\43",
-            "\1\45\5\uffff\1\44",
+    protected DFA11 dfa11 = new DFA11(this);
+    static final String DFA11_eotS =
+        "\1\uffff\1\43\1\45\3\43\4\uffff\1\43\2\uffff\1\43\2\uffff\1\66\1\uffff\1\71\1\43\2\uffff\3\43\1\uffff\3\41\2\uffff\1\41\2\uffff\1\43\3\uffff\5\43\4\uffff\1\43\2\uffff\1\43\7\uffff\1\43\2\uffff\3\43\7\uffff\16\43\1\142\10\43\1\153\3\43\1\uffff\1\43\1\160\2\43\1\163\2\43\1\166\1\uffff\1\167\3\43\1\uffff\2\43\1\uffff\1\175\1\43\2\uffff\1\43\1\u0080\2\43\1\u0083\1\uffff\1\43\1\u0085\1\uffff\1\u0086\1\u0087\1\uffff\1\u0088\4\uffff";
+    static final String DFA11_eofS =
+        "\u0089\uffff";
+    static final String DFA11_minS =
+        "\1\0\1\162\1\56\1\142\1\154\1\162\4\uffff\1\145\2\uffff\1\160\2\uffff\1\55\1\uffff\1\75\1\143\2\uffff\1\162\1\141\1\156\1\uffff\2\0\1\101\2\uffff\1\52\2\uffff\1\145\3\uffff\1\163\1\141\1\156\1\164\1\162\4\uffff\1\146\2\uffff\1\160\7\uffff\1\157\2\uffff\1\165\1\154\1\153\7\uffff\1\142\1\144\1\164\1\163\1\164\1\145\1\157\1\145\1\157\1\160\1\145\1\163\1\156\1\154\1\60\1\162\1\163\1\141\1\156\2\162\1\163\1\145\1\60\1\145\1\157\1\145\1\uffff\1\141\1\60\1\151\1\144\1\60\1\163\1\151\1\60\1\uffff\1\60\1\167\1\155\1\143\1\uffff\1\156\1\163\1\uffff\1\60\1\164\2\uffff\1\156\1\60\1\164\1\163\1\60\1\uffff\1\145\1\60\1\uffff\2\60\1\uffff\1\60\4\uffff";
+    static final String DFA11_maxS =
+        "\1\uffff\1\162\1\56\1\142\1\157\1\170\4\uffff\1\145\2\uffff\1\160\2\uffff\1\55\1\uffff\1\75\1\143\2\uffff\1\162\1\141\1\156\1\uffff\2\uffff\1\172\2\uffff\1\57\2\uffff\1\157\3\uffff\1\163\1\141\1\156\1\164\1\162\4\uffff\1\146\2\uffff\1\160\7\uffff\1\157\2\uffff\1\165\1\154\1\153\7\uffff\1\142\1\144\1\164\1\163\1\164\1\145\1\157\1\145\1\157\1\160\1\145\1\163\1\156\1\154\1\172\1\162\1\163\1\141\1\156\2\162\1\163\1\145\1\172\1\145\1\157\1\145\1\uffff\1\141\1\172\1\151\1\144\1\172\1\163\1\151\1\172\1\uffff\1\172\1\167\1\155\1\143\1\uffff\1\156\1\163\1\uffff\1\172\1\164\2\uffff\1\156\1\172\1\164\1\163\1\172\1\uffff\1\145\1\172\1\uffff\2\172\1\uffff\1\172\4\uffff";
+    static final String DFA11_acceptS =
+        "\6\uffff\1\6\1\7\1\10\1\11\1\uffff\1\14\1\15\1\uffff\1\21\1\22\1\uffff\1\24\2\uffff\1\31\1\33\3\uffff\1\37\3\uffff\1\42\1\43\1\uffff\1\46\1\47\1\uffff\1\42\1\32\1\2\5\uffff\1\6\1\7\1\10\1\11\1\uffff\1\14\1\15\1\uffff\1\21\1\22\1\23\1\26\1\24\1\30\1\25\1\uffff\1\31\1\33\3\uffff\1\37\1\40\1\41\1\43\1\44\1\45\1\46\33\uffff\1\20\10\uffff\1\34\4\uffff\1\4\2\uffff\1\17\2\uffff\1\27\1\35\5\uffff\1\13\2\uffff\1\1\2\uffff\1\5\1\uffff\1\36\1\3\1\12\1\16";
+    static final String DFA11_specialS =
+        "\1\1\31\uffff\1\2\1\0\155\uffff}>";
+    static final String[] DFA11_transitionS = {
+            "\11\41\2\40\2\41\1\40\22\41\1\40\1\21\1\32\4\41\1\33\1\16\1\17\1\25\1\22\1\6\1\41\1\2\1\37\12\36\1\20\1\10\1\41\1\24\1\41\1\31\1\41\32\35\1\13\1\41\1\14\1\34\1\35\1\41\1\3\1\35\1\4\1\35\1\5\1\27\10\35\1\15\1\1\1\35\1\12\1\23\1\26\1\30\5\35\1\7\1\41\1\11\uff82\41",
+            "\1\42",
+            "\1\44",
+            "\1\46",
+            "\1\47\2\uffff\1\50",
+            "\1\52\5\uffff\1\51",
             "",
             "",
             "",
-            "\1\51",
-            "\1\53",
-            "\1\54",
-            "\1\55",
             "",
+            "\1\57",
             "",
-            "\1\61\2\uffff\1\60",
             "",
+            "\1\62",
             "",
-            "\1\65",
-            "\1\67",
             "",
+            "\1\65",
             "",
+            "\1\70",
             "\1\72",
-            "\1\73",
-            "\1\74",
-            "",
-            "\32\41\4\uffff\1\41\1\uffff\32\41",
             "",
             "",
-            "\0\77",
-            "\0\77",
-            "\1\100\4\uffff\1\101",
+            "\1\75",
+            "\1\76",
+            "\1\77",
             "",
+            "\0\101",
+            "\0\102",
+            "\32\43\4\uffff\1\43\1\uffff\32\43",
             "",
-            "\1\103",
             "",
-            "\1\104",
-            "\1\105",
-            "\1\106",
-            "\1\107",
+            "\1\104\4\uffff\1\105",
             "",
             "",
+            "\1\110\11\uffff\1\107",
             "",
             "",
             "",
-            "\1\110",
             "\1\111",
             "\1\112",
+            "\1\113",
+            "\1\114",
+            "\1\115",
             "",
             "",
             "",
             "",
+            "\1\116",
             "",
             "",
+            "\1\117",
             "",
             "",
             "",
-            "\1\113",
-            "",
-            "",
-            "\1\114",
-            "\1\115",
-            "\1\116",
             "",
             "",
             "",
             "",
+            "\1\120",
             "",
             "",
-            "\1\117",
-            "\1\120",
             "\1\121",
             "\1\122",
             "\1\123",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
+            "",
             "\1\124",
             "\1\125",
             "\1\126",
@@ -1520,176 +1570,191 @@ public class InternalProblemLexer extends Lexer {
             "\1\137",
             "\1\140",
             "\1\141",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "\1\143",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
+            "\1\144",
             "\1\145",
             "\1\146",
             "\1\147",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
+            "\1\150",
             "\1\151",
             "\1\152",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "\1\154",
             "\1\155",
+            "\1\156",
             "",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
-            "",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
-            "\1\160",
+            "\1\157",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "\1\161",
-            "",
             "\1\162",
-            "\1\163",
-            "",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "\1\164",
             "\1\165",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "",
-            "",
-            "\1\166",
-            "\1\167",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "\1\170",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
-            "",
+            "\1\171",
             "\1\172",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
             "",
-            "\12\41\7\uffff\32\41\4\uffff\1\41\1\uffff\32\41",
+            "\1\173",
+            "\1\174",
+            "",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "\1\176",
+            "",
+            "",
+            "\1\177",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "\1\u0081",
+            "\1\u0082",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "",
+            "\1\u0084",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
+            "",
+            "\12\43\7\uffff\32\43\4\uffff\1\43\1\uffff\32\43",
             "",
             "",
             "",
             ""
     };
 
-    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__11 | 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 | RULE_ID | RULE_INT | RULE_STRING | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
+            return "1:1: Tokens : ( T__12 | T__13 | T__14 | T__15 | T__16 | T__17 | T__18 | T__19 | T__20 | T__21 | T__22 | T__23 | T__24 | T__25 | T__26 | T__27 | T__28 | T__29 | T__30 | T__31 | T__32 | T__33 | T__34 | T__35 | T__36 | T__37 | T__38 | T__39 | T__40 | T__41 | T__42 | RULE_STRING | RULE_QUOTED_ID | RULE_ID | RULE_INT | RULE_ML_COMMENT | RULE_SL_COMMENT | RULE_WS | RULE_ANY_OTHER );";
         }
         public int specialStateTransition(int s, IntStream _input) throws NoViableAltException {
             IntStream input = _input;
                 int _s = s;
             switch ( s ) {
                     case 0 : 
-                        int LA12_28 = input.LA(1);
+                        int LA11_27 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA12_28>='\u0000' && LA12_28<='\uFFFF')) ) {s = 63;}
+                        if ( ((LA11_27>='\u0000' && LA11_27<='\uFFFF')) ) {s = 66;}
 
-                        else s = 31;
+                        else s = 33;
 
                         if ( s>=0 ) return s;
                         break;
                     case 1 : 
-                        int LA12_0 = input.LA(1);
+                        int LA11_0 = input.LA(1);
 
                         s = -1;
-                        if ( (LA12_0=='a') ) {s = 1;}
+                        if ( (LA11_0=='p') ) {s = 1;}
+
+                        else if ( (LA11_0=='.') ) {s = 2;}
+
+                        else if ( (LA11_0=='a') ) {s = 3;}
 
-                        else if ( (LA12_0=='c') ) {s = 2;}
+                        else if ( (LA11_0=='c') ) {s = 4;}
 
-                        else if ( (LA12_0=='e') ) {s = 3;}
+                        else if ( (LA11_0=='e') ) {s = 5;}
 
-                        else if ( (LA12_0=='[') ) {s = 4;}
+                        else if ( (LA11_0==',') ) {s = 6;}
 
-                        else if ( (LA12_0==',') ) {s = 5;}
+                        else if ( (LA11_0=='{') ) {s = 7;}
 
-                        else if ( (LA12_0==']') ) {s = 6;}
+                        else if ( (LA11_0==';') ) {s = 8;}
 
-                        else if ( (LA12_0=='.') ) {s = 7;}
+                        else if ( (LA11_0=='}') ) {s = 9;}
 
-                        else if ( (LA12_0=='r') ) {s = 8;}
+                        else if ( (LA11_0=='r') ) {s = 10;}
 
-                        else if ( (LA12_0=='o') ) {s = 9;}
+                        else if ( (LA11_0=='[') ) {s = 11;}
 
-                        else if ( (LA12_0=='p') ) {s = 10;}
+                        else if ( (LA11_0==']') ) {s = 12;}
 
-                        else if ( (LA12_0=='(') ) {s = 11;}
+                        else if ( (LA11_0=='o') ) {s = 13;}
 
-                        else if ( (LA12_0==')') ) {s = 12;}
+                        else if ( (LA11_0=='(') ) {s = 14;}
 
-                        else if ( (LA12_0==':') ) {s = 13;}
+                        else if ( (LA11_0==')') ) {s = 15;}
 
-                        else if ( (LA12_0==';') ) {s = 14;}
+                        else if ( (LA11_0==':') ) {s = 16;}
 
-                        else if ( (LA12_0=='!') ) {s = 15;}
+                        else if ( (LA11_0=='!') ) {s = 17;}
 
-                        else if ( (LA12_0=='+') ) {s = 16;}
+                        else if ( (LA11_0=='+') ) {s = 18;}
 
-                        else if ( (LA12_0=='s') ) {s = 17;}
+                        else if ( (LA11_0=='s') ) {s = 19;}
 
-                        else if ( (LA12_0=='=') ) {s = 18;}
+                        else if ( (LA11_0=='=') ) {s = 20;}
 
-                        else if ( (LA12_0=='*') ) {s = 19;}
+                        else if ( (LA11_0=='*') ) {s = 21;}
 
-                        else if ( (LA12_0=='t') ) {s = 20;}
+                        else if ( (LA11_0=='t') ) {s = 22;}
 
-                        else if ( (LA12_0=='f') ) {s = 21;}
+                        else if ( (LA11_0=='f') ) {s = 23;}
 
-                        else if ( (LA12_0=='u') ) {s = 22;}
+                        else if ( (LA11_0=='u') ) {s = 24;}
 
-                        else if ( (LA12_0=='?') ) {s = 23;}
+                        else if ( (LA11_0=='?') ) {s = 25;}
 
-                        else if ( (LA12_0=='^') ) {s = 24;}
+                        else if ( (LA11_0=='\"') ) {s = 26;}
 
-                        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 = 25;}
+                        else if ( (LA11_0=='\'') ) {s = 27;}
 
-                        else if ( ((LA12_0>='0' && LA12_0<='9')) ) {s = 26;}
+                        else if ( (LA11_0=='^') ) {s = 28;}
 
-                        else if ( (LA12_0=='\"') ) {s = 27;}
+                        else if ( ((LA11_0>='A' && 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 = 29;}
 
-                        else if ( (LA12_0=='\'') ) {s = 28;}
+                        else if ( ((LA11_0>='0' && LA11_0<='9')) ) {s = 30;}
 
-                        else if ( (LA12_0=='/') ) {s = 29;}
+                        else if ( (LA11_0=='/') ) {s = 31;}
 
-                        else if ( ((LA12_0>='\t' && LA12_0<='\n')||LA12_0=='\r'||LA12_0==' ') ) {s = 30;}
+                        else if ( ((LA11_0>='\t' && LA11_0<='\n')||LA11_0=='\r'||LA11_0==' ') ) {s = 32;}
 
-                        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<='\uFFFF')) ) {s = 31;}
+                        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<='\uFFFF')) ) {s = 33;}
 
                         if ( s>=0 ) return s;
                         break;
                     case 2 : 
-                        int LA12_27 = input.LA(1);
+                        int LA11_26 = input.LA(1);
 
                         s = -1;
-                        if ( ((LA12_27>='\u0000' && LA12_27<='\uFFFF')) ) {s = 63;}
+                        if ( ((LA11_26>='\u0000' && LA11_26<='\uFFFF')) ) {s = 65;}
 
-                        else s = 31;
+                        else s = 33;
 
                         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/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemParser.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemParser.java
index 9bfeb079..c4f19943 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemParser.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemParser.java
@@ -22,10 +22,10 @@ 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_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'abstract'", "'class'", "'extends'", "'['", "','", "']'", "'.'", "'contains'", "'refers'", "'opposite'", "'error'", "'pred'", "'('", "')'", "':='", "';'", "'!'", "'+'", "':'", "'scope'", "'+='", "'='", "'..'", "'*'", "'::'", "'true'", "'false'", "'unknown'", "'?'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INT", "RULE_QUOTED_ID", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'problem'", "'.'", "'abstract'", "'class'", "'extends'", "','", "'{'", "';'", "'}'", "'contains'", "'refers'", "'['", "']'", "'opposite'", "'error'", "'pred'", "'('", "')'", "':-'", "'!'", "'+'", "':'", "'scope'", "'+='", "'='", "'..'", "'*'", "'true'", "'false'", "'unknown'", "'?'"
     };
-    public static final int RULE_STRING=6;
-    public static final int RULE_SL_COMMENT=8;
+    public static final int RULE_STRING=7;
+    public static final int RULE_SL_COMMENT=9;
     public static final int T__19=19;
     public static final int T__15=15;
     public static final int T__37=37;
@@ -34,7 +34,6 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     public static final int T__17=17;
     public static final int T__39=39;
     public static final int T__18=18;
-    public static final int T__11=11;
     public static final int T__33=33;
     public static final int T__12=12;
     public static final int T__34=34;
@@ -47,19 +46,23 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     public static final int T__31=31;
     public static final int T__32=32;
     public static final int RULE_ID=4;
-    public static final int RULE_WS=9;
-    public static final int RULE_ANY_OTHER=10;
+    public static final int RULE_WS=10;
+    public static final int RULE_QUOTED_ID=6;
+    public static final int RULE_ANY_OTHER=11;
     public static final int T__26=26;
     public static final int T__27=27;
     public static final int T__28=28;
     public static final int RULE_INT=5;
     public static final int T__29=29;
     public static final int T__22=22;
-    public static final int RULE_ML_COMMENT=7;
+    public static final int RULE_ML_COMMENT=8;
     public static final int T__23=23;
     public static final int T__24=24;
     public static final int T__25=25;
+    public static final int T__40=40;
+    public static final int T__41=41;
     public static final int T__20=20;
+    public static final int T__42=42;
     public static final int T__21=21;
 
     // delegates
@@ -138,57 +141,114 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleProblem"
-    // InternalProblem.g:72:1: ruleProblem returns [EObject current=null] : ( (lv_statements_0_0= ruleStatement ) )* ;
+    // InternalProblem.g:72:1: ruleProblem returns [EObject current=null] : ( (otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* ) ;
     public final EObject ruleProblem() throws RecognitionException {
         EObject current = null;
 
-        EObject lv_statements_0_0 = null;
+        Token otherlv_0=null;
+        Token lv_name_1_0=null;
+        Token otherlv_2=null;
+        EObject lv_statements_3_0 = null;
 
 
 
                 enterRule();
 
         try {
-            // InternalProblem.g:78:2: ( ( (lv_statements_0_0= ruleStatement ) )* )
-            // InternalProblem.g:79:2: ( (lv_statements_0_0= ruleStatement ) )*
+            // InternalProblem.g:78:2: ( ( (otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* ) )
+            // InternalProblem.g:79:2: ( (otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* )
             {
-            // InternalProblem.g:79:2: ( (lv_statements_0_0= ruleStatement ) )*
-            loop1:
+            // InternalProblem.g:79:2: ( (otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* )
+            // InternalProblem.g:80:3: (otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )*
+            {
+            // InternalProblem.g:80:3: (otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.' )?
+            int alt1=2;
+            int LA1_0 = input.LA(1);
+
+            if ( (LA1_0==12) ) {
+                alt1=1;
+            }
+            switch (alt1) {
+                case 1 :
+                    // InternalProblem.g:81:4: otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.'
+                    {
+                    otherlv_0=(Token)match(input,12,FOLLOW_3); 
+
+                                                newLeafNode(otherlv_0, grammarAccess.getProblemAccess().getProblemKeyword_0_0());
+                                        
+                    // InternalProblem.g:85:4: ( (lv_name_1_0= RULE_ID ) )
+                    // InternalProblem.g:86:5: (lv_name_1_0= RULE_ID )
+                    {
+                    // InternalProblem.g:86:5: (lv_name_1_0= RULE_ID )
+                    // InternalProblem.g:87:6: lv_name_1_0= RULE_ID
+                    {
+                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_4); 
+
+                                                                newLeafNode(lv_name_1_0, grammarAccess.getProblemAccess().getNameIDTerminalRuleCall_0_1_0());
+                                                        
+
+                                                                if (current==null) {
+                                                                        current = createModelElement(grammarAccess.getProblemRule());
+                                                                }
+                                                                setWithLastConsumed(
+                                                                        current,
+                                                                        "name",
+                                                                        lv_name_1_0,
+                                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                        
+
+                    }
+
+
+                    }
+
+                    otherlv_2=(Token)match(input,13,FOLLOW_5); 
+
+                                                newLeafNode(otherlv_2, grammarAccess.getProblemAccess().getFullStopKeyword_0_2());
+                                        
+
+                    }
+                    break;
+
+            }
+
+            // InternalProblem.g:108:3: ( (lv_statements_3_0= ruleStatement ) )*
+            loop2:
             do {
-                int alt1=2;
-                int LA1_0 = input.LA(1);
+                int alt2=2;
+                int LA2_0 = input.LA(1);
 
-                if ( (LA1_0==RULE_ID||(LA1_0>=11 && LA1_0<=12)||(LA1_0>=21 && LA1_0<=22)||LA1_0==27||LA1_0==30||LA1_0==39) ) {
-                    alt1=1;
+                if ( (LA2_0==RULE_ID||LA2_0==RULE_QUOTED_ID||(LA2_0>=14 && LA2_0<=15)||(LA2_0>=26 && LA2_0<=27)||LA2_0==31||LA2_0==34||LA2_0==42) ) {
+                    alt2=1;
                 }
 
 
-                switch (alt1) {
+                switch (alt2) {
                 case 1 :
-                    // InternalProblem.g:80:3: (lv_statements_0_0= ruleStatement )
+                    // InternalProblem.g:109:4: (lv_statements_3_0= ruleStatement )
                     {
-                    // InternalProblem.g:80:3: (lv_statements_0_0= ruleStatement )
-                    // InternalProblem.g:81:4: lv_statements_0_0= ruleStatement
+                    // InternalProblem.g:109:4: (lv_statements_3_0= ruleStatement )
+                    // InternalProblem.g:110:5: lv_statements_3_0= ruleStatement
                     {
 
-                                                newCompositeNode(grammarAccess.getProblemAccess().getStatementsStatementParserRuleCall_0());
-                                        
-                    pushFollow(FOLLOW_3);
-                    lv_statements_0_0=ruleStatement();
+                                                        newCompositeNode(grammarAccess.getProblemAccess().getStatementsStatementParserRuleCall_1_0());
+                                                
+                    pushFollow(FOLLOW_5);
+                    lv_statements_3_0=ruleStatement();
 
                     state._fsp--;
 
 
-                                                if (current==null) {
-                                                        current = createModelElementForParent(grammarAccess.getProblemRule());
-                                                }
-                                                add(
-                                                        current,
-                                                        "statements",
-                                                        lv_statements_0_0,
-                                                        "org.eclipse.viatra.solver.language.Problem.Statement");
-                                                afterParserOrEnumRuleCall();
-                                        
+                                                        if (current==null) {
+                                                                current = createModelElementForParent(grammarAccess.getProblemRule());
+                                                        }
+                                                        add(
+                                                                current,
+                                                                "statements",
+                                                                lv_statements_3_0,
+                                                                "org.eclipse.viatra.solver.language.Problem.Statement");
+                                                        afterParserOrEnumRuleCall();
+                                                
 
                     }
 
@@ -197,7 +257,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     break;
 
                 default :
-                    break loop1;
+                    break loop2;
                 }
             } while (true);
 
@@ -205,6 +265,9 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
 
 
+            }
+
+
                 leaveRule();
 
         }
@@ -221,7 +284,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStatement"
-    // InternalProblem.g:101:1: entryRuleStatement returns [EObject current=null] : iv_ruleStatement= ruleStatement EOF ;
+    // InternalProblem.g:131:1: entryRuleStatement returns [EObject current=null] : iv_ruleStatement= ruleStatement EOF ;
     public final EObject entryRuleStatement() throws RecognitionException {
         EObject current = null;
 
@@ -229,8 +292,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:101:50: (iv_ruleStatement= ruleStatement EOF )
-            // InternalProblem.g:102:2: iv_ruleStatement= ruleStatement EOF
+            // InternalProblem.g:131:50: (iv_ruleStatement= ruleStatement EOF )
+            // InternalProblem.g:132:2: iv_ruleStatement= ruleStatement EOF
             {
              newCompositeNode(grammarAccess.getStatementRule()); 
             pushFollow(FOLLOW_1);
@@ -257,7 +320,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStatement"
-    // InternalProblem.g:108:1: ruleStatement returns [EObject current=null] : (this_ClassDeclaration_0= ruleClassDeclaration | this_PredicateDefinition_1= rulePredicateDefinition | this_Assertion_2= ruleAssertion | this_ScopeDeclaration_3= ruleScopeDeclaration ) ;
+    // InternalProblem.g:138:1: ruleStatement returns [EObject current=null] : (this_ClassDeclaration_0= ruleClassDeclaration | this_PredicateDefinition_1= rulePredicateDefinition | this_Assertion_2= ruleAssertion | this_ScopeDeclaration_3= ruleScopeDeclaration ) ;
     public final EObject ruleStatement() throws RecognitionException {
         EObject current = null;
 
@@ -274,46 +337,47 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:114:2: ( (this_ClassDeclaration_0= ruleClassDeclaration | this_PredicateDefinition_1= rulePredicateDefinition | this_Assertion_2= ruleAssertion | this_ScopeDeclaration_3= ruleScopeDeclaration ) )
-            // InternalProblem.g:115:2: (this_ClassDeclaration_0= ruleClassDeclaration | this_PredicateDefinition_1= rulePredicateDefinition | this_Assertion_2= ruleAssertion | this_ScopeDeclaration_3= ruleScopeDeclaration )
+            // InternalProblem.g:144:2: ( (this_ClassDeclaration_0= ruleClassDeclaration | this_PredicateDefinition_1= rulePredicateDefinition | this_Assertion_2= ruleAssertion | this_ScopeDeclaration_3= ruleScopeDeclaration ) )
+            // InternalProblem.g:145:2: (this_ClassDeclaration_0= ruleClassDeclaration | this_PredicateDefinition_1= rulePredicateDefinition | this_Assertion_2= ruleAssertion | this_ScopeDeclaration_3= ruleScopeDeclaration )
             {
-            // InternalProblem.g:115:2: (this_ClassDeclaration_0= ruleClassDeclaration | this_PredicateDefinition_1= rulePredicateDefinition | this_Assertion_2= ruleAssertion | this_ScopeDeclaration_3= ruleScopeDeclaration )
-            int alt2=4;
+            // InternalProblem.g:145:2: (this_ClassDeclaration_0= ruleClassDeclaration | this_PredicateDefinition_1= rulePredicateDefinition | this_Assertion_2= ruleAssertion | this_ScopeDeclaration_3= ruleScopeDeclaration )
+            int alt3=4;
             switch ( input.LA(1) ) {
-            case 11:
-            case 12:
+            case 14:
+            case 15:
                 {
-                alt2=1;
+                alt3=1;
                 }
                 break;
-            case 21:
-            case 22:
+            case 26:
+            case 27:
                 {
-                alt2=2;
+                alt3=2;
                 }
                 break;
             case RULE_ID:
-            case 27:
-            case 39:
+            case RULE_QUOTED_ID:
+            case 31:
+            case 42:
                 {
-                alt2=3;
+                alt3=3;
                 }
                 break;
-            case 30:
+            case 34:
                 {
-                alt2=4;
+                alt3=4;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("", 2, 0, input);
+                    new NoViableAltException("", 3, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt2) {
+            switch (alt3) {
                 case 1 :
-                    // InternalProblem.g:116:3: this_ClassDeclaration_0= ruleClassDeclaration
+                    // InternalProblem.g:146:3: this_ClassDeclaration_0= ruleClassDeclaration
                     {
 
                                         newCompositeNode(grammarAccess.getStatementAccess().getClassDeclarationParserRuleCall_0());
@@ -331,7 +395,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:125:3: this_PredicateDefinition_1= rulePredicateDefinition
+                    // InternalProblem.g:155:3: this_PredicateDefinition_1= rulePredicateDefinition
                     {
 
                                         newCompositeNode(grammarAccess.getStatementAccess().getPredicateDefinitionParserRuleCall_1());
@@ -349,7 +413,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalProblem.g:134:3: this_Assertion_2= ruleAssertion
+                    // InternalProblem.g:164:3: this_Assertion_2= ruleAssertion
                     {
 
                                         newCompositeNode(grammarAccess.getStatementAccess().getAssertionParserRuleCall_2());
@@ -367,7 +431,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 4 :
-                    // InternalProblem.g:143:3: this_ScopeDeclaration_3= ruleScopeDeclaration
+                    // InternalProblem.g:173:3: this_ScopeDeclaration_3= ruleScopeDeclaration
                     {
 
                                         newCompositeNode(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_3());
@@ -407,7 +471,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleClassDeclaration"
-    // InternalProblem.g:155:1: entryRuleClassDeclaration returns [EObject current=null] : iv_ruleClassDeclaration= ruleClassDeclaration EOF ;
+    // InternalProblem.g:185:1: entryRuleClassDeclaration returns [EObject current=null] : iv_ruleClassDeclaration= ruleClassDeclaration EOF ;
     public final EObject entryRuleClassDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -415,8 +479,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:155:57: (iv_ruleClassDeclaration= ruleClassDeclaration EOF )
-            // InternalProblem.g:156:2: iv_ruleClassDeclaration= ruleClassDeclaration EOF
+            // InternalProblem.g:185:57: (iv_ruleClassDeclaration= ruleClassDeclaration EOF )
+            // InternalProblem.g:186:2: iv_ruleClassDeclaration= ruleClassDeclaration EOF
             {
              newCompositeNode(grammarAccess.getClassDeclarationRule()); 
             pushFollow(FOLLOW_1);
@@ -443,7 +507,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleClassDeclaration"
-    // InternalProblem.g:162:1: ruleClassDeclaration returns [EObject current=null] : ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) ( (otherlv_3= 'extends' ( ( (otherlv_4= RULE_ID ) ) | (otherlv_5= '[' ( ( (otherlv_6= RULE_ID ) ) (otherlv_7= ',' ( (otherlv_8= RULE_ID ) ) )* )? otherlv_9= ']' ) ) ) | ( (lv_referenceDeclarations_10_0= ruleReferenceDeclaration ) ) )? (otherlv_11= ',' ( (lv_referenceDeclarations_12_0= ruleReferenceDeclaration ) ) )* otherlv_13= '.' ) ;
+    // InternalProblem.g:192:1: ruleClassDeclaration returns [EObject current=null] : ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) ) ;
     public final EObject ruleClassDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -451,44 +515,39 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
         Token otherlv_1=null;
         Token lv_name_2_0=null;
         Token otherlv_3=null;
-        Token otherlv_4=null;
         Token otherlv_5=null;
-        Token otherlv_6=null;
         Token otherlv_7=null;
-        Token otherlv_8=null;
         Token otherlv_9=null;
+        Token otherlv_10=null;
         Token otherlv_11=null;
-        Token otherlv_13=null;
-        EObject lv_referenceDeclarations_10_0 = null;
-
-        EObject lv_referenceDeclarations_12_0 = null;
+        EObject lv_referenceDeclarations_8_0 = null;
 
 
 
                 enterRule();
 
         try {
-            // InternalProblem.g:168:2: ( ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) ( (otherlv_3= 'extends' ( ( (otherlv_4= RULE_ID ) ) | (otherlv_5= '[' ( ( (otherlv_6= RULE_ID ) ) (otherlv_7= ',' ( (otherlv_8= RULE_ID ) ) )* )? otherlv_9= ']' ) ) ) | ( (lv_referenceDeclarations_10_0= ruleReferenceDeclaration ) ) )? (otherlv_11= ',' ( (lv_referenceDeclarations_12_0= ruleReferenceDeclaration ) ) )* otherlv_13= '.' ) )
-            // InternalProblem.g:169:2: ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) ( (otherlv_3= 'extends' ( ( (otherlv_4= RULE_ID ) ) | (otherlv_5= '[' ( ( (otherlv_6= RULE_ID ) ) (otherlv_7= ',' ( (otherlv_8= RULE_ID ) ) )* )? otherlv_9= ']' ) ) ) | ( (lv_referenceDeclarations_10_0= ruleReferenceDeclaration ) ) )? (otherlv_11= ',' ( (lv_referenceDeclarations_12_0= ruleReferenceDeclaration ) ) )* otherlv_13= '.' )
+            // InternalProblem.g:198:2: ( ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) ) )
+            // InternalProblem.g:199:2: ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) )
             {
-            // InternalProblem.g:169:2: ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) ( (otherlv_3= 'extends' ( ( (otherlv_4= RULE_ID ) ) | (otherlv_5= '[' ( ( (otherlv_6= RULE_ID ) ) (otherlv_7= ',' ( (otherlv_8= RULE_ID ) ) )* )? otherlv_9= ']' ) ) ) | ( (lv_referenceDeclarations_10_0= ruleReferenceDeclaration ) ) )? (otherlv_11= ',' ( (lv_referenceDeclarations_12_0= ruleReferenceDeclaration ) ) )* otherlv_13= '.' )
-            // InternalProblem.g:170:3: ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) ( (otherlv_3= 'extends' ( ( (otherlv_4= RULE_ID ) ) | (otherlv_5= '[' ( ( (otherlv_6= RULE_ID ) ) (otherlv_7= ',' ( (otherlv_8= RULE_ID ) ) )* )? otherlv_9= ']' ) ) ) | ( (lv_referenceDeclarations_10_0= ruleReferenceDeclaration ) ) )? (otherlv_11= ',' ( (lv_referenceDeclarations_12_0= ruleReferenceDeclaration ) ) )* otherlv_13= '.'
+            // InternalProblem.g:199:2: ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) )
+            // InternalProblem.g:200:3: ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' )
             {
-            // InternalProblem.g:170:3: ( (lv_abstract_0_0= 'abstract' ) )?
-            int alt3=2;
-            int LA3_0 = input.LA(1);
+            // InternalProblem.g:200:3: ( (lv_abstract_0_0= 'abstract' ) )?
+            int alt4=2;
+            int LA4_0 = input.LA(1);
 
-            if ( (LA3_0==11) ) {
-                alt3=1;
+            if ( (LA4_0==14) ) {
+                alt4=1;
             }
-            switch (alt3) {
+            switch (alt4) {
                 case 1 :
-                    // InternalProblem.g:171:4: (lv_abstract_0_0= 'abstract' )
+                    // InternalProblem.g:201:4: (lv_abstract_0_0= 'abstract' )
                     {
-                    // InternalProblem.g:171:4: (lv_abstract_0_0= 'abstract' )
-                    // InternalProblem.g:172:5: lv_abstract_0_0= 'abstract'
+                    // InternalProblem.g:201:4: (lv_abstract_0_0= 'abstract' )
+                    // InternalProblem.g:202:5: lv_abstract_0_0= 'abstract'
                     {
-                    lv_abstract_0_0=(Token)match(input,11,FOLLOW_4); 
+                    lv_abstract_0_0=(Token)match(input,14,FOLLOW_6); 
 
                                                         newLeafNode(lv_abstract_0_0, grammarAccess.getClassDeclarationAccess().getAbstractAbstractKeyword_0_0());
                                                 
@@ -507,17 +566,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,12,FOLLOW_5); 
+            otherlv_1=(Token)match(input,15,FOLLOW_3); 
 
                                 newLeafNode(otherlv_1, grammarAccess.getClassDeclarationAccess().getClassKeyword_1());
                         
-            // InternalProblem.g:188:3: ( (lv_name_2_0= RULE_ID ) )
-            // InternalProblem.g:189:4: (lv_name_2_0= RULE_ID )
+            // InternalProblem.g:218:3: ( (lv_name_2_0= RULE_ID ) )
+            // InternalProblem.g:219:4: (lv_name_2_0= RULE_ID )
             {
-            // InternalProblem.g:189:4: (lv_name_2_0= RULE_ID )
-            // InternalProblem.g:190:5: lv_name_2_0= RULE_ID
+            // InternalProblem.g:219:4: (lv_name_2_0= RULE_ID )
+            // InternalProblem.g:220:5: lv_name_2_0= RULE_ID
             {
-            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_6); 
+            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_7); 
 
                                                 newLeafNode(lv_name_2_0, grammarAccess.getClassDeclarationAccess().getNameIDTerminalRuleCall_2_0());
                                         
@@ -537,290 +596,237 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:206:3: ( (otherlv_3= 'extends' ( ( (otherlv_4= RULE_ID ) ) | (otherlv_5= '[' ( ( (otherlv_6= RULE_ID ) ) (otherlv_7= ',' ( (otherlv_8= RULE_ID ) ) )* )? otherlv_9= ']' ) ) ) | ( (lv_referenceDeclarations_10_0= ruleReferenceDeclaration ) ) )?
-            int alt7=3;
-            int LA7_0 = input.LA(1);
+            // InternalProblem.g:236:3: (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )?
+            int alt6=2;
+            int LA6_0 = input.LA(1);
 
-            if ( (LA7_0==13) ) {
-                alt7=1;
-            }
-            else if ( ((LA7_0>=18 && LA7_0<=19)) ) {
-                alt7=2;
+            if ( (LA6_0==16) ) {
+                alt6=1;
             }
-            switch (alt7) {
+            switch (alt6) {
                 case 1 :
-                    // InternalProblem.g:207:4: (otherlv_3= 'extends' ( ( (otherlv_4= RULE_ID ) ) | (otherlv_5= '[' ( ( (otherlv_6= RULE_ID ) ) (otherlv_7= ',' ( (otherlv_8= RULE_ID ) ) )* )? otherlv_9= ']' ) ) )
+                    // InternalProblem.g:237:4: otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )*
                     {
-                    // InternalProblem.g:207:4: (otherlv_3= 'extends' ( ( (otherlv_4= RULE_ID ) ) | (otherlv_5= '[' ( ( (otherlv_6= RULE_ID ) ) (otherlv_7= ',' ( (otherlv_8= RULE_ID ) ) )* )? otherlv_9= ']' ) ) )
-                    // InternalProblem.g:208:5: otherlv_3= 'extends' ( ( (otherlv_4= RULE_ID ) ) | (otherlv_5= '[' ( ( (otherlv_6= RULE_ID ) ) (otherlv_7= ',' ( (otherlv_8= RULE_ID ) ) )* )? otherlv_9= ']' ) )
-                    {
-                    otherlv_3=(Token)match(input,13,FOLLOW_7); 
-
-                                                        newLeafNode(otherlv_3, grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0_0());
-                                                
-                    // InternalProblem.g:212:5: ( ( (otherlv_4= RULE_ID ) ) | (otherlv_5= '[' ( ( (otherlv_6= RULE_ID ) ) (otherlv_7= ',' ( (otherlv_8= RULE_ID ) ) )* )? otherlv_9= ']' ) )
-                    int alt6=2;
-                    int LA6_0 = input.LA(1);
-
-                    if ( (LA6_0==RULE_ID) ) {
-                        alt6=1;
-                    }
-                    else if ( (LA6_0==14) ) {
-                        alt6=2;
-                    }
-                    else {
-                        NoViableAltException nvae =
-                            new NoViableAltException("", 6, 0, input);
-
-                        throw nvae;
-                    }
-                    switch (alt6) {
-                        case 1 :
-                            // InternalProblem.g:213:6: ( (otherlv_4= RULE_ID ) )
-                            {
-                            // InternalProblem.g:213:6: ( (otherlv_4= RULE_ID ) )
-                            // InternalProblem.g:214:7: (otherlv_4= RULE_ID )
-                            {
-                            // InternalProblem.g:214:7: (otherlv_4= RULE_ID )
-                            // InternalProblem.g:215:8: otherlv_4= RULE_ID
-                            {
-
-                                                                                        if (current==null) {
-                                                                                                current = createModelElement(grammarAccess.getClassDeclarationRule());
-                                                                                        }
-                                                                                
-                            otherlv_4=(Token)match(input,RULE_ID,FOLLOW_8); 
-
-                                                                                        newLeafNode(otherlv_4, grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_0_1_0_0());
-                                                                                
-
-                            }
-
-
-                            }
-
-
-                            }
-                            break;
-                        case 2 :
-                            // InternalProblem.g:227:6: (otherlv_5= '[' ( ( (otherlv_6= RULE_ID ) ) (otherlv_7= ',' ( (otherlv_8= RULE_ID ) ) )* )? otherlv_9= ']' )
-                            {
-                            // InternalProblem.g:227:6: (otherlv_5= '[' ( ( (otherlv_6= RULE_ID ) ) (otherlv_7= ',' ( (otherlv_8= RULE_ID ) ) )* )? otherlv_9= ']' )
-                            // InternalProblem.g:228:7: otherlv_5= '[' ( ( (otherlv_6= RULE_ID ) ) (otherlv_7= ',' ( (otherlv_8= RULE_ID ) ) )* )? otherlv_9= ']'
-                            {
-                            otherlv_5=(Token)match(input,14,FOLLOW_9); 
-
-                                                                                newLeafNode(otherlv_5, grammarAccess.getClassDeclarationAccess().getLeftSquareBracketKeyword_3_0_1_1_0());
-                                                                        
-                            // InternalProblem.g:232:7: ( ( (otherlv_6= RULE_ID ) ) (otherlv_7= ',' ( (otherlv_8= RULE_ID ) ) )* )?
-                            int alt5=2;
-                            int LA5_0 = input.LA(1);
-
-                            if ( (LA5_0==RULE_ID) ) {
-                                alt5=1;
-                            }
-                            switch (alt5) {
-                                case 1 :
-                                    // InternalProblem.g:233:8: ( (otherlv_6= RULE_ID ) ) (otherlv_7= ',' ( (otherlv_8= RULE_ID ) ) )*
-                                    {
-                                    // InternalProblem.g:233:8: ( (otherlv_6= RULE_ID ) )
-                                    // InternalProblem.g:234:9: (otherlv_6= RULE_ID )
-                                    {
-                                    // InternalProblem.g:234:9: (otherlv_6= RULE_ID )
-                                    // InternalProblem.g:235:10: otherlv_6= RULE_ID
-                                    {
+                    otherlv_3=(Token)match(input,16,FOLLOW_8); 
 
-                                                                                                                if (current==null) {
-                                                                                                                        current = createModelElement(grammarAccess.getClassDeclarationRule());
-                                                                                                                }
-                                                                                                        
-                                    otherlv_6=(Token)match(input,RULE_ID,FOLLOW_10); 
+                                                newLeafNode(otherlv_3, grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0());
+                                        
+                    // InternalProblem.g:241:4: ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:242:5: ( ruleQualifiedName )
+                    {
+                    // InternalProblem.g:242:5: ( ruleQualifiedName )
+                    // InternalProblem.g:243:6: ruleQualifiedName
+                    {
 
-                                                                                                                newLeafNode(otherlv_6, grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_0_1_1_1_0_0());
-                                                                                                        
+                                                                if (current==null) {
+                                                                        current = createModelElement(grammarAccess.getClassDeclarationRule());
+                                                                }
+                                                        
 
-                                    }
+                                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_1_0());
+                                                        
+                    pushFollow(FOLLOW_9);
+                    ruleQualifiedName();
 
+                    state._fsp--;
 
-                                    }
 
-                                    // InternalProblem.g:246:8: (otherlv_7= ',' ( (otherlv_8= RULE_ID ) ) )*
-                                    loop4:
-                                    do {
-                                        int alt4=2;
-                                        int LA4_0 = input.LA(1);
+                                                                afterParserOrEnumRuleCall();
+                                                        
 
-                                        if ( (LA4_0==15) ) {
-                                            alt4=1;
-                                        }
+                    }
 
 
-                                        switch (alt4) {
-                                        case 1 :
-                                            // InternalProblem.g:247:9: otherlv_7= ',' ( (otherlv_8= RULE_ID ) )
-                                            {
-                                            otherlv_7=(Token)match(input,15,FOLLOW_5); 
+                    }
 
-                                                                                                                newLeafNode(otherlv_7, grammarAccess.getClassDeclarationAccess().getCommaKeyword_3_0_1_1_1_1_0());
-                                                                                                        
-                                            // InternalProblem.g:251:9: ( (otherlv_8= RULE_ID ) )
-                                            // InternalProblem.g:252:10: (otherlv_8= RULE_ID )
-                                            {
-                                            // InternalProblem.g:252:10: (otherlv_8= RULE_ID )
-                                            // InternalProblem.g:253:11: otherlv_8= RULE_ID
-                                            {
+                    // InternalProblem.g:257:4: (otherlv_5= ',' ( ( ruleQualifiedName ) ) )*
+                    loop5:
+                    do {
+                        int alt5=2;
+                        int LA5_0 = input.LA(1);
 
-                                                                                                                                if (current==null) {
-                                                                                                                                        current = createModelElement(grammarAccess.getClassDeclarationRule());
-                                                                                                                                }
-                                                                                                                        
-                                            otherlv_8=(Token)match(input,RULE_ID,FOLLOW_10); 
+                        if ( (LA5_0==17) ) {
+                            alt5=1;
+                        }
 
-                                                                                                                                newLeafNode(otherlv_8, grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_0_1_1_1_1_1_0());
-                                                                                                                        
 
-                                            }
+                        switch (alt5) {
+                        case 1 :
+                            // InternalProblem.g:258:5: otherlv_5= ',' ( ( ruleQualifiedName ) )
+                            {
+                            otherlv_5=(Token)match(input,17,FOLLOW_8); 
 
+                                                                newLeafNode(otherlv_5, grammarAccess.getClassDeclarationAccess().getCommaKeyword_3_2_0());
+                                                        
+                            // InternalProblem.g:262:5: ( ( ruleQualifiedName ) )
+                            // InternalProblem.g:263:6: ( ruleQualifiedName )
+                            {
+                            // InternalProblem.g:263:6: ( ruleQualifiedName )
+                            // InternalProblem.g:264:7: ruleQualifiedName
+                            {
 
-                                            }
+                                                                                if (current==null) {
+                                                                                        current = createModelElement(grammarAccess.getClassDeclarationRule());
+                                                                                }
+                                                                        
 
+                                                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_2_1_0());
+                                                                        
+                            pushFollow(FOLLOW_9);
+                            ruleQualifiedName();
 
-                                            }
-                                            break;
+                            state._fsp--;
 
-                                        default :
-                                            break loop4;
-                                        }
-                                    } while (true);
 
+                                                                                afterParserOrEnumRuleCall();
+                                                                        
 
-                                    }
-                                    break;
+                            }
 
-                            }
 
-                            otherlv_9=(Token)match(input,16,FOLLOW_8); 
+                            }
 
-                                                                                newLeafNode(otherlv_9, grammarAccess.getClassDeclarationAccess().getRightSquareBracketKeyword_3_0_1_1_2());
-                                                                        
 
-                            }
+                            }
+                            break;
 
+                        default :
+                            break loop5;
+                        }
+                    } while (true);
 
-                            }
-                            break;
 
                     }
+                    break;
 
+            }
 
-                    }
+            // InternalProblem.g:280:3: ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' )
+            int alt9=2;
+            int LA9_0 = input.LA(1);
 
+            if ( (LA9_0==18) ) {
+                alt9=1;
+            }
+            else if ( (LA9_0==13) ) {
+                alt9=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 9, 0, input);
 
-                    }
-                    break;
-                case 2 :
-                    // InternalProblem.g:274:4: ( (lv_referenceDeclarations_10_0= ruleReferenceDeclaration ) )
-                    {
-                    // InternalProblem.g:274:4: ( (lv_referenceDeclarations_10_0= ruleReferenceDeclaration ) )
-                    // InternalProblem.g:275:5: (lv_referenceDeclarations_10_0= ruleReferenceDeclaration )
+                throw nvae;
+            }
+            switch (alt9) {
+                case 1 :
+                    // InternalProblem.g:281:4: (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' )
                     {
-                    // InternalProblem.g:275:5: (lv_referenceDeclarations_10_0= ruleReferenceDeclaration )
-                    // InternalProblem.g:276:6: lv_referenceDeclarations_10_0= ruleReferenceDeclaration
+                    // InternalProblem.g:281:4: (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' )
+                    // InternalProblem.g:282:5: otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}'
                     {
+                    otherlv_7=(Token)match(input,18,FOLLOW_10); 
 
-                                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_3_1_0());
-                                                        
-                    pushFollow(FOLLOW_8);
-                    lv_referenceDeclarations_10_0=ruleReferenceDeclaration();
+                                                        newLeafNode(otherlv_7, grammarAccess.getClassDeclarationAccess().getLeftCurlyBracketKeyword_4_0_0());
+                                                
+                    // InternalProblem.g:286:5: ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )*
+                    loop8:
+                    do {
+                        int alt8=2;
+                        int LA8_0 = input.LA(1);
 
-                    state._fsp--;
+                        if ( ((LA8_0>=21 && LA8_0<=22)) ) {
+                            alt8=1;
+                        }
 
 
-                                                                if (current==null) {
-                                                                        current = createModelElementForParent(grammarAccess.getClassDeclarationRule());
-                                                                }
-                                                                add(
-                                                                        current,
-                                                                        "referenceDeclarations",
-                                                                        lv_referenceDeclarations_10_0,
-                                                                        "org.eclipse.viatra.solver.language.Problem.ReferenceDeclaration");
-                                                                afterParserOrEnumRuleCall();
-                                                        
+                        switch (alt8) {
+                        case 1 :
+                            // InternalProblem.g:287:6: ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )?
+                            {
+                            // InternalProblem.g:287:6: ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) )
+                            // InternalProblem.g:288:7: (lv_referenceDeclarations_8_0= ruleReferenceDeclaration )
+                            {
+                            // InternalProblem.g:288:7: (lv_referenceDeclarations_8_0= ruleReferenceDeclaration )
+                            // InternalProblem.g:289:8: lv_referenceDeclarations_8_0= ruleReferenceDeclaration
+                            {
 
-                    }
+                                                                                        newCompositeNode(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_0_1_0_0());
+                                                                                
+                            pushFollow(FOLLOW_11);
+                            lv_referenceDeclarations_8_0=ruleReferenceDeclaration();
 
+                            state._fsp--;
 
-                    }
 
+                                                                                        if (current==null) {
+                                                                                                current = createModelElementForParent(grammarAccess.getClassDeclarationRule());
+                                                                                        }
+                                                                                        add(
+                                                                                                current,
+                                                                                                "referenceDeclarations",
+                                                                                                lv_referenceDeclarations_8_0,
+                                                                                                "org.eclipse.viatra.solver.language.Problem.ReferenceDeclaration");
+                                                                                        afterParserOrEnumRuleCall();
+                                                                                
 
-                    }
-                    break;
+                            }
 
-            }
 
-            // InternalProblem.g:294:3: (otherlv_11= ',' ( (lv_referenceDeclarations_12_0= ruleReferenceDeclaration ) ) )*
-            loop8:
-            do {
-                int alt8=2;
-                int LA8_0 = input.LA(1);
+                            }
 
-                if ( (LA8_0==15) ) {
-                    alt8=1;
-                }
+                            // InternalProblem.g:306:6: (otherlv_9= ';' )?
+                            int alt7=2;
+                            int LA7_0 = input.LA(1);
 
+                            if ( (LA7_0==19) ) {
+                                alt7=1;
+                            }
+                            switch (alt7) {
+                                case 1 :
+                                    // InternalProblem.g:307:7: otherlv_9= ';'
+                                    {
+                                    otherlv_9=(Token)match(input,19,FOLLOW_10); 
 
-                switch (alt8) {
-                case 1 :
-                    // InternalProblem.g:295:4: otherlv_11= ',' ( (lv_referenceDeclarations_12_0= ruleReferenceDeclaration ) )
-                    {
-                    otherlv_11=(Token)match(input,15,FOLLOW_11); 
+                                                                                        newLeafNode(otherlv_9, grammarAccess.getClassDeclarationAccess().getSemicolonKeyword_4_0_1_1());
+                                                                                
 
-                                                newLeafNode(otherlv_11, grammarAccess.getClassDeclarationAccess().getCommaKeyword_4_0());
-                                        
-                    // InternalProblem.g:299:4: ( (lv_referenceDeclarations_12_0= ruleReferenceDeclaration ) )
-                    // InternalProblem.g:300:5: (lv_referenceDeclarations_12_0= ruleReferenceDeclaration )
-                    {
-                    // InternalProblem.g:300:5: (lv_referenceDeclarations_12_0= ruleReferenceDeclaration )
-                    // InternalProblem.g:301:6: lv_referenceDeclarations_12_0= ruleReferenceDeclaration
-                    {
+                                    }
+                                    break;
 
-                                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_1_0());
-                                                        
-                    pushFollow(FOLLOW_8);
-                    lv_referenceDeclarations_12_0=ruleReferenceDeclaration();
+                            }
 
-                    state._fsp--;
 
+                            }
+                            break;
 
-                                                                if (current==null) {
-                                                                        current = createModelElementForParent(grammarAccess.getClassDeclarationRule());
-                                                                }
-                                                                add(
-                                                                        current,
-                                                                        "referenceDeclarations",
-                                                                        lv_referenceDeclarations_12_0,
-                                                                        "org.eclipse.viatra.solver.language.Problem.ReferenceDeclaration");
-                                                                afterParserOrEnumRuleCall();
-                                                        
+                        default :
+                            break loop8;
+                        }
+                    } while (true);
 
-                    }
+                    otherlv_10=(Token)match(input,20,FOLLOW_2); 
 
+                                                        newLeafNode(otherlv_10, grammarAccess.getClassDeclarationAccess().getRightCurlyBracketKeyword_4_0_2());
+                                                
 
-                    }
+                    }
 
 
-                    }
-                    break;
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:319:4: otherlv_11= '.'
+                    {
+                    otherlv_11=(Token)match(input,13,FOLLOW_2); 
 
-                default :
-                    break loop8;
-                }
-            } while (true);
+                                                newLeafNode(otherlv_11, grammarAccess.getClassDeclarationAccess().getFullStopKeyword_4_1());
+                                        
 
-            otherlv_13=(Token)match(input,17,FOLLOW_2); 
+                    }
+                    break;
+
+            }
 
-                                newLeafNode(otherlv_13, grammarAccess.getClassDeclarationAccess().getFullStopKeyword_5());
-                        
 
             }
 
@@ -844,7 +850,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleReferenceDeclaration"
-    // InternalProblem.g:327:1: entryRuleReferenceDeclaration returns [EObject current=null] : iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF ;
+    // InternalProblem.g:328:1: entryRuleReferenceDeclaration returns [EObject current=null] : iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF ;
     public final EObject entryRuleReferenceDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -852,8 +858,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:327:61: (iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF )
-            // InternalProblem.g:328:2: iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF
+            // InternalProblem.g:328:61: (iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF )
+            // InternalProblem.g:329:2: iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF
             {
              newCompositeNode(grammarAccess.getReferenceDeclarationRule()); 
             pushFollow(FOLLOW_1);
@@ -880,13 +886,12 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleReferenceDeclaration"
-    // InternalProblem.g:334:1: ruleReferenceDeclaration returns [EObject current=null] : ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( (otherlv_2= RULE_ID ) ) otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? ) ;
+    // InternalProblem.g:335:1: ruleReferenceDeclaration returns [EObject current=null] : ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? ) ;
     public final EObject ruleReferenceDeclaration() throws RecognitionException {
         EObject current = null;
 
         Token lv_containment_0_0=null;
         Token otherlv_1=null;
-        Token otherlv_2=null;
         Token otherlv_3=null;
         Token otherlv_5=null;
         Token lv_name_6_0=null;
@@ -898,39 +903,39 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:340:2: ( ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( (otherlv_2= RULE_ID ) ) otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? ) )
-            // InternalProblem.g:341:2: ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( (otherlv_2= RULE_ID ) ) otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? )
+            // InternalProblem.g:341:2: ( ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? ) )
+            // InternalProblem.g:342:2: ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? )
             {
-            // InternalProblem.g:341:2: ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( (otherlv_2= RULE_ID ) ) otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? )
-            // InternalProblem.g:342:3: ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( (otherlv_2= RULE_ID ) ) otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )?
+            // InternalProblem.g:342:2: ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? )
+            // InternalProblem.g:343:3: ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )?
             {
-            // InternalProblem.g:342:3: ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' )
-            int alt9=2;
-            int LA9_0 = input.LA(1);
+            // InternalProblem.g:343:3: ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' )
+            int alt10=2;
+            int LA10_0 = input.LA(1);
 
-            if ( (LA9_0==18) ) {
-                alt9=1;
+            if ( (LA10_0==21) ) {
+                alt10=1;
             }
-            else if ( (LA9_0==19) ) {
-                alt9=2;
+            else if ( (LA10_0==22) ) {
+                alt10=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 9, 0, input);
+                    new NoViableAltException("", 10, 0, input);
 
                 throw nvae;
             }
-            switch (alt9) {
+            switch (alt10) {
                 case 1 :
-                    // InternalProblem.g:343:4: ( (lv_containment_0_0= 'contains' ) )
+                    // InternalProblem.g:344:4: ( (lv_containment_0_0= 'contains' ) )
                     {
-                    // InternalProblem.g:343:4: ( (lv_containment_0_0= 'contains' ) )
-                    // InternalProblem.g:344:5: (lv_containment_0_0= 'contains' )
+                    // InternalProblem.g:344:4: ( (lv_containment_0_0= 'contains' ) )
+                    // InternalProblem.g:345:5: (lv_containment_0_0= 'contains' )
                     {
-                    // InternalProblem.g:344:5: (lv_containment_0_0= 'contains' )
-                    // InternalProblem.g:345:6: lv_containment_0_0= 'contains'
+                    // InternalProblem.g:345:5: (lv_containment_0_0= 'contains' )
+                    // InternalProblem.g:346:6: lv_containment_0_0= 'contains'
                     {
-                    lv_containment_0_0=(Token)match(input,18,FOLLOW_5); 
+                    lv_containment_0_0=(Token)match(input,21,FOLLOW_8); 
 
                                                                 newLeafNode(lv_containment_0_0, grammarAccess.getReferenceDeclarationAccess().getContainmentContainsKeyword_0_0_0());
                                                         
@@ -950,9 +955,9 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:358:4: otherlv_1= 'refers'
+                    // InternalProblem.g:359:4: otherlv_1= 'refers'
                     {
-                    otherlv_1=(Token)match(input,19,FOLLOW_5); 
+                    otherlv_1=(Token)match(input,22,FOLLOW_8); 
 
                                                 newLeafNode(otherlv_1, grammarAccess.getReferenceDeclarationAccess().getRefersKeyword_0_1());
                                         
@@ -962,20 +967,27 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:363:3: ( (otherlv_2= RULE_ID ) )
-            // InternalProblem.g:364:4: (otherlv_2= RULE_ID )
+            // InternalProblem.g:364:3: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:365:4: ( ruleQualifiedName )
             {
-            // InternalProblem.g:364:4: (otherlv_2= RULE_ID )
-            // InternalProblem.g:365:5: otherlv_2= RULE_ID
+            // InternalProblem.g:365:4: ( ruleQualifiedName )
+            // InternalProblem.g:366:5: ruleQualifiedName
             {
 
                                                 if (current==null) {
                                                         current = createModelElement(grammarAccess.getReferenceDeclarationRule());
                                                 }
                                         
-            otherlv_2=(Token)match(input,RULE_ID,FOLLOW_12); 
 
-                                                newLeafNode(otherlv_2, grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationCrossReference_1_0());
+                                                newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationCrossReference_1_0());
+                                        
+            pushFollow(FOLLOW_12);
+            ruleQualifiedName();
+
+            state._fsp--;
+
+
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -983,54 +995,71 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_3=(Token)match(input,14,FOLLOW_13); 
+            // InternalProblem.g:380:3: (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )?
+            int alt11=2;
+            int LA11_0 = input.LA(1);
 
-                                newLeafNode(otherlv_3, grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2());
-                        
-            // InternalProblem.g:380:3: ( (lv_multiplicity_4_0= ruleMultiplicity ) )
-            // InternalProblem.g:381:4: (lv_multiplicity_4_0= ruleMultiplicity )
-            {
-            // InternalProblem.g:381:4: (lv_multiplicity_4_0= ruleMultiplicity )
-            // InternalProblem.g:382:5: lv_multiplicity_4_0= ruleMultiplicity
-            {
+            if ( (LA11_0==23) ) {
+                alt11=1;
+            }
+            switch (alt11) {
+                case 1 :
+                    // InternalProblem.g:381:4: otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']'
+                    {
+                    otherlv_3=(Token)match(input,23,FOLLOW_13); 
 
-                                                newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getMultiplicityMultiplicityParserRuleCall_3_0());
-                                        
-            pushFollow(FOLLOW_14);
-            lv_multiplicity_4_0=ruleMultiplicity();
+                                                newLeafNode(otherlv_3, grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2_0());
+                                        
+                    // InternalProblem.g:385:4: ( (lv_multiplicity_4_0= ruleMultiplicity ) )
+                    // InternalProblem.g:386:5: (lv_multiplicity_4_0= ruleMultiplicity )
+                    {
+                    // InternalProblem.g:386:5: (lv_multiplicity_4_0= ruleMultiplicity )
+                    // InternalProblem.g:387:6: lv_multiplicity_4_0= ruleMultiplicity
+                    {
 
-            state._fsp--;
+                                                                newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getMultiplicityMultiplicityParserRuleCall_2_1_0());
+                                                        
+                    pushFollow(FOLLOW_14);
+                    lv_multiplicity_4_0=ruleMultiplicity();
 
+                    state._fsp--;
 
-                                                if (current==null) {
-                                                        current = createModelElementForParent(grammarAccess.getReferenceDeclarationRule());
-                                                }
-                                                set(
-                                                        current,
-                                                        "multiplicity",
-                                                        lv_multiplicity_4_0,
-                                                        "org.eclipse.viatra.solver.language.Problem.Multiplicity");
-                                                afterParserOrEnumRuleCall();
-                                        
 
-            }
+                                                                if (current==null) {
+                                                                        current = createModelElementForParent(grammarAccess.getReferenceDeclarationRule());
+                                                                }
+                                                                set(
+                                                                        current,
+                                                                        "multiplicity",
+                                                                        lv_multiplicity_4_0,
+                                                                        "org.eclipse.viatra.solver.language.Problem.Multiplicity");
+                                                                afterParserOrEnumRuleCall();
+                                                        
 
+                    }
 
-            }
 
-            otherlv_5=(Token)match(input,16,FOLLOW_5); 
+                    }
 
-                                newLeafNode(otherlv_5, grammarAccess.getReferenceDeclarationAccess().getRightSquareBracketKeyword_4());
-                        
-            // InternalProblem.g:403:3: ( (lv_name_6_0= RULE_ID ) )
-            // InternalProblem.g:404:4: (lv_name_6_0= RULE_ID )
+                    otherlv_5=(Token)match(input,24,FOLLOW_3); 
+
+                                                newLeafNode(otherlv_5, grammarAccess.getReferenceDeclarationAccess().getRightSquareBracketKeyword_2_2());
+                                        
+
+                    }
+                    break;
+
+            }
+
+            // InternalProblem.g:409:3: ( (lv_name_6_0= RULE_ID ) )
+            // InternalProblem.g:410:4: (lv_name_6_0= RULE_ID )
             {
-            // InternalProblem.g:404:4: (lv_name_6_0= RULE_ID )
-            // InternalProblem.g:405:5: lv_name_6_0= RULE_ID
+            // InternalProblem.g:410:4: (lv_name_6_0= RULE_ID )
+            // InternalProblem.g:411:5: lv_name_6_0= RULE_ID
             {
             lv_name_6_0=(Token)match(input,RULE_ID,FOLLOW_15); 
 
-                                                newLeafNode(lv_name_6_0, grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_5_0());
+                                                newLeafNode(lv_name_6_0, grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_3_0());
                                         
 
                                                 if (current==null) {
@@ -1048,26 +1077,26 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:421:3: (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )?
-            int alt10=2;
-            int LA10_0 = input.LA(1);
+            // InternalProblem.g:427:3: (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )?
+            int alt12=2;
+            int LA12_0 = input.LA(1);
 
-            if ( (LA10_0==20) ) {
-                alt10=1;
+            if ( (LA12_0==25) ) {
+                alt12=1;
             }
-            switch (alt10) {
+            switch (alt12) {
                 case 1 :
-                    // InternalProblem.g:422:4: otherlv_7= 'opposite' ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:428:4: otherlv_7= 'opposite' ( ( ruleQualifiedName ) )
                     {
-                    otherlv_7=(Token)match(input,20,FOLLOW_5); 
+                    otherlv_7=(Token)match(input,25,FOLLOW_8); 
 
-                                                newLeafNode(otherlv_7, grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_6_0());
+                                                newLeafNode(otherlv_7, grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_4_0());
                                         
-                    // InternalProblem.g:426:4: ( ( ruleQualifiedName ) )
-                    // InternalProblem.g:427:5: ( ruleQualifiedName )
+                    // InternalProblem.g:432:4: ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:433:5: ( ruleQualifiedName )
                     {
-                    // InternalProblem.g:427:5: ( ruleQualifiedName )
-                    // InternalProblem.g:428:6: ruleQualifiedName
+                    // InternalProblem.g:433:5: ( ruleQualifiedName )
+                    // InternalProblem.g:434:6: ruleQualifiedName
                     {
 
                                                                 if (current==null) {
@@ -1075,7 +1104,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                                                 }
                                                         
 
-                                                                newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationCrossReference_6_1_0());
+                                                                newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getOppositeReferenceDeclarationCrossReference_4_1_0());
                                                         
                     pushFollow(FOLLOW_2);
                     ruleQualifiedName();
@@ -1120,7 +1149,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePredicateDefinition"
-    // InternalProblem.g:447:1: entryRulePredicateDefinition returns [EObject current=null] : iv_rulePredicateDefinition= rulePredicateDefinition EOF ;
+    // InternalProblem.g:453:1: entryRulePredicateDefinition returns [EObject current=null] : iv_rulePredicateDefinition= rulePredicateDefinition EOF ;
     public final EObject entryRulePredicateDefinition() throws RecognitionException {
         EObject current = null;
 
@@ -1128,8 +1157,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:447:60: (iv_rulePredicateDefinition= rulePredicateDefinition EOF )
-            // InternalProblem.g:448:2: iv_rulePredicateDefinition= rulePredicateDefinition EOF
+            // InternalProblem.g:453:60: (iv_rulePredicateDefinition= rulePredicateDefinition EOF )
+            // InternalProblem.g:454:2: iv_rulePredicateDefinition= rulePredicateDefinition EOF
             {
              newCompositeNode(grammarAccess.getPredicateDefinitionRule()); 
             pushFollow(FOLLOW_1);
@@ -1156,7 +1185,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePredicateDefinition"
-    // InternalProblem.g:454:1: rulePredicateDefinition returns [EObject current=null] : ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':=' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' ) ;
+    // InternalProblem.g:460:1: rulePredicateDefinition returns [EObject current=null] : ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' ) ;
     public final EObject rulePredicateDefinition() throws RecognitionException {
         EObject current = null;
 
@@ -1183,42 +1212,42 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:460:2: ( ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':=' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' ) )
-            // InternalProblem.g:461:2: ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':=' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' )
+            // InternalProblem.g:466:2: ( ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' ) )
+            // InternalProblem.g:467:2: ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' )
             {
-            // InternalProblem.g:461:2: ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':=' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' )
-            // InternalProblem.g:462:3: ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':=' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.'
+            // InternalProblem.g:467:2: ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' )
+            // InternalProblem.g:468:3: ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.'
             {
-            // InternalProblem.g:462:3: ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' )
-            int alt12=2;
-            int LA12_0 = input.LA(1);
+            // InternalProblem.g:468:3: ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' )
+            int alt14=2;
+            int LA14_0 = input.LA(1);
 
-            if ( (LA12_0==21) ) {
-                alt12=1;
+            if ( (LA14_0==26) ) {
+                alt14=1;
             }
-            else if ( (LA12_0==22) ) {
-                alt12=2;
+            else if ( (LA14_0==27) ) {
+                alt14=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 12, 0, input);
+                    new NoViableAltException("", 14, 0, input);
 
                 throw nvae;
             }
-            switch (alt12) {
+            switch (alt14) {
                 case 1 :
-                    // InternalProblem.g:463:4: ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? )
+                    // InternalProblem.g:469:4: ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? )
                     {
-                    // InternalProblem.g:463:4: ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? )
-                    // InternalProblem.g:464:5: ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )?
+                    // InternalProblem.g:469:4: ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? )
+                    // InternalProblem.g:470:5: ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )?
                     {
-                    // InternalProblem.g:464:5: ( (lv_error_0_0= 'error' ) )
-                    // InternalProblem.g:465:6: (lv_error_0_0= 'error' )
+                    // InternalProblem.g:470:5: ( (lv_error_0_0= 'error' ) )
+                    // InternalProblem.g:471:6: (lv_error_0_0= 'error' )
                     {
-                    // InternalProblem.g:465:6: (lv_error_0_0= 'error' )
-                    // InternalProblem.g:466:7: lv_error_0_0= 'error'
+                    // InternalProblem.g:471:6: (lv_error_0_0= 'error' )
+                    // InternalProblem.g:472:7: lv_error_0_0= 'error'
                     {
-                    lv_error_0_0=(Token)match(input,21,FOLLOW_16); 
+                    lv_error_0_0=(Token)match(input,26,FOLLOW_16); 
 
                                                                         newLeafNode(lv_error_0_0, grammarAccess.getPredicateDefinitionAccess().getErrorErrorKeyword_0_0_0_0());
                                                                 
@@ -1234,18 +1263,18 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:478:5: (otherlv_1= 'pred' )?
-                    int alt11=2;
-                    int LA11_0 = input.LA(1);
+                    // InternalProblem.g:484:5: (otherlv_1= 'pred' )?
+                    int alt13=2;
+                    int LA13_0 = input.LA(1);
 
-                    if ( (LA11_0==22) ) {
-                        alt11=1;
+                    if ( (LA13_0==27) ) {
+                        alt13=1;
                     }
-                    switch (alt11) {
+                    switch (alt13) {
                         case 1 :
-                            // InternalProblem.g:479:6: otherlv_1= 'pred'
+                            // InternalProblem.g:485:6: otherlv_1= 'pred'
                             {
-                            otherlv_1=(Token)match(input,22,FOLLOW_5); 
+                            otherlv_1=(Token)match(input,27,FOLLOW_3); 
 
                                                                         newLeafNode(otherlv_1, grammarAccess.getPredicateDefinitionAccess().getPredKeyword_0_0_1());
                                                                 
@@ -1262,9 +1291,9 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:486:4: otherlv_2= 'pred'
+                    // InternalProblem.g:492:4: otherlv_2= 'pred'
                     {
-                    otherlv_2=(Token)match(input,22,FOLLOW_5); 
+                    otherlv_2=(Token)match(input,27,FOLLOW_3); 
 
                                                 newLeafNode(otherlv_2, grammarAccess.getPredicateDefinitionAccess().getPredKeyword_0_1());
                                         
@@ -1274,11 +1303,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:491:3: ( (lv_name_3_0= RULE_ID ) )
-            // InternalProblem.g:492:4: (lv_name_3_0= RULE_ID )
+            // InternalProblem.g:497:3: ( (lv_name_3_0= RULE_ID ) )
+            // InternalProblem.g:498:4: (lv_name_3_0= RULE_ID )
             {
-            // InternalProblem.g:492:4: (lv_name_3_0= RULE_ID )
-            // InternalProblem.g:493:5: lv_name_3_0= RULE_ID
+            // InternalProblem.g:498:4: (lv_name_3_0= RULE_ID )
+            // InternalProblem.g:499:5: lv_name_3_0= RULE_ID
             {
             lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_17); 
 
@@ -1300,26 +1329,26 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,23,FOLLOW_18); 
+            otherlv_4=(Token)match(input,28,FOLLOW_18); 
 
                                 newLeafNode(otherlv_4, grammarAccess.getPredicateDefinitionAccess().getLeftParenthesisKeyword_2());
                         
-            // InternalProblem.g:513:3: ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )?
-            int alt14=2;
-            int LA14_0 = input.LA(1);
+            // InternalProblem.g:519:3: ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )?
+            int alt16=2;
+            int LA16_0 = input.LA(1);
 
-            if ( (LA14_0==RULE_ID) ) {
-                alt14=1;
+            if ( (LA16_0==RULE_ID) ) {
+                alt16=1;
             }
-            switch (alt14) {
+            switch (alt16) {
                 case 1 :
-                    // InternalProblem.g:514:4: ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )*
+                    // InternalProblem.g:520:4: ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )*
                     {
-                    // InternalProblem.g:514:4: ( (lv_parameters_5_0= ruleParameter ) )
-                    // InternalProblem.g:515:5: (lv_parameters_5_0= ruleParameter )
+                    // InternalProblem.g:520:4: ( (lv_parameters_5_0= ruleParameter ) )
+                    // InternalProblem.g:521:5: (lv_parameters_5_0= ruleParameter )
                     {
-                    // InternalProblem.g:515:5: (lv_parameters_5_0= ruleParameter )
-                    // InternalProblem.g:516:6: lv_parameters_5_0= ruleParameter
+                    // InternalProblem.g:521:5: (lv_parameters_5_0= ruleParameter )
+                    // InternalProblem.g:522:6: lv_parameters_5_0= ruleParameter
                     {
 
                                                                 newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getParametersParameterParserRuleCall_3_0_0());
@@ -1346,30 +1375,30 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:533:4: (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )*
-                    loop13:
+                    // InternalProblem.g:539:4: (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )*
+                    loop15:
                     do {
-                        int alt13=2;
-                        int LA13_0 = input.LA(1);
+                        int alt15=2;
+                        int LA15_0 = input.LA(1);
 
-                        if ( (LA13_0==15) ) {
-                            alt13=1;
+                        if ( (LA15_0==17) ) {
+                            alt15=1;
                         }
 
 
-                        switch (alt13) {
+                        switch (alt15) {
                         case 1 :
-                            // InternalProblem.g:534:5: otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) )
+                            // InternalProblem.g:540:5: otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) )
                             {
-                            otherlv_6=(Token)match(input,15,FOLLOW_5); 
+                            otherlv_6=(Token)match(input,17,FOLLOW_3); 
 
                                                                 newLeafNode(otherlv_6, grammarAccess.getPredicateDefinitionAccess().getCommaKeyword_3_1_0());
                                                         
-                            // InternalProblem.g:538:5: ( (lv_parameters_7_0= ruleParameter ) )
-                            // InternalProblem.g:539:6: (lv_parameters_7_0= ruleParameter )
+                            // InternalProblem.g:544:5: ( (lv_parameters_7_0= ruleParameter ) )
+                            // InternalProblem.g:545:6: (lv_parameters_7_0= ruleParameter )
                             {
-                            // InternalProblem.g:539:6: (lv_parameters_7_0= ruleParameter )
-                            // InternalProblem.g:540:7: lv_parameters_7_0= ruleParameter
+                            // InternalProblem.g:545:6: (lv_parameters_7_0= ruleParameter )
+                            // InternalProblem.g:546:7: lv_parameters_7_0= ruleParameter
                             {
 
                                                                                 newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getParametersParameterParserRuleCall_3_1_1_0());
@@ -1401,7 +1430,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                             break;
 
                         default :
-                            break loop13;
+                            break loop15;
                         }
                     } while (true);
 
@@ -1411,30 +1440,30 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_8=(Token)match(input,24,FOLLOW_20); 
+            otherlv_8=(Token)match(input,29,FOLLOW_20); 
 
                                 newLeafNode(otherlv_8, grammarAccess.getPredicateDefinitionAccess().getRightParenthesisKeyword_4());
                         
-            // InternalProblem.g:563:3: (otherlv_9= ':=' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )?
-            int alt16=2;
-            int LA16_0 = input.LA(1);
+            // InternalProblem.g:569:3: (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )?
+            int alt18=2;
+            int LA18_0 = input.LA(1);
 
-            if ( (LA16_0==25) ) {
-                alt16=1;
+            if ( (LA18_0==30) ) {
+                alt18=1;
             }
-            switch (alt16) {
+            switch (alt18) {
                 case 1 :
-                    // InternalProblem.g:564:4: otherlv_9= ':=' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )*
+                    // InternalProblem.g:570:4: otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )*
                     {
-                    otherlv_9=(Token)match(input,25,FOLLOW_21); 
+                    otherlv_9=(Token)match(input,30,FOLLOW_21); 
 
-                                                newLeafNode(otherlv_9, grammarAccess.getPredicateDefinitionAccess().getColonEqualsSignKeyword_5_0());
+                                                newLeafNode(otherlv_9, grammarAccess.getPredicateDefinitionAccess().getColonHyphenMinusKeyword_5_0());
                                         
-                    // InternalProblem.g:568:4: ( (lv_bodies_10_0= ruleConjunction ) )
-                    // InternalProblem.g:569:5: (lv_bodies_10_0= ruleConjunction )
+                    // InternalProblem.g:574:4: ( (lv_bodies_10_0= ruleConjunction ) )
+                    // InternalProblem.g:575:5: (lv_bodies_10_0= ruleConjunction )
                     {
-                    // InternalProblem.g:569:5: (lv_bodies_10_0= ruleConjunction )
-                    // InternalProblem.g:570:6: lv_bodies_10_0= ruleConjunction
+                    // InternalProblem.g:575:5: (lv_bodies_10_0= ruleConjunction )
+                    // InternalProblem.g:576:6: lv_bodies_10_0= ruleConjunction
                     {
 
                                                                 newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getBodiesConjunctionParserRuleCall_5_1_0());
@@ -1461,30 +1490,30 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:587:4: (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )*
-                    loop15:
+                    // InternalProblem.g:593:4: (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )*
+                    loop17:
                     do {
-                        int alt15=2;
-                        int LA15_0 = input.LA(1);
+                        int alt17=2;
+                        int LA17_0 = input.LA(1);
 
-                        if ( (LA15_0==26) ) {
-                            alt15=1;
+                        if ( (LA17_0==19) ) {
+                            alt17=1;
                         }
 
 
-                        switch (alt15) {
+                        switch (alt17) {
                         case 1 :
-                            // InternalProblem.g:588:5: otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) )
+                            // InternalProblem.g:594:5: otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) )
                             {
-                            otherlv_11=(Token)match(input,26,FOLLOW_21); 
+                            otherlv_11=(Token)match(input,19,FOLLOW_21); 
 
                                                                 newLeafNode(otherlv_11, grammarAccess.getPredicateDefinitionAccess().getSemicolonKeyword_5_2_0());
                                                         
-                            // InternalProblem.g:592:5: ( (lv_bodies_12_0= ruleConjunction ) )
-                            // InternalProblem.g:593:6: (lv_bodies_12_0= ruleConjunction )
+                            // InternalProblem.g:598:5: ( (lv_bodies_12_0= ruleConjunction ) )
+                            // InternalProblem.g:599:6: (lv_bodies_12_0= ruleConjunction )
                             {
-                            // InternalProblem.g:593:6: (lv_bodies_12_0= ruleConjunction )
-                            // InternalProblem.g:594:7: lv_bodies_12_0= ruleConjunction
+                            // InternalProblem.g:599:6: (lv_bodies_12_0= ruleConjunction )
+                            // InternalProblem.g:600:7: lv_bodies_12_0= ruleConjunction
                             {
 
                                                                                 newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getBodiesConjunctionParserRuleCall_5_2_1_0());
@@ -1516,7 +1545,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                             break;
 
                         default :
-                            break loop15;
+                            break loop17;
                         }
                     } while (true);
 
@@ -1526,7 +1555,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_13=(Token)match(input,17,FOLLOW_2); 
+            otherlv_13=(Token)match(input,13,FOLLOW_2); 
 
                                 newLeafNode(otherlv_13, grammarAccess.getPredicateDefinitionAccess().getFullStopKeyword_6());
                         
@@ -1553,7 +1582,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleParameter"
-    // InternalProblem.g:621:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ;
+    // InternalProblem.g:627:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ;
     public final EObject entryRuleParameter() throws RecognitionException {
         EObject current = null;
 
@@ -1561,8 +1590,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:621:50: (iv_ruleParameter= ruleParameter EOF )
-            // InternalProblem.g:622:2: iv_ruleParameter= ruleParameter EOF
+            // InternalProblem.g:627:50: (iv_ruleParameter= ruleParameter EOF )
+            // InternalProblem.g:628:2: iv_ruleParameter= ruleParameter EOF
             {
              newCompositeNode(grammarAccess.getParameterRule()); 
             pushFollow(FOLLOW_1);
@@ -1589,7 +1618,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleParameter"
-    // InternalProblem.g:628:1: ruleParameter returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) ) ;
+    // InternalProblem.g:634:1: ruleParameter returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) ) ;
     public final EObject ruleParameter() throws RecognitionException {
         EObject current = null;
 
@@ -1600,24 +1629,24 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:634:2: ( ( ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) ) )
-            // InternalProblem.g:635:2: ( ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) )
+            // InternalProblem.g:640:2: ( ( ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) ) )
+            // InternalProblem.g:641:2: ( ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) )
             {
-            // InternalProblem.g:635:2: ( ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) )
-            // InternalProblem.g:636:3: ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) )
+            // InternalProblem.g:641:2: ( ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) )
+            // InternalProblem.g:642:3: ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) )
             {
-            // InternalProblem.g:636:3: ( (otherlv_0= RULE_ID ) )
-            // InternalProblem.g:637:4: (otherlv_0= RULE_ID )
+            // InternalProblem.g:642:3: ( (otherlv_0= RULE_ID ) )
+            // InternalProblem.g:643:4: (otherlv_0= RULE_ID )
             {
-            // InternalProblem.g:637:4: (otherlv_0= RULE_ID )
-            // InternalProblem.g:638:5: otherlv_0= RULE_ID
+            // InternalProblem.g:643:4: (otherlv_0= RULE_ID )
+            // InternalProblem.g:644:5: otherlv_0= RULE_ID
             {
 
                                                 if (current==null) {
                                                         current = createModelElement(grammarAccess.getParameterRule());
                                                 }
                                         
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_5); 
+            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_3); 
 
                                                 newLeafNode(otherlv_0, grammarAccess.getParameterAccess().getParameterTypeClassDeclarationCrossReference_0_0());
                                         
@@ -1627,11 +1656,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:649:3: ( (lv_name_1_0= RULE_ID ) )
-            // InternalProblem.g:650:4: (lv_name_1_0= RULE_ID )
+            // InternalProblem.g:655:3: ( (lv_name_1_0= RULE_ID ) )
+            // InternalProblem.g:656:4: (lv_name_1_0= RULE_ID )
             {
-            // InternalProblem.g:650:4: (lv_name_1_0= RULE_ID )
-            // InternalProblem.g:651:5: lv_name_1_0= RULE_ID
+            // InternalProblem.g:656:4: (lv_name_1_0= RULE_ID )
+            // InternalProblem.g:657:5: lv_name_1_0= RULE_ID
             {
             lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
@@ -1676,7 +1705,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleConjunction"
-    // InternalProblem.g:671:1: entryRuleConjunction returns [EObject current=null] : iv_ruleConjunction= ruleConjunction EOF ;
+    // InternalProblem.g:677:1: entryRuleConjunction returns [EObject current=null] : iv_ruleConjunction= ruleConjunction EOF ;
     public final EObject entryRuleConjunction() throws RecognitionException {
         EObject current = null;
 
@@ -1684,8 +1713,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:671:52: (iv_ruleConjunction= ruleConjunction EOF )
-            // InternalProblem.g:672:2: iv_ruleConjunction= ruleConjunction EOF
+            // InternalProblem.g:677:52: (iv_ruleConjunction= ruleConjunction EOF )
+            // InternalProblem.g:678:2: iv_ruleConjunction= ruleConjunction EOF
             {
              newCompositeNode(grammarAccess.getConjunctionRule()); 
             pushFollow(FOLLOW_1);
@@ -1712,7 +1741,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleConjunction"
-    // InternalProblem.g:678:1: ruleConjunction returns [EObject current=null] : ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* ) ;
+    // InternalProblem.g:684: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;
 
@@ -1726,17 +1755,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:684:2: ( ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* ) )
-            // InternalProblem.g:685:2: ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* )
+            // InternalProblem.g:690:2: ( ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* ) )
+            // InternalProblem.g:691:2: ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* )
             {
-            // InternalProblem.g:685:2: ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* )
-            // InternalProblem.g:686:3: ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )*
+            // InternalProblem.g:691:2: ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* )
+            // InternalProblem.g:692:3: ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )*
             {
-            // InternalProblem.g:686:3: ( (lv_literals_0_0= ruleLiteral ) )
-            // InternalProblem.g:687:4: (lv_literals_0_0= ruleLiteral )
+            // InternalProblem.g:692:3: ( (lv_literals_0_0= ruleLiteral ) )
+            // InternalProblem.g:693:4: (lv_literals_0_0= ruleLiteral )
             {
-            // InternalProblem.g:687:4: (lv_literals_0_0= ruleLiteral )
-            // InternalProblem.g:688:5: lv_literals_0_0= ruleLiteral
+            // InternalProblem.g:693:4: (lv_literals_0_0= ruleLiteral )
+            // InternalProblem.g:694:5: lv_literals_0_0= ruleLiteral
             {
 
                                                 newCompositeNode(grammarAccess.getConjunctionAccess().getLiteralsLiteralParserRuleCall_0_0());
@@ -1763,30 +1792,30 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:705:3: (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )*
-            loop17:
+            // InternalProblem.g:711:3: (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )*
+            loop19:
             do {
-                int alt17=2;
-                int LA17_0 = input.LA(1);
+                int alt19=2;
+                int LA19_0 = input.LA(1);
 
-                if ( (LA17_0==15) ) {
-                    alt17=1;
+                if ( (LA19_0==17) ) {
+                    alt19=1;
                 }
 
 
-                switch (alt17) {
+                switch (alt19) {
                 case 1 :
-                    // InternalProblem.g:706:4: otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) )
+                    // InternalProblem.g:712:4: otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) )
                     {
-                    otherlv_1=(Token)match(input,15,FOLLOW_21); 
+                    otherlv_1=(Token)match(input,17,FOLLOW_21); 
 
                                                 newLeafNode(otherlv_1, grammarAccess.getConjunctionAccess().getCommaKeyword_1_0());
                                         
-                    // InternalProblem.g:710:4: ( (lv_literals_2_0= ruleLiteral ) )
-                    // InternalProblem.g:711:5: (lv_literals_2_0= ruleLiteral )
+                    // InternalProblem.g:716:4: ( (lv_literals_2_0= ruleLiteral ) )
+                    // InternalProblem.g:717:5: (lv_literals_2_0= ruleLiteral )
                     {
-                    // InternalProblem.g:711:5: (lv_literals_2_0= ruleLiteral )
-                    // InternalProblem.g:712:6: lv_literals_2_0= ruleLiteral
+                    // InternalProblem.g:717:5: (lv_literals_2_0= ruleLiteral )
+                    // InternalProblem.g:718:6: lv_literals_2_0= ruleLiteral
                     {
 
                                                                 newCompositeNode(grammarAccess.getConjunctionAccess().getLiteralsLiteralParserRuleCall_1_1_0());
@@ -1818,7 +1847,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     break;
 
                 default :
-                    break loop17;
+                    break loop19;
                 }
             } while (true);
 
@@ -1845,7 +1874,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // InternalProblem.g:734:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
+    // InternalProblem.g:740:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
     public final EObject entryRuleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1853,8 +1882,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:734:48: (iv_ruleLiteral= ruleLiteral EOF )
-            // InternalProblem.g:735:2: iv_ruleLiteral= ruleLiteral EOF
+            // InternalProblem.g:740:48: (iv_ruleLiteral= ruleLiteral EOF )
+            // InternalProblem.g:741:2: iv_ruleLiteral= ruleLiteral EOF
             {
              newCompositeNode(grammarAccess.getLiteralRule()); 
             pushFollow(FOLLOW_1);
@@ -1881,7 +1910,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteral"
-    // InternalProblem.g:741:1: ruleLiteral returns [EObject current=null] : (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral ) ;
+    // InternalProblem.g:747:1: ruleLiteral returns [EObject current=null] : (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral ) ;
     public final EObject ruleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1894,28 +1923,28 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:747:2: ( (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral ) )
-            // InternalProblem.g:748:2: (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral )
+            // InternalProblem.g:753:2: ( (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral ) )
+            // InternalProblem.g:754:2: (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral )
             {
-            // InternalProblem.g:748:2: (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral )
-            int alt18=2;
-            int LA18_0 = input.LA(1);
+            // InternalProblem.g:754:2: (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral )
+            int alt20=2;
+            int LA20_0 = input.LA(1);
 
-            if ( (LA18_0==RULE_ID) ) {
-                alt18=1;
+            if ( (LA20_0==RULE_ID||LA20_0==RULE_QUOTED_ID) ) {
+                alt20=1;
             }
-            else if ( (LA18_0==27) ) {
-                alt18=2;
+            else if ( (LA20_0==31) ) {
+                alt20=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 18, 0, input);
+                    new NoViableAltException("", 20, 0, input);
 
                 throw nvae;
             }
-            switch (alt18) {
+            switch (alt20) {
                 case 1 :
-                    // InternalProblem.g:749:3: this_Atom_0= ruleAtom
+                    // InternalProblem.g:755:3: this_Atom_0= ruleAtom
                     {
 
                                         newCompositeNode(grammarAccess.getLiteralAccess().getAtomParserRuleCall_0());
@@ -1933,7 +1962,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:758:3: this_NegativeLiteral_1= ruleNegativeLiteral
+                    // InternalProblem.g:764:3: this_NegativeLiteral_1= ruleNegativeLiteral
                     {
 
                                         newCompositeNode(grammarAccess.getLiteralAccess().getNegativeLiteralParserRuleCall_1());
@@ -1973,7 +2002,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNegativeLiteral"
-    // InternalProblem.g:770:1: entryRuleNegativeLiteral returns [EObject current=null] : iv_ruleNegativeLiteral= ruleNegativeLiteral EOF ;
+    // InternalProblem.g:776:1: entryRuleNegativeLiteral returns [EObject current=null] : iv_ruleNegativeLiteral= ruleNegativeLiteral EOF ;
     public final EObject entryRuleNegativeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1981,8 +2010,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:770:56: (iv_ruleNegativeLiteral= ruleNegativeLiteral EOF )
-            // InternalProblem.g:771:2: iv_ruleNegativeLiteral= ruleNegativeLiteral EOF
+            // InternalProblem.g:776:56: (iv_ruleNegativeLiteral= ruleNegativeLiteral EOF )
+            // InternalProblem.g:777:2: iv_ruleNegativeLiteral= ruleNegativeLiteral EOF
             {
              newCompositeNode(grammarAccess.getNegativeLiteralRule()); 
             pushFollow(FOLLOW_1);
@@ -2009,7 +2038,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNegativeLiteral"
-    // InternalProblem.g:777:1: ruleNegativeLiteral returns [EObject current=null] : (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) ) ;
+    // InternalProblem.g:783:1: ruleNegativeLiteral returns [EObject current=null] : (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) ) ;
     public final EObject ruleNegativeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2021,21 +2050,21 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:783:2: ( (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) ) )
-            // InternalProblem.g:784:2: (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) )
+            // InternalProblem.g:789:2: ( (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) ) )
+            // InternalProblem.g:790:2: (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) )
             {
-            // InternalProblem.g:784:2: (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) )
-            // InternalProblem.g:785:3: otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) )
+            // InternalProblem.g:790:2: (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) )
+            // InternalProblem.g:791:3: otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) )
             {
-            otherlv_0=(Token)match(input,27,FOLLOW_5); 
+            otherlv_0=(Token)match(input,31,FOLLOW_8); 
 
                                 newLeafNode(otherlv_0, grammarAccess.getNegativeLiteralAccess().getExclamationMarkKeyword_0());
                         
-            // InternalProblem.g:789:3: ( (lv_atom_1_0= ruleAtom ) )
-            // InternalProblem.g:790:4: (lv_atom_1_0= ruleAtom )
+            // InternalProblem.g:795:3: ( (lv_atom_1_0= ruleAtom ) )
+            // InternalProblem.g:796:4: (lv_atom_1_0= ruleAtom )
             {
-            // InternalProblem.g:790:4: (lv_atom_1_0= ruleAtom )
-            // InternalProblem.g:791:5: lv_atom_1_0= ruleAtom
+            // InternalProblem.g:796:4: (lv_atom_1_0= ruleAtom )
+            // InternalProblem.g:797:5: lv_atom_1_0= ruleAtom
             {
 
                                                 newCompositeNode(grammarAccess.getNegativeLiteralAccess().getAtomAtomParserRuleCall_1_0());
@@ -2085,7 +2114,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAtom"
-    // InternalProblem.g:812:1: entryRuleAtom returns [EObject current=null] : iv_ruleAtom= ruleAtom EOF ;
+    // InternalProblem.g:818:1: entryRuleAtom returns [EObject current=null] : iv_ruleAtom= ruleAtom EOF ;
     public final EObject entryRuleAtom() throws RecognitionException {
         EObject current = null;
 
@@ -2093,8 +2122,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:812:45: (iv_ruleAtom= ruleAtom EOF )
-            // InternalProblem.g:813:2: iv_ruleAtom= ruleAtom EOF
+            // InternalProblem.g:818:45: (iv_ruleAtom= ruleAtom EOF )
+            // InternalProblem.g:819:2: iv_ruleAtom= ruleAtom EOF
             {
              newCompositeNode(grammarAccess.getAtomRule()); 
             pushFollow(FOLLOW_1);
@@ -2121,32 +2150,34 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAtom"
-    // InternalProblem.g:819:1: ruleAtom returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (otherlv_3= RULE_ID ) ) (otherlv_4= ',' ( (otherlv_5= RULE_ID ) ) )* )? otherlv_6= ')' ) ;
+    // InternalProblem.g:825:1: ruleAtom returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' ) ;
     public final EObject ruleAtom() throws RecognitionException {
         EObject current = null;
 
         Token lv_transitiveClosure_1_0=null;
         Token otherlv_2=null;
-        Token otherlv_3=null;
         Token otherlv_4=null;
-        Token otherlv_5=null;
         Token otherlv_6=null;
+        EObject lv_arguments_3_0 = null;
+
+        EObject lv_arguments_5_0 = null;
+
 
 
                 enterRule();
 
         try {
-            // InternalProblem.g:825:2: ( ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (otherlv_3= RULE_ID ) ) (otherlv_4= ',' ( (otherlv_5= RULE_ID ) ) )* )? otherlv_6= ')' ) )
-            // InternalProblem.g:826:2: ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (otherlv_3= RULE_ID ) ) (otherlv_4= ',' ( (otherlv_5= RULE_ID ) ) )* )? otherlv_6= ')' )
+            // InternalProblem.g:831:2: ( ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' ) )
+            // InternalProblem.g:832:2: ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' )
             {
-            // InternalProblem.g:826:2: ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (otherlv_3= RULE_ID ) ) (otherlv_4= ',' ( (otherlv_5= RULE_ID ) ) )* )? otherlv_6= ')' )
-            // InternalProblem.g:827:3: ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (otherlv_3= RULE_ID ) ) (otherlv_4= ',' ( (otherlv_5= RULE_ID ) ) )* )? otherlv_6= ')'
+            // InternalProblem.g:832:2: ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' )
+            // InternalProblem.g:833:3: ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')'
             {
-            // InternalProblem.g:827:3: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:828:4: ( ruleQualifiedName )
+            // InternalProblem.g:833:3: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:834:4: ( ruleQualifiedName )
             {
-            // InternalProblem.g:828:4: ( ruleQualifiedName )
-            // InternalProblem.g:829:5: ruleQualifiedName
+            // InternalProblem.g:834:4: ( ruleQualifiedName )
+            // InternalProblem.g:835:5: ruleQualifiedName
             {
 
                                                 if (current==null) {
@@ -2170,21 +2201,21 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:843:3: ( (lv_transitiveClosure_1_0= '+' ) )?
-            int alt19=2;
-            int LA19_0 = input.LA(1);
+            // InternalProblem.g:849:3: ( (lv_transitiveClosure_1_0= '+' ) )?
+            int alt21=2;
+            int LA21_0 = input.LA(1);
 
-            if ( (LA19_0==28) ) {
-                alt19=1;
+            if ( (LA21_0==32) ) {
+                alt21=1;
             }
-            switch (alt19) {
+            switch (alt21) {
                 case 1 :
-                    // InternalProblem.g:844:4: (lv_transitiveClosure_1_0= '+' )
+                    // InternalProblem.g:850:4: (lv_transitiveClosure_1_0= '+' )
                     {
-                    // InternalProblem.g:844:4: (lv_transitiveClosure_1_0= '+' )
-                    // InternalProblem.g:845:5: lv_transitiveClosure_1_0= '+'
+                    // InternalProblem.g:850:4: (lv_transitiveClosure_1_0= '+' )
+                    // InternalProblem.g:851:5: lv_transitiveClosure_1_0= '+'
                     {
-                    lv_transitiveClosure_1_0=(Token)match(input,28,FOLLOW_17); 
+                    lv_transitiveClosure_1_0=(Token)match(input,32,FOLLOW_17); 
 
                                                         newLeafNode(lv_transitiveClosure_1_0, grammarAccess.getAtomAccess().getTransitiveClosurePlusSignKeyword_1_0());
                                                 
@@ -2203,35 +2234,45 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,23,FOLLOW_18); 
+            otherlv_2=(Token)match(input,28,FOLLOW_18); 
 
                                 newLeafNode(otherlv_2, grammarAccess.getAtomAccess().getLeftParenthesisKeyword_2());
                         
-            // InternalProblem.g:861:3: ( ( (otherlv_3= RULE_ID ) ) (otherlv_4= ',' ( (otherlv_5= RULE_ID ) ) )* )?
-            int alt21=2;
-            int LA21_0 = input.LA(1);
+            // InternalProblem.g:867:3: ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )?
+            int alt23=2;
+            int LA23_0 = input.LA(1);
 
-            if ( (LA21_0==RULE_ID) ) {
-                alt21=1;
+            if ( (LA23_0==RULE_ID) ) {
+                alt23=1;
             }
-            switch (alt21) {
+            switch (alt23) {
                 case 1 :
-                    // InternalProblem.g:862:4: ( (otherlv_3= RULE_ID ) ) (otherlv_4= ',' ( (otherlv_5= RULE_ID ) ) )*
+                    // InternalProblem.g:868:4: ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )*
                     {
-                    // InternalProblem.g:862:4: ( (otherlv_3= RULE_ID ) )
-                    // InternalProblem.g:863:5: (otherlv_3= RULE_ID )
+                    // InternalProblem.g:868:4: ( (lv_arguments_3_0= ruleArgument ) )
+                    // InternalProblem.g:869:5: (lv_arguments_3_0= ruleArgument )
                     {
-                    // InternalProblem.g:863:5: (otherlv_3= RULE_ID )
-                    // InternalProblem.g:864:6: otherlv_3= RULE_ID
+                    // InternalProblem.g:869:5: (lv_arguments_3_0= ruleArgument )
+                    // InternalProblem.g:870:6: lv_arguments_3_0= ruleArgument
                     {
 
-                                                                if (current==null) {
-                                                                        current = createModelElement(grammarAccess.getAtomRule());
-                                                                }
+                                                                newCompositeNode(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_0_0());
                                                         
-                    otherlv_3=(Token)match(input,RULE_ID,FOLLOW_19); 
+                    pushFollow(FOLLOW_19);
+                    lv_arguments_3_0=ruleArgument();
 
-                                                                newLeafNode(otherlv_3, grammarAccess.getAtomAccess().getArgumentsVariableCrossReference_3_0_0());
+                    state._fsp--;
+
+
+                                                                if (current==null) {
+                                                                        current = createModelElementForParent(grammarAccess.getAtomRule());
+                                                                }
+                                                                add(
+                                                                        current,
+                                                                        "arguments",
+                                                                        lv_arguments_3_0,
+                                                                        "org.eclipse.viatra.solver.language.Problem.Argument");
+                                                                afterParserOrEnumRuleCall();
                                                         
 
                     }
@@ -2239,39 +2280,49 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:875:4: (otherlv_4= ',' ( (otherlv_5= RULE_ID ) ) )*
-                    loop20:
+                    // InternalProblem.g:887:4: (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )*
+                    loop22:
                     do {
-                        int alt20=2;
-                        int LA20_0 = input.LA(1);
+                        int alt22=2;
+                        int LA22_0 = input.LA(1);
 
-                        if ( (LA20_0==15) ) {
-                            alt20=1;
+                        if ( (LA22_0==17) ) {
+                            alt22=1;
                         }
 
 
-                        switch (alt20) {
+                        switch (alt22) {
                         case 1 :
-                            // InternalProblem.g:876:5: otherlv_4= ',' ( (otherlv_5= RULE_ID ) )
+                            // InternalProblem.g:888:5: otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) )
                             {
-                            otherlv_4=(Token)match(input,15,FOLLOW_5); 
+                            otherlv_4=(Token)match(input,17,FOLLOW_3); 
 
                                                                 newLeafNode(otherlv_4, grammarAccess.getAtomAccess().getCommaKeyword_3_1_0());
                                                         
-                            // InternalProblem.g:880:5: ( (otherlv_5= RULE_ID ) )
-                            // InternalProblem.g:881:6: (otherlv_5= RULE_ID )
+                            // InternalProblem.g:892:5: ( (lv_arguments_5_0= ruleArgument ) )
+                            // InternalProblem.g:893:6: (lv_arguments_5_0= ruleArgument )
                             {
-                            // InternalProblem.g:881:6: (otherlv_5= RULE_ID )
-                            // InternalProblem.g:882:7: otherlv_5= RULE_ID
+                            // InternalProblem.g:893:6: (lv_arguments_5_0= ruleArgument )
+                            // InternalProblem.g:894:7: lv_arguments_5_0= ruleArgument
                             {
 
-                                                                                if (current==null) {
-                                                                                        current = createModelElement(grammarAccess.getAtomRule());
-                                                                                }
+                                                                                newCompositeNode(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_1_1_0());
                                                                         
-                            otherlv_5=(Token)match(input,RULE_ID,FOLLOW_19); 
+                            pushFollow(FOLLOW_19);
+                            lv_arguments_5_0=ruleArgument();
+
+                            state._fsp--;
 
-                                                                                newLeafNode(otherlv_5, grammarAccess.getAtomAccess().getArgumentsVariableCrossReference_3_1_1_0());
+
+                                                                                if (current==null) {
+                                                                                        current = createModelElementForParent(grammarAccess.getAtomRule());
+                                                                                }
+                                                                                add(
+                                                                                        current,
+                                                                                        "arguments",
+                                                                                        lv_arguments_5_0,
+                                                                                        "org.eclipse.viatra.solver.language.Problem.Argument");
+                                                                                afterParserOrEnumRuleCall();
                                                                         
 
                             }
@@ -2284,7 +2335,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                             break;
 
                         default :
-                            break loop20;
+                            break loop22;
                         }
                     } while (true);
 
@@ -2294,7 +2345,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_6=(Token)match(input,24,FOLLOW_2); 
+            otherlv_6=(Token)match(input,29,FOLLOW_2); 
 
                                 newLeafNode(otherlv_6, grammarAccess.getAtomAccess().getRightParenthesisKeyword_4());
                         
@@ -2320,8 +2371,98 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     // $ANTLR end "ruleAtom"
 
 
+    // $ANTLR start "entryRuleArgument"
+    // InternalProblem.g:921:1: entryRuleArgument returns [EObject current=null] : iv_ruleArgument= ruleArgument EOF ;
+    public final EObject entryRuleArgument() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleArgument = null;
+
+
+        try {
+            // InternalProblem.g:921:49: (iv_ruleArgument= ruleArgument EOF )
+            // InternalProblem.g:922:2: iv_ruleArgument= ruleArgument EOF
+            {
+             newCompositeNode(grammarAccess.getArgumentRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleArgument=ruleArgument();
+
+            state._fsp--;
+
+             current =iv_ruleArgument; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleArgument"
+
+
+    // $ANTLR start "ruleArgument"
+    // InternalProblem.g:928:1: ruleArgument returns [EObject current=null] : ( (otherlv_0= RULE_ID ) ) ;
+    public final EObject ruleArgument() throws RecognitionException {
+        EObject current = null;
+
+        Token otherlv_0=null;
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:934:2: ( ( (otherlv_0= RULE_ID ) ) )
+            // InternalProblem.g:935:2: ( (otherlv_0= RULE_ID ) )
+            {
+            // InternalProblem.g:935:2: ( (otherlv_0= RULE_ID ) )
+            // InternalProblem.g:936:3: (otherlv_0= RULE_ID )
+            {
+            // InternalProblem.g:936:3: (otherlv_0= RULE_ID )
+            // InternalProblem.g:937:4: otherlv_0= RULE_ID
+            {
+
+                                        if (current==null) {
+                                                current = createModelElement(grammarAccess.getArgumentRule());
+                                        }
+                                
+            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_2); 
+
+                                        newLeafNode(otherlv_0, grammarAccess.getArgumentAccess().getVariableVariableCrossReference_0());
+                                
+
+            }
+
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleArgument"
+
+
     // $ANTLR start "entryRuleAssertion"
-    // InternalProblem.g:903:1: entryRuleAssertion returns [EObject current=null] : iv_ruleAssertion= ruleAssertion EOF ;
+    // InternalProblem.g:951:1: entryRuleAssertion returns [EObject current=null] : iv_ruleAssertion= ruleAssertion EOF ;
     public final EObject entryRuleAssertion() throws RecognitionException {
         EObject current = null;
 
@@ -2329,8 +2470,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:903:50: (iv_ruleAssertion= ruleAssertion EOF )
-            // InternalProblem.g:904:2: iv_ruleAssertion= ruleAssertion EOF
+            // InternalProblem.g:951:50: (iv_ruleAssertion= ruleAssertion EOF )
+            // InternalProblem.g:952:2: iv_ruleAssertion= ruleAssertion EOF
             {
              newCompositeNode(grammarAccess.getAssertionRule()); 
             pushFollow(FOLLOW_1);
@@ -2357,7 +2498,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAssertion"
-    // InternalProblem.g:910: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:958:1: ruleAssertion returns [EObject current=null] : ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' ) ;
     public final EObject ruleAssertion() throws RecognitionException {
         EObject current = null;
 
@@ -2378,27 +2519,27 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:916: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:917: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:964:2: ( ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' ) )
+            // InternalProblem.g:965:2: ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' )
             {
-            // InternalProblem.g:917: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:918: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:965:2: ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' )
+            // InternalProblem.g:966:3: ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.'
             {
-            // InternalProblem.g:918: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 alt27=2;
-            alt27 = dfa27.predict(input);
-            switch (alt27) {
+            // InternalProblem.g:966:3: ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) )
+            int alt29=2;
+            alt29 = dfa29.predict(input);
+            switch (alt29) {
                 case 1 :
-                    // InternalProblem.g:919:4: ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) )
+                    // InternalProblem.g:967:4: ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) )
                     {
-                    // InternalProblem.g:919:4: ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) )
-                    // InternalProblem.g:920:5: ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) )
+                    // InternalProblem.g:967:4: ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) )
+                    // InternalProblem.g:968:5: ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) )
                     {
-                    // InternalProblem.g:920:5: ( ( ruleQualifiedName ) )
-                    // InternalProblem.g:921:6: ( ruleQualifiedName )
+                    // InternalProblem.g:968:5: ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:969:6: ( ruleQualifiedName )
                     {
-                    // InternalProblem.g:921:6: ( ruleQualifiedName )
-                    // InternalProblem.g:922:7: ruleQualifiedName
+                    // InternalProblem.g:969:6: ( ruleQualifiedName )
+                    // InternalProblem.g:970:7: ruleQualifiedName
                     {
 
                                                                         if (current==null) {
@@ -2422,26 +2563,26 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_1=(Token)match(input,23,FOLLOW_18); 
+                    otherlv_1=(Token)match(input,28,FOLLOW_25); 
 
                                                         newLeafNode(otherlv_1, grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_0_1());
                                                 
-                    // InternalProblem.g:940:5: ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )?
-                    int alt23=2;
-                    int LA23_0 = input.LA(1);
+                    // InternalProblem.g:988:5: ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )?
+                    int alt25=2;
+                    int LA25_0 = input.LA(1);
 
-                    if ( (LA23_0==RULE_ID) ) {
-                        alt23=1;
+                    if ( (LA25_0==RULE_ID||LA25_0==RULE_QUOTED_ID) ) {
+                        alt25=1;
                     }
-                    switch (alt23) {
+                    switch (alt25) {
                         case 1 :
-                            // InternalProblem.g:941:6: ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )*
+                            // InternalProblem.g:989:6: ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )*
                             {
-                            // InternalProblem.g:941:6: ( ( ruleQualifiedName ) )
-                            // InternalProblem.g:942:7: ( ruleQualifiedName )
+                            // InternalProblem.g:989:6: ( ( ruleQualifiedName ) )
+                            // InternalProblem.g:990:7: ( ruleQualifiedName )
                             {
-                            // InternalProblem.g:942:7: ( ruleQualifiedName )
-                            // InternalProblem.g:943:8: ruleQualifiedName
+                            // InternalProblem.g:990:7: ( ruleQualifiedName )
+                            // InternalProblem.g:991:8: ruleQualifiedName
                             {
 
                                                                                         if (current==null) {
@@ -2465,30 +2606,30 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalProblem.g:957:6: (otherlv_3= ',' ( ( ruleQualifiedName ) ) )*
-                            loop22:
+                            // InternalProblem.g:1005:6: (otherlv_3= ',' ( ( ruleQualifiedName ) ) )*
+                            loop24:
                             do {
-                                int alt22=2;
-                                int LA22_0 = input.LA(1);
+                                int alt24=2;
+                                int LA24_0 = input.LA(1);
 
-                                if ( (LA22_0==15) ) {
-                                    alt22=1;
+                                if ( (LA24_0==17) ) {
+                                    alt24=1;
                                 }
 
 
-                                switch (alt22) {
+                                switch (alt24) {
                                 case 1 :
-                                    // InternalProblem.g:958:7: otherlv_3= ',' ( ( ruleQualifiedName ) )
+                                    // InternalProblem.g:1006:7: otherlv_3= ',' ( ( ruleQualifiedName ) )
                                     {
-                                    otherlv_3=(Token)match(input,15,FOLLOW_5); 
+                                    otherlv_3=(Token)match(input,17,FOLLOW_8); 
 
                                                                                         newLeafNode(otherlv_3, grammarAccess.getAssertionAccess().getCommaKeyword_0_0_2_1_0());
                                                                                 
-                                    // InternalProblem.g:962:7: ( ( ruleQualifiedName ) )
-                                    // InternalProblem.g:963:8: ( ruleQualifiedName )
+                                    // InternalProblem.g:1010:7: ( ( ruleQualifiedName ) )
+                                    // InternalProblem.g:1011:8: ( ruleQualifiedName )
                                     {
-                                    // InternalProblem.g:963:8: ( ruleQualifiedName )
-                                    // InternalProblem.g:964:9: ruleQualifiedName
+                                    // InternalProblem.g:1011:8: ( ruleQualifiedName )
+                                    // InternalProblem.g:1012:9: ruleQualifiedName
                                     {
 
                                                                                                         if (current==null) {
@@ -2517,7 +2658,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                     break;
 
                                 default :
-                                    break loop22;
+                                    break loop24;
                                 }
                             } while (true);
 
@@ -2527,24 +2668,24 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_5=(Token)match(input,24,FOLLOW_25); 
+                    otherlv_5=(Token)match(input,29,FOLLOW_26); 
 
                                                         newLeafNode(otherlv_5, grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_0_3());
                                                 
-                    otherlv_6=(Token)match(input,29,FOLLOW_26); 
+                    otherlv_6=(Token)match(input,33,FOLLOW_27); 
 
                                                         newLeafNode(otherlv_6, grammarAccess.getAssertionAccess().getColonKeyword_0_0_4());
                                                 
-                    // InternalProblem.g:988:5: ( (lv_value_7_0= ruleLogicValue ) )
-                    // InternalProblem.g:989:6: (lv_value_7_0= ruleLogicValue )
+                    // InternalProblem.g:1036:5: ( (lv_value_7_0= ruleLogicValue ) )
+                    // InternalProblem.g:1037:6: (lv_value_7_0= ruleLogicValue )
                     {
-                    // InternalProblem.g:989:6: (lv_value_7_0= ruleLogicValue )
-                    // InternalProblem.g:990:7: lv_value_7_0= ruleLogicValue
+                    // InternalProblem.g:1037:6: (lv_value_7_0= ruleLogicValue )
+                    // InternalProblem.g:1038:7: lv_value_7_0= ruleLogicValue
                     {
 
                                                                         newCompositeNode(grammarAccess.getAssertionAccess().getValueLogicValueEnumRuleCall_0_0_5_0());
                                                                 
-                    pushFollow(FOLLOW_27);
+                    pushFollow(FOLLOW_4);
                     lv_value_7_0=ruleLogicValue();
 
                     state._fsp--;
@@ -2573,29 +2714,29 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1009:4: ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' )
+                    // InternalProblem.g:1057:4: ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' )
                     {
-                    // InternalProblem.g:1009:4: ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' )
-                    // InternalProblem.g:1010:5: ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')'
+                    // InternalProblem.g:1057:4: ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' )
+                    // InternalProblem.g:1058:5: ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')'
                     {
-                    // InternalProblem.g:1010:5: ( (lv_value_8_0= ruleShortLogicValue ) )?
-                    int alt24=2;
-                    int LA24_0 = input.LA(1);
+                    // InternalProblem.g:1058:5: ( (lv_value_8_0= ruleShortLogicValue ) )?
+                    int alt26=2;
+                    int LA26_0 = input.LA(1);
 
-                    if ( (LA24_0==27||LA24_0==39) ) {
-                        alt24=1;
+                    if ( (LA26_0==31||LA26_0==42) ) {
+                        alt26=1;
                     }
-                    switch (alt24) {
+                    switch (alt26) {
                         case 1 :
-                            // InternalProblem.g:1011:6: (lv_value_8_0= ruleShortLogicValue )
+                            // InternalProblem.g:1059:6: (lv_value_8_0= ruleShortLogicValue )
                             {
-                            // InternalProblem.g:1011:6: (lv_value_8_0= ruleShortLogicValue )
-                            // InternalProblem.g:1012:7: lv_value_8_0= ruleShortLogicValue
+                            // InternalProblem.g:1059:6: (lv_value_8_0= ruleShortLogicValue )
+                            // InternalProblem.g:1060:7: lv_value_8_0= ruleShortLogicValue
                             {
 
                                                                                 newCompositeNode(grammarAccess.getAssertionAccess().getValueShortLogicValueEnumRuleCall_0_1_0_0());
                                                                         
-                            pushFollow(FOLLOW_5);
+                            pushFollow(FOLLOW_8);
                             lv_value_8_0=ruleShortLogicValue();
 
                             state._fsp--;
@@ -2620,11 +2761,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:1029:5: ( ( ruleQualifiedName ) )
-                    // InternalProblem.g:1030:6: ( ruleQualifiedName )
+                    // InternalProblem.g:1077:5: ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:1078:6: ( ruleQualifiedName )
                     {
-                    // InternalProblem.g:1030:6: ( ruleQualifiedName )
-                    // InternalProblem.g:1031:7: ruleQualifiedName
+                    // InternalProblem.g:1078:6: ( ruleQualifiedName )
+                    // InternalProblem.g:1079:7: ruleQualifiedName
                     {
 
                                                                         if (current==null) {
@@ -2648,26 +2789,26 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_10=(Token)match(input,23,FOLLOW_18); 
+                    otherlv_10=(Token)match(input,28,FOLLOW_25); 
 
                                                         newLeafNode(otherlv_10, grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_1_2());
                                                 
-                    // InternalProblem.g:1049:5: ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )?
-                    int alt26=2;
-                    int LA26_0 = input.LA(1);
+                    // InternalProblem.g:1097:5: ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )?
+                    int alt28=2;
+                    int LA28_0 = input.LA(1);
 
-                    if ( (LA26_0==RULE_ID) ) {
-                        alt26=1;
+                    if ( (LA28_0==RULE_ID||LA28_0==RULE_QUOTED_ID) ) {
+                        alt28=1;
                     }
-                    switch (alt26) {
+                    switch (alt28) {
                         case 1 :
-                            // InternalProblem.g:1050:6: ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )*
+                            // InternalProblem.g:1098:6: ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )*
                             {
-                            // InternalProblem.g:1050:6: ( ( ruleQualifiedName ) )
-                            // InternalProblem.g:1051:7: ( ruleQualifiedName )
+                            // InternalProblem.g:1098:6: ( ( ruleQualifiedName ) )
+                            // InternalProblem.g:1099:7: ( ruleQualifiedName )
                             {
-                            // InternalProblem.g:1051:7: ( ruleQualifiedName )
-                            // InternalProblem.g:1052:8: ruleQualifiedName
+                            // InternalProblem.g:1099:7: ( ruleQualifiedName )
+                            // InternalProblem.g:1100:8: ruleQualifiedName
                             {
 
                                                                                         if (current==null) {
@@ -2691,30 +2832,30 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalProblem.g:1066:6: (otherlv_12= ',' ( ( ruleQualifiedName ) ) )*
-                            loop25:
+                            // InternalProblem.g:1114:6: (otherlv_12= ',' ( ( ruleQualifiedName ) ) )*
+                            loop27:
                             do {
-                                int alt25=2;
-                                int LA25_0 = input.LA(1);
+                                int alt27=2;
+                                int LA27_0 = input.LA(1);
 
-                                if ( (LA25_0==15) ) {
-                                    alt25=1;
+                                if ( (LA27_0==17) ) {
+                                    alt27=1;
                                 }
 
 
-                                switch (alt25) {
+                                switch (alt27) {
                                 case 1 :
-                                    // InternalProblem.g:1067:7: otherlv_12= ',' ( ( ruleQualifiedName ) )
+                                    // InternalProblem.g:1115:7: otherlv_12= ',' ( ( ruleQualifiedName ) )
                                     {
-                                    otherlv_12=(Token)match(input,15,FOLLOW_5); 
+                                    otherlv_12=(Token)match(input,17,FOLLOW_8); 
 
                                                                                         newLeafNode(otherlv_12, grammarAccess.getAssertionAccess().getCommaKeyword_0_1_3_1_0());
                                                                                 
-                                    // InternalProblem.g:1071:7: ( ( ruleQualifiedName ) )
-                                    // InternalProblem.g:1072:8: ( ruleQualifiedName )
+                                    // InternalProblem.g:1119:7: ( ( ruleQualifiedName ) )
+                                    // InternalProblem.g:1120:8: ( ruleQualifiedName )
                                     {
-                                    // InternalProblem.g:1072:8: ( ruleQualifiedName )
-                                    // InternalProblem.g:1073:9: ruleQualifiedName
+                                    // InternalProblem.g:1120:8: ( ruleQualifiedName )
+                                    // InternalProblem.g:1121:9: ruleQualifiedName
                                     {
 
                                                                                                         if (current==null) {
@@ -2743,7 +2884,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                     break;
 
                                 default :
-                                    break loop25;
+                                    break loop27;
                                 }
                             } while (true);
 
@@ -2753,7 +2894,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_14=(Token)match(input,24,FOLLOW_27); 
+                    otherlv_14=(Token)match(input,29,FOLLOW_4); 
 
                                                         newLeafNode(otherlv_14, grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_1_4());
                                                 
@@ -2766,7 +2907,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_15=(Token)match(input,17,FOLLOW_2); 
+            otherlv_15=(Token)match(input,13,FOLLOW_2); 
 
                                 newLeafNode(otherlv_15, grammarAccess.getAssertionAccess().getFullStopKeyword_1());
                         
@@ -2793,7 +2934,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleScopeDeclaration"
-    // InternalProblem.g:1103:1: entryRuleScopeDeclaration returns [EObject current=null] : iv_ruleScopeDeclaration= ruleScopeDeclaration EOF ;
+    // InternalProblem.g:1151:1: entryRuleScopeDeclaration returns [EObject current=null] : iv_ruleScopeDeclaration= ruleScopeDeclaration EOF ;
     public final EObject entryRuleScopeDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -2801,8 +2942,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1103:57: (iv_ruleScopeDeclaration= ruleScopeDeclaration EOF )
-            // InternalProblem.g:1104:2: iv_ruleScopeDeclaration= ruleScopeDeclaration EOF
+            // InternalProblem.g:1151:57: (iv_ruleScopeDeclaration= ruleScopeDeclaration EOF )
+            // InternalProblem.g:1152:2: iv_ruleScopeDeclaration= ruleScopeDeclaration EOF
             {
              newCompositeNode(grammarAccess.getScopeDeclarationRule()); 
             pushFollow(FOLLOW_1);
@@ -2829,7 +2970,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleScopeDeclaration"
-    // InternalProblem.g:1110: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:1158: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;
 
@@ -2845,26 +2986,26 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1116:2: ( (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' ) )
-            // InternalProblem.g:1117:2: (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' )
+            // InternalProblem.g:1164:2: ( (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' ) )
+            // InternalProblem.g:1165:2: (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' )
             {
-            // InternalProblem.g:1117:2: (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' )
-            // InternalProblem.g:1118:3: otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.'
+            // InternalProblem.g:1165:2: (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' )
+            // InternalProblem.g:1166:3: otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.'
             {
-            otherlv_0=(Token)match(input,30,FOLLOW_5); 
+            otherlv_0=(Token)match(input,34,FOLLOW_3); 
 
                                 newLeafNode(otherlv_0, grammarAccess.getScopeDeclarationAccess().getScopeKeyword_0());
                         
-            // InternalProblem.g:1122:3: ( (lv_typeScopes_1_0= ruleTypeScope ) )
-            // InternalProblem.g:1123:4: (lv_typeScopes_1_0= ruleTypeScope )
+            // InternalProblem.g:1170:3: ( (lv_typeScopes_1_0= ruleTypeScope ) )
+            // InternalProblem.g:1171:4: (lv_typeScopes_1_0= ruleTypeScope )
             {
-            // InternalProblem.g:1123:4: (lv_typeScopes_1_0= ruleTypeScope )
-            // InternalProblem.g:1124:5: lv_typeScopes_1_0= ruleTypeScope
+            // InternalProblem.g:1171:4: (lv_typeScopes_1_0= ruleTypeScope )
+            // InternalProblem.g:1172:5: lv_typeScopes_1_0= ruleTypeScope
             {
 
                                                 newCompositeNode(grammarAccess.getScopeDeclarationAccess().getTypeScopesTypeScopeParserRuleCall_1_0());
                                         
-            pushFollow(FOLLOW_8);
+            pushFollow(FOLLOW_28);
             lv_typeScopes_1_0=ruleTypeScope();
 
             state._fsp--;
@@ -2886,35 +3027,35 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:1141:3: (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )*
-            loop28:
+            // InternalProblem.g:1189:3: (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )*
+            loop30:
             do {
-                int alt28=2;
-                int LA28_0 = input.LA(1);
+                int alt30=2;
+                int LA30_0 = input.LA(1);
 
-                if ( (LA28_0==15) ) {
-                    alt28=1;
+                if ( (LA30_0==17) ) {
+                    alt30=1;
                 }
 
 
-                switch (alt28) {
+                switch (alt30) {
                 case 1 :
-                    // InternalProblem.g:1142:4: otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) )
+                    // InternalProblem.g:1190:4: otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) )
                     {
-                    otherlv_2=(Token)match(input,15,FOLLOW_5); 
+                    otherlv_2=(Token)match(input,17,FOLLOW_3); 
 
                                                 newLeafNode(otherlv_2, grammarAccess.getScopeDeclarationAccess().getCommaKeyword_2_0());
                                         
-                    // InternalProblem.g:1146:4: ( (lv_typeScopes_3_0= ruleTypeScope ) )
-                    // InternalProblem.g:1147:5: (lv_typeScopes_3_0= ruleTypeScope )
+                    // InternalProblem.g:1194:4: ( (lv_typeScopes_3_0= ruleTypeScope ) )
+                    // InternalProblem.g:1195:5: (lv_typeScopes_3_0= ruleTypeScope )
                     {
-                    // InternalProblem.g:1147:5: (lv_typeScopes_3_0= ruleTypeScope )
-                    // InternalProblem.g:1148:6: lv_typeScopes_3_0= ruleTypeScope
+                    // InternalProblem.g:1195:5: (lv_typeScopes_3_0= ruleTypeScope )
+                    // InternalProblem.g:1196:6: lv_typeScopes_3_0= ruleTypeScope
                     {
 
                                                                 newCompositeNode(grammarAccess.getScopeDeclarationAccess().getTypeScopesTypeScopeParserRuleCall_2_1_0());
                                                         
-                    pushFollow(FOLLOW_8);
+                    pushFollow(FOLLOW_28);
                     lv_typeScopes_3_0=ruleTypeScope();
 
                     state._fsp--;
@@ -2941,11 +3082,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     break;
 
                 default :
-                    break loop28;
+                    break loop30;
                 }
             } while (true);
 
-            otherlv_4=(Token)match(input,17,FOLLOW_2); 
+            otherlv_4=(Token)match(input,13,FOLLOW_2); 
 
                                 newLeafNode(otherlv_4, grammarAccess.getScopeDeclarationAccess().getFullStopKeyword_3());
                         
@@ -2972,7 +3113,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTypeScope"
-    // InternalProblem.g:1174:1: entryRuleTypeScope returns [EObject current=null] : iv_ruleTypeScope= ruleTypeScope EOF ;
+    // InternalProblem.g:1222:1: entryRuleTypeScope returns [EObject current=null] : iv_ruleTypeScope= ruleTypeScope EOF ;
     public final EObject entryRuleTypeScope() throws RecognitionException {
         EObject current = null;
 
@@ -2980,8 +3121,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1174:50: (iv_ruleTypeScope= ruleTypeScope EOF )
-            // InternalProblem.g:1175:2: iv_ruleTypeScope= ruleTypeScope EOF
+            // InternalProblem.g:1222:50: (iv_ruleTypeScope= ruleTypeScope EOF )
+            // InternalProblem.g:1223:2: iv_ruleTypeScope= ruleTypeScope EOF
             {
              newCompositeNode(grammarAccess.getTypeScopeRule()); 
             pushFollow(FOLLOW_1);
@@ -3008,7 +3149,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTypeScope"
-    // InternalProblem.g:1181:1: ruleTypeScope returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleMultiplicity ) ) ) ;
+    // InternalProblem.g:1229: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;
 
@@ -3022,24 +3163,24 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1187:2: ( ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleMultiplicity ) ) ) )
-            // InternalProblem.g:1188:2: ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleMultiplicity ) ) )
+            // InternalProblem.g:1235:2: ( ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) ) )
+            // InternalProblem.g:1236:2: ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) )
             {
-            // InternalProblem.g:1188:2: ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleMultiplicity ) ) )
-            // InternalProblem.g:1189:3: ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleMultiplicity ) )
+            // InternalProblem.g:1236:2: ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) )
+            // InternalProblem.g:1237:3: ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) )
             {
-            // InternalProblem.g:1189:3: ( (otherlv_0= RULE_ID ) )
-            // InternalProblem.g:1190:4: (otherlv_0= RULE_ID )
+            // InternalProblem.g:1237:3: ( (otherlv_0= RULE_ID ) )
+            // InternalProblem.g:1238:4: (otherlv_0= RULE_ID )
             {
-            // InternalProblem.g:1190:4: (otherlv_0= RULE_ID )
-            // InternalProblem.g:1191:5: otherlv_0= RULE_ID
+            // InternalProblem.g:1238:4: (otherlv_0= RULE_ID )
+            // InternalProblem.g:1239:5: otherlv_0= RULE_ID
             {
 
                                                 if (current==null) {
                                                         current = createModelElement(grammarAccess.getTypeScopeRule());
                                                 }
                                         
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_28); 
+            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_29); 
 
                                                 newLeafNode(otherlv_0, grammarAccess.getTypeScopeAccess().getTargetTypeClassDeclarationCrossReference_0_0());
                                         
@@ -3049,33 +3190,33 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:1202:3: ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' )
-            int alt29=2;
-            int LA29_0 = input.LA(1);
+            // InternalProblem.g:1250:3: ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' )
+            int alt31=2;
+            int LA31_0 = input.LA(1);
 
-            if ( (LA29_0==31) ) {
-                alt29=1;
+            if ( (LA31_0==35) ) {
+                alt31=1;
             }
-            else if ( (LA29_0==32) ) {
-                alt29=2;
+            else if ( (LA31_0==36) ) {
+                alt31=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 29, 0, input);
+                    new NoViableAltException("", 31, 0, input);
 
                 throw nvae;
             }
-            switch (alt29) {
+            switch (alt31) {
                 case 1 :
-                    // InternalProblem.g:1203:4: ( (lv_increment_1_0= '+=' ) )
+                    // InternalProblem.g:1251:4: ( (lv_increment_1_0= '+=' ) )
                     {
-                    // InternalProblem.g:1203:4: ( (lv_increment_1_0= '+=' ) )
-                    // InternalProblem.g:1204:5: (lv_increment_1_0= '+=' )
+                    // InternalProblem.g:1251:4: ( (lv_increment_1_0= '+=' ) )
+                    // InternalProblem.g:1252:5: (lv_increment_1_0= '+=' )
                     {
-                    // InternalProblem.g:1204:5: (lv_increment_1_0= '+=' )
-                    // InternalProblem.g:1205:6: lv_increment_1_0= '+='
+                    // InternalProblem.g:1252:5: (lv_increment_1_0= '+=' )
+                    // InternalProblem.g:1253:6: lv_increment_1_0= '+='
                     {
-                    lv_increment_1_0=(Token)match(input,31,FOLLOW_13); 
+                    lv_increment_1_0=(Token)match(input,35,FOLLOW_13); 
 
                                                                 newLeafNode(lv_increment_1_0, grammarAccess.getTypeScopeAccess().getIncrementPlusSignEqualsSignKeyword_1_0_0());
                                                         
@@ -3095,9 +3236,9 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1218:4: otherlv_2= '='
+                    // InternalProblem.g:1266:4: otherlv_2= '='
                     {
-                    otherlv_2=(Token)match(input,32,FOLLOW_13); 
+                    otherlv_2=(Token)match(input,36,FOLLOW_13); 
 
                                                 newLeafNode(otherlv_2, grammarAccess.getTypeScopeAccess().getEqualsSignKeyword_1_1());
                                         
@@ -3107,17 +3248,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:1223:3: ( (lv_multiplicity_3_0= ruleMultiplicity ) )
-            // InternalProblem.g:1224:4: (lv_multiplicity_3_0= ruleMultiplicity )
+            // InternalProblem.g:1271:3: ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) )
+            // InternalProblem.g:1272:4: (lv_multiplicity_3_0= ruleDefiniteMultiplicity )
             {
-            // InternalProblem.g:1224:4: (lv_multiplicity_3_0= ruleMultiplicity )
-            // InternalProblem.g:1225:5: lv_multiplicity_3_0= ruleMultiplicity
+            // InternalProblem.g:1272:4: (lv_multiplicity_3_0= ruleDefiniteMultiplicity )
+            // InternalProblem.g:1273:5: lv_multiplicity_3_0= ruleDefiniteMultiplicity
             {
 
-                                                newCompositeNode(grammarAccess.getTypeScopeAccess().getMultiplicityMultiplicityParserRuleCall_2_0());
+                                                newCompositeNode(grammarAccess.getTypeScopeAccess().getMultiplicityDefiniteMultiplicityParserRuleCall_2_0());
                                         
             pushFollow(FOLLOW_2);
-            lv_multiplicity_3_0=ruleMultiplicity();
+            lv_multiplicity_3_0=ruleDefiniteMultiplicity();
 
             state._fsp--;
 
@@ -3129,7 +3270,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                                         current,
                                                         "multiplicity",
                                                         lv_multiplicity_3_0,
-                                                        "org.eclipse.viatra.solver.language.Problem.Multiplicity");
+                                                        "org.eclipse.viatra.solver.language.Problem.DefiniteMultiplicity");
                                                 afterParserOrEnumRuleCall();
                                         
 
@@ -3161,7 +3302,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleMultiplicity"
-    // InternalProblem.g:1246:1: entryRuleMultiplicity returns [EObject current=null] : iv_ruleMultiplicity= ruleMultiplicity EOF ;
+    // InternalProblem.g:1294:1: entryRuleMultiplicity returns [EObject current=null] : iv_ruleMultiplicity= ruleMultiplicity EOF ;
     public final EObject entryRuleMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3169,8 +3310,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1246:53: (iv_ruleMultiplicity= ruleMultiplicity EOF )
-            // InternalProblem.g:1247:2: iv_ruleMultiplicity= ruleMultiplicity EOF
+            // InternalProblem.g:1294:53: (iv_ruleMultiplicity= ruleMultiplicity EOF )
+            // InternalProblem.g:1295:2: iv_ruleMultiplicity= ruleMultiplicity EOF
             {
              newCompositeNode(grammarAccess.getMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -3197,10 +3338,138 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleMultiplicity"
-    // InternalProblem.g:1253:1: ruleMultiplicity returns [EObject current=null] : (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity ) ;
+    // InternalProblem.g:1301:1: ruleMultiplicity returns [EObject current=null] : (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity ) ;
     public final EObject ruleMultiplicity() throws RecognitionException {
         EObject current = null;
 
+        EObject this_UnboundedMultiplicity_0 = null;
+
+        EObject this_DefiniteMultiplicity_1 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:1307:2: ( (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity ) )
+            // InternalProblem.g:1308:2: (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity )
+            {
+            // InternalProblem.g:1308:2: (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity )
+            int alt32=2;
+            int LA32_0 = input.LA(1);
+
+            if ( (LA32_0==EOF||LA32_0==24) ) {
+                alt32=1;
+            }
+            else if ( (LA32_0==RULE_INT) ) {
+                alt32=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 32, 0, input);
+
+                throw nvae;
+            }
+            switch (alt32) {
+                case 1 :
+                    // InternalProblem.g:1309:3: this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity
+                    {
+
+                                        newCompositeNode(grammarAccess.getMultiplicityAccess().getUnboundedMultiplicityParserRuleCall_0());
+                                
+                    pushFollow(FOLLOW_2);
+                    this_UnboundedMultiplicity_0=ruleUnboundedMultiplicity();
+
+                    state._fsp--;
+
+
+                                        current = this_UnboundedMultiplicity_0;
+                                        afterParserOrEnumRuleCall();
+                                
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:1318:3: this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity
+                    {
+
+                                        newCompositeNode(grammarAccess.getMultiplicityAccess().getDefiniteMultiplicityParserRuleCall_1());
+                                
+                    pushFollow(FOLLOW_2);
+                    this_DefiniteMultiplicity_1=ruleDefiniteMultiplicity();
+
+                    state._fsp--;
+
+
+                                        current = this_DefiniteMultiplicity_1;
+                                        afterParserOrEnumRuleCall();
+                                
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleMultiplicity"
+
+
+    // $ANTLR start "entryRuleDefiniteMultiplicity"
+    // InternalProblem.g:1330:1: entryRuleDefiniteMultiplicity returns [EObject current=null] : iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF ;
+    public final EObject entryRuleDefiniteMultiplicity() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleDefiniteMultiplicity = null;
+
+
+        try {
+            // InternalProblem.g:1330:61: (iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF )
+            // InternalProblem.g:1331:2: iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF
+            {
+             newCompositeNode(grammarAccess.getDefiniteMultiplicityRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleDefiniteMultiplicity=ruleDefiniteMultiplicity();
+
+            state._fsp--;
+
+             current =iv_ruleDefiniteMultiplicity; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleDefiniteMultiplicity"
+
+
+    // $ANTLR start "ruleDefiniteMultiplicity"
+    // InternalProblem.g:1337:1: ruleDefiniteMultiplicity returns [EObject current=null] : (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity ) ;
+    public final EObject ruleDefiniteMultiplicity() throws RecognitionException {
+        EObject current = null;
+
         EObject this_RangeMultiplicity_0 = null;
 
         EObject this_ExactMultiplicity_1 = null;
@@ -3210,41 +3479,41 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1259:2: ( (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity ) )
-            // InternalProblem.g:1260:2: (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity )
+            // InternalProblem.g:1343:2: ( (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity ) )
+            // InternalProblem.g:1344:2: (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity )
             {
-            // InternalProblem.g:1260:2: (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity )
-            int alt30=2;
-            int LA30_0 = input.LA(1);
+            // InternalProblem.g:1344:2: (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity )
+            int alt33=2;
+            int LA33_0 = input.LA(1);
 
-            if ( (LA30_0==RULE_INT) ) {
-                int LA30_1 = input.LA(2);
+            if ( (LA33_0==RULE_INT) ) {
+                int LA33_1 = input.LA(2);
 
-                if ( (LA30_1==33) ) {
-                    alt30=1;
+                if ( (LA33_1==37) ) {
+                    alt33=1;
                 }
-                else if ( (LA30_1==EOF||(LA30_1>=15 && LA30_1<=17)) ) {
-                    alt30=2;
+                else if ( (LA33_1==EOF||LA33_1==13||LA33_1==17||LA33_1==24) ) {
+                    alt33=2;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("", 30, 1, input);
+                        new NoViableAltException("", 33, 1, input);
 
                     throw nvae;
                 }
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 30, 0, input);
+                    new NoViableAltException("", 33, 0, input);
 
                 throw nvae;
             }
-            switch (alt30) {
+            switch (alt33) {
                 case 1 :
-                    // InternalProblem.g:1261:3: this_RangeMultiplicity_0= ruleRangeMultiplicity
+                    // InternalProblem.g:1345:3: this_RangeMultiplicity_0= ruleRangeMultiplicity
                     {
 
-                                        newCompositeNode(grammarAccess.getMultiplicityAccess().getRangeMultiplicityParserRuleCall_0());
+                                        newCompositeNode(grammarAccess.getDefiniteMultiplicityAccess().getRangeMultiplicityParserRuleCall_0());
                                 
                     pushFollow(FOLLOW_2);
                     this_RangeMultiplicity_0=ruleRangeMultiplicity();
@@ -3259,10 +3528,10 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1270:3: this_ExactMultiplicity_1= ruleExactMultiplicity
+                    // InternalProblem.g:1354:3: this_ExactMultiplicity_1= ruleExactMultiplicity
                     {
 
-                                        newCompositeNode(grammarAccess.getMultiplicityAccess().getExactMultiplicityParserRuleCall_1());
+                                        newCompositeNode(grammarAccess.getDefiniteMultiplicityAccess().getExactMultiplicityParserRuleCall_1());
                                 
                     pushFollow(FOLLOW_2);
                     this_ExactMultiplicity_1=ruleExactMultiplicity();
@@ -3295,11 +3564,84 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
         }
         return current;
     }
-    // $ANTLR end "ruleMultiplicity"
+    // $ANTLR end "ruleDefiniteMultiplicity"
+
+
+    // $ANTLR start "entryRuleUnboundedMultiplicity"
+    // InternalProblem.g:1366:1: entryRuleUnboundedMultiplicity returns [EObject current=null] : iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF ;
+    public final EObject entryRuleUnboundedMultiplicity() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleUnboundedMultiplicity = null;
+
+
+        try {
+            // InternalProblem.g:1366:62: (iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF )
+            // InternalProblem.g:1367:2: iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF
+            {
+             newCompositeNode(grammarAccess.getUnboundedMultiplicityRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleUnboundedMultiplicity=ruleUnboundedMultiplicity();
+
+            state._fsp--;
+
+             current =iv_ruleUnboundedMultiplicity; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleUnboundedMultiplicity"
+
+
+    // $ANTLR start "ruleUnboundedMultiplicity"
+    // InternalProblem.g:1373:1: ruleUnboundedMultiplicity returns [EObject current=null] : () ;
+    public final EObject ruleUnboundedMultiplicity() throws RecognitionException {
+        EObject current = null;
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:1379:2: ( () )
+            // InternalProblem.g:1380:2: ()
+            {
+            // InternalProblem.g:1380:2: ()
+            // InternalProblem.g:1381:3: 
+            {
+
+                                current = forceCreateModelElement(
+                                        grammarAccess.getUnboundedMultiplicityAccess().getUnboundedMultiplicityAction(),
+                                        current);
+                        
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleUnboundedMultiplicity"
 
 
     // $ANTLR start "entryRuleRangeMultiplicity"
-    // InternalProblem.g:1282:1: entryRuleRangeMultiplicity returns [EObject current=null] : iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF ;
+    // InternalProblem.g:1390:1: entryRuleRangeMultiplicity returns [EObject current=null] : iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF ;
     public final EObject entryRuleRangeMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3307,8 +3649,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1282:58: (iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF )
-            // InternalProblem.g:1283:2: iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF
+            // InternalProblem.g:1390:58: (iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF )
+            // InternalProblem.g:1391:2: iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF
             {
              newCompositeNode(grammarAccess.getRangeMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -3335,7 +3677,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRangeMultiplicity"
-    // InternalProblem.g:1289:1: ruleRangeMultiplicity returns [EObject current=null] : ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) ) ;
+    // InternalProblem.g:1397: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;
 
@@ -3348,19 +3690,19 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1295:2: ( ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) ) )
-            // InternalProblem.g:1296:2: ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) )
+            // InternalProblem.g:1403:2: ( ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) ) )
+            // InternalProblem.g:1404:2: ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) )
             {
-            // InternalProblem.g:1296:2: ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) )
-            // InternalProblem.g:1297:3: ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) )
+            // InternalProblem.g:1404:2: ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) )
+            // InternalProblem.g:1405:3: ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) )
             {
-            // InternalProblem.g:1297:3: ( (lv_lowerBound_0_0= RULE_INT ) )
-            // InternalProblem.g:1298:4: (lv_lowerBound_0_0= RULE_INT )
+            // InternalProblem.g:1405:3: ( (lv_lowerBound_0_0= RULE_INT ) )
+            // InternalProblem.g:1406:4: (lv_lowerBound_0_0= RULE_INT )
             {
-            // InternalProblem.g:1298:4: (lv_lowerBound_0_0= RULE_INT )
-            // InternalProblem.g:1299:5: lv_lowerBound_0_0= RULE_INT
+            // InternalProblem.g:1406:4: (lv_lowerBound_0_0= RULE_INT )
+            // InternalProblem.g:1407:5: lv_lowerBound_0_0= RULE_INT
             {
-            lv_lowerBound_0_0=(Token)match(input,RULE_INT,FOLLOW_29); 
+            lv_lowerBound_0_0=(Token)match(input,RULE_INT,FOLLOW_30); 
 
                                                 newLeafNode(lv_lowerBound_0_0, grammarAccess.getRangeMultiplicityAccess().getLowerBoundINTTerminalRuleCall_0_0());
                                         
@@ -3380,15 +3722,15 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,33,FOLLOW_30); 
+            otherlv_1=(Token)match(input,37,FOLLOW_31); 
 
                                 newLeafNode(otherlv_1, grammarAccess.getRangeMultiplicityAccess().getFullStopFullStopKeyword_1());
                         
-            // InternalProblem.g:1319:3: ( (lv_upperBound_2_0= ruleUpperBound ) )
-            // InternalProblem.g:1320:4: (lv_upperBound_2_0= ruleUpperBound )
+            // InternalProblem.g:1427:3: ( (lv_upperBound_2_0= ruleUpperBound ) )
+            // InternalProblem.g:1428:4: (lv_upperBound_2_0= ruleUpperBound )
             {
-            // InternalProblem.g:1320:4: (lv_upperBound_2_0= ruleUpperBound )
-            // InternalProblem.g:1321:5: lv_upperBound_2_0= ruleUpperBound
+            // InternalProblem.g:1428:4: (lv_upperBound_2_0= ruleUpperBound )
+            // InternalProblem.g:1429:5: lv_upperBound_2_0= ruleUpperBound
             {
 
                                                 newCompositeNode(grammarAccess.getRangeMultiplicityAccess().getUpperBoundUpperBoundParserRuleCall_2_0());
@@ -3438,7 +3780,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleExactMultiplicity"
-    // InternalProblem.g:1342:1: entryRuleExactMultiplicity returns [EObject current=null] : iv_ruleExactMultiplicity= ruleExactMultiplicity EOF ;
+    // InternalProblem.g:1450:1: entryRuleExactMultiplicity returns [EObject current=null] : iv_ruleExactMultiplicity= ruleExactMultiplicity EOF ;
     public final EObject entryRuleExactMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3446,8 +3788,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1342:58: (iv_ruleExactMultiplicity= ruleExactMultiplicity EOF )
-            // InternalProblem.g:1343:2: iv_ruleExactMultiplicity= ruleExactMultiplicity EOF
+            // InternalProblem.g:1450:58: (iv_ruleExactMultiplicity= ruleExactMultiplicity EOF )
+            // InternalProblem.g:1451:2: iv_ruleExactMultiplicity= ruleExactMultiplicity EOF
             {
              newCompositeNode(grammarAccess.getExactMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -3474,7 +3816,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleExactMultiplicity"
-    // InternalProblem.g:1349:1: ruleExactMultiplicity returns [EObject current=null] : ( (lv_exactValue_0_0= RULE_INT ) ) ;
+    // InternalProblem.g:1457:1: ruleExactMultiplicity returns [EObject current=null] : ( (lv_exactValue_0_0= RULE_INT ) ) ;
     public final EObject ruleExactMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3484,14 +3826,14 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1355:2: ( ( (lv_exactValue_0_0= RULE_INT ) ) )
-            // InternalProblem.g:1356:2: ( (lv_exactValue_0_0= RULE_INT ) )
+            // InternalProblem.g:1463:2: ( ( (lv_exactValue_0_0= RULE_INT ) ) )
+            // InternalProblem.g:1464:2: ( (lv_exactValue_0_0= RULE_INT ) )
             {
-            // InternalProblem.g:1356:2: ( (lv_exactValue_0_0= RULE_INT ) )
-            // InternalProblem.g:1357:3: (lv_exactValue_0_0= RULE_INT )
+            // InternalProblem.g:1464:2: ( (lv_exactValue_0_0= RULE_INT ) )
+            // InternalProblem.g:1465:3: (lv_exactValue_0_0= RULE_INT )
             {
-            // InternalProblem.g:1357:3: (lv_exactValue_0_0= RULE_INT )
-            // InternalProblem.g:1358:4: lv_exactValue_0_0= RULE_INT
+            // InternalProblem.g:1465:3: (lv_exactValue_0_0= RULE_INT )
+            // InternalProblem.g:1466:4: lv_exactValue_0_0= RULE_INT
             {
             lv_exactValue_0_0=(Token)match(input,RULE_INT,FOLLOW_2); 
 
@@ -3533,7 +3875,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleUpperBound"
-    // InternalProblem.g:1377:1: entryRuleUpperBound returns [String current=null] : iv_ruleUpperBound= ruleUpperBound EOF ;
+    // InternalProblem.g:1485:1: entryRuleUpperBound returns [String current=null] : iv_ruleUpperBound= ruleUpperBound EOF ;
     public final String entryRuleUpperBound() throws RecognitionException {
         String current = null;
 
@@ -3541,8 +3883,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1377:50: (iv_ruleUpperBound= ruleUpperBound EOF )
-            // InternalProblem.g:1378:2: iv_ruleUpperBound= ruleUpperBound EOF
+            // InternalProblem.g:1485:50: (iv_ruleUpperBound= ruleUpperBound EOF )
+            // InternalProblem.g:1486:2: iv_ruleUpperBound= ruleUpperBound EOF
             {
              newCompositeNode(grammarAccess.getUpperBoundRule()); 
             pushFollow(FOLLOW_1);
@@ -3569,7 +3911,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleUpperBound"
-    // InternalProblem.g:1384:1: ruleUpperBound returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_INT_0= RULE_INT | kw= '*' ) ;
+    // InternalProblem.g:1492:1: ruleUpperBound returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_INT_0= RULE_INT | kw= '*' ) ;
     public final AntlrDatatypeRuleToken ruleUpperBound() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -3580,28 +3922,28 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1390:2: ( (this_INT_0= RULE_INT | kw= '*' ) )
-            // InternalProblem.g:1391:2: (this_INT_0= RULE_INT | kw= '*' )
+            // InternalProblem.g:1498:2: ( (this_INT_0= RULE_INT | kw= '*' ) )
+            // InternalProblem.g:1499:2: (this_INT_0= RULE_INT | kw= '*' )
             {
-            // InternalProblem.g:1391:2: (this_INT_0= RULE_INT | kw= '*' )
-            int alt31=2;
-            int LA31_0 = input.LA(1);
+            // InternalProblem.g:1499:2: (this_INT_0= RULE_INT | kw= '*' )
+            int alt34=2;
+            int LA34_0 = input.LA(1);
 
-            if ( (LA31_0==RULE_INT) ) {
-                alt31=1;
+            if ( (LA34_0==RULE_INT) ) {
+                alt34=1;
             }
-            else if ( (LA31_0==34) ) {
-                alt31=2;
+            else if ( (LA34_0==38) ) {
+                alt34=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 31, 0, input);
+                    new NoViableAltException("", 34, 0, input);
 
                 throw nvae;
             }
-            switch (alt31) {
+            switch (alt34) {
                 case 1 :
-                    // InternalProblem.g:1392:3: this_INT_0= RULE_INT
+                    // InternalProblem.g:1500:3: this_INT_0= RULE_INT
                     {
                     this_INT_0=(Token)match(input,RULE_INT,FOLLOW_2); 
 
@@ -3614,9 +3956,9 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1400:3: kw= '*'
+                    // InternalProblem.g:1508:3: kw= '*'
                     {
-                    kw=(Token)match(input,34,FOLLOW_2); 
+                    kw=(Token)match(input,38,FOLLOW_2); 
 
                                         current.merge(kw);
                                         newLeafNode(kw, grammarAccess.getUpperBoundAccess().getAsteriskKeyword_1());
@@ -3647,7 +3989,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleQualifiedName"
-    // InternalProblem.g:1409:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
+    // InternalProblem.g:1517:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
     public final String entryRuleQualifiedName() throws RecognitionException {
         String current = null;
 
@@ -3655,8 +3997,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1409:53: (iv_ruleQualifiedName= ruleQualifiedName EOF )
-            // InternalProblem.g:1410:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+            // InternalProblem.g:1517:53: (iv_ruleQualifiedName= ruleQualifiedName EOF )
+            // InternalProblem.g:1518:2: iv_ruleQualifiedName= ruleQualifiedName EOF
             {
              newCompositeNode(grammarAccess.getQualifiedNameRule()); 
             pushFollow(FOLLOW_1);
@@ -3683,67 +4025,143 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // InternalProblem.g:1416:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID (kw= '::' this_ID_2= RULE_ID )* ) ;
+    // InternalProblem.g:1524:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
-        Token this_ID_0=null;
+        Token this_QUOTED_ID_0=null;
+        Token this_ID_1=null;
         Token kw=null;
-        Token this_ID_2=null;
+        Token this_ID_3=null;
+        Token this_QUOTED_ID_5=null;
 
 
                 enterRule();
 
         try {
-            // InternalProblem.g:1422:2: ( (this_ID_0= RULE_ID (kw= '::' this_ID_2= RULE_ID )* ) )
-            // InternalProblem.g:1423:2: (this_ID_0= RULE_ID (kw= '::' this_ID_2= RULE_ID )* )
+            // InternalProblem.g:1530:2: ( (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) ) )
+            // InternalProblem.g:1531:2: (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) )
             {
-            // InternalProblem.g:1423:2: (this_ID_0= RULE_ID (kw= '::' this_ID_2= RULE_ID )* )
-            // InternalProblem.g:1424:3: this_ID_0= RULE_ID (kw= '::' this_ID_2= RULE_ID )*
-            {
-            this_ID_0=(Token)match(input,RULE_ID,FOLLOW_31); 
+            // InternalProblem.g:1531:2: (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) )
+            int alt37=2;
+            int LA37_0 = input.LA(1);
 
-                                current.merge(this_ID_0);
-                        
+            if ( (LA37_0==RULE_QUOTED_ID) ) {
+                alt37=1;
+            }
+            else if ( (LA37_0==RULE_ID) ) {
+                alt37=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 37, 0, input);
 
-                                newLeafNode(this_ID_0, grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_0());
-                        
-            // InternalProblem.g:1431:3: (kw= '::' this_ID_2= RULE_ID )*
-            loop32:
-            do {
-                int alt32=2;
-                int LA32_0 = input.LA(1);
+                throw nvae;
+            }
+            switch (alt37) {
+                case 1 :
+                    // InternalProblem.g:1532:3: this_QUOTED_ID_0= RULE_QUOTED_ID
+                    {
+                    this_QUOTED_ID_0=(Token)match(input,RULE_QUOTED_ID,FOLLOW_2); 
 
-                if ( (LA32_0==35) ) {
-                    alt32=1;
-                }
+                                        current.merge(this_QUOTED_ID_0);
+                                
 
+                                        newLeafNode(this_QUOTED_ID_0, grammarAccess.getQualifiedNameAccess().getQUOTED_IDTerminalRuleCall_0());
+                                
 
-                switch (alt32) {
-                case 1 :
-                    // InternalProblem.g:1432:4: kw= '::' this_ID_2= RULE_ID
-                    {
-                    kw=(Token)match(input,35,FOLLOW_5); 
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:1540:3: (this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? )
+                    {
+                    // InternalProblem.g:1540:3: (this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? )
+                    // InternalProblem.g:1541:4: this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )?
+                    {
+                    this_ID_1=(Token)match(input,RULE_ID,FOLLOW_32); 
 
-                                                current.merge(kw);
-                                                newLeafNode(kw, grammarAccess.getQualifiedNameAccess().getColonColonKeyword_1_0());
-                                        
-                    this_ID_2=(Token)match(input,RULE_ID,FOLLOW_31); 
+                                                current.merge(this_ID_1);
+                                        
 
-                                                current.merge(this_ID_2);
-                                        
+                                                newLeafNode(this_ID_1, grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_0());
+                                        
+                    // InternalProblem.g:1548:4: (kw= ':' this_ID_3= RULE_ID )*
+                    loop35:
+                    do {
+                        int alt35=2;
+                        int LA35_0 = input.LA(1);
 
-                                                newLeafNode(this_ID_2, grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1());
-                                        
+                        if ( (LA35_0==33) ) {
+                            int LA35_1 = input.LA(2);
 
-                    }
-                    break;
+                            if ( (LA35_1==RULE_ID) ) {
+                                alt35=1;
+                            }
 
-                default :
-                    break loop32;
-                }
-            } while (true);
 
+                        }
+
+
+                        switch (alt35) {
+                        case 1 :
+                            // InternalProblem.g:1549:5: kw= ':' this_ID_3= RULE_ID
+                            {
+                            kw=(Token)match(input,33,FOLLOW_3); 
+
+                                                                current.merge(kw);
+                                                                newLeafNode(kw, grammarAccess.getQualifiedNameAccess().getColonKeyword_1_1_0());
+                                                        
+                            this_ID_3=(Token)match(input,RULE_ID,FOLLOW_32); 
+
+                                                                current.merge(this_ID_3);
+                                                        
+
+                                                                newLeafNode(this_ID_3, grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1_1());
+                                                        
+
+                            }
+                            break;
+
+                        default :
+                            break loop35;
+                        }
+                    } while (true);
+
+                    // InternalProblem.g:1562:4: (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )?
+                    int alt36=2;
+                    int LA36_0 = input.LA(1);
+
+                    if ( (LA36_0==33) ) {
+                        alt36=1;
+                    }
+                    switch (alt36) {
+                        case 1 :
+                            // InternalProblem.g:1563:5: kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID
+                            {
+                            kw=(Token)match(input,33,FOLLOW_33); 
+
+                                                                current.merge(kw);
+                                                                newLeafNode(kw, grammarAccess.getQualifiedNameAccess().getColonKeyword_1_2_0());
+                                                        
+                            this_QUOTED_ID_5=(Token)match(input,RULE_QUOTED_ID,FOLLOW_2); 
+
+                                                                current.merge(this_QUOTED_ID_5);
+                                                        
+
+                                                                newLeafNode(this_QUOTED_ID_5, grammarAccess.getQualifiedNameAccess().getQUOTED_IDTerminalRuleCall_1_2_1());
+                                                        
+
+                            }
+                            break;
+
+                    }
+
+
+                    }
+
+
+                    }
+                    break;
 
             }
 
@@ -3767,7 +4185,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLogicValue"
-    // InternalProblem.g:1449:1: ruleLogicValue returns [Enumerator current=null] : ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) ) ;
+    // InternalProblem.g:1581:1: ruleLogicValue returns [Enumerator current=null] : ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) ) ;
     public final Enumerator ruleLogicValue() throws RecognitionException {
         Enumerator current = null;
 
@@ -3779,42 +4197,42 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1455:2: ( ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) ) )
-            // InternalProblem.g:1456:2: ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) )
+            // InternalProblem.g:1587:2: ( ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) ) )
+            // InternalProblem.g:1588:2: ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) )
             {
-            // InternalProblem.g:1456:2: ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) )
-            int alt33=3;
+            // InternalProblem.g:1588:2: ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) )
+            int alt38=3;
             switch ( input.LA(1) ) {
-            case 36:
+            case 39:
                 {
-                alt33=1;
+                alt38=1;
                 }
                 break;
-            case 37:
+            case 40:
                 {
-                alt33=2;
+                alt38=2;
                 }
                 break;
-            case 38:
+            case 41:
                 {
-                alt33=3;
+                alt38=3;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("", 33, 0, input);
+                    new NoViableAltException("", 38, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt33) {
+            switch (alt38) {
                 case 1 :
-                    // InternalProblem.g:1457:3: (enumLiteral_0= 'true' )
+                    // InternalProblem.g:1589:3: (enumLiteral_0= 'true' )
                     {
-                    // InternalProblem.g:1457:3: (enumLiteral_0= 'true' )
-                    // InternalProblem.g:1458:4: enumLiteral_0= 'true'
+                    // InternalProblem.g:1589:3: (enumLiteral_0= 'true' )
+                    // InternalProblem.g:1590:4: enumLiteral_0= 'true'
                     {
-                    enumLiteral_0=(Token)match(input,36,FOLLOW_2); 
+                    enumLiteral_0=(Token)match(input,39,FOLLOW_2); 
 
                                                 current = grammarAccess.getLogicValueAccess().getTRUEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                                                 newLeafNode(enumLiteral_0, grammarAccess.getLogicValueAccess().getTRUEEnumLiteralDeclaration_0());
@@ -3826,12 +4244,12 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1465:3: (enumLiteral_1= 'false' )
+                    // InternalProblem.g:1597:3: (enumLiteral_1= 'false' )
                     {
-                    // InternalProblem.g:1465:3: (enumLiteral_1= 'false' )
-                    // InternalProblem.g:1466:4: enumLiteral_1= 'false'
+                    // InternalProblem.g:1597:3: (enumLiteral_1= 'false' )
+                    // InternalProblem.g:1598:4: enumLiteral_1= 'false'
                     {
-                    enumLiteral_1=(Token)match(input,37,FOLLOW_2); 
+                    enumLiteral_1=(Token)match(input,40,FOLLOW_2); 
 
                                                 current = grammarAccess.getLogicValueAccess().getFALSEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                                                 newLeafNode(enumLiteral_1, grammarAccess.getLogicValueAccess().getFALSEEnumLiteralDeclaration_1());
@@ -3843,12 +4261,12 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalProblem.g:1473:3: (enumLiteral_2= 'unknown' )
+                    // InternalProblem.g:1605:3: (enumLiteral_2= 'unknown' )
                     {
-                    // InternalProblem.g:1473:3: (enumLiteral_2= 'unknown' )
-                    // InternalProblem.g:1474:4: enumLiteral_2= 'unknown'
+                    // InternalProblem.g:1605:3: (enumLiteral_2= 'unknown' )
+                    // InternalProblem.g:1606:4: enumLiteral_2= 'unknown'
                     {
-                    enumLiteral_2=(Token)match(input,38,FOLLOW_2); 
+                    enumLiteral_2=(Token)match(input,41,FOLLOW_2); 
 
                                                 current = grammarAccess.getLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
                                                 newLeafNode(enumLiteral_2, grammarAccess.getLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_2());
@@ -3882,7 +4300,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleShortLogicValue"
-    // InternalProblem.g:1484:1: ruleShortLogicValue returns [Enumerator current=null] : ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) ) ;
+    // InternalProblem.g:1616:1: ruleShortLogicValue returns [Enumerator current=null] : ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) ) ;
     public final Enumerator ruleShortLogicValue() throws RecognitionException {
         Enumerator current = null;
 
@@ -3893,33 +4311,33 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1490:2: ( ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) ) )
-            // InternalProblem.g:1491:2: ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) )
+            // InternalProblem.g:1622:2: ( ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) ) )
+            // InternalProblem.g:1623:2: ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) )
             {
-            // InternalProblem.g:1491:2: ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) )
-            int alt34=2;
-            int LA34_0 = input.LA(1);
+            // InternalProblem.g:1623:2: ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) )
+            int alt39=2;
+            int LA39_0 = input.LA(1);
 
-            if ( (LA34_0==27) ) {
-                alt34=1;
+            if ( (LA39_0==31) ) {
+                alt39=1;
             }
-            else if ( (LA34_0==39) ) {
-                alt34=2;
+            else if ( (LA39_0==42) ) {
+                alt39=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 34, 0, input);
+                    new NoViableAltException("", 39, 0, input);
 
                 throw nvae;
             }
-            switch (alt34) {
+            switch (alt39) {
                 case 1 :
-                    // InternalProblem.g:1492:3: (enumLiteral_0= '!' )
+                    // InternalProblem.g:1624:3: (enumLiteral_0= '!' )
                     {
-                    // InternalProblem.g:1492:3: (enumLiteral_0= '!' )
-                    // InternalProblem.g:1493:4: enumLiteral_0= '!'
+                    // InternalProblem.g:1624:3: (enumLiteral_0= '!' )
+                    // InternalProblem.g:1625:4: enumLiteral_0= '!'
                     {
-                    enumLiteral_0=(Token)match(input,27,FOLLOW_2); 
+                    enumLiteral_0=(Token)match(input,31,FOLLOW_2); 
 
                                                 current = grammarAccess.getShortLogicValueAccess().getFALSEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                                                 newLeafNode(enumLiteral_0, grammarAccess.getShortLogicValueAccess().getFALSEEnumLiteralDeclaration_0());
@@ -3931,12 +4349,12 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1500:3: (enumLiteral_1= '?' )
+                    // InternalProblem.g:1632:3: (enumLiteral_1= '?' )
                     {
-                    // InternalProblem.g:1500:3: (enumLiteral_1= '?' )
-                    // InternalProblem.g:1501:4: enumLiteral_1= '?'
+                    // InternalProblem.g:1632:3: (enumLiteral_1= '?' )
+                    // InternalProblem.g:1633:4: enumLiteral_1= '?'
                     {
-                    enumLiteral_1=(Token)match(input,39,FOLLOW_2); 
+                    enumLiteral_1=(Token)match(input,42,FOLLOW_2); 
 
                                                 current = grammarAccess.getShortLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                                                 newLeafNode(enumLiteral_1, grammarAccess.getShortLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_1());
@@ -3971,28 +4389,34 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     // Delegated rules
 
 
-    protected DFA27 dfa27 = new DFA27(this);
-    static final String dfa_1s = "\17\uffff";
-    static final String dfa_2s = "\1\4\1\27\1\uffff\2\4\1\27\1\17\1\21\2\4\1\uffff\2\17\1\4\1\17";
-    static final String dfa_3s = "\1\47\1\43\1\uffff\1\4\1\30\2\43\1\35\2\4\1\uffff\2\43\1\4\1\43";
-    static final String dfa_4s = "\2\uffff\1\2\7\uffff\1\1\4\uffff";
-    static final String dfa_5s = "\17\uffff}>";
+    protected DFA29 dfa29 = new DFA29(this);
+    static final String dfa_1s = "\25\uffff";
+    static final String dfa_2s = "\1\4\2\34\1\uffff\2\4\2\21\1\15\2\34\2\4\1\uffff\4\21\1\4\2\21";
+    static final String dfa_3s = "\1\52\1\34\1\41\1\uffff\1\35\1\6\1\35\2\41\1\34\1\41\2\6\1\uffff\1\35\1\41\1\35\1\41\1\6\1\35\1\41";
+    static final String dfa_4s = "\3\uffff\1\2\11\uffff\1\1\7\uffff";
+    static final String dfa_5s = "\25\uffff}>";
     static final String[] dfa_6s = {
-            "\1\1\26\uffff\1\2\13\uffff\1\2",
-            "\1\4\13\uffff\1\3",
+            "\1\2\1\uffff\1\1\30\uffff\1\3\12\uffff\1\3",
+            "\1\4",
+            "\1\4\4\uffff\1\5",
             "",
-            "\1\5",
-            "\1\6\23\uffff\1\7",
-            "\1\4\13\uffff\1\3",
-            "\1\11\10\uffff\1\7\12\uffff\1\10",
-            "\1\2\13\uffff\1\12",
-            "\1\13",
-            "\1\14",
+            "\1\7\1\uffff\1\6\26\uffff\1\10",
+            "\1\12\1\uffff\1\11",
+            "\1\13\13\uffff\1\10",
+            "\1\13\13\uffff\1\10\3\uffff\1\14",
+            "\1\3\23\uffff\1\15",
+            "\1\4",
+            "\1\4\4\uffff\1\5",
+            "\1\17\1\uffff\1\16",
+            "\1\21\1\uffff\1\20",
             "",
-            "\1\11\10\uffff\1\7\12\uffff\1\10",
-            "\1\11\10\uffff\1\7\12\uffff\1\15",
-            "\1\16",
-            "\1\11\10\uffff\1\7\12\uffff\1\15"
+            "\1\13\13\uffff\1\10",
+            "\1\13\13\uffff\1\10\3\uffff\1\22",
+            "\1\13\13\uffff\1\10",
+            "\1\13\13\uffff\1\10\3\uffff\1\14",
+            "\1\24\1\uffff\1\23",
+            "\1\13\13\uffff\1\10",
+            "\1\13\13\uffff\1\10\3\uffff\1\22"
     };
 
     static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
@@ -4002,11 +4426,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
     static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
 
-    class DFA27 extends DFA {
+    class DFA29 extends DFA {
 
-        public DFA27(BaseRecognizer recognizer) {
+        public DFA29(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 27;
+            this.decisionNumber = 29;
             this.eot = dfa_1;
             this.eof = dfa_1;
             this.min = dfa_2;
@@ -4016,41 +4440,43 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             this.transition = dfa_6;
         }
         public String getDescription() {
-            return "918: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 "966:3: ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) )";
         }
     }
  
 
     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[]{0x0000008048601812L});
-    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000001000L});
-    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x0000000000000010L});
-    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x00000000000EA000L});
-    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000004010L});
-    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000028000L});
-    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000010010L});
-    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000018000L});
-    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x00000000000C0000L});
-    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000004000L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000002000L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x000004048C00C052L});
+    public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000008000L});
+    public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000052000L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000000050L});
+    public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000062000L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000700000L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000780000L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000800010L});
     public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000000010000L});
-    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000100002L});
-    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000000400010L});
-    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000800000L});
-    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000001000010L});
-    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000001008000L});
-    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000002020000L});
-    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000008000010L});
-    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000004020000L});
-    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000000008002L});
-    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000010800000L});
-    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000020000000L});
-    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000007000000000L});
-    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000000020000L});
-    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000180000000L});
-    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000000400000020L});
-    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000800000002L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000001000000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000002000002L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000008000010L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000010000000L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000020000010L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000020020000L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000040002000L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000080000050L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000000082000L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000000020002L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000110000000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000020000050L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000200000000L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000038000000000L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000000022000L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000001800000000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000002000000000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000004000000020L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000200000002L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000000040L});
 
 }
\ No newline at end of file
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSemanticSequencer.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSemanticSequencer.java
index a857b997..336d0867 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSemanticSequencer.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSemanticSequencer.java
@@ -7,6 +7,7 @@ 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;
@@ -20,6 +21,7 @@ import org.eclipse.viatra.solver.language.model.problem.RangeMultiplicity;
 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.TypeScope;
+import org.eclipse.viatra.solver.language.model.problem.UnboundedMultiplicity;
 import org.eclipse.viatra.solver.language.services.ProblemGrammarAccess;
 import org.eclipse.xtext.Action;
 import org.eclipse.xtext.Parameter;
@@ -43,6 +45,9 @@ 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; 
@@ -82,6 +87,9 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
                         case ProblemPackage.TYPE_SCOPE:
                                 sequence_TypeScope(context, (TypeScope) semanticObject); 
                                 return; 
+                        case ProblemPackage.UNBOUNDED_MULTIPLICITY:
+                                sequence_UnboundedMultiplicity(context, (UnboundedMultiplicity) semanticObject); 
+                                return; 
                         }
                 if (errorAcceptor != null)
                         errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));
@@ -89,6 +97,24 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
         
         /**
          * Contexts:
+         *     Argument returns Argument
+         *
+         * Constraint:
+         *     variable=[Variable|ID]
+         */
+        protected void sequence_Argument(ISerializationContext context, Argument semanticObject) {
+                if (errorAcceptor != null) {
+                        if (transientValues.isValueTransient(semanticObject, ProblemPackage.Literals.ARGUMENT__VARIABLE) == ValueTransient.YES)
+                                errorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, ProblemPackage.Literals.ARGUMENT__VARIABLE));
+                }
+                SequenceFeeder feeder = createSequencerFeeder(context, semanticObject);
+                feeder.accept(grammarAccess.getArgumentAccess().getVariableVariableIDTerminalRuleCall_0_1(), semanticObject.eGet(ProblemPackage.Literals.ARGUMENT__VARIABLE, false));
+                feeder.finish();
+        }
+        
+        
+        /**
+         * Contexts:
          *     Statement returns Assertion
          *     Assertion returns Assertion
          *
@@ -109,7 +135,7 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
          *     Atom returns Atom
          *
          * Constraint:
-         *     (relation=[Relation|QualifiedName] transitiveClosure?='+'? (arguments+=[Variable|ID] arguments+=[Variable|ID]*)?)
+         *     (relation=[Relation|QualifiedName] transitiveClosure?='+'? (arguments+=Argument arguments+=Argument*)?)
          */
         protected void sequence_Atom(ISerializationContext context, Atom semanticObject) {
                 genericSequencer.createSequence(context, semanticObject);
@@ -125,11 +151,7 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
          *     (
          *         abstract?='abstract'? 
          *         name=ID 
-         *         (
-         *             superTypes+=[ClassDeclaration|ID] | 
-         *             (superTypes+=[ClassDeclaration|ID] superTypes+=[ClassDeclaration|ID]*) | 
-         *             referenceDeclarations+=ReferenceDeclaration
-         *         )? 
+         *         (superTypes+=[ClassDeclaration|QualifiedName] superTypes+=[ClassDeclaration|QualifiedName]*)? 
          *         referenceDeclarations+=ReferenceDeclaration*
          *     )
          */
@@ -153,6 +175,7 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
         /**
          * Contexts:
          *     Multiplicity returns ExactMultiplicity
+         *     DefiniteMultiplicity returns ExactMultiplicity
          *     ExactMultiplicity returns ExactMultiplicity
          *
          * Constraint:
@@ -227,7 +250,7 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
          *     Problem returns Problem
          *
          * Constraint:
-         *     statements+=Statement+
+         *     ((name=ID statements+=Statement+) | statements+=Statement+)?
          */
         protected void sequence_Problem(ISerializationContext context, Problem semanticObject) {
                 genericSequencer.createSequence(context, semanticObject);
@@ -237,6 +260,7 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
         /**
          * Contexts:
          *     Multiplicity returns RangeMultiplicity
+         *     DefiniteMultiplicity returns RangeMultiplicity
          *     RangeMultiplicity returns RangeMultiplicity
          *
          * Constraint:
@@ -261,7 +285,13 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
          *     ReferenceDeclaration returns ReferenceDeclaration
          *
          * Constraint:
-         *     (containment?='contains'? referenceType=[ClassDeclaration|ID] multiplicity=Multiplicity name=ID opposite=[ReferenceDeclaration|QualifiedName]?)
+         *     (
+         *         containment?='contains'? 
+         *         referenceType=[ClassDeclaration|QualifiedName] 
+         *         multiplicity=Multiplicity? 
+         *         name=ID 
+         *         opposite=[ReferenceDeclaration|QualifiedName]?
+         *     )
          */
         protected void sequence_ReferenceDeclaration(ISerializationContext context, ReferenceDeclaration semanticObject) {
                 genericSequencer.createSequence(context, semanticObject);
@@ -286,11 +316,24 @@ public class ProblemSemanticSequencer extends AbstractDelegatingSemanticSequence
          *     TypeScope returns TypeScope
          *
          * Constraint:
-         *     (targetType=[ClassDeclaration|ID] increment?='+='? multiplicity=Multiplicity)
+         *     (targetType=[ClassDeclaration|ID] increment?='+='? multiplicity=DefiniteMultiplicity)
          */
         protected void sequence_TypeScope(ISerializationContext context, TypeScope semanticObject) {
                 genericSequencer.createSequence(context, semanticObject);
         }
         
         
+        /**
+         * Contexts:
+         *     Multiplicity returns UnboundedMultiplicity
+         *     UnboundedMultiplicity returns UnboundedMultiplicity
+         *
+         * Constraint:
+         *     {UnboundedMultiplicity}
+         */
+        protected void sequence_UnboundedMultiplicity(ISerializationContext context, UnboundedMultiplicity semanticObject) {
+                genericSequencer.createSequence(context, semanticObject);
+        }
+        
+        
 }
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSyntacticSequencer.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSyntacticSequencer.java
index 3ffb6315..80ac73d6 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSyntacticSequencer.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/serializer/ProblemSyntacticSequencer.java
@@ -11,6 +11,7 @@ import org.eclipse.xtext.IGrammarAccess;
 import org.eclipse.xtext.RuleCall;
 import org.eclipse.xtext.nodemodel.INode;
 import org.eclipse.xtext.serializer.analysis.GrammarAlias.AbstractElementAlias;
+import org.eclipse.xtext.serializer.analysis.GrammarAlias.AlternativeAlias;
 import org.eclipse.xtext.serializer.analysis.GrammarAlias.GroupAlias;
 import org.eclipse.xtext.serializer.analysis.GrammarAlias.TokenAlias;
 import org.eclipse.xtext.serializer.analysis.ISyntacticSequencerPDAProvider.ISynNavigable;
@@ -21,13 +22,15 @@ import org.eclipse.xtext.serializer.sequencer.AbstractSyntacticSequencer;
 public class ProblemSyntacticSequencer extends AbstractSyntacticSequencer {
 
         protected ProblemGrammarAccess grammarAccess;
-        protected AbstractElementAlias match_ClassDeclaration___ExtendsKeyword_3_0_0_LeftSquareBracketKeyword_3_0_1_1_0_RightSquareBracketKeyword_3_0_1_1_2__q;
+        protected AbstractElementAlias match_ClassDeclaration_FullStopKeyword_4_1_or___LeftCurlyBracketKeyword_4_0_0_RightCurlyBracketKeyword_4_0_2__;
+        protected AbstractElementAlias match_ClassDeclaration_SemicolonKeyword_4_0_1_1_q;
         protected AbstractElementAlias match_PredicateDefinition_PredKeyword_0_0_1_q;
         
         @Inject
         protected void init(IGrammarAccess access) {
                 grammarAccess = (ProblemGrammarAccess) access;
-                match_ClassDeclaration___ExtendsKeyword_3_0_0_LeftSquareBracketKeyword_3_0_1_1_0_RightSquareBracketKeyword_3_0_1_1_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0_0()), new TokenAlias(false, false, grammarAccess.getClassDeclarationAccess().getLeftSquareBracketKeyword_3_0_1_1_0()), new TokenAlias(false, false, grammarAccess.getClassDeclarationAccess().getRightSquareBracketKeyword_3_0_1_1_2()));
+                match_ClassDeclaration_FullStopKeyword_4_1_or___LeftCurlyBracketKeyword_4_0_0_RightCurlyBracketKeyword_4_0_2__ = new AlternativeAlias(false, false, new GroupAlias(false, false, new TokenAlias(false, false, grammarAccess.getClassDeclarationAccess().getLeftCurlyBracketKeyword_4_0_0()), new TokenAlias(false, false, grammarAccess.getClassDeclarationAccess().getRightCurlyBracketKeyword_4_0_2())), new TokenAlias(false, false, grammarAccess.getClassDeclarationAccess().getFullStopKeyword_4_1()));
+                match_ClassDeclaration_SemicolonKeyword_4_0_1_1_q = new TokenAlias(false, true, grammarAccess.getClassDeclarationAccess().getSemicolonKeyword_4_0_1_1());
                 match_PredicateDefinition_PredKeyword_0_0_1_q = new TokenAlias(false, true, grammarAccess.getPredicateDefinitionAccess().getPredKeyword_0_0_1());
         }
         
@@ -43,8 +46,10 @@ public class ProblemSyntacticSequencer extends AbstractSyntacticSequencer {
                 List<INode> transitionNodes = collectNodes(fromNode, toNode);
                 for (AbstractElementAlias syntax : transition.getAmbiguousSyntaxes()) {
                         List<INode> syntaxNodes = getNodesFor(transitionNodes, syntax);
-                        if (match_ClassDeclaration___ExtendsKeyword_3_0_0_LeftSquareBracketKeyword_3_0_1_1_0_RightSquareBracketKeyword_3_0_1_1_2__q.equals(syntax))
-                                emit_ClassDeclaration___ExtendsKeyword_3_0_0_LeftSquareBracketKeyword_3_0_1_1_0_RightSquareBracketKeyword_3_0_1_1_2__q(semanticObject, getLastNavigableState(), syntaxNodes);
+                        if (match_ClassDeclaration_FullStopKeyword_4_1_or___LeftCurlyBracketKeyword_4_0_0_RightCurlyBracketKeyword_4_0_2__.equals(syntax))
+                                emit_ClassDeclaration_FullStopKeyword_4_1_or___LeftCurlyBracketKeyword_4_0_0_RightCurlyBracketKeyword_4_0_2__(semanticObject, getLastNavigableState(), syntaxNodes);
+                        else if (match_ClassDeclaration_SemicolonKeyword_4_0_1_1_q.equals(syntax))
+                                emit_ClassDeclaration_SemicolonKeyword_4_0_1_1_q(semanticObject, getLastNavigableState(), syntaxNodes);
                         else if (match_PredicateDefinition_PredKeyword_0_0_1_q.equals(syntax))
                                 emit_PredicateDefinition_PredKeyword_0_0_1_q(semanticObject, getLastNavigableState(), syntaxNodes);
                         else acceptNodes(getLastNavigableState(), syntaxNodes);
@@ -53,13 +58,25 @@ public class ProblemSyntacticSequencer extends AbstractSyntacticSequencer {
 
         /**
          * Ambiguous syntax:
-         *     ('extends' '[' ']')?
+         *     ('{' '}') | '.'
          *
          * This ambiguous syntax occurs at:
-         *     name=ID (ambiguity) ',' referenceDeclarations+=ReferenceDeclaration
-         *     name=ID (ambiguity) '.' (rule end)
+         *     name=ID (ambiguity) (rule end)
+         *     superTypes+=[ClassDeclaration|QualifiedName] (ambiguity) (rule end)
          */
-        protected void emit_ClassDeclaration___ExtendsKeyword_3_0_0_LeftSquareBracketKeyword_3_0_1_1_0_RightSquareBracketKeyword_3_0_1_1_2__q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+        protected void emit_ClassDeclaration_FullStopKeyword_4_1_or___LeftCurlyBracketKeyword_4_0_0_RightCurlyBracketKeyword_4_0_2__(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
+                acceptNodes(transition, nodes);
+        }
+        
+        /**
+         * Ambiguous syntax:
+         *     ';'?
+         *
+         * This ambiguous syntax occurs at:
+         *     referenceDeclarations+=ReferenceDeclaration (ambiguity) '}' (rule end)
+         *     referenceDeclarations+=ReferenceDeclaration (ambiguity) referenceDeclarations+=ReferenceDeclaration
+         */
+        protected void emit_ClassDeclaration_SemicolonKeyword_4_0_1_1_q(EObject semanticObject, ISynNavigable transition, List<INode> nodes) {
                 acceptNodes(transition, nodes);
         }
         
diff --git a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/services/ProblemGrammarAccess.java b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/services/ProblemGrammarAccess.java
index 7d6b7013..5b3781a2 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/services/ProblemGrammarAccess.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/services/ProblemGrammarAccess.java
@@ -6,6 +6,7 @@ package org.eclipse.viatra.solver.language.services;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 import java.util.List;
+import org.eclipse.xtext.Action;
 import org.eclipse.xtext.Alternatives;
 import org.eclipse.xtext.Assignment;
 import org.eclipse.xtext.CrossReference;
@@ -27,18 +28,44 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         
         public class ProblemElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.Problem");
-                private final Assignment cStatementsAssignment = (Assignment)rule.eContents().get(1);
-                private final RuleCall cStatementsStatementParserRuleCall_0 = (RuleCall)cStatementsAssignment.eContents().get(0);
+                private final Group cGroup = (Group)rule.eContents().get(1);
+                private final Group cGroup_0 = (Group)cGroup.eContents().get(0);
+                private final Keyword cProblemKeyword_0_0 = (Keyword)cGroup_0.eContents().get(0);
+                private final Assignment cNameAssignment_0_1 = (Assignment)cGroup_0.eContents().get(1);
+                private final RuleCall cNameIDTerminalRuleCall_0_1_0 = (RuleCall)cNameAssignment_0_1.eContents().get(0);
+                private final Keyword cFullStopKeyword_0_2 = (Keyword)cGroup_0.eContents().get(2);
+                private final Assignment cStatementsAssignment_1 = (Assignment)cGroup.eContents().get(1);
+                private final RuleCall cStatementsStatementParserRuleCall_1_0 = (RuleCall)cStatementsAssignment_1.eContents().get(0);
                 
                 //Problem:
+                //    ("problem" name=ID ".")?
                 //    statements+=Statement*;
                 @Override public ParserRule getRule() { return rule; }
                 
+                //("problem" name=ID ".")?
                 //statements+=Statement*
-                public Assignment getStatementsAssignment() { return cStatementsAssignment; }
+                public Group getGroup() { return cGroup; }
+                
+                //("problem" name=ID ".")?
+                public Group getGroup_0() { return cGroup_0; }
+                
+                //"problem"
+                public Keyword getProblemKeyword_0_0() { return cProblemKeyword_0_0; }
+                
+                //name=ID
+                public Assignment getNameAssignment_0_1() { return cNameAssignment_0_1; }
+                
+                //ID
+                public RuleCall getNameIDTerminalRuleCall_0_1_0() { return cNameIDTerminalRuleCall_0_1_0; }
+                
+                //"."
+                public Keyword getFullStopKeyword_0_2() { return cFullStopKeyword_0_2; }
+                
+                //statements+=Statement*
+                public Assignment getStatementsAssignment_1() { return cStatementsAssignment_1; }
                 
                 //Statement
-                public RuleCall getStatementsStatementParserRuleCall_0() { return cStatementsStatementParserRuleCall_0; }
+                public RuleCall getStatementsStatementParserRuleCall_1_0() { return cStatementsStatementParserRuleCall_1_0; }
         }
         public class StatementElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.Statement");
@@ -75,50 +102,37 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 private final Keyword cClassKeyword_1 = (Keyword)cGroup.eContents().get(1);
                 private final Assignment cNameAssignment_2 = (Assignment)cGroup.eContents().get(2);
                 private final RuleCall cNameIDTerminalRuleCall_2_0 = (RuleCall)cNameAssignment_2.eContents().get(0);
-                private final Alternatives cAlternatives_3 = (Alternatives)cGroup.eContents().get(3);
-                private final Group cGroup_3_0 = (Group)cAlternatives_3.eContents().get(0);
-                private final Keyword cExtendsKeyword_3_0_0 = (Keyword)cGroup_3_0.eContents().get(0);
-                private final Alternatives cAlternatives_3_0_1 = (Alternatives)cGroup_3_0.eContents().get(1);
-                private final Assignment cSuperTypesAssignment_3_0_1_0 = (Assignment)cAlternatives_3_0_1.eContents().get(0);
-                private final CrossReference cSuperTypesClassDeclarationCrossReference_3_0_1_0_0 = (CrossReference)cSuperTypesAssignment_3_0_1_0.eContents().get(0);
-                private final RuleCall cSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_0_0_1 = (RuleCall)cSuperTypesClassDeclarationCrossReference_3_0_1_0_0.eContents().get(1);
-                private final Group cGroup_3_0_1_1 = (Group)cAlternatives_3_0_1.eContents().get(1);
-                private final Keyword cLeftSquareBracketKeyword_3_0_1_1_0 = (Keyword)cGroup_3_0_1_1.eContents().get(0);
-                private final Group cGroup_3_0_1_1_1 = (Group)cGroup_3_0_1_1.eContents().get(1);
-                private final Assignment cSuperTypesAssignment_3_0_1_1_1_0 = (Assignment)cGroup_3_0_1_1_1.eContents().get(0);
-                private final CrossReference cSuperTypesClassDeclarationCrossReference_3_0_1_1_1_0_0 = (CrossReference)cSuperTypesAssignment_3_0_1_1_1_0.eContents().get(0);
-                private final RuleCall cSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_1_1_0_0_1 = (RuleCall)cSuperTypesClassDeclarationCrossReference_3_0_1_1_1_0_0.eContents().get(1);
-                private final Group cGroup_3_0_1_1_1_1 = (Group)cGroup_3_0_1_1_1.eContents().get(1);
-                private final Keyword cCommaKeyword_3_0_1_1_1_1_0 = (Keyword)cGroup_3_0_1_1_1_1.eContents().get(0);
-                private final Assignment cSuperTypesAssignment_3_0_1_1_1_1_1 = (Assignment)cGroup_3_0_1_1_1_1.eContents().get(1);
-                private final CrossReference cSuperTypesClassDeclarationCrossReference_3_0_1_1_1_1_1_0 = (CrossReference)cSuperTypesAssignment_3_0_1_1_1_1_1.eContents().get(0);
-                private final RuleCall cSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_1_1_1_1_0_1 = (RuleCall)cSuperTypesClassDeclarationCrossReference_3_0_1_1_1_1_1_0.eContents().get(1);
-                private final Keyword cRightSquareBracketKeyword_3_0_1_1_2 = (Keyword)cGroup_3_0_1_1.eContents().get(2);
-                private final Assignment cReferenceDeclarationsAssignment_3_1 = (Assignment)cAlternatives_3.eContents().get(1);
-                private final RuleCall cReferenceDeclarationsReferenceDeclarationParserRuleCall_3_1_0 = (RuleCall)cReferenceDeclarationsAssignment_3_1.eContents().get(0);
-                private final Group cGroup_4 = (Group)cGroup.eContents().get(4);
-                private final Keyword cCommaKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);
-                private final Assignment cReferenceDeclarationsAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);
-                private final RuleCall cReferenceDeclarationsReferenceDeclarationParserRuleCall_4_1_0 = (RuleCall)cReferenceDeclarationsAssignment_4_1.eContents().get(0);
-                private final Keyword cFullStopKeyword_5 = (Keyword)cGroup.eContents().get(5);
+                private final Group cGroup_3 = (Group)cGroup.eContents().get(3);
+                private final Keyword cExtendsKeyword_3_0 = (Keyword)cGroup_3.eContents().get(0);
+                private final Assignment cSuperTypesAssignment_3_1 = (Assignment)cGroup_3.eContents().get(1);
+                private final CrossReference cSuperTypesClassDeclarationCrossReference_3_1_0 = (CrossReference)cSuperTypesAssignment_3_1.eContents().get(0);
+                private final RuleCall cSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_1_0_1 = (RuleCall)cSuperTypesClassDeclarationCrossReference_3_1_0.eContents().get(1);
+                private final Group cGroup_3_2 = (Group)cGroup_3.eContents().get(2);
+                private final Keyword cCommaKeyword_3_2_0 = (Keyword)cGroup_3_2.eContents().get(0);
+                private final Assignment cSuperTypesAssignment_3_2_1 = (Assignment)cGroup_3_2.eContents().get(1);
+                private final CrossReference cSuperTypesClassDeclarationCrossReference_3_2_1_0 = (CrossReference)cSuperTypesAssignment_3_2_1.eContents().get(0);
+                private final RuleCall cSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_2_1_0_1 = (RuleCall)cSuperTypesClassDeclarationCrossReference_3_2_1_0.eContents().get(1);
+                private final Alternatives cAlternatives_4 = (Alternatives)cGroup.eContents().get(4);
+                private final Group cGroup_4_0 = (Group)cAlternatives_4.eContents().get(0);
+                private final Keyword cLeftCurlyBracketKeyword_4_0_0 = (Keyword)cGroup_4_0.eContents().get(0);
+                private final Group cGroup_4_0_1 = (Group)cGroup_4_0.eContents().get(1);
+                private final Assignment cReferenceDeclarationsAssignment_4_0_1_0 = (Assignment)cGroup_4_0_1.eContents().get(0);
+                private final RuleCall cReferenceDeclarationsReferenceDeclarationParserRuleCall_4_0_1_0_0 = (RuleCall)cReferenceDeclarationsAssignment_4_0_1_0.eContents().get(0);
+                private final Keyword cSemicolonKeyword_4_0_1_1 = (Keyword)cGroup_4_0_1.eContents().get(1);
+                private final Keyword cRightCurlyBracketKeyword_4_0_2 = (Keyword)cGroup_4_0.eContents().get(2);
+                private final Keyword cFullStopKeyword_4_1 = (Keyword)cAlternatives_4.eContents().get(1);
                 
                 //ClassDeclaration:
                 //    abstract?="abstract"? "class"
                 //    name=ID
-                //    ("extends" (superTypes+=[ClassDeclaration] |
-                //    "[" (superTypes+=[ClassDeclaration] ("," superTypes+=[ClassDeclaration])*)? "]") |
-                //    referenceDeclarations+=ReferenceDeclaration)?
-                //    ("," referenceDeclarations+=ReferenceDeclaration)*
-                //    ".";
+                //    ("extends" superTypes+=[ClassDeclaration|QualifiedName] ("," superTypes+=[ClassDeclaration|QualifiedName])*)?
+                //    ("{" (referenceDeclarations+=ReferenceDeclaration ";"?)* "}" | ".");
                 @Override public ParserRule getRule() { return rule; }
                 
                 //abstract?="abstract"? "class"
                 //name=ID
-                //("extends" (superTypes+=[ClassDeclaration] |
-                //"[" (superTypes+=[ClassDeclaration] ("," superTypes+=[ClassDeclaration])*)? "]") |
-                //referenceDeclarations+=ReferenceDeclaration)?
-                //("," referenceDeclarations+=ReferenceDeclaration)*
-                //"."
+                //("extends" superTypes+=[ClassDeclaration|QualifiedName] ("," superTypes+=[ClassDeclaration|QualifiedName])*)?
+                //("{" (referenceDeclarations+=ReferenceDeclaration ";"?)* "}" | ".")
                 public Group getGroup() { return cGroup; }
                 
                 //abstract?="abstract"?
@@ -136,87 +150,62 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //ID
                 public RuleCall getNameIDTerminalRuleCall_2_0() { return cNameIDTerminalRuleCall_2_0; }
                 
-                //("extends" (superTypes+=[ClassDeclaration] |
-                //"[" (superTypes+=[ClassDeclaration] ("," superTypes+=[ClassDeclaration])*)? "]") |
-                //referenceDeclarations+=ReferenceDeclaration)?
-                public Alternatives getAlternatives_3() { return cAlternatives_3; }
-                
-                //"extends" (superTypes+=[ClassDeclaration] |
-                //    "[" (superTypes+=[ClassDeclaration] ("," superTypes+=[ClassDeclaration])*)? "]")
-                public Group getGroup_3_0() { return cGroup_3_0; }
+                //("extends" superTypes+=[ClassDeclaration|QualifiedName] ("," superTypes+=[ClassDeclaration|QualifiedName])*)?
+                public Group getGroup_3() { return cGroup_3; }
                 
                 //"extends"
-                public Keyword getExtendsKeyword_3_0_0() { return cExtendsKeyword_3_0_0; }
-                
-                //(superTypes+=[ClassDeclaration] |
-                //   "[" (superTypes+=[ClassDeclaration] ("," superTypes+=[ClassDeclaration])*)? "]")
-                public Alternatives getAlternatives_3_0_1() { return cAlternatives_3_0_1; }
-                
-                //superTypes+=[ClassDeclaration]
-                public Assignment getSuperTypesAssignment_3_0_1_0() { return cSuperTypesAssignment_3_0_1_0; }
-                
-                //[ClassDeclaration]
-                public CrossReference getSuperTypesClassDeclarationCrossReference_3_0_1_0_0() { return cSuperTypesClassDeclarationCrossReference_3_0_1_0_0; }
+                public Keyword getExtendsKeyword_3_0() { return cExtendsKeyword_3_0; }
                 
-                //ID
-                public RuleCall getSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_0_0_1() { return cSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_0_0_1; }
-                
-                //"[" (superTypes+=[ClassDeclaration] ("," superTypes+=[ClassDeclaration])*)? "]"
-                public Group getGroup_3_0_1_1() { return cGroup_3_0_1_1; }
+                //superTypes+=[ClassDeclaration|QualifiedName]
+                public Assignment getSuperTypesAssignment_3_1() { return cSuperTypesAssignment_3_1; }
                 
-                //"["
-                public Keyword getLeftSquareBracketKeyword_3_0_1_1_0() { return cLeftSquareBracketKeyword_3_0_1_1_0; }
+                //[ClassDeclaration|QualifiedName]
+                public CrossReference getSuperTypesClassDeclarationCrossReference_3_1_0() { return cSuperTypesClassDeclarationCrossReference_3_1_0; }
                 
-                //(superTypes+=[ClassDeclaration] ("," superTypes+=[ClassDeclaration])*)?
-                public Group getGroup_3_0_1_1_1() { return cGroup_3_0_1_1_1; }
+                //QualifiedName
+                public RuleCall getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_1_0_1() { return cSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_1_0_1; }
                 
-                //superTypes+=[ClassDeclaration]
-                public Assignment getSuperTypesAssignment_3_0_1_1_1_0() { return cSuperTypesAssignment_3_0_1_1_1_0; }
+                //("," superTypes+=[ClassDeclaration|QualifiedName])*
+                public Group getGroup_3_2() { return cGroup_3_2; }
                 
-                //[ClassDeclaration]
-                public CrossReference getSuperTypesClassDeclarationCrossReference_3_0_1_1_1_0_0() { return cSuperTypesClassDeclarationCrossReference_3_0_1_1_1_0_0; }
+                //","
+                public Keyword getCommaKeyword_3_2_0() { return cCommaKeyword_3_2_0; }
                 
-                //ID
-                public RuleCall getSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_1_1_0_0_1() { return cSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_1_1_0_0_1; }
+                //superTypes+=[ClassDeclaration|QualifiedName]
+                public Assignment getSuperTypesAssignment_3_2_1() { return cSuperTypesAssignment_3_2_1; }
                 
-                //("," superTypes+=[ClassDeclaration])*
-                public Group getGroup_3_0_1_1_1_1() { return cGroup_3_0_1_1_1_1; }
+                //[ClassDeclaration|QualifiedName]
+                public CrossReference getSuperTypesClassDeclarationCrossReference_3_2_1_0() { return cSuperTypesClassDeclarationCrossReference_3_2_1_0; }
                 
-                //","
-                public Keyword getCommaKeyword_3_0_1_1_1_1_0() { return cCommaKeyword_3_0_1_1_1_1_0; }
+                //QualifiedName
+                public RuleCall getSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_2_1_0_1() { return cSuperTypesClassDeclarationQualifiedNameParserRuleCall_3_2_1_0_1; }
                 
-                //superTypes+=[ClassDeclaration]
-                public Assignment getSuperTypesAssignment_3_0_1_1_1_1_1() { return cSuperTypesAssignment_3_0_1_1_1_1_1; }
+                //("{" (referenceDeclarations+=ReferenceDeclaration ";"?)* "}" | ".")
+                public Alternatives getAlternatives_4() { return cAlternatives_4; }
                 
-                //[ClassDeclaration]
-                public CrossReference getSuperTypesClassDeclarationCrossReference_3_0_1_1_1_1_1_0() { return cSuperTypesClassDeclarationCrossReference_3_0_1_1_1_1_1_0; }
+                //"{" (referenceDeclarations+=ReferenceDeclaration ";"?)* "}"
+                public Group getGroup_4_0() { return cGroup_4_0; }
                 
-                //ID
-                public RuleCall getSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_1_1_1_1_0_1() { return cSuperTypesClassDeclarationIDTerminalRuleCall_3_0_1_1_1_1_1_0_1; }
+                //"{"
+                public Keyword getLeftCurlyBracketKeyword_4_0_0() { return cLeftCurlyBracketKeyword_4_0_0; }
                 
-                //"]"
-                public Keyword getRightSquareBracketKeyword_3_0_1_1_2() { return cRightSquareBracketKeyword_3_0_1_1_2; }
+                //(referenceDeclarations+=ReferenceDeclaration ";"?)*
+                public Group getGroup_4_0_1() { return cGroup_4_0_1; }
                 
                 //referenceDeclarations+=ReferenceDeclaration
-                public Assignment getReferenceDeclarationsAssignment_3_1() { return cReferenceDeclarationsAssignment_3_1; }
+                public Assignment getReferenceDeclarationsAssignment_4_0_1_0() { return cReferenceDeclarationsAssignment_4_0_1_0; }
                 
                 //ReferenceDeclaration
-                public RuleCall getReferenceDeclarationsReferenceDeclarationParserRuleCall_3_1_0() { return cReferenceDeclarationsReferenceDeclarationParserRuleCall_3_1_0; }
+                public RuleCall getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_0_1_0_0() { return cReferenceDeclarationsReferenceDeclarationParserRuleCall_4_0_1_0_0; }
                 
-                //("," referenceDeclarations+=ReferenceDeclaration)*
-                public Group getGroup_4() { return cGroup_4; }
+                //";"?
+                public Keyword getSemicolonKeyword_4_0_1_1() { return cSemicolonKeyword_4_0_1_1; }
                 
-                //","
-                public Keyword getCommaKeyword_4_0() { return cCommaKeyword_4_0; }
-                
-                //referenceDeclarations+=ReferenceDeclaration
-                public Assignment getReferenceDeclarationsAssignment_4_1() { return cReferenceDeclarationsAssignment_4_1; }
-                
-                //ReferenceDeclaration
-                public RuleCall getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_1_0() { return cReferenceDeclarationsReferenceDeclarationParserRuleCall_4_1_0; }
+                //"}"
+                public Keyword getRightCurlyBracketKeyword_4_0_2() { return cRightCurlyBracketKeyword_4_0_2; }
                 
                 //"."
-                public Keyword getFullStopKeyword_5() { return cFullStopKeyword_5; }
+                public Keyword getFullStopKeyword_4_1() { return cFullStopKeyword_4_1; }
         }
         public class ReferenceDeclarationElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.ReferenceDeclaration");
@@ -227,30 +216,31 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 private final Keyword cRefersKeyword_0_1 = (Keyword)cAlternatives_0.eContents().get(1);
                 private final Assignment cReferenceTypeAssignment_1 = (Assignment)cGroup.eContents().get(1);
                 private final CrossReference cReferenceTypeClassDeclarationCrossReference_1_0 = (CrossReference)cReferenceTypeAssignment_1.eContents().get(0);
-                private final RuleCall cReferenceTypeClassDeclarationIDTerminalRuleCall_1_0_1 = (RuleCall)cReferenceTypeClassDeclarationCrossReference_1_0.eContents().get(1);
-                private final Keyword cLeftSquareBracketKeyword_2 = (Keyword)cGroup.eContents().get(2);
-                private final Assignment cMultiplicityAssignment_3 = (Assignment)cGroup.eContents().get(3);
-                private final RuleCall cMultiplicityMultiplicityParserRuleCall_3_0 = (RuleCall)cMultiplicityAssignment_3.eContents().get(0);
-                private final Keyword cRightSquareBracketKeyword_4 = (Keyword)cGroup.eContents().get(4);
-                private final Assignment cNameAssignment_5 = (Assignment)cGroup.eContents().get(5);
-                private final RuleCall cNameIDTerminalRuleCall_5_0 = (RuleCall)cNameAssignment_5.eContents().get(0);
-                private final Group cGroup_6 = (Group)cGroup.eContents().get(6);
-                private final Keyword cOppositeKeyword_6_0 = (Keyword)cGroup_6.eContents().get(0);
-                private final Assignment cOppositeAssignment_6_1 = (Assignment)cGroup_6.eContents().get(1);
-                private final CrossReference cOppositeReferenceDeclarationCrossReference_6_1_0 = (CrossReference)cOppositeAssignment_6_1.eContents().get(0);
-                private final RuleCall cOppositeReferenceDeclarationQualifiedNameParserRuleCall_6_1_0_1 = (RuleCall)cOppositeReferenceDeclarationCrossReference_6_1_0.eContents().get(1);
+                private final RuleCall cReferenceTypeClassDeclarationQualifiedNameParserRuleCall_1_0_1 = (RuleCall)cReferenceTypeClassDeclarationCrossReference_1_0.eContents().get(1);
+                private final Group cGroup_2 = (Group)cGroup.eContents().get(2);
+                private final Keyword cLeftSquareBracketKeyword_2_0 = (Keyword)cGroup_2.eContents().get(0);
+                private final Assignment cMultiplicityAssignment_2_1 = (Assignment)cGroup_2.eContents().get(1);
+                private final RuleCall cMultiplicityMultiplicityParserRuleCall_2_1_0 = (RuleCall)cMultiplicityAssignment_2_1.eContents().get(0);
+                private final Keyword cRightSquareBracketKeyword_2_2 = (Keyword)cGroup_2.eContents().get(2);
+                private final Assignment cNameAssignment_3 = (Assignment)cGroup.eContents().get(3);
+                private final RuleCall cNameIDTerminalRuleCall_3_0 = (RuleCall)cNameAssignment_3.eContents().get(0);
+                private final Group cGroup_4 = (Group)cGroup.eContents().get(4);
+                private final Keyword cOppositeKeyword_4_0 = (Keyword)cGroup_4.eContents().get(0);
+                private final Assignment cOppositeAssignment_4_1 = (Assignment)cGroup_4.eContents().get(1);
+                private final CrossReference cOppositeReferenceDeclarationCrossReference_4_1_0 = (CrossReference)cOppositeAssignment_4_1.eContents().get(0);
+                private final RuleCall cOppositeReferenceDeclarationQualifiedNameParserRuleCall_4_1_0_1 = (RuleCall)cOppositeReferenceDeclarationCrossReference_4_1_0.eContents().get(1);
                 
                 //ReferenceDeclaration:
                 //    (containment?="contains" | "refers")
-                //    referenceType=[ClassDeclaration]
-                //    "[" multiplicity=Multiplicity "]"
+                //    referenceType=[ClassDeclaration|QualifiedName]
+                //    ("[" multiplicity=Multiplicity "]")?
                 //    name=ID
                 //    ("opposite" opposite=[ReferenceDeclaration|QualifiedName])?;
                 @Override public ParserRule getRule() { return rule; }
                 
                 //(containment?="contains" | "refers")
-                //referenceType=[ClassDeclaration]
-                //"[" multiplicity=Multiplicity "]"
+                //referenceType=[ClassDeclaration|QualifiedName]
+                //("[" multiplicity=Multiplicity "]")?
                 //name=ID
                 //("opposite" opposite=[ReferenceDeclaration|QualifiedName])?
                 public Group getGroup() { return cGroup; }
@@ -267,47 +257,50 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //"refers"
                 public Keyword getRefersKeyword_0_1() { return cRefersKeyword_0_1; }
                 
-                //referenceType=[ClassDeclaration]
+                //referenceType=[ClassDeclaration|QualifiedName]
                 public Assignment getReferenceTypeAssignment_1() { return cReferenceTypeAssignment_1; }
                 
-                //[ClassDeclaration]
+                //[ClassDeclaration|QualifiedName]
                 public CrossReference getReferenceTypeClassDeclarationCrossReference_1_0() { return cReferenceTypeClassDeclarationCrossReference_1_0; }
                 
-                //ID
-                public RuleCall getReferenceTypeClassDeclarationIDTerminalRuleCall_1_0_1() { return cReferenceTypeClassDeclarationIDTerminalRuleCall_1_0_1; }
+                //QualifiedName
+                public RuleCall getReferenceTypeClassDeclarationQualifiedNameParserRuleCall_1_0_1() { return cReferenceTypeClassDeclarationQualifiedNameParserRuleCall_1_0_1; }
+                
+                //("[" multiplicity=Multiplicity "]")?
+                public Group getGroup_2() { return cGroup_2; }
                 
                 //"["
-                public Keyword getLeftSquareBracketKeyword_2() { return cLeftSquareBracketKeyword_2; }
+                public Keyword getLeftSquareBracketKeyword_2_0() { return cLeftSquareBracketKeyword_2_0; }
                 
                 //multiplicity=Multiplicity
-                public Assignment getMultiplicityAssignment_3() { return cMultiplicityAssignment_3; }
+                public Assignment getMultiplicityAssignment_2_1() { return cMultiplicityAssignment_2_1; }
                 
                 //Multiplicity
-                public RuleCall getMultiplicityMultiplicityParserRuleCall_3_0() { return cMultiplicityMultiplicityParserRuleCall_3_0; }
+                public RuleCall getMultiplicityMultiplicityParserRuleCall_2_1_0() { return cMultiplicityMultiplicityParserRuleCall_2_1_0; }
                 
                 //"]"
-                public Keyword getRightSquareBracketKeyword_4() { return cRightSquareBracketKeyword_4; }
+                public Keyword getRightSquareBracketKeyword_2_2() { return cRightSquareBracketKeyword_2_2; }
                 
                 //name=ID
-                public Assignment getNameAssignment_5() { return cNameAssignment_5; }
+                public Assignment getNameAssignment_3() { return cNameAssignment_3; }
                 
                 //ID
-                public RuleCall getNameIDTerminalRuleCall_5_0() { return cNameIDTerminalRuleCall_5_0; }
+                public RuleCall getNameIDTerminalRuleCall_3_0() { return cNameIDTerminalRuleCall_3_0; }
                 
                 //("opposite" opposite=[ReferenceDeclaration|QualifiedName])?
-                public Group getGroup_6() { return cGroup_6; }
+                public Group getGroup_4() { return cGroup_4; }
                 
                 //"opposite"
-                public Keyword getOppositeKeyword_6_0() { return cOppositeKeyword_6_0; }
+                public Keyword getOppositeKeyword_4_0() { return cOppositeKeyword_4_0; }
                 
                 //opposite=[ReferenceDeclaration|QualifiedName]
-                public Assignment getOppositeAssignment_6_1() { return cOppositeAssignment_6_1; }
+                public Assignment getOppositeAssignment_4_1() { return cOppositeAssignment_4_1; }
                 
                 //[ReferenceDeclaration|QualifiedName]
-                public CrossReference getOppositeReferenceDeclarationCrossReference_6_1_0() { return cOppositeReferenceDeclarationCrossReference_6_1_0; }
+                public CrossReference getOppositeReferenceDeclarationCrossReference_4_1_0() { return cOppositeReferenceDeclarationCrossReference_4_1_0; }
                 
                 //QualifiedName
-                public RuleCall getOppositeReferenceDeclarationQualifiedNameParserRuleCall_6_1_0_1() { return cOppositeReferenceDeclarationQualifiedNameParserRuleCall_6_1_0_1; }
+                public RuleCall getOppositeReferenceDeclarationQualifiedNameParserRuleCall_4_1_0_1() { return cOppositeReferenceDeclarationQualifiedNameParserRuleCall_4_1_0_1; }
         }
         public class PredicateDefinitionElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.PredicateDefinition");
@@ -330,7 +323,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 private final RuleCall cParametersParameterParserRuleCall_3_1_1_0 = (RuleCall)cParametersAssignment_3_1_1.eContents().get(0);
                 private final Keyword cRightParenthesisKeyword_4 = (Keyword)cGroup.eContents().get(4);
                 private final Group cGroup_5 = (Group)cGroup.eContents().get(5);
-                private final Keyword cColonEqualsSignKeyword_5_0 = (Keyword)cGroup_5.eContents().get(0);
+                private final Keyword cColonHyphenMinusKeyword_5_0 = (Keyword)cGroup_5.eContents().get(0);
                 private final Assignment cBodiesAssignment_5_1 = (Assignment)cGroup_5.eContents().get(1);
                 private final RuleCall cBodiesConjunctionParserRuleCall_5_1_0 = (RuleCall)cBodiesAssignment_5_1.eContents().get(0);
                 private final Group cGroup_5_2 = (Group)cGroup_5.eContents().get(2);
@@ -343,14 +336,14 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //    (error?="error" "pred"? | "pred")
                 //    name=ID
                 //    "(" (parameters+=Parameter ("," parameters+=Parameter)*)? ")"
-                //    (":=" bodies+=Conjunction (";" bodies+=Conjunction)*)?
+                //    (":-" bodies+=Conjunction (";" bodies+=Conjunction)*)?
                 //    ".";
                 @Override public ParserRule getRule() { return rule; }
                 
                 //(error?="error" "pred"? | "pred")
                 //name=ID
                 //"(" (parameters+=Parameter ("," parameters+=Parameter)*)? ")"
-                //(":=" bodies+=Conjunction (";" bodies+=Conjunction)*)?
+                //(":-" bodies+=Conjunction (";" bodies+=Conjunction)*)?
                 //"."
                 public Group getGroup() { return cGroup; }
                 
@@ -405,11 +398,11 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //")"
                 public Keyword getRightParenthesisKeyword_4() { return cRightParenthesisKeyword_4; }
                 
-                //(":=" bodies+=Conjunction (";" bodies+=Conjunction)*)?
+                //(":-" bodies+=Conjunction (";" bodies+=Conjunction)*)?
                 public Group getGroup_5() { return cGroup_5; }
                 
-                //":="
-                public Keyword getColonEqualsSignKeyword_5_0() { return cColonEqualsSignKeyword_5_0; }
+                //":-"
+                public Keyword getColonHyphenMinusKeyword_5_0() { return cColonHyphenMinusKeyword_5_0; }
                 
                 //bodies+=Conjunction
                 public Assignment getBodiesAssignment_5_1() { return cBodiesAssignment_5_1; }
@@ -551,24 +544,22 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 private final Keyword cLeftParenthesisKeyword_2 = (Keyword)cGroup.eContents().get(2);
                 private final Group cGroup_3 = (Group)cGroup.eContents().get(3);
                 private final Assignment cArgumentsAssignment_3_0 = (Assignment)cGroup_3.eContents().get(0);
-                private final CrossReference cArgumentsVariableCrossReference_3_0_0 = (CrossReference)cArgumentsAssignment_3_0.eContents().get(0);
-                private final RuleCall cArgumentsVariableIDTerminalRuleCall_3_0_0_1 = (RuleCall)cArgumentsVariableCrossReference_3_0_0.eContents().get(1);
+                private final RuleCall cArgumentsArgumentParserRuleCall_3_0_0 = (RuleCall)cArgumentsAssignment_3_0.eContents().get(0);
                 private final Group cGroup_3_1 = (Group)cGroup_3.eContents().get(1);
                 private final Keyword cCommaKeyword_3_1_0 = (Keyword)cGroup_3_1.eContents().get(0);
                 private final Assignment cArgumentsAssignment_3_1_1 = (Assignment)cGroup_3_1.eContents().get(1);
-                private final CrossReference cArgumentsVariableCrossReference_3_1_1_0 = (CrossReference)cArgumentsAssignment_3_1_1.eContents().get(0);
-                private final RuleCall cArgumentsVariableIDTerminalRuleCall_3_1_1_0_1 = (RuleCall)cArgumentsVariableCrossReference_3_1_1_0.eContents().get(1);
+                private final RuleCall cArgumentsArgumentParserRuleCall_3_1_1_0 = (RuleCall)cArgumentsAssignment_3_1_1.eContents().get(0);
                 private final Keyword cRightParenthesisKeyword_4 = (Keyword)cGroup.eContents().get(4);
                 
                 //Atom:
                 //    relation=[Relation|QualifiedName]
                 //    transitiveClosure?="+"?
-                //    "(" (arguments+=[Variable] ("," arguments+=[Variable])*)? ")";
+                //    "(" (arguments+=Argument ("," arguments+=Argument)*)? ")";
                 @Override public ParserRule getRule() { return rule; }
                 
                 //relation=[Relation|QualifiedName]
                 //transitiveClosure?="+"?
-                //"(" (arguments+=[Variable] ("," arguments+=[Variable])*)? ")"
+                //"(" (arguments+=Argument ("," arguments+=Argument)*)? ")"
                 public Group getGroup() { return cGroup; }
                 
                 //relation=[Relation|QualifiedName]
@@ -589,36 +580,49 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //"("
                 public Keyword getLeftParenthesisKeyword_2() { return cLeftParenthesisKeyword_2; }
                 
-                //(arguments+=[Variable] ("," arguments+=[Variable])*)?
+                //(arguments+=Argument ("," arguments+=Argument)*)?
                 public Group getGroup_3() { return cGroup_3; }
                 
-                //arguments+=[Variable]
+                //arguments+=Argument
                 public Assignment getArgumentsAssignment_3_0() { return cArgumentsAssignment_3_0; }
                 
-                //[Variable]
-                public CrossReference getArgumentsVariableCrossReference_3_0_0() { return cArgumentsVariableCrossReference_3_0_0; }
-                
-                //ID
-                public RuleCall getArgumentsVariableIDTerminalRuleCall_3_0_0_1() { return cArgumentsVariableIDTerminalRuleCall_3_0_0_1; }
+                //Argument
+                public RuleCall getArgumentsArgumentParserRuleCall_3_0_0() { return cArgumentsArgumentParserRuleCall_3_0_0; }
                 
-                //("," arguments+=[Variable])*
+                //("," arguments+=Argument)*
                 public Group getGroup_3_1() { return cGroup_3_1; }
                 
                 //","
                 public Keyword getCommaKeyword_3_1_0() { return cCommaKeyword_3_1_0; }
                 
-                //arguments+=[Variable]
+                //arguments+=Argument
                 public Assignment getArgumentsAssignment_3_1_1() { return cArgumentsAssignment_3_1_1; }
                 
-                //[Variable]
-                public CrossReference getArgumentsVariableCrossReference_3_1_1_0() { return cArgumentsVariableCrossReference_3_1_1_0; }
-                
-                //ID
-                public RuleCall getArgumentsVariableIDTerminalRuleCall_3_1_1_0_1() { return cArgumentsVariableIDTerminalRuleCall_3_1_1_0_1; }
+                //Argument
+                public RuleCall getArgumentsArgumentParserRuleCall_3_1_1_0() { return cArgumentsArgumentParserRuleCall_3_1_1_0; }
                 
                 //")"
                 public Keyword getRightParenthesisKeyword_4() { return cRightParenthesisKeyword_4; }
         }
+        public class ArgumentElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.Argument");
+                private final Assignment cVariableAssignment = (Assignment)rule.eContents().get(1);
+                private final CrossReference cVariableVariableCrossReference_0 = (CrossReference)cVariableAssignment.eContents().get(0);
+                private final RuleCall cVariableVariableIDTerminalRuleCall_0_1 = (RuleCall)cVariableVariableCrossReference_0.eContents().get(1);
+                
+                //Argument:
+                //    variable=[Variable];
+                @Override public ParserRule getRule() { return rule; }
+                
+                //variable=[Variable]
+                public Assignment getVariableAssignment() { return cVariableAssignment; }
+                
+                //[Variable]
+                public CrossReference getVariableVariableCrossReference_0() { return cVariableVariableCrossReference_0; }
+                
+                //ID
+                public RuleCall getVariableVariableIDTerminalRuleCall_0_1() { return cVariableVariableIDTerminalRuleCall_0_1; }
+        }
         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);
@@ -853,17 +857,17 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 private final Keyword cIncrementPlusSignEqualsSignKeyword_1_0_0 = (Keyword)cIncrementAssignment_1_0.eContents().get(0);
                 private final Keyword cEqualsSignKeyword_1_1 = (Keyword)cAlternatives_1.eContents().get(1);
                 private final Assignment cMultiplicityAssignment_2 = (Assignment)cGroup.eContents().get(2);
-                private final RuleCall cMultiplicityMultiplicityParserRuleCall_2_0 = (RuleCall)cMultiplicityAssignment_2.eContents().get(0);
+                private final RuleCall cMultiplicityDefiniteMultiplicityParserRuleCall_2_0 = (RuleCall)cMultiplicityAssignment_2.eContents().get(0);
                 
                 //TypeScope:
                 //    targetType=[ClassDeclaration]
                 //    (increment?="+=" | "=")
-                //    multiplicity=Multiplicity;
+                //    multiplicity=DefiniteMultiplicity;
                 @Override public ParserRule getRule() { return rule; }
                 
                 //targetType=[ClassDeclaration]
                 //(increment?="+=" | "=")
-                //multiplicity=Multiplicity
+                //multiplicity=DefiniteMultiplicity
                 public Group getGroup() { return cGroup; }
                 
                 //targetType=[ClassDeclaration]
@@ -887,19 +891,38 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //"="
                 public Keyword getEqualsSignKeyword_1_1() { return cEqualsSignKeyword_1_1; }
                 
-                //multiplicity=Multiplicity
+                //multiplicity=DefiniteMultiplicity
                 public Assignment getMultiplicityAssignment_2() { return cMultiplicityAssignment_2; }
                 
-                //Multiplicity
-                public RuleCall getMultiplicityMultiplicityParserRuleCall_2_0() { return cMultiplicityMultiplicityParserRuleCall_2_0; }
+                //DefiniteMultiplicity
+                public RuleCall getMultiplicityDefiniteMultiplicityParserRuleCall_2_0() { return cMultiplicityDefiniteMultiplicityParserRuleCall_2_0; }
         }
         public class MultiplicityElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.Multiplicity");
                 private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final RuleCall cUnboundedMultiplicityParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final RuleCall cDefiniteMultiplicityParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
+                
+                //Multiplicity:
+                //    UnboundedMultiplicity | DefiniteMultiplicity;
+                @Override public ParserRule getRule() { return rule; }
+                
+                //UnboundedMultiplicity | DefiniteMultiplicity
+                public Alternatives getAlternatives() { return cAlternatives; }
+                
+                //UnboundedMultiplicity
+                public RuleCall getUnboundedMultiplicityParserRuleCall_0() { return cUnboundedMultiplicityParserRuleCall_0; }
+                
+                //DefiniteMultiplicity
+                public RuleCall getDefiniteMultiplicityParserRuleCall_1() { return cDefiniteMultiplicityParserRuleCall_1; }
+        }
+        public class DefiniteMultiplicityElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.DefiniteMultiplicity");
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
                 private final RuleCall cRangeMultiplicityParserRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
                 private final RuleCall cExactMultiplicityParserRuleCall_1 = (RuleCall)cAlternatives.eContents().get(1);
                 
-                //Multiplicity:
+                //DefiniteMultiplicity returns Multiplicity:
                 //    RangeMultiplicity | ExactMultiplicity;
                 @Override public ParserRule getRule() { return rule; }
                 
@@ -912,6 +935,17 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 //ExactMultiplicity
                 public RuleCall getExactMultiplicityParserRuleCall_1() { return cExactMultiplicityParserRuleCall_1; }
         }
+        public class UnboundedMultiplicityElements extends AbstractParserRuleElementFinder {
+                private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.UnboundedMultiplicity");
+                private final Action cUnboundedMultiplicityAction = (Action)rule.eContents().get(1);
+                
+                //UnboundedMultiplicity:
+                //    {UnboundedMultiplicity};
+                @Override public ParserRule getRule() { return rule; }
+                
+                //{UnboundedMultiplicity}
+                public Action getUnboundedMultiplicityAction() { return cUnboundedMultiplicityAction; }
+        }
         public class RangeMultiplicityElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.RangeMultiplicity");
                 private final Group cGroup = (Group)rule.eContents().get(1);
@@ -979,30 +1013,50 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         }
         public class QualifiedNameElements extends AbstractParserRuleElementFinder {
                 private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "org.eclipse.viatra.solver.language.Problem.QualifiedName");
-                private final Group cGroup = (Group)rule.eContents().get(1);
-                private final RuleCall cIDTerminalRuleCall_0 = (RuleCall)cGroup.eContents().get(0);
-                private final Group cGroup_1 = (Group)cGroup.eContents().get(1);
-                private final Keyword cColonColonKeyword_1_0 = (Keyword)cGroup_1.eContents().get(0);
-                private final RuleCall cIDTerminalRuleCall_1_1 = (RuleCall)cGroup_1.eContents().get(1);
+                private final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);
+                private final RuleCall cQUOTED_IDTerminalRuleCall_0 = (RuleCall)cAlternatives.eContents().get(0);
+                private final Group cGroup_1 = (Group)cAlternatives.eContents().get(1);
+                private final RuleCall cIDTerminalRuleCall_1_0 = (RuleCall)cGroup_1.eContents().get(0);
+                private final Group cGroup_1_1 = (Group)cGroup_1.eContents().get(1);
+                private final Keyword cColonKeyword_1_1_0 = (Keyword)cGroup_1_1.eContents().get(0);
+                private final RuleCall cIDTerminalRuleCall_1_1_1 = (RuleCall)cGroup_1_1.eContents().get(1);
+                private final Group cGroup_1_2 = (Group)cGroup_1.eContents().get(2);
+                private final Keyword cColonKeyword_1_2_0 = (Keyword)cGroup_1_2.eContents().get(0);
+                private final RuleCall cQUOTED_IDTerminalRuleCall_1_2_1 = (RuleCall)cGroup_1_2.eContents().get(1);
                 
                 //QualifiedName:
-                //    ID ("::" ID)*;
+                //    QUOTED_ID | ID (":" ID)* (":" QUOTED_ID)?;
                 @Override public ParserRule getRule() { return rule; }
                 
-                //ID ("::" ID)*
-                public Group getGroup() { return cGroup; }
+                //QUOTED_ID | ID (":" ID)* (":" QUOTED_ID)?
+                public Alternatives getAlternatives() { return cAlternatives; }
                 
-                //ID
-                public RuleCall getIDTerminalRuleCall_0() { return cIDTerminalRuleCall_0; }
+                //QUOTED_ID
+                public RuleCall getQUOTED_IDTerminalRuleCall_0() { return cQUOTED_IDTerminalRuleCall_0; }
                 
-                //("::" ID)*
+                //ID (":" ID)* (":" QUOTED_ID)?
                 public Group getGroup_1() { return cGroup_1; }
                 
-                //"::"
-                public Keyword getColonColonKeyword_1_0() { return cColonColonKeyword_1_0; }
+                //ID
+                public RuleCall getIDTerminalRuleCall_1_0() { return cIDTerminalRuleCall_1_0; }
+                
+                //(":" ID)*
+                public Group getGroup_1_1() { return cGroup_1_1; }
+                
+                //":"
+                public Keyword getColonKeyword_1_1_0() { return cColonKeyword_1_1_0; }
                 
                 //ID
-                public RuleCall getIDTerminalRuleCall_1_1() { return cIDTerminalRuleCall_1_1; }
+                public RuleCall getIDTerminalRuleCall_1_1_1() { return cIDTerminalRuleCall_1_1_1; }
+                
+                //(":" QUOTED_ID)?
+                public Group getGroup_1_2() { return cGroup_1_2; }
+                
+                //":"
+                public Keyword getColonKeyword_1_2_0() { return cColonKeyword_1_2_0; }
+                
+                //QUOTED_ID
+                public RuleCall getQUOTED_IDTerminalRuleCall_1_2_1() { return cQUOTED_IDTerminalRuleCall_1_2_1; }
         }
         
         public class LogicValueElements extends AbstractElementFinder.AbstractEnumRuleElementFinder {
@@ -1078,16 +1132,21 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         private final LiteralElements pLiteral;
         private final NegativeLiteralElements pNegativeLiteral;
         private final AtomElements pAtom;
+        private final ArgumentElements pArgument;
         private final AssertionElements pAssertion;
         private final LogicValueElements eLogicValue;
         private final ShortLogicValueElements eShortLogicValue;
         private final ScopeDeclarationElements pScopeDeclaration;
         private final TypeScopeElements pTypeScope;
         private final MultiplicityElements pMultiplicity;
+        private final DefiniteMultiplicityElements pDefiniteMultiplicity;
+        private final UnboundedMultiplicityElements pUnboundedMultiplicity;
         private final RangeMultiplicityElements pRangeMultiplicity;
         private final ExactMultiplicityElements pExactMultiplicity;
         private final UpperBoundElements pUpperBound;
         private final QualifiedNameElements pQualifiedName;
+        private final TerminalRule tSTRING;
+        private final TerminalRule tQUOTED_ID;
         
         private final Grammar grammar;
         
@@ -1108,16 +1167,21 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 this.pLiteral = new LiteralElements();
                 this.pNegativeLiteral = new NegativeLiteralElements();
                 this.pAtom = new AtomElements();
+                this.pArgument = new ArgumentElements();
                 this.pAssertion = new AssertionElements();
                 this.eLogicValue = new LogicValueElements();
                 this.eShortLogicValue = new ShortLogicValueElements();
                 this.pScopeDeclaration = new ScopeDeclarationElements();
                 this.pTypeScope = new TypeScopeElements();
                 this.pMultiplicity = new MultiplicityElements();
+                this.pDefiniteMultiplicity = new DefiniteMultiplicityElements();
+                this.pUnboundedMultiplicity = new UnboundedMultiplicityElements();
                 this.pRangeMultiplicity = new RangeMultiplicityElements();
                 this.pExactMultiplicity = new ExactMultiplicityElements();
                 this.pUpperBound = new UpperBoundElements();
                 this.pQualifiedName = new QualifiedNameElements();
+                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");
         }
         
         protected Grammar internalFindGrammar(GrammarProvider grammarProvider) {
@@ -1148,6 +1212,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
 
         
         //Problem:
+        //    ("problem" name=ID ".")?
         //    statements+=Statement*;
         public ProblemElements getProblemAccess() {
                 return pProblem;
@@ -1170,11 +1235,8 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         //ClassDeclaration:
         //    abstract?="abstract"? "class"
         //    name=ID
-        //    ("extends" (superTypes+=[ClassDeclaration] |
-        //    "[" (superTypes+=[ClassDeclaration] ("," superTypes+=[ClassDeclaration])*)? "]") |
-        //    referenceDeclarations+=ReferenceDeclaration)?
-        //    ("," referenceDeclarations+=ReferenceDeclaration)*
-        //    ".";
+        //    ("extends" superTypes+=[ClassDeclaration|QualifiedName] ("," superTypes+=[ClassDeclaration|QualifiedName])*)?
+        //    ("{" (referenceDeclarations+=ReferenceDeclaration ";"?)* "}" | ".");
         public ClassDeclarationElements getClassDeclarationAccess() {
                 return pClassDeclaration;
         }
@@ -1185,8 +1247,8 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         
         //ReferenceDeclaration:
         //    (containment?="contains" | "refers")
-        //    referenceType=[ClassDeclaration]
-        //    "[" multiplicity=Multiplicity "]"
+        //    referenceType=[ClassDeclaration|QualifiedName]
+        //    ("[" multiplicity=Multiplicity "]")?
         //    name=ID
         //    ("opposite" opposite=[ReferenceDeclaration|QualifiedName])?;
         public ReferenceDeclarationElements getReferenceDeclarationAccess() {
@@ -1201,7 +1263,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         //    (error?="error" "pred"? | "pred")
         //    name=ID
         //    "(" (parameters+=Parameter ("," parameters+=Parameter)*)? ")"
-        //    (":=" bodies+=Conjunction (";" bodies+=Conjunction)*)?
+        //    (":-" bodies+=Conjunction (";" bodies+=Conjunction)*)?
         //    ".";
         public PredicateDefinitionElements getPredicateDefinitionAccess() {
                 return pPredicateDefinition;
@@ -1254,7 +1316,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         //Atom:
         //    relation=[Relation|QualifiedName]
         //    transitiveClosure?="+"?
-        //    "(" (arguments+=[Variable] ("," arguments+=[Variable])*)? ")";
+        //    "(" (arguments+=Argument ("," arguments+=Argument)*)? ")";
         public AtomElements getAtomAccess() {
                 return pAtom;
         }
@@ -1263,6 +1325,16 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 return getAtomAccess().getRule();
         }
         
+        //Argument:
+        //    variable=[Variable];
+        public ArgumentElements getArgumentAccess() {
+                return pArgument;
+        }
+        
+        public ParserRule getArgumentRule() {
+                return getArgumentAccess().getRule();
+        }
+        
         //Assertion:
         //    (relation=[Relation|QualifiedName]
         //    "(" (arguments+=[Node|QualifiedName] ("," arguments+=[Node|QualifiedName])*)? ")"
@@ -1312,7 +1384,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         //TypeScope:
         //    targetType=[ClassDeclaration]
         //    (increment?="+=" | "=")
-        //    multiplicity=Multiplicity;
+        //    multiplicity=DefiniteMultiplicity;
         public TypeScopeElements getTypeScopeAccess() {
                 return pTypeScope;
         }
@@ -1322,7 +1394,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         }
         
         //Multiplicity:
-        //    RangeMultiplicity | ExactMultiplicity;
+        //    UnboundedMultiplicity | DefiniteMultiplicity;
         public MultiplicityElements getMultiplicityAccess() {
                 return pMultiplicity;
         }
@@ -1331,6 +1403,26 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 return getMultiplicityAccess().getRule();
         }
         
+        //DefiniteMultiplicity returns Multiplicity:
+        //    RangeMultiplicity | ExactMultiplicity;
+        public DefiniteMultiplicityElements getDefiniteMultiplicityAccess() {
+                return pDefiniteMultiplicity;
+        }
+        
+        public ParserRule getDefiniteMultiplicityRule() {
+                return getDefiniteMultiplicityAccess().getRule();
+        }
+        
+        //UnboundedMultiplicity:
+        //    {UnboundedMultiplicity};
+        public UnboundedMultiplicityElements getUnboundedMultiplicityAccess() {
+                return pUnboundedMultiplicity;
+        }
+        
+        public ParserRule getUnboundedMultiplicityRule() {
+                return getUnboundedMultiplicityAccess().getRule();
+        }
+        
         //RangeMultiplicity:
         //    lowerBound=INT ".." upperBound=UpperBound;
         public RangeMultiplicityElements getRangeMultiplicityAccess() {
@@ -1362,7 +1454,7 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
         }
         
         //QualifiedName:
-        //    ID ("::" ID)*;
+        //    QUOTED_ID | ID (":" ID)* (":" QUOTED_ID)?;
         public QualifiedNameElements getQualifiedNameAccess() {
                 return pQualifiedName;
         }
@@ -1371,6 +1463,17 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 return getQualifiedNameAccess().getRule();
         }
         
+        //@Override
+        //terminal STRING: '"' ( '\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\'|'"') )* '"';
+        public TerminalRule getSTRINGRule() {
+                return tSTRING;
+        }
+        
+        //terminal QUOTED_ID: "'" ( '\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\'|"'") )* "'";
+        public TerminalRule getQUOTED_IDRule() {
+                return tQUOTED_ID;
+        }
+        
         //terminal ID: '^'?('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
         public TerminalRule getIDRule() {
                 return gaTerminals.getIDRule();
@@ -1381,14 +1484,6 @@ public class ProblemGrammarAccess extends AbstractElementFinder.AbstractGrammarE
                 return gaTerminals.getINTRule();
         }
         
-        //terminal STRING:
-        //            '"' ( '\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\'|'"') )* '"' |
-        //            "'" ( '\\' . /* 'b'|'t'|'n'|'f'|'r'|'u'|'"'|"'"|'\\' */ | !('\\'|"'") )* "'"
-        //        ;
-        public TerminalRule getSTRINGRule() {
-                return gaTerminals.getSTRINGRule();
-        }
-        
         //terminal ML_COMMENT : '/*' -> '*/';
         public TerminalRule getML_COMMENTRule() {
                 return gaTerminals.getML_COMMENTRule();