FIx scoping, extend grammar

1 files changed, 1417 insertions, 991 deletions

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