1 files changed, 1665 insertions, 851 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 c4f19943..28b54551 100644
--- a/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemParser.java
+++ b/org.eclipse.viatra.solver.language.parent/org.eclipse.viatra.solver.language/src/main/xtext-gen/org/eclipse/viatra/solver/language/parser/antlr/internal/InternalProblemParser.java
@@ -22,33 +22,18 @@ import java.util.ArrayList;
 @SuppressWarnings("all")
 public class InternalProblemParser extends AbstractInternalAntlrParser {
     public static final String[] tokenNames = new String[] {
-        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INT", "RULE_QUOTED_ID", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'problem'", "'.'", "'abstract'", "'class'", "'extends'", "','", "'{'", "';'", "'}'", "'contains'", "'refers'", "'['", "']'", "'opposite'", "'error'", "'pred'", "'('", "')'", "':-'", "'!'", "'+'", "':'", "'scope'", "'+='", "'='", "'..'", "'*'", "'true'", "'false'", "'unknown'", "'?'"
+        "<invalid>", "<EOR>", "<DOWN>", "<UP>", "RULE_ID", "RULE_INT", "RULE_QUOTED_ID", "RULE_STRING", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_WS", "RULE_ANY_OTHER", "'problem'", "'.'", "'abstract'", "'class'", "'extends'", "','", "'{'", "';'", "'}'", "'enum'", "'contains'", "'refers'", "'['", "']'", "'opposite'", "'error'", "'pred'", "'('", "')'", "':-'", "'!'", "'+'", "':'", "'scope'", "'+='", "'='", "'..'", "'*'", "'true'", "'false'", "'unknown'", "'?'"
     };
-    public static final int RULE_STRING=7;
-    public static final int RULE_SL_COMMENT=9;
     public static final int T__19=19;
     public static final int T__15=15;
-    public static final int T__37=37;
     public static final int T__16=16;
-    public static final int T__38=38;
     public static final int T__17=17;
-    public static final int T__39=39;
     public static final int T__18=18;
-    public static final int T__33=33;
     public static final int T__12=12;
-    public static final int T__34=34;
     public static final int T__13=13;
-    public static final int T__35=35;
     public static final int T__14=14;
-    public static final int T__36=36;
-    public static final int EOF=-1;
-    public static final int T__30=30;
-    public static final int T__31=31;
-    public static final int T__32=32;
     public static final int RULE_ID=4;
-    public static final int RULE_WS=10;
     public static final int RULE_QUOTED_ID=6;
-    public static final int RULE_ANY_OTHER=11;
     public static final int T__26=26;
     public static final int T__27=27;
     public static final int T__28=28;
@@ -59,11 +44,27 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     public static final int T__23=23;
     public static final int T__24=24;
     public static final int T__25=25;
+    public static final int T__20=20;
+    public static final int T__21=21;
+    public static final int RULE_STRING=7;
+    public static final int RULE_SL_COMMENT=9;
+    public static final int T__37=37;
+    public static final int T__38=38;
+    public static final int T__39=39;
+    public static final int T__33=33;
+    public static final int T__34=34;
+    public static final int T__35=35;
+    public static final int T__36=36;
+    public static final int EOF=-1;
+    public static final int T__30=30;
+    public static final int T__31=31;
+    public static final int T__32=32;
+    public static final int RULE_WS=10;
+    public static final int RULE_ANY_OTHER=11;
     public static final int T__40=40;
     public static final int T__41=41;
-    public static final int T__20=20;
     public static final int T__42=42;
-    public static final int T__21=21;
+    public static final int T__43=43;
 
     // delegates
     // delegators
@@ -141,13 +142,14 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleProblem"
-    // InternalProblem.g:72:1: ruleProblem returns [EObject current=null] : ( (otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* ) ;
+    // InternalProblem.g:72:1: ruleProblem returns [EObject current=null] : ( (otherlv_0= 'problem' ( (lv_name_1_0= ruleIdentifier ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* ) ;
     public final EObject ruleProblem() throws RecognitionException {
         EObject current = null;
 
         Token otherlv_0=null;
-        Token lv_name_1_0=null;
         Token otherlv_2=null;
+        AntlrDatatypeRuleToken lv_name_1_0 = null;
+
         EObject lv_statements_3_0 = null;
 
 
@@ -155,13 +157,13 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:78:2: ( ( (otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* ) )
-            // InternalProblem.g:79:2: ( (otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* )
+            // InternalProblem.g:78:2: ( ( (otherlv_0= 'problem' ( (lv_name_1_0= ruleIdentifier ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* ) )
+            // InternalProblem.g:79:2: ( (otherlv_0= 'problem' ( (lv_name_1_0= ruleIdentifier ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* )
             {
-            // InternalProblem.g:79:2: ( (otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* )
-            // InternalProblem.g:80:3: (otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )*
+            // InternalProblem.g:79:2: ( (otherlv_0= 'problem' ( (lv_name_1_0= ruleIdentifier ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )* )
+            // InternalProblem.g:80:3: (otherlv_0= 'problem' ( (lv_name_1_0= ruleIdentifier ) ) otherlv_2= '.' )? ( (lv_statements_3_0= ruleStatement ) )*
             {
-            // InternalProblem.g:80:3: (otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.' )?
+            // InternalProblem.g:80:3: (otherlv_0= 'problem' ( (lv_name_1_0= ruleIdentifier ) ) otherlv_2= '.' )?
             int alt1=2;
             int LA1_0 = input.LA(1);
 
@@ -170,31 +172,36 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             switch (alt1) {
                 case 1 :
-                    // InternalProblem.g:81:4: otherlv_0= 'problem' ( (lv_name_1_0= RULE_ID ) ) otherlv_2= '.'
+                    // InternalProblem.g:81:4: otherlv_0= 'problem' ( (lv_name_1_0= ruleIdentifier ) ) otherlv_2= '.'
                     {
                     otherlv_0=(Token)match(input,12,FOLLOW_3); 
 
                                                 newLeafNode(otherlv_0, grammarAccess.getProblemAccess().getProblemKeyword_0_0());
                                         
-                    // InternalProblem.g:85:4: ( (lv_name_1_0= RULE_ID ) )
-                    // InternalProblem.g:86:5: (lv_name_1_0= RULE_ID )
+                    // InternalProblem.g:85:4: ( (lv_name_1_0= ruleIdentifier ) )
+                    // InternalProblem.g:86:5: (lv_name_1_0= ruleIdentifier )
                     {
-                    // InternalProblem.g:86:5: (lv_name_1_0= RULE_ID )
-                    // InternalProblem.g:87:6: lv_name_1_0= RULE_ID
+                    // InternalProblem.g:86:5: (lv_name_1_0= ruleIdentifier )
+                    // InternalProblem.g:87:6: lv_name_1_0= ruleIdentifier
                     {
-                    lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_4); 
 
-                                                                newLeafNode(lv_name_1_0, grammarAccess.getProblemAccess().getNameIDTerminalRuleCall_0_1_0());
+                                                                newCompositeNode(grammarAccess.getProblemAccess().getNameIdentifierParserRuleCall_0_1_0());
                                                         
+                    pushFollow(FOLLOW_4);
+                    lv_name_1_0=ruleIdentifier();
+
+                    state._fsp--;
+
 
                                                                 if (current==null) {
-                                                                        current = createModelElement(grammarAccess.getProblemRule());
+                                                                        current = createModelElementForParent(grammarAccess.getProblemRule());
                                                                 }
-                                                                setWithLastConsumed(
+                                                                set(
                                                                         current,
                                                                         "name",
                                                                         lv_name_1_0,
-                                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                                        "org.eclipse.viatra.solver.language.Problem.Identifier");
+                                                                afterParserOrEnumRuleCall();
                                                         
 
                     }
@@ -212,23 +219,23 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:108:3: ( (lv_statements_3_0= ruleStatement ) )*
+            // InternalProblem.g:109:3: ( (lv_statements_3_0= ruleStatement ) )*
             loop2:
             do {
                 int alt2=2;
                 int LA2_0 = input.LA(1);
 
-                if ( (LA2_0==RULE_ID||LA2_0==RULE_QUOTED_ID||(LA2_0>=14 && LA2_0<=15)||(LA2_0>=26 && LA2_0<=27)||LA2_0==31||LA2_0==34||LA2_0==42) ) {
+                if ( (LA2_0==RULE_ID||LA2_0==RULE_QUOTED_ID||(LA2_0>=14 && LA2_0<=15)||LA2_0==21||(LA2_0>=27 && LA2_0<=28)||LA2_0==32||LA2_0==35||(LA2_0>=40 && LA2_0<=41)||LA2_0==43) ) {
                     alt2=1;
                 }
 
 
                 switch (alt2) {
                 case 1 :
-                    // InternalProblem.g:109:4: (lv_statements_3_0= ruleStatement )
+                    // InternalProblem.g:110:4: (lv_statements_3_0= ruleStatement )
                     {
-                    // InternalProblem.g:109:4: (lv_statements_3_0= ruleStatement )
-                    // InternalProblem.g:110:5: lv_statements_3_0= ruleStatement
+                    // InternalProblem.g:110:4: (lv_statements_3_0= ruleStatement )
+                    // InternalProblem.g:111:5: lv_statements_3_0= ruleStatement
                     {
 
                                                         newCompositeNode(grammarAccess.getProblemAccess().getStatementsStatementParserRuleCall_1_0());
@@ -284,7 +291,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleStatement"
-    // InternalProblem.g:131:1: entryRuleStatement returns [EObject current=null] : iv_ruleStatement= ruleStatement EOF ;
+    // InternalProblem.g:132:1: entryRuleStatement returns [EObject current=null] : iv_ruleStatement= ruleStatement EOF ;
     public final EObject entryRuleStatement() throws RecognitionException {
         EObject current = null;
 
@@ -292,8 +299,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:131:50: (iv_ruleStatement= ruleStatement EOF )
-            // InternalProblem.g:132:2: iv_ruleStatement= ruleStatement EOF
+            // InternalProblem.g:132:50: (iv_ruleStatement= ruleStatement EOF )
+            // InternalProblem.g:133:2: iv_ruleStatement= ruleStatement EOF
             {
              newCompositeNode(grammarAccess.getStatementRule()); 
             pushFollow(FOLLOW_1);
@@ -320,28 +327,30 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleStatement"
-    // InternalProblem.g:138:1: ruleStatement returns [EObject current=null] : (this_ClassDeclaration_0= ruleClassDeclaration | this_PredicateDefinition_1= rulePredicateDefinition | this_Assertion_2= ruleAssertion | this_ScopeDeclaration_3= ruleScopeDeclaration ) ;
+    // InternalProblem.g:139:1: ruleStatement returns [EObject current=null] : (this_ClassDeclaration_0= ruleClassDeclaration | this_EnumDeclaration_1= ruleEnumDeclaration | this_PredicateDefinition_2= rulePredicateDefinition | this_Assertion_3= ruleAssertion | this_ScopeDeclaration_4= ruleScopeDeclaration ) ;
     public final EObject ruleStatement() throws RecognitionException {
         EObject current = null;
 
         EObject this_ClassDeclaration_0 = null;
 
-        EObject this_PredicateDefinition_1 = null;
+        EObject this_EnumDeclaration_1 = null;
+
+        EObject this_PredicateDefinition_2 = null;
 
-        EObject this_Assertion_2 = null;
+        EObject this_Assertion_3 = null;
 
-        EObject this_ScopeDeclaration_3 = null;
+        EObject this_ScopeDeclaration_4 = null;
 
 
 
                 enterRule();
 
         try {
-            // InternalProblem.g:144:2: ( (this_ClassDeclaration_0= ruleClassDeclaration | this_PredicateDefinition_1= rulePredicateDefinition | this_Assertion_2= ruleAssertion | this_ScopeDeclaration_3= ruleScopeDeclaration ) )
-            // InternalProblem.g:145:2: (this_ClassDeclaration_0= ruleClassDeclaration | this_PredicateDefinition_1= rulePredicateDefinition | this_Assertion_2= ruleAssertion | this_ScopeDeclaration_3= ruleScopeDeclaration )
+            // InternalProblem.g:145:2: ( (this_ClassDeclaration_0= ruleClassDeclaration | this_EnumDeclaration_1= ruleEnumDeclaration | this_PredicateDefinition_2= rulePredicateDefinition | this_Assertion_3= ruleAssertion | this_ScopeDeclaration_4= ruleScopeDeclaration ) )
+            // InternalProblem.g:146:2: (this_ClassDeclaration_0= ruleClassDeclaration | this_EnumDeclaration_1= ruleEnumDeclaration | this_PredicateDefinition_2= rulePredicateDefinition | this_Assertion_3= ruleAssertion | this_ScopeDeclaration_4= ruleScopeDeclaration )
             {
-            // InternalProblem.g:145:2: (this_ClassDeclaration_0= ruleClassDeclaration | this_PredicateDefinition_1= rulePredicateDefinition | this_Assertion_2= ruleAssertion | this_ScopeDeclaration_3= ruleScopeDeclaration )
-            int alt3=4;
+            // InternalProblem.g:146:2: (this_ClassDeclaration_0= ruleClassDeclaration | this_EnumDeclaration_1= ruleEnumDeclaration | this_PredicateDefinition_2= rulePredicateDefinition | this_Assertion_3= ruleAssertion | this_ScopeDeclaration_4= ruleScopeDeclaration )
+            int alt3=5;
             switch ( input.LA(1) ) {
             case 14:
             case 15:
@@ -349,25 +358,32 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 alt3=1;
                 }
                 break;
-            case 26:
-            case 27:
+            case 21:
                 {
                 alt3=2;
                 }
                 break;
-            case RULE_ID:
-            case RULE_QUOTED_ID:
-            case 31:
-            case 42:
+            case 27:
+            case 28:
                 {
                 alt3=3;
                 }
                 break;
-            case 34:
+            case RULE_ID:
+            case RULE_QUOTED_ID:
+            case 32:
+            case 40:
+            case 41:
+            case 43:
                 {
                 alt3=4;
                 }
                 break;
+            case 35:
+                {
+                alt3=5;
+                }
+                break;
             default:
                 NoViableAltException nvae =
                     new NoViableAltException("", 3, 0, input);
@@ -377,7 +393,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             switch (alt3) {
                 case 1 :
-                    // InternalProblem.g:146:3: this_ClassDeclaration_0= ruleClassDeclaration
+                    // InternalProblem.g:147:3: this_ClassDeclaration_0= ruleClassDeclaration
                     {
 
                                         newCompositeNode(grammarAccess.getStatementAccess().getClassDeclarationParserRuleCall_0());
@@ -395,54 +411,72 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:155:3: this_PredicateDefinition_1= rulePredicateDefinition
+                    // InternalProblem.g:156:3: this_EnumDeclaration_1= ruleEnumDeclaration
                     {
 
-                                        newCompositeNode(grammarAccess.getStatementAccess().getPredicateDefinitionParserRuleCall_1());
+                                        newCompositeNode(grammarAccess.getStatementAccess().getEnumDeclarationParserRuleCall_1());
                                 
                     pushFollow(FOLLOW_2);
-                    this_PredicateDefinition_1=rulePredicateDefinition();
+                    this_EnumDeclaration_1=ruleEnumDeclaration();
 
                     state._fsp--;
 
 
-                                        current = this_PredicateDefinition_1;
+                                        current = this_EnumDeclaration_1;
                                         afterParserOrEnumRuleCall();
                                 
 
                     }
                     break;
                 case 3 :
-                    // InternalProblem.g:164:3: this_Assertion_2= ruleAssertion
+                    // InternalProblem.g:165:3: this_PredicateDefinition_2= rulePredicateDefinition
                     {
 
-                                        newCompositeNode(grammarAccess.getStatementAccess().getAssertionParserRuleCall_2());
+                                        newCompositeNode(grammarAccess.getStatementAccess().getPredicateDefinitionParserRuleCall_2());
                                 
                     pushFollow(FOLLOW_2);
-                    this_Assertion_2=ruleAssertion();
+                    this_PredicateDefinition_2=rulePredicateDefinition();
 
                     state._fsp--;
 
 
-                                        current = this_Assertion_2;
+                                        current = this_PredicateDefinition_2;
                                         afterParserOrEnumRuleCall();
                                 
 
                     }
                     break;
                 case 4 :
-                    // InternalProblem.g:173:3: this_ScopeDeclaration_3= ruleScopeDeclaration
+                    // InternalProblem.g:174:3: this_Assertion_3= ruleAssertion
+                    {
+
+                                        newCompositeNode(grammarAccess.getStatementAccess().getAssertionParserRuleCall_3());
+                                
+                    pushFollow(FOLLOW_2);
+                    this_Assertion_3=ruleAssertion();
+
+                    state._fsp--;
+
+
+                                        current = this_Assertion_3;
+                                        afterParserOrEnumRuleCall();
+                                
+
+                    }
+                    break;
+                case 5 :
+                    // InternalProblem.g:183:3: this_ScopeDeclaration_4= ruleScopeDeclaration
                     {
 
-                                        newCompositeNode(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_3());
+                                        newCompositeNode(grammarAccess.getStatementAccess().getScopeDeclarationParserRuleCall_4());
                                 
                     pushFollow(FOLLOW_2);
-                    this_ScopeDeclaration_3=ruleScopeDeclaration();
+                    this_ScopeDeclaration_4=ruleScopeDeclaration();
 
                     state._fsp--;
 
 
-                                        current = this_ScopeDeclaration_3;
+                                        current = this_ScopeDeclaration_4;
                                         afterParserOrEnumRuleCall();
                                 
 
@@ -471,7 +505,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleClassDeclaration"
-    // InternalProblem.g:185:1: entryRuleClassDeclaration returns [EObject current=null] : iv_ruleClassDeclaration= ruleClassDeclaration EOF ;
+    // InternalProblem.g:195:1: entryRuleClassDeclaration returns [EObject current=null] : iv_ruleClassDeclaration= ruleClassDeclaration EOF ;
     public final EObject entryRuleClassDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -479,8 +513,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:185:57: (iv_ruleClassDeclaration= ruleClassDeclaration EOF )
-            // InternalProblem.g:186:2: iv_ruleClassDeclaration= ruleClassDeclaration EOF
+            // InternalProblem.g:195:57: (iv_ruleClassDeclaration= ruleClassDeclaration EOF )
+            // InternalProblem.g:196:2: iv_ruleClassDeclaration= ruleClassDeclaration EOF
             {
              newCompositeNode(grammarAccess.getClassDeclarationRule()); 
             pushFollow(FOLLOW_1);
@@ -507,19 +541,20 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleClassDeclaration"
-    // InternalProblem.g:192:1: ruleClassDeclaration returns [EObject current=null] : ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) ) ;
+    // InternalProblem.g:202:1: ruleClassDeclaration returns [EObject current=null] : ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= ruleIdentifier ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) ) ;
     public final EObject ruleClassDeclaration() throws RecognitionException {
         EObject current = null;
 
         Token lv_abstract_0_0=null;
         Token otherlv_1=null;
-        Token lv_name_2_0=null;
         Token otherlv_3=null;
         Token otherlv_5=null;
         Token otherlv_7=null;
         Token otherlv_9=null;
         Token otherlv_10=null;
         Token otherlv_11=null;
+        AntlrDatatypeRuleToken lv_name_2_0 = null;
+
         EObject lv_referenceDeclarations_8_0 = null;
 
 
@@ -527,13 +562,13 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:198:2: ( ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) ) )
-            // InternalProblem.g:199:2: ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) )
+            // InternalProblem.g:208:2: ( ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= ruleIdentifier ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) ) )
+            // InternalProblem.g:209:2: ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= ruleIdentifier ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) )
             {
-            // InternalProblem.g:199:2: ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) )
-            // InternalProblem.g:200:3: ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= RULE_ID ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' )
+            // InternalProblem.g:209:2: ( ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= ruleIdentifier ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' ) )
+            // InternalProblem.g:210:3: ( (lv_abstract_0_0= 'abstract' ) )? otherlv_1= 'class' ( (lv_name_2_0= ruleIdentifier ) ) (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )? ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' )
             {
-            // InternalProblem.g:200:3: ( (lv_abstract_0_0= 'abstract' ) )?
+            // InternalProblem.g:210:3: ( (lv_abstract_0_0= 'abstract' ) )?
             int alt4=2;
             int LA4_0 = input.LA(1);
 
@@ -542,10 +577,10 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             switch (alt4) {
                 case 1 :
-                    // InternalProblem.g:201:4: (lv_abstract_0_0= 'abstract' )
+                    // InternalProblem.g:211:4: (lv_abstract_0_0= 'abstract' )
                     {
-                    // InternalProblem.g:201:4: (lv_abstract_0_0= 'abstract' )
-                    // InternalProblem.g:202:5: lv_abstract_0_0= 'abstract'
+                    // InternalProblem.g:211:4: (lv_abstract_0_0= 'abstract' )
+                    // InternalProblem.g:212:5: lv_abstract_0_0= 'abstract'
                     {
                     lv_abstract_0_0=(Token)match(input,14,FOLLOW_6); 
 
@@ -570,25 +605,30 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                 newLeafNode(otherlv_1, grammarAccess.getClassDeclarationAccess().getClassKeyword_1());
                         
-            // InternalProblem.g:218:3: ( (lv_name_2_0= RULE_ID ) )
-            // InternalProblem.g:219:4: (lv_name_2_0= RULE_ID )
+            // InternalProblem.g:228:3: ( (lv_name_2_0= ruleIdentifier ) )
+            // InternalProblem.g:229:4: (lv_name_2_0= ruleIdentifier )
             {
-            // InternalProblem.g:219:4: (lv_name_2_0= RULE_ID )
-            // InternalProblem.g:220:5: lv_name_2_0= RULE_ID
+            // InternalProblem.g:229:4: (lv_name_2_0= ruleIdentifier )
+            // InternalProblem.g:230:5: lv_name_2_0= ruleIdentifier
             {
-            lv_name_2_0=(Token)match(input,RULE_ID,FOLLOW_7); 
 
-                                                newLeafNode(lv_name_2_0, grammarAccess.getClassDeclarationAccess().getNameIDTerminalRuleCall_2_0());
+                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getNameIdentifierParserRuleCall_2_0());
                                         
+            pushFollow(FOLLOW_7);
+            lv_name_2_0=ruleIdentifier();
+
+            state._fsp--;
+
 
                                                 if (current==null) {
-                                                        current = createModelElement(grammarAccess.getClassDeclarationRule());
+                                                        current = createModelElementForParent(grammarAccess.getClassDeclarationRule());
                                                 }
-                                                setWithLastConsumed(
+                                                set(
                                                         current,
                                                         "name",
                                                         lv_name_2_0,
-                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                        "org.eclipse.viatra.solver.language.Problem.Identifier");
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -596,7 +636,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:236:3: (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )?
+            // InternalProblem.g:247:3: (otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )* )?
             int alt6=2;
             int LA6_0 = input.LA(1);
 
@@ -605,17 +645,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             switch (alt6) {
                 case 1 :
-                    // InternalProblem.g:237:4: otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )*
+                    // InternalProblem.g:248:4: otherlv_3= 'extends' ( ( ruleQualifiedName ) ) (otherlv_5= ',' ( ( ruleQualifiedName ) ) )*
                     {
                     otherlv_3=(Token)match(input,16,FOLLOW_8); 
 
                                                 newLeafNode(otherlv_3, grammarAccess.getClassDeclarationAccess().getExtendsKeyword_3_0());
                                         
-                    // InternalProblem.g:241:4: ( ( ruleQualifiedName ) )
-                    // InternalProblem.g:242:5: ( ruleQualifiedName )
+                    // InternalProblem.g:252:4: ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:253:5: ( ruleQualifiedName )
                     {
-                    // InternalProblem.g:242:5: ( ruleQualifiedName )
-                    // InternalProblem.g:243:6: ruleQualifiedName
+                    // InternalProblem.g:253:5: ( ruleQualifiedName )
+                    // InternalProblem.g:254:6: ruleQualifiedName
                     {
 
                                                                 if (current==null) {
@@ -623,7 +663,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                                                 }
                                                         
 
-                                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_1_0());
+                                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationCrossReference_3_1_0());
                                                         
                     pushFollow(FOLLOW_9);
                     ruleQualifiedName();
@@ -639,7 +679,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:257:4: (otherlv_5= ',' ( ( ruleQualifiedName ) ) )*
+                    // InternalProblem.g:268:4: (otherlv_5= ',' ( ( ruleQualifiedName ) ) )*
                     loop5:
                     do {
                         int alt5=2;
@@ -652,17 +692,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                         switch (alt5) {
                         case 1 :
-                            // InternalProblem.g:258:5: otherlv_5= ',' ( ( ruleQualifiedName ) )
+                            // InternalProblem.g:269:5: otherlv_5= ',' ( ( ruleQualifiedName ) )
                             {
                             otherlv_5=(Token)match(input,17,FOLLOW_8); 
 
                                                                 newLeafNode(otherlv_5, grammarAccess.getClassDeclarationAccess().getCommaKeyword_3_2_0());
                                                         
-                            // InternalProblem.g:262:5: ( ( ruleQualifiedName ) )
-                            // InternalProblem.g:263:6: ( ruleQualifiedName )
+                            // InternalProblem.g:273:5: ( ( ruleQualifiedName ) )
+                            // InternalProblem.g:274:6: ( ruleQualifiedName )
                             {
-                            // InternalProblem.g:263:6: ( ruleQualifiedName )
-                            // InternalProblem.g:264:7: ruleQualifiedName
+                            // InternalProblem.g:274:6: ( ruleQualifiedName )
+                            // InternalProblem.g:275:7: ruleQualifiedName
                             {
 
                                                                                 if (current==null) {
@@ -670,7 +710,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                                                                 }
                                                                         
 
-                                                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getSuperTypesClassDeclarationCrossReference_3_2_1_0());
+                                                                                newCompositeNode(grammarAccess.getClassDeclarationAccess().getSuperTypesRelationCrossReference_3_2_1_0());
                                                                         
                             pushFollow(FOLLOW_9);
                             ruleQualifiedName();
@@ -701,7 +741,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:280:3: ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' )
+            // InternalProblem.g:291:3: ( (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' ) | otherlv_11= '.' )
             int alt9=2;
             int LA9_0 = input.LA(1);
 
@@ -719,35 +759,35 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             }
             switch (alt9) {
                 case 1 :
-                    // InternalProblem.g:281:4: (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' )
+                    // InternalProblem.g:292:4: (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' )
                     {
-                    // InternalProblem.g:281:4: (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' )
-                    // InternalProblem.g:282:5: otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}'
+                    // InternalProblem.g:292:4: (otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}' )
+                    // InternalProblem.g:293:5: otherlv_7= '{' ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )* otherlv_10= '}'
                     {
                     otherlv_7=(Token)match(input,18,FOLLOW_10); 
 
                                                         newLeafNode(otherlv_7, grammarAccess.getClassDeclarationAccess().getLeftCurlyBracketKeyword_4_0_0());
                                                 
-                    // InternalProblem.g:286:5: ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )*
+                    // InternalProblem.g:297:5: ( ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )? )*
                     loop8:
                     do {
                         int alt8=2;
                         int LA8_0 = input.LA(1);
 
-                        if ( ((LA8_0>=21 && LA8_0<=22)) ) {
+                        if ( (LA8_0==RULE_ID||LA8_0==RULE_QUOTED_ID||(LA8_0>=22 && LA8_0<=23)||(LA8_0>=40 && LA8_0<=41)) ) {
                             alt8=1;
                         }
 
 
                         switch (alt8) {
                         case 1 :
-                            // InternalProblem.g:287:6: ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )?
+                            // InternalProblem.g:298:6: ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) ) (otherlv_9= ';' )?
                             {
-                            // InternalProblem.g:287:6: ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) )
-                            // InternalProblem.g:288:7: (lv_referenceDeclarations_8_0= ruleReferenceDeclaration )
+                            // InternalProblem.g:298:6: ( (lv_referenceDeclarations_8_0= ruleReferenceDeclaration ) )
+                            // InternalProblem.g:299:7: (lv_referenceDeclarations_8_0= ruleReferenceDeclaration )
                             {
-                            // InternalProblem.g:288:7: (lv_referenceDeclarations_8_0= ruleReferenceDeclaration )
-                            // InternalProblem.g:289:8: lv_referenceDeclarations_8_0= ruleReferenceDeclaration
+                            // InternalProblem.g:299:7: (lv_referenceDeclarations_8_0= ruleReferenceDeclaration )
+                            // InternalProblem.g:300:8: lv_referenceDeclarations_8_0= ruleReferenceDeclaration
                             {
 
                                                                                         newCompositeNode(grammarAccess.getClassDeclarationAccess().getReferenceDeclarationsReferenceDeclarationParserRuleCall_4_0_1_0_0());
@@ -774,7 +814,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalProblem.g:306:6: (otherlv_9= ';' )?
+                            // InternalProblem.g:317:6: (otherlv_9= ';' )?
                             int alt7=2;
                             int LA7_0 = input.LA(1);
 
@@ -783,7 +823,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                             }
                             switch (alt7) {
                                 case 1 :
-                                    // InternalProblem.g:307:7: otherlv_9= ';'
+                                    // InternalProblem.g:318:7: otherlv_9= ';'
                                     {
                                     otherlv_9=(Token)match(input,19,FOLLOW_10); 
 
@@ -815,7 +855,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:319:4: otherlv_11= '.'
+                    // InternalProblem.g:330:4: otherlv_11= '.'
                     {
                     otherlv_11=(Token)match(input,13,FOLLOW_2); 
 
@@ -849,8 +889,428 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     // $ANTLR end "ruleClassDeclaration"
 
 
+    // $ANTLR start "entryRuleEnumDeclaration"
+    // InternalProblem.g:339:1: entryRuleEnumDeclaration returns [EObject current=null] : iv_ruleEnumDeclaration= ruleEnumDeclaration EOF ;
+    public final EObject entryRuleEnumDeclaration() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleEnumDeclaration = null;
+
+
+        try {
+            // InternalProblem.g:339:56: (iv_ruleEnumDeclaration= ruleEnumDeclaration EOF )
+            // InternalProblem.g:340:2: iv_ruleEnumDeclaration= ruleEnumDeclaration EOF
+            {
+             newCompositeNode(grammarAccess.getEnumDeclarationRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleEnumDeclaration=ruleEnumDeclaration();
+
+            state._fsp--;
+
+             current =iv_ruleEnumDeclaration; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleEnumDeclaration"
+
+
+    // $ANTLR start "ruleEnumDeclaration"
+    // InternalProblem.g:346:1: ruleEnumDeclaration returns [EObject current=null] : (otherlv_0= 'enum' ( (lv_name_1_0= ruleIdentifier ) ) ( (otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}' ) | otherlv_9= '.' ) ) ;
+    public final EObject ruleEnumDeclaration() throws RecognitionException {
+        EObject current = null;
+
+        Token otherlv_0=null;
+        Token otherlv_2=null;
+        Token otherlv_4=null;
+        Token otherlv_6=null;
+        Token otherlv_7=null;
+        Token otherlv_8=null;
+        Token otherlv_9=null;
+        AntlrDatatypeRuleToken lv_name_1_0 = null;
+
+        EObject lv_literals_3_0 = null;
+
+        EObject lv_literals_5_0 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:352:2: ( (otherlv_0= 'enum' ( (lv_name_1_0= ruleIdentifier ) ) ( (otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}' ) | otherlv_9= '.' ) ) )
+            // InternalProblem.g:353:2: (otherlv_0= 'enum' ( (lv_name_1_0= ruleIdentifier ) ) ( (otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}' ) | otherlv_9= '.' ) )
+            {
+            // InternalProblem.g:353:2: (otherlv_0= 'enum' ( (lv_name_1_0= ruleIdentifier ) ) ( (otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}' ) | otherlv_9= '.' ) )
+            // InternalProblem.g:354:3: otherlv_0= 'enum' ( (lv_name_1_0= ruleIdentifier ) ) ( (otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}' ) | otherlv_9= '.' )
+            {
+            otherlv_0=(Token)match(input,21,FOLLOW_3); 
+
+                                newLeafNode(otherlv_0, grammarAccess.getEnumDeclarationAccess().getEnumKeyword_0());
+                        
+            // InternalProblem.g:358:3: ( (lv_name_1_0= ruleIdentifier ) )
+            // InternalProblem.g:359:4: (lv_name_1_0= ruleIdentifier )
+            {
+            // InternalProblem.g:359:4: (lv_name_1_0= ruleIdentifier )
+            // InternalProblem.g:360:5: lv_name_1_0= ruleIdentifier
+            {
+
+                                                newCompositeNode(grammarAccess.getEnumDeclarationAccess().getNameIdentifierParserRuleCall_1_0());
+                                        
+            pushFollow(FOLLOW_12);
+            lv_name_1_0=ruleIdentifier();
+
+            state._fsp--;
+
+
+                                                if (current==null) {
+                                                        current = createModelElementForParent(grammarAccess.getEnumDeclarationRule());
+                                                }
+                                                set(
+                                                        current,
+                                                        "name",
+                                                        lv_name_1_0,
+                                                        "org.eclipse.viatra.solver.language.Problem.Identifier");
+                                                afterParserOrEnumRuleCall();
+                                        
+
+            }
+
+
+            }
+
+            // InternalProblem.g:377:3: ( (otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}' ) | otherlv_9= '.' )
+            int alt13=2;
+            int LA13_0 = input.LA(1);
+
+            if ( (LA13_0==18) ) {
+                alt13=1;
+            }
+            else if ( (LA13_0==13) ) {
+                alt13=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 13, 0, input);
+
+                throw nvae;
+            }
+            switch (alt13) {
+                case 1 :
+                    // InternalProblem.g:378:4: (otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}' )
+                    {
+                    // InternalProblem.g:378:4: (otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}' )
+                    // InternalProblem.g:379:5: otherlv_2= '{' ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )? otherlv_8= '}'
+                    {
+                    otherlv_2=(Token)match(input,18,FOLLOW_13); 
+
+                                                        newLeafNode(otherlv_2, grammarAccess.getEnumDeclarationAccess().getLeftCurlyBracketKeyword_2_0_0());
+                                                
+                    // InternalProblem.g:383:5: ( ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )? )?
+                    int alt12=2;
+                    int LA12_0 = input.LA(1);
+
+                    if ( (LA12_0==RULE_ID||LA12_0==RULE_QUOTED_ID||(LA12_0>=40 && LA12_0<=41)) ) {
+                        alt12=1;
+                    }
+                    switch (alt12) {
+                        case 1 :
+                            // InternalProblem.g:384:6: ( (lv_literals_3_0= ruleEnumLiteral ) ) (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )* (otherlv_6= ',' | otherlv_7= ';' )?
+                            {
+                            // InternalProblem.g:384:6: ( (lv_literals_3_0= ruleEnumLiteral ) )
+                            // InternalProblem.g:385:7: (lv_literals_3_0= ruleEnumLiteral )
+                            {
+                            // InternalProblem.g:385:7: (lv_literals_3_0= ruleEnumLiteral )
+                            // InternalProblem.g:386:8: lv_literals_3_0= ruleEnumLiteral
+                            {
+
+                                                                                        newCompositeNode(grammarAccess.getEnumDeclarationAccess().getLiteralsEnumLiteralParserRuleCall_2_0_1_0_0());
+                                                                                
+                            pushFollow(FOLLOW_14);
+                            lv_literals_3_0=ruleEnumLiteral();
+
+                            state._fsp--;
+
+
+                                                                                        if (current==null) {
+                                                                                                current = createModelElementForParent(grammarAccess.getEnumDeclarationRule());
+                                                                                        }
+                                                                                        add(
+                                                                                                current,
+                                                                                                "literals",
+                                                                                                lv_literals_3_0,
+                                                                                                "org.eclipse.viatra.solver.language.Problem.EnumLiteral");
+                                                                                        afterParserOrEnumRuleCall();
+                                                                                
+
+                            }
+
+
+                            }
+
+                            // InternalProblem.g:403:6: (otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) ) )*
+                            loop10:
+                            do {
+                                int alt10=2;
+                                int LA10_0 = input.LA(1);
+
+                                if ( (LA10_0==17) ) {
+                                    int LA10_1 = input.LA(2);
+
+                                    if ( (LA10_1==RULE_ID||LA10_1==RULE_QUOTED_ID||(LA10_1>=40 && LA10_1<=41)) ) {
+                                        alt10=1;
+                                    }
+
+
+                                }
+
+
+                                switch (alt10) {
+                                case 1 :
+                                    // InternalProblem.g:404:7: otherlv_4= ',' ( (lv_literals_5_0= ruleEnumLiteral ) )
+                                    {
+                                    otherlv_4=(Token)match(input,17,FOLLOW_8); 
+
+                                                                                        newLeafNode(otherlv_4, grammarAccess.getEnumDeclarationAccess().getCommaKeyword_2_0_1_1_0());
+                                                                                
+                                    // InternalProblem.g:408:7: ( (lv_literals_5_0= ruleEnumLiteral ) )
+                                    // InternalProblem.g:409:8: (lv_literals_5_0= ruleEnumLiteral )
+                                    {
+                                    // InternalProblem.g:409:8: (lv_literals_5_0= ruleEnumLiteral )
+                                    // InternalProblem.g:410:9: lv_literals_5_0= ruleEnumLiteral
+                                    {
+
+                                                                                                        newCompositeNode(grammarAccess.getEnumDeclarationAccess().getLiteralsEnumLiteralParserRuleCall_2_0_1_1_1_0());
+                                                                                                
+                                    pushFollow(FOLLOW_14);
+                                    lv_literals_5_0=ruleEnumLiteral();
+
+                                    state._fsp--;
+
+
+                                                                                                        if (current==null) {
+                                                                                                                current = createModelElementForParent(grammarAccess.getEnumDeclarationRule());
+                                                                                                        }
+                                                                                                        add(
+                                                                                                                current,
+                                                                                                                "literals",
+                                                                                                                lv_literals_5_0,
+                                                                                                                "org.eclipse.viatra.solver.language.Problem.EnumLiteral");
+                                                                                                        afterParserOrEnumRuleCall();
+                                                                                                
+
+                                    }
+
+
+                                    }
+
+
+                                    }
+                                    break;
+
+                                default :
+                                    break loop10;
+                                }
+                            } while (true);
+
+                            // InternalProblem.g:428:6: (otherlv_6= ',' | otherlv_7= ';' )?
+                            int alt11=3;
+                            int LA11_0 = input.LA(1);
+
+                            if ( (LA11_0==17) ) {
+                                alt11=1;
+                            }
+                            else if ( (LA11_0==19) ) {
+                                alt11=2;
+                            }
+                            switch (alt11) {
+                                case 1 :
+                                    // InternalProblem.g:429:7: otherlv_6= ','
+                                    {
+                                    otherlv_6=(Token)match(input,17,FOLLOW_15); 
+
+                                                                                        newLeafNode(otherlv_6, grammarAccess.getEnumDeclarationAccess().getCommaKeyword_2_0_1_2_0());
+                                                                                
+
+                                    }
+                                    break;
+                                case 2 :
+                                    // InternalProblem.g:434:7: otherlv_7= ';'
+                                    {
+                                    otherlv_7=(Token)match(input,19,FOLLOW_15); 
+
+                                                                                        newLeafNode(otherlv_7, grammarAccess.getEnumDeclarationAccess().getSemicolonKeyword_2_0_1_2_1());
+                                                                                
+
+                                    }
+                                    break;
+
+                            }
+
+
+                            }
+                            break;
+
+                    }
+
+                    otherlv_8=(Token)match(input,20,FOLLOW_2); 
+
+                                                        newLeafNode(otherlv_8, grammarAccess.getEnumDeclarationAccess().getRightCurlyBracketKeyword_2_0_2());
+                                                
+
+                    }
+
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:446:4: otherlv_9= '.'
+                    {
+                    otherlv_9=(Token)match(input,13,FOLLOW_2); 
+
+                                                newLeafNode(otherlv_9, grammarAccess.getEnumDeclarationAccess().getFullStopKeyword_2_1());
+                                        
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleEnumDeclaration"
+
+
+    // $ANTLR start "entryRuleEnumLiteral"
+    // InternalProblem.g:455:1: entryRuleEnumLiteral returns [EObject current=null] : iv_ruleEnumLiteral= ruleEnumLiteral EOF ;
+    public final EObject entryRuleEnumLiteral() throws RecognitionException {
+        EObject current = null;
+
+        EObject iv_ruleEnumLiteral = null;
+
+
+        try {
+            // InternalProblem.g:455:52: (iv_ruleEnumLiteral= ruleEnumLiteral EOF )
+            // InternalProblem.g:456:2: iv_ruleEnumLiteral= ruleEnumLiteral EOF
+            {
+             newCompositeNode(grammarAccess.getEnumLiteralRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleEnumLiteral=ruleEnumLiteral();
+
+            state._fsp--;
+
+             current =iv_ruleEnumLiteral; 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleEnumLiteral"
+
+
+    // $ANTLR start "ruleEnumLiteral"
+    // InternalProblem.g:462:1: ruleEnumLiteral returns [EObject current=null] : ( (lv_name_0_0= ruleQuotedOrUnquotedId ) ) ;
+    public final EObject ruleEnumLiteral() throws RecognitionException {
+        EObject current = null;
+
+        AntlrDatatypeRuleToken lv_name_0_0 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:468:2: ( ( (lv_name_0_0= ruleQuotedOrUnquotedId ) ) )
+            // InternalProblem.g:469:2: ( (lv_name_0_0= ruleQuotedOrUnquotedId ) )
+            {
+            // InternalProblem.g:469:2: ( (lv_name_0_0= ruleQuotedOrUnquotedId ) )
+            // InternalProblem.g:470:3: (lv_name_0_0= ruleQuotedOrUnquotedId )
+            {
+            // InternalProblem.g:470:3: (lv_name_0_0= ruleQuotedOrUnquotedId )
+            // InternalProblem.g:471:4: lv_name_0_0= ruleQuotedOrUnquotedId
+            {
+
+                                        newCompositeNode(grammarAccess.getEnumLiteralAccess().getNameQuotedOrUnquotedIdParserRuleCall_0());
+                                
+            pushFollow(FOLLOW_2);
+            lv_name_0_0=ruleQuotedOrUnquotedId();
+
+            state._fsp--;
+
+
+                                        if (current==null) {
+                                                current = createModelElementForParent(grammarAccess.getEnumLiteralRule());
+                                        }
+                                        set(
+                                                current,
+                                                "name",
+                                                lv_name_0_0,
+                                                "org.eclipse.viatra.solver.language.Problem.QuotedOrUnquotedId");
+                                        afterParserOrEnumRuleCall();
+                                
+
+            }
+
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleEnumLiteral"
+
+
     // $ANTLR start "entryRuleReferenceDeclaration"
-    // InternalProblem.g:328:1: entryRuleReferenceDeclaration returns [EObject current=null] : iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF ;
+    // InternalProblem.g:491:1: entryRuleReferenceDeclaration returns [EObject current=null] : iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF ;
     public final EObject entryRuleReferenceDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -858,8 +1318,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:328:61: (iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF )
-            // InternalProblem.g:329:2: iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF
+            // InternalProblem.g:491:61: (iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF )
+            // InternalProblem.g:492:2: iv_ruleReferenceDeclaration= ruleReferenceDeclaration EOF
             {
              newCompositeNode(grammarAccess.getReferenceDeclarationRule()); 
             pushFollow(FOLLOW_1);
@@ -886,7 +1346,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleReferenceDeclaration"
-    // InternalProblem.g:335:1: ruleReferenceDeclaration returns [EObject current=null] : ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? ) ;
+    // InternalProblem.g:498:1: ruleReferenceDeclaration returns [EObject current=null] : ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' )? ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= ruleIdentifier ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? ) ;
     public final EObject ruleReferenceDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -894,48 +1354,43 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
         Token otherlv_1=null;
         Token otherlv_3=null;
         Token otherlv_5=null;
-        Token lv_name_6_0=null;
         Token otherlv_7=null;
         EObject lv_multiplicity_4_0 = null;
 
+        AntlrDatatypeRuleToken lv_name_6_0 = null;
+
 
 
                 enterRule();
 
         try {
-            // InternalProblem.g:341:2: ( ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? ) )
-            // InternalProblem.g:342:2: ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? )
+            // InternalProblem.g:504:2: ( ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' )? ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= ruleIdentifier ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? ) )
+            // InternalProblem.g:505:2: ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' )? ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= ruleIdentifier ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? )
             {
-            // InternalProblem.g:342:2: ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? )
-            // InternalProblem.g:343:3: ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' ) ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= RULE_ID ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )?
+            // InternalProblem.g:505:2: ( ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' )? ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= ruleIdentifier ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )? )
+            // InternalProblem.g:506:3: ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' )? ( ( ruleQualifiedName ) ) (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )? ( (lv_name_6_0= ruleIdentifier ) ) (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )?
             {
-            // InternalProblem.g:343:3: ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' )
-            int alt10=2;
-            int LA10_0 = input.LA(1);
+            // InternalProblem.g:506:3: ( ( (lv_containment_0_0= 'contains' ) ) | otherlv_1= 'refers' )?
+            int alt14=3;
+            int LA14_0 = input.LA(1);
 
-            if ( (LA10_0==21) ) {
-                alt10=1;
-            }
-            else if ( (LA10_0==22) ) {
-                alt10=2;
+            if ( (LA14_0==22) ) {
+                alt14=1;
             }
-            else {
-                NoViableAltException nvae =
-                    new NoViableAltException("", 10, 0, input);
-
-                throw nvae;
+            else if ( (LA14_0==23) ) {
+                alt14=2;
             }
-            switch (alt10) {
+            switch (alt14) {
                 case 1 :
-                    // InternalProblem.g:344:4: ( (lv_containment_0_0= 'contains' ) )
+                    // InternalProblem.g:507:4: ( (lv_containment_0_0= 'contains' ) )
                     {
-                    // InternalProblem.g:344:4: ( (lv_containment_0_0= 'contains' ) )
-                    // InternalProblem.g:345:5: (lv_containment_0_0= 'contains' )
+                    // InternalProblem.g:507:4: ( (lv_containment_0_0= 'contains' ) )
+                    // InternalProblem.g:508:5: (lv_containment_0_0= 'contains' )
                     {
-                    // InternalProblem.g:345:5: (lv_containment_0_0= 'contains' )
-                    // InternalProblem.g:346:6: lv_containment_0_0= 'contains'
+                    // InternalProblem.g:508:5: (lv_containment_0_0= 'contains' )
+                    // InternalProblem.g:509:6: lv_containment_0_0= 'contains'
                     {
-                    lv_containment_0_0=(Token)match(input,21,FOLLOW_8); 
+                    lv_containment_0_0=(Token)match(input,22,FOLLOW_8); 
 
                                                                 newLeafNode(lv_containment_0_0, grammarAccess.getReferenceDeclarationAccess().getContainmentContainsKeyword_0_0_0());
                                                         
@@ -955,9 +1410,9 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:359:4: otherlv_1= 'refers'
+                    // InternalProblem.g:522:4: otherlv_1= 'refers'
                     {
-                    otherlv_1=(Token)match(input,22,FOLLOW_8); 
+                    otherlv_1=(Token)match(input,23,FOLLOW_8); 
 
                                                 newLeafNode(otherlv_1, grammarAccess.getReferenceDeclarationAccess().getRefersKeyword_0_1());
                                         
@@ -967,11 +1422,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:364:3: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:365:4: ( ruleQualifiedName )
+            // InternalProblem.g:527:3: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:528:4: ( ruleQualifiedName )
             {
-            // InternalProblem.g:365:4: ( ruleQualifiedName )
-            // InternalProblem.g:366:5: ruleQualifiedName
+            // InternalProblem.g:528:4: ( ruleQualifiedName )
+            // InternalProblem.g:529:5: ruleQualifiedName
             {
 
                                                 if (current==null) {
@@ -979,9 +1434,9 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                                 }
                                         
 
-                                                newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeClassDeclarationCrossReference_1_0());
+                                                newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getReferenceTypeRelationCrossReference_1_0());
                                         
-            pushFollow(FOLLOW_12);
+            pushFollow(FOLLOW_16);
             ruleQualifiedName();
 
             state._fsp--;
@@ -995,31 +1450,31 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:380:3: (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )?
-            int alt11=2;
-            int LA11_0 = input.LA(1);
+            // InternalProblem.g:543:3: (otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']' )?
+            int alt15=2;
+            int LA15_0 = input.LA(1);
 
-            if ( (LA11_0==23) ) {
-                alt11=1;
+            if ( (LA15_0==24) ) {
+                alt15=1;
             }
-            switch (alt11) {
+            switch (alt15) {
                 case 1 :
-                    // InternalProblem.g:381:4: otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']'
+                    // InternalProblem.g:544:4: otherlv_3= '[' ( (lv_multiplicity_4_0= ruleMultiplicity ) ) otherlv_5= ']'
                     {
-                    otherlv_3=(Token)match(input,23,FOLLOW_13); 
+                    otherlv_3=(Token)match(input,24,FOLLOW_17); 
 
                                                 newLeafNode(otherlv_3, grammarAccess.getReferenceDeclarationAccess().getLeftSquareBracketKeyword_2_0());
                                         
-                    // InternalProblem.g:385:4: ( (lv_multiplicity_4_0= ruleMultiplicity ) )
-                    // InternalProblem.g:386:5: (lv_multiplicity_4_0= ruleMultiplicity )
+                    // InternalProblem.g:548:4: ( (lv_multiplicity_4_0= ruleMultiplicity ) )
+                    // InternalProblem.g:549:5: (lv_multiplicity_4_0= ruleMultiplicity )
                     {
-                    // InternalProblem.g:386:5: (lv_multiplicity_4_0= ruleMultiplicity )
-                    // InternalProblem.g:387:6: lv_multiplicity_4_0= ruleMultiplicity
+                    // InternalProblem.g:549:5: (lv_multiplicity_4_0= ruleMultiplicity )
+                    // InternalProblem.g:550:6: lv_multiplicity_4_0= ruleMultiplicity
                     {
 
                                                                 newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getMultiplicityMultiplicityParserRuleCall_2_1_0());
                                                         
-                    pushFollow(FOLLOW_14);
+                    pushFollow(FOLLOW_18);
                     lv_multiplicity_4_0=ruleMultiplicity();
 
                     state._fsp--;
@@ -1041,7 +1496,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_5=(Token)match(input,24,FOLLOW_3); 
+                    otherlv_5=(Token)match(input,25,FOLLOW_3); 
 
                                                 newLeafNode(otherlv_5, grammarAccess.getReferenceDeclarationAccess().getRightSquareBracketKeyword_2_2());
                                         
@@ -1051,25 +1506,30 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:409:3: ( (lv_name_6_0= RULE_ID ) )
-            // InternalProblem.g:410:4: (lv_name_6_0= RULE_ID )
+            // InternalProblem.g:572:3: ( (lv_name_6_0= ruleIdentifier ) )
+            // InternalProblem.g:573:4: (lv_name_6_0= ruleIdentifier )
             {
-            // InternalProblem.g:410:4: (lv_name_6_0= RULE_ID )
-            // InternalProblem.g:411:5: lv_name_6_0= RULE_ID
+            // InternalProblem.g:573:4: (lv_name_6_0= ruleIdentifier )
+            // InternalProblem.g:574:5: lv_name_6_0= ruleIdentifier
             {
-            lv_name_6_0=(Token)match(input,RULE_ID,FOLLOW_15); 
 
-                                                newLeafNode(lv_name_6_0, grammarAccess.getReferenceDeclarationAccess().getNameIDTerminalRuleCall_3_0());
+                                                newCompositeNode(grammarAccess.getReferenceDeclarationAccess().getNameIdentifierParserRuleCall_3_0());
                                         
+            pushFollow(FOLLOW_19);
+            lv_name_6_0=ruleIdentifier();
+
+            state._fsp--;
+
 
                                                 if (current==null) {
-                                                        current = createModelElement(grammarAccess.getReferenceDeclarationRule());
+                                                        current = createModelElementForParent(grammarAccess.getReferenceDeclarationRule());
                                                 }
-                                                setWithLastConsumed(
+                                                set(
                                                         current,
                                                         "name",
                                                         lv_name_6_0,
-                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                        "org.eclipse.viatra.solver.language.Problem.Identifier");
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -1077,26 +1537,26 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:427:3: (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )?
-            int alt12=2;
-            int LA12_0 = input.LA(1);
+            // InternalProblem.g:591:3: (otherlv_7= 'opposite' ( ( ruleQualifiedName ) ) )?
+            int alt16=2;
+            int LA16_0 = input.LA(1);
 
-            if ( (LA12_0==25) ) {
-                alt12=1;
+            if ( (LA16_0==26) ) {
+                alt16=1;
             }
-            switch (alt12) {
+            switch (alt16) {
                 case 1 :
-                    // InternalProblem.g:428:4: otherlv_7= 'opposite' ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:592:4: otherlv_7= 'opposite' ( ( ruleQualifiedName ) )
                     {
-                    otherlv_7=(Token)match(input,25,FOLLOW_8); 
+                    otherlv_7=(Token)match(input,26,FOLLOW_8); 
 
                                                 newLeafNode(otherlv_7, grammarAccess.getReferenceDeclarationAccess().getOppositeKeyword_4_0());
                                         
-                    // InternalProblem.g:432:4: ( ( ruleQualifiedName ) )
-                    // InternalProblem.g:433:5: ( ruleQualifiedName )
+                    // InternalProblem.g:596:4: ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:597:5: ( ruleQualifiedName )
                     {
-                    // InternalProblem.g:433:5: ( ruleQualifiedName )
-                    // InternalProblem.g:434:6: ruleQualifiedName
+                    // InternalProblem.g:597:5: ( ruleQualifiedName )
+                    // InternalProblem.g:598:6: ruleQualifiedName
                     {
 
                                                                 if (current==null) {
@@ -1149,7 +1609,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRulePredicateDefinition"
-    // InternalProblem.g:453:1: entryRulePredicateDefinition returns [EObject current=null] : iv_rulePredicateDefinition= rulePredicateDefinition EOF ;
+    // InternalProblem.g:617:1: entryRulePredicateDefinition returns [EObject current=null] : iv_rulePredicateDefinition= rulePredicateDefinition EOF ;
     public final EObject entryRulePredicateDefinition() throws RecognitionException {
         EObject current = null;
 
@@ -1157,8 +1617,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:453:60: (iv_rulePredicateDefinition= rulePredicateDefinition EOF )
-            // InternalProblem.g:454:2: iv_rulePredicateDefinition= rulePredicateDefinition EOF
+            // InternalProblem.g:617:60: (iv_rulePredicateDefinition= rulePredicateDefinition EOF )
+            // InternalProblem.g:618:2: iv_rulePredicateDefinition= rulePredicateDefinition EOF
             {
              newCompositeNode(grammarAccess.getPredicateDefinitionRule()); 
             pushFollow(FOLLOW_1);
@@ -1185,20 +1645,21 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "rulePredicateDefinition"
-    // InternalProblem.g:460:1: rulePredicateDefinition returns [EObject current=null] : ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' ) ;
+    // InternalProblem.g:624:1: rulePredicateDefinition returns [EObject current=null] : ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' ) ;
     public final EObject rulePredicateDefinition() throws RecognitionException {
         EObject current = null;
 
         Token lv_error_0_0=null;
         Token otherlv_1=null;
         Token otherlv_2=null;
-        Token lv_name_3_0=null;
         Token otherlv_4=null;
         Token otherlv_6=null;
         Token otherlv_8=null;
         Token otherlv_9=null;
         Token otherlv_11=null;
         Token otherlv_13=null;
+        AntlrDatatypeRuleToken lv_name_3_0 = null;
+
         EObject lv_parameters_5_0 = null;
 
         EObject lv_parameters_7_0 = null;
@@ -1212,42 +1673,42 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:466:2: ( ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' ) )
-            // InternalProblem.g:467:2: ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' )
+            // InternalProblem.g:630:2: ( ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' ) )
+            // InternalProblem.g:631:2: ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' )
             {
-            // InternalProblem.g:467:2: ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' )
-            // InternalProblem.g:468:3: ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= RULE_ID ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.'
+            // InternalProblem.g:631:2: ( ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.' )
+            // InternalProblem.g:632:3: ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' ) ( (lv_name_3_0= ruleIdentifier ) ) otherlv_4= '(' ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )? otherlv_8= ')' (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )? otherlv_13= '.'
             {
-            // InternalProblem.g:468:3: ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' )
-            int alt14=2;
-            int LA14_0 = input.LA(1);
+            // InternalProblem.g:632:3: ( ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? ) | otherlv_2= 'pred' )
+            int alt18=2;
+            int LA18_0 = input.LA(1);
 
-            if ( (LA14_0==26) ) {
-                alt14=1;
+            if ( (LA18_0==27) ) {
+                alt18=1;
             }
-            else if ( (LA14_0==27) ) {
-                alt14=2;
+            else if ( (LA18_0==28) ) {
+                alt18=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 14, 0, input);
+                    new NoViableAltException("", 18, 0, input);
 
                 throw nvae;
             }
-            switch (alt14) {
+            switch (alt18) {
                 case 1 :
-                    // InternalProblem.g:469:4: ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? )
+                    // InternalProblem.g:633:4: ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? )
                     {
-                    // InternalProblem.g:469:4: ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? )
-                    // InternalProblem.g:470:5: ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )?
+                    // InternalProblem.g:633:4: ( ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )? )
+                    // InternalProblem.g:634:5: ( (lv_error_0_0= 'error' ) ) (otherlv_1= 'pred' )?
                     {
-                    // InternalProblem.g:470:5: ( (lv_error_0_0= 'error' ) )
-                    // InternalProblem.g:471:6: (lv_error_0_0= 'error' )
+                    // InternalProblem.g:634:5: ( (lv_error_0_0= 'error' ) )
+                    // InternalProblem.g:635:6: (lv_error_0_0= 'error' )
                     {
-                    // InternalProblem.g:471:6: (lv_error_0_0= 'error' )
-                    // InternalProblem.g:472:7: lv_error_0_0= 'error'
+                    // InternalProblem.g:635:6: (lv_error_0_0= 'error' )
+                    // InternalProblem.g:636:7: lv_error_0_0= 'error'
                     {
-                    lv_error_0_0=(Token)match(input,26,FOLLOW_16); 
+                    lv_error_0_0=(Token)match(input,27,FOLLOW_20); 
 
                                                                         newLeafNode(lv_error_0_0, grammarAccess.getPredicateDefinitionAccess().getErrorErrorKeyword_0_0_0_0());
                                                                 
@@ -1263,18 +1724,18 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:484:5: (otherlv_1= 'pred' )?
-                    int alt13=2;
-                    int LA13_0 = input.LA(1);
+                    // InternalProblem.g:648:5: (otherlv_1= 'pred' )?
+                    int alt17=2;
+                    int LA17_0 = input.LA(1);
 
-                    if ( (LA13_0==27) ) {
-                        alt13=1;
+                    if ( (LA17_0==28) ) {
+                        alt17=1;
                     }
-                    switch (alt13) {
+                    switch (alt17) {
                         case 1 :
-                            // InternalProblem.g:485:6: otherlv_1= 'pred'
+                            // InternalProblem.g:649:6: otherlv_1= 'pred'
                             {
-                            otherlv_1=(Token)match(input,27,FOLLOW_3); 
+                            otherlv_1=(Token)match(input,28,FOLLOW_3); 
 
                                                                         newLeafNode(otherlv_1, grammarAccess.getPredicateDefinitionAccess().getPredKeyword_0_0_1());
                                                                 
@@ -1291,9 +1752,9 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:492:4: otherlv_2= 'pred'
+                    // InternalProblem.g:656:4: otherlv_2= 'pred'
                     {
-                    otherlv_2=(Token)match(input,27,FOLLOW_3); 
+                    otherlv_2=(Token)match(input,28,FOLLOW_3); 
 
                                                 newLeafNode(otherlv_2, grammarAccess.getPredicateDefinitionAccess().getPredKeyword_0_1());
                                         
@@ -1303,25 +1764,30 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:497:3: ( (lv_name_3_0= RULE_ID ) )
-            // InternalProblem.g:498:4: (lv_name_3_0= RULE_ID )
+            // InternalProblem.g:661:3: ( (lv_name_3_0= ruleIdentifier ) )
+            // InternalProblem.g:662:4: (lv_name_3_0= ruleIdentifier )
             {
-            // InternalProblem.g:498:4: (lv_name_3_0= RULE_ID )
-            // InternalProblem.g:499:5: lv_name_3_0= RULE_ID
+            // InternalProblem.g:662:4: (lv_name_3_0= ruleIdentifier )
+            // InternalProblem.g:663:5: lv_name_3_0= ruleIdentifier
             {
-            lv_name_3_0=(Token)match(input,RULE_ID,FOLLOW_17); 
 
-                                                newLeafNode(lv_name_3_0, grammarAccess.getPredicateDefinitionAccess().getNameIDTerminalRuleCall_1_0());
+                                                newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getNameIdentifierParserRuleCall_1_0());
                                         
+            pushFollow(FOLLOW_21);
+            lv_name_3_0=ruleIdentifier();
+
+            state._fsp--;
+
 
                                                 if (current==null) {
-                                                        current = createModelElement(grammarAccess.getPredicateDefinitionRule());
+                                                        current = createModelElementForParent(grammarAccess.getPredicateDefinitionRule());
                                                 }
-                                                setWithLastConsumed(
+                                                set(
                                                         current,
                                                         "name",
                                                         lv_name_3_0,
-                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                        "org.eclipse.viatra.solver.language.Problem.Identifier");
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -1329,31 +1795,31 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_4=(Token)match(input,28,FOLLOW_18); 
+            otherlv_4=(Token)match(input,29,FOLLOW_22); 
 
                                 newLeafNode(otherlv_4, grammarAccess.getPredicateDefinitionAccess().getLeftParenthesisKeyword_2());
                         
-            // InternalProblem.g:519:3: ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )?
-            int alt16=2;
-            int LA16_0 = input.LA(1);
+            // InternalProblem.g:684:3: ( ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )* )?
+            int alt20=2;
+            int LA20_0 = input.LA(1);
 
-            if ( (LA16_0==RULE_ID) ) {
-                alt16=1;
+            if ( (LA20_0==RULE_ID||LA20_0==RULE_QUOTED_ID||(LA20_0>=40 && LA20_0<=41)) ) {
+                alt20=1;
             }
-            switch (alt16) {
+            switch (alt20) {
                 case 1 :
-                    // InternalProblem.g:520:4: ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )*
+                    // InternalProblem.g:685:4: ( (lv_parameters_5_0= ruleParameter ) ) (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )*
                     {
-                    // InternalProblem.g:520:4: ( (lv_parameters_5_0= ruleParameter ) )
-                    // InternalProblem.g:521:5: (lv_parameters_5_0= ruleParameter )
+                    // InternalProblem.g:685:4: ( (lv_parameters_5_0= ruleParameter ) )
+                    // InternalProblem.g:686:5: (lv_parameters_5_0= ruleParameter )
                     {
-                    // InternalProblem.g:521:5: (lv_parameters_5_0= ruleParameter )
-                    // InternalProblem.g:522:6: lv_parameters_5_0= ruleParameter
+                    // InternalProblem.g:686:5: (lv_parameters_5_0= ruleParameter )
+                    // InternalProblem.g:687:6: lv_parameters_5_0= ruleParameter
                     {
 
                                                                 newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getParametersParameterParserRuleCall_3_0_0());
                                                         
-                    pushFollow(FOLLOW_19);
+                    pushFollow(FOLLOW_23);
                     lv_parameters_5_0=ruleParameter();
 
                     state._fsp--;
@@ -1375,35 +1841,35 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:539:4: (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )*
-                    loop15:
+                    // InternalProblem.g:704:4: (otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) ) )*
+                    loop19:
                     do {
-                        int alt15=2;
-                        int LA15_0 = input.LA(1);
+                        int alt19=2;
+                        int LA19_0 = input.LA(1);
 
-                        if ( (LA15_0==17) ) {
-                            alt15=1;
+                        if ( (LA19_0==17) ) {
+                            alt19=1;
                         }
 
 
-                        switch (alt15) {
+                        switch (alt19) {
                         case 1 :
-                            // InternalProblem.g:540:5: otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) )
+                            // InternalProblem.g:705:5: otherlv_6= ',' ( (lv_parameters_7_0= ruleParameter ) )
                             {
-                            otherlv_6=(Token)match(input,17,FOLLOW_3); 
+                            otherlv_6=(Token)match(input,17,FOLLOW_8); 
 
                                                                 newLeafNode(otherlv_6, grammarAccess.getPredicateDefinitionAccess().getCommaKeyword_3_1_0());
                                                         
-                            // InternalProblem.g:544:5: ( (lv_parameters_7_0= ruleParameter ) )
-                            // InternalProblem.g:545:6: (lv_parameters_7_0= ruleParameter )
+                            // InternalProblem.g:709:5: ( (lv_parameters_7_0= ruleParameter ) )
+                            // InternalProblem.g:710:6: (lv_parameters_7_0= ruleParameter )
                             {
-                            // InternalProblem.g:545:6: (lv_parameters_7_0= ruleParameter )
-                            // InternalProblem.g:546:7: lv_parameters_7_0= ruleParameter
+                            // InternalProblem.g:710:6: (lv_parameters_7_0= ruleParameter )
+                            // InternalProblem.g:711:7: lv_parameters_7_0= ruleParameter
                             {
 
                                                                                 newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getParametersParameterParserRuleCall_3_1_1_0());
                                                                         
-                            pushFollow(FOLLOW_19);
+                            pushFollow(FOLLOW_23);
                             lv_parameters_7_0=ruleParameter();
 
                             state._fsp--;
@@ -1430,7 +1896,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                             break;
 
                         default :
-                            break loop15;
+                            break loop19;
                         }
                     } while (true);
 
@@ -1440,35 +1906,35 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_8=(Token)match(input,29,FOLLOW_20); 
+            otherlv_8=(Token)match(input,30,FOLLOW_24); 
 
                                 newLeafNode(otherlv_8, grammarAccess.getPredicateDefinitionAccess().getRightParenthesisKeyword_4());
                         
-            // InternalProblem.g:569:3: (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )?
-            int alt18=2;
-            int LA18_0 = input.LA(1);
+            // InternalProblem.g:734:3: (otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )* )?
+            int alt22=2;
+            int LA22_0 = input.LA(1);
 
-            if ( (LA18_0==30) ) {
-                alt18=1;
+            if ( (LA22_0==31) ) {
+                alt22=1;
             }
-            switch (alt18) {
+            switch (alt22) {
                 case 1 :
-                    // InternalProblem.g:570:4: otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )*
+                    // InternalProblem.g:735:4: otherlv_9= ':-' ( (lv_bodies_10_0= ruleConjunction ) ) (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )*
                     {
-                    otherlv_9=(Token)match(input,30,FOLLOW_21); 
+                    otherlv_9=(Token)match(input,31,FOLLOW_25); 
 
                                                 newLeafNode(otherlv_9, grammarAccess.getPredicateDefinitionAccess().getColonHyphenMinusKeyword_5_0());
                                         
-                    // InternalProblem.g:574:4: ( (lv_bodies_10_0= ruleConjunction ) )
-                    // InternalProblem.g:575:5: (lv_bodies_10_0= ruleConjunction )
+                    // InternalProblem.g:739:4: ( (lv_bodies_10_0= ruleConjunction ) )
+                    // InternalProblem.g:740:5: (lv_bodies_10_0= ruleConjunction )
                     {
-                    // InternalProblem.g:575:5: (lv_bodies_10_0= ruleConjunction )
-                    // InternalProblem.g:576:6: lv_bodies_10_0= ruleConjunction
+                    // InternalProblem.g:740:5: (lv_bodies_10_0= ruleConjunction )
+                    // InternalProblem.g:741:6: lv_bodies_10_0= ruleConjunction
                     {
 
                                                                 newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getBodiesConjunctionParserRuleCall_5_1_0());
                                                         
-                    pushFollow(FOLLOW_22);
+                    pushFollow(FOLLOW_26);
                     lv_bodies_10_0=ruleConjunction();
 
                     state._fsp--;
@@ -1490,35 +1956,35 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:593:4: (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )*
-                    loop17:
+                    // InternalProblem.g:758:4: (otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) ) )*
+                    loop21:
                     do {
-                        int alt17=2;
-                        int LA17_0 = input.LA(1);
+                        int alt21=2;
+                        int LA21_0 = input.LA(1);
 
-                        if ( (LA17_0==19) ) {
-                            alt17=1;
+                        if ( (LA21_0==19) ) {
+                            alt21=1;
                         }
 
 
-                        switch (alt17) {
+                        switch (alt21) {
                         case 1 :
-                            // InternalProblem.g:594:5: otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) )
+                            // InternalProblem.g:759:5: otherlv_11= ';' ( (lv_bodies_12_0= ruleConjunction ) )
                             {
-                            otherlv_11=(Token)match(input,19,FOLLOW_21); 
+                            otherlv_11=(Token)match(input,19,FOLLOW_25); 
 
                                                                 newLeafNode(otherlv_11, grammarAccess.getPredicateDefinitionAccess().getSemicolonKeyword_5_2_0());
                                                         
-                            // InternalProblem.g:598:5: ( (lv_bodies_12_0= ruleConjunction ) )
-                            // InternalProblem.g:599:6: (lv_bodies_12_0= ruleConjunction )
+                            // InternalProblem.g:763:5: ( (lv_bodies_12_0= ruleConjunction ) )
+                            // InternalProblem.g:764:6: (lv_bodies_12_0= ruleConjunction )
                             {
-                            // InternalProblem.g:599:6: (lv_bodies_12_0= ruleConjunction )
-                            // InternalProblem.g:600:7: lv_bodies_12_0= ruleConjunction
+                            // InternalProblem.g:764:6: (lv_bodies_12_0= ruleConjunction )
+                            // InternalProblem.g:765:7: lv_bodies_12_0= ruleConjunction
                             {
 
                                                                                 newCompositeNode(grammarAccess.getPredicateDefinitionAccess().getBodiesConjunctionParserRuleCall_5_2_1_0());
                                                                         
-                            pushFollow(FOLLOW_22);
+                            pushFollow(FOLLOW_26);
                             lv_bodies_12_0=ruleConjunction();
 
                             state._fsp--;
@@ -1545,7 +2011,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                             break;
 
                         default :
-                            break loop17;
+                            break loop21;
                         }
                     } while (true);
 
@@ -1582,7 +2048,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleParameter"
-    // InternalProblem.g:627:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ;
+    // InternalProblem.g:792:1: entryRuleParameter returns [EObject current=null] : iv_ruleParameter= ruleParameter EOF ;
     public final EObject entryRuleParameter() throws RecognitionException {
         EObject current = null;
 
@@ -1590,8 +2056,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:627:50: (iv_ruleParameter= ruleParameter EOF )
-            // InternalProblem.g:628:2: iv_ruleParameter= ruleParameter EOF
+            // InternalProblem.g:792:50: (iv_ruleParameter= ruleParameter EOF )
+            // InternalProblem.g:793:2: iv_ruleParameter= ruleParameter EOF
             {
              newCompositeNode(grammarAccess.getParameterRule()); 
             pushFollow(FOLLOW_1);
@@ -1618,63 +2084,116 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleParameter"
-    // InternalProblem.g:634:1: ruleParameter returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) ) ;
+    // InternalProblem.g:799:1: ruleParameter returns [EObject current=null] : ( ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) ) ) ;
     public final EObject ruleParameter() throws RecognitionException {
         EObject current = null;
 
-        Token otherlv_0=null;
-        Token lv_name_1_0=null;
+        AntlrDatatypeRuleToken lv_name_1_0 = null;
+
 
 
                 enterRule();
 
         try {
-            // InternalProblem.g:640:2: ( ( ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) ) )
-            // InternalProblem.g:641:2: ( ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) )
-            {
-            // InternalProblem.g:641:2: ( ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) ) )
-            // InternalProblem.g:642:3: ( (otherlv_0= RULE_ID ) ) ( (lv_name_1_0= RULE_ID ) )
-            {
-            // InternalProblem.g:642:3: ( (otherlv_0= RULE_ID ) )
-            // InternalProblem.g:643:4: (otherlv_0= RULE_ID )
+            // InternalProblem.g:805:2: ( ( ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) ) ) )
+            // InternalProblem.g:806:2: ( ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) ) )
             {
-            // InternalProblem.g:643:4: (otherlv_0= RULE_ID )
-            // InternalProblem.g:644:5: otherlv_0= RULE_ID
+            // InternalProblem.g:806:2: ( ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) ) )
+            // InternalProblem.g:807:3: ( ( ruleQualifiedName ) )? ( (lv_name_1_0= ruleIdentifier ) )
             {
+            // InternalProblem.g:807:3: ( ( ruleQualifiedName ) )?
+            int alt23=2;
+            switch ( input.LA(1) ) {
+                case RULE_QUOTED_ID:
+                    {
+                    alt23=1;
+                    }
+                    break;
+                case RULE_ID:
+                    {
+                    int LA23_2 = input.LA(2);
 
-                                                if (current==null) {
-                                                        current = createModelElement(grammarAccess.getParameterRule());
-                                                }
-                                        
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_3); 
+                    if ( (LA23_2==RULE_ID||LA23_2==34||(LA23_2>=40 && LA23_2<=41)) ) {
+                        alt23=1;
+                    }
+                    }
+                    break;
+                case 40:
+                    {
+                    int LA23_3 = input.LA(2);
 
-                                                newLeafNode(otherlv_0, grammarAccess.getParameterAccess().getParameterTypeClassDeclarationCrossReference_0_0());
-                                        
+                    if ( (LA23_3==RULE_ID||LA23_3==34||(LA23_3>=40 && LA23_3<=41)) ) {
+                        alt23=1;
+                    }
+                    }
+                    break;
+                case 41:
+                    {
+                    int LA23_4 = input.LA(2);
 
+                    if ( (LA23_4==RULE_ID||LA23_4==34||(LA23_4>=40 && LA23_4<=41)) ) {
+                        alt23=1;
+                    }
+                    }
+                    break;
             }
 
+            switch (alt23) {
+                case 1 :
+                    // InternalProblem.g:808:4: ( ruleQualifiedName )
+                    {
+                    // InternalProblem.g:808:4: ( ruleQualifiedName )
+                    // InternalProblem.g:809:5: ruleQualifiedName
+                    {
+
+                                                        if (current==null) {
+                                                                current = createModelElement(grammarAccess.getParameterRule());
+                                                        }
+                                                
+
+                                                        newCompositeNode(grammarAccess.getParameterAccess().getParameterTypeRelationCrossReference_0_0());
+                                                
+                    pushFollow(FOLLOW_3);
+                    ruleQualifiedName();
+
+                    state._fsp--;
+
+
+                                                        afterParserOrEnumRuleCall();
+                                                
+
+                    }
+
+
+                    }
+                    break;
 
             }
 
-            // InternalProblem.g:655:3: ( (lv_name_1_0= RULE_ID ) )
-            // InternalProblem.g:656:4: (lv_name_1_0= RULE_ID )
+            // InternalProblem.g:823:3: ( (lv_name_1_0= ruleIdentifier ) )
+            // InternalProblem.g:824:4: (lv_name_1_0= ruleIdentifier )
             {
-            // InternalProblem.g:656:4: (lv_name_1_0= RULE_ID )
-            // InternalProblem.g:657:5: lv_name_1_0= RULE_ID
+            // InternalProblem.g:824:4: (lv_name_1_0= ruleIdentifier )
+            // InternalProblem.g:825:5: lv_name_1_0= ruleIdentifier
             {
-            lv_name_1_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
-                                                newLeafNode(lv_name_1_0, grammarAccess.getParameterAccess().getNameIDTerminalRuleCall_1_0());
+                                                newCompositeNode(grammarAccess.getParameterAccess().getNameIdentifierParserRuleCall_1_0());
                                         
+            pushFollow(FOLLOW_2);
+            lv_name_1_0=ruleIdentifier();
+
+            state._fsp--;
+
 
                                                 if (current==null) {
-                                                        current = createModelElement(grammarAccess.getParameterRule());
+                                                        current = createModelElementForParent(grammarAccess.getParameterRule());
                                                 }
-                                                setWithLastConsumed(
+                                                set(
                                                         current,
                                                         "name",
                                                         lv_name_1_0,
-                                                        "org.eclipse.xtext.common.Terminals.ID");
+                                                        "org.eclipse.viatra.solver.language.Problem.Identifier");
+                                                afterParserOrEnumRuleCall();
                                         
 
             }
@@ -1705,7 +2224,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleConjunction"
-    // InternalProblem.g:677:1: entryRuleConjunction returns [EObject current=null] : iv_ruleConjunction= ruleConjunction EOF ;
+    // InternalProblem.g:846:1: entryRuleConjunction returns [EObject current=null] : iv_ruleConjunction= ruleConjunction EOF ;
     public final EObject entryRuleConjunction() throws RecognitionException {
         EObject current = null;
 
@@ -1713,8 +2232,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:677:52: (iv_ruleConjunction= ruleConjunction EOF )
-            // InternalProblem.g:678:2: iv_ruleConjunction= ruleConjunction EOF
+            // InternalProblem.g:846:52: (iv_ruleConjunction= ruleConjunction EOF )
+            // InternalProblem.g:847:2: iv_ruleConjunction= ruleConjunction EOF
             {
              newCompositeNode(grammarAccess.getConjunctionRule()); 
             pushFollow(FOLLOW_1);
@@ -1741,7 +2260,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleConjunction"
-    // InternalProblem.g:684:1: ruleConjunction returns [EObject current=null] : ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* ) ;
+    // InternalProblem.g:853:1: ruleConjunction returns [EObject current=null] : ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* ) ;
     public final EObject ruleConjunction() throws RecognitionException {
         EObject current = null;
 
@@ -1755,22 +2274,22 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:690:2: ( ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* ) )
-            // InternalProblem.g:691:2: ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* )
+            // InternalProblem.g:859:2: ( ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* ) )
+            // InternalProblem.g:860:2: ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* )
             {
-            // InternalProblem.g:691:2: ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* )
-            // InternalProblem.g:692:3: ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )*
+            // InternalProblem.g:860:2: ( ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )* )
+            // InternalProblem.g:861:3: ( (lv_literals_0_0= ruleLiteral ) ) (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )*
             {
-            // InternalProblem.g:692:3: ( (lv_literals_0_0= ruleLiteral ) )
-            // InternalProblem.g:693:4: (lv_literals_0_0= ruleLiteral )
+            // InternalProblem.g:861:3: ( (lv_literals_0_0= ruleLiteral ) )
+            // InternalProblem.g:862:4: (lv_literals_0_0= ruleLiteral )
             {
-            // InternalProblem.g:693:4: (lv_literals_0_0= ruleLiteral )
-            // InternalProblem.g:694:5: lv_literals_0_0= ruleLiteral
+            // InternalProblem.g:862:4: (lv_literals_0_0= ruleLiteral )
+            // InternalProblem.g:863:5: lv_literals_0_0= ruleLiteral
             {
 
                                                 newCompositeNode(grammarAccess.getConjunctionAccess().getLiteralsLiteralParserRuleCall_0_0());
                                         
-            pushFollow(FOLLOW_23);
+            pushFollow(FOLLOW_27);
             lv_literals_0_0=ruleLiteral();
 
             state._fsp--;
@@ -1792,35 +2311,35 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:711:3: (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )*
-            loop19:
+            // InternalProblem.g:880:3: (otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) ) )*
+            loop24:
             do {
-                int alt19=2;
-                int LA19_0 = input.LA(1);
+                int alt24=2;
+                int LA24_0 = input.LA(1);
 
-                if ( (LA19_0==17) ) {
-                    alt19=1;
+                if ( (LA24_0==17) ) {
+                    alt24=1;
                 }
 
 
-                switch (alt19) {
+                switch (alt24) {
                 case 1 :
-                    // InternalProblem.g:712:4: otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) )
+                    // InternalProblem.g:881:4: otherlv_1= ',' ( (lv_literals_2_0= ruleLiteral ) )
                     {
-                    otherlv_1=(Token)match(input,17,FOLLOW_21); 
+                    otherlv_1=(Token)match(input,17,FOLLOW_25); 
 
                                                 newLeafNode(otherlv_1, grammarAccess.getConjunctionAccess().getCommaKeyword_1_0());
                                         
-                    // InternalProblem.g:716:4: ( (lv_literals_2_0= ruleLiteral ) )
-                    // InternalProblem.g:717:5: (lv_literals_2_0= ruleLiteral )
+                    // InternalProblem.g:885:4: ( (lv_literals_2_0= ruleLiteral ) )
+                    // InternalProblem.g:886:5: (lv_literals_2_0= ruleLiteral )
                     {
-                    // InternalProblem.g:717:5: (lv_literals_2_0= ruleLiteral )
-                    // InternalProblem.g:718:6: lv_literals_2_0= ruleLiteral
+                    // InternalProblem.g:886:5: (lv_literals_2_0= ruleLiteral )
+                    // InternalProblem.g:887:6: lv_literals_2_0= ruleLiteral
                     {
 
                                                                 newCompositeNode(grammarAccess.getConjunctionAccess().getLiteralsLiteralParserRuleCall_1_1_0());
                                                         
-                    pushFollow(FOLLOW_23);
+                    pushFollow(FOLLOW_27);
                     lv_literals_2_0=ruleLiteral();
 
                     state._fsp--;
@@ -1847,7 +2366,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     break;
 
                 default :
-                    break loop19;
+                    break loop24;
                 }
             } while (true);
 
@@ -1874,7 +2393,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleLiteral"
-    // InternalProblem.g:740:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
+    // InternalProblem.g:909:1: entryRuleLiteral returns [EObject current=null] : iv_ruleLiteral= ruleLiteral EOF ;
     public final EObject entryRuleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1882,8 +2401,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:740:48: (iv_ruleLiteral= ruleLiteral EOF )
-            // InternalProblem.g:741:2: iv_ruleLiteral= ruleLiteral EOF
+            // InternalProblem.g:909:48: (iv_ruleLiteral= ruleLiteral EOF )
+            // InternalProblem.g:910:2: iv_ruleLiteral= ruleLiteral EOF
             {
              newCompositeNode(grammarAccess.getLiteralRule()); 
             pushFollow(FOLLOW_1);
@@ -1910,7 +2429,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleLiteral"
-    // InternalProblem.g:747:1: ruleLiteral returns [EObject current=null] : (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral ) ;
+    // InternalProblem.g:916:1: ruleLiteral returns [EObject current=null] : (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral ) ;
     public final EObject ruleLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -1923,28 +2442,28 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:753:2: ( (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral ) )
-            // InternalProblem.g:754:2: (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral )
+            // InternalProblem.g:922:2: ( (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral ) )
+            // InternalProblem.g:923:2: (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral )
             {
-            // InternalProblem.g:754:2: (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral )
-            int alt20=2;
-            int LA20_0 = input.LA(1);
+            // InternalProblem.g:923:2: (this_Atom_0= ruleAtom | this_NegativeLiteral_1= ruleNegativeLiteral )
+            int alt25=2;
+            int LA25_0 = input.LA(1);
 
-            if ( (LA20_0==RULE_ID||LA20_0==RULE_QUOTED_ID) ) {
-                alt20=1;
+            if ( (LA25_0==RULE_ID||LA25_0==RULE_QUOTED_ID||(LA25_0>=40 && LA25_0<=41)) ) {
+                alt25=1;
             }
-            else if ( (LA20_0==31) ) {
-                alt20=2;
+            else if ( (LA25_0==32) ) {
+                alt25=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 20, 0, input);
+                    new NoViableAltException("", 25, 0, input);
 
                 throw nvae;
             }
-            switch (alt20) {
+            switch (alt25) {
                 case 1 :
-                    // InternalProblem.g:755:3: this_Atom_0= ruleAtom
+                    // InternalProblem.g:924:3: this_Atom_0= ruleAtom
                     {
 
                                         newCompositeNode(grammarAccess.getLiteralAccess().getAtomParserRuleCall_0());
@@ -1962,7 +2481,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:764:3: this_NegativeLiteral_1= ruleNegativeLiteral
+                    // InternalProblem.g:933:3: this_NegativeLiteral_1= ruleNegativeLiteral
                     {
 
                                         newCompositeNode(grammarAccess.getLiteralAccess().getNegativeLiteralParserRuleCall_1());
@@ -2002,7 +2521,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleNegativeLiteral"
-    // InternalProblem.g:776:1: entryRuleNegativeLiteral returns [EObject current=null] : iv_ruleNegativeLiteral= ruleNegativeLiteral EOF ;
+    // InternalProblem.g:945:1: entryRuleNegativeLiteral returns [EObject current=null] : iv_ruleNegativeLiteral= ruleNegativeLiteral EOF ;
     public final EObject entryRuleNegativeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2010,8 +2529,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:776:56: (iv_ruleNegativeLiteral= ruleNegativeLiteral EOF )
-            // InternalProblem.g:777:2: iv_ruleNegativeLiteral= ruleNegativeLiteral EOF
+            // InternalProblem.g:945:56: (iv_ruleNegativeLiteral= ruleNegativeLiteral EOF )
+            // InternalProblem.g:946:2: iv_ruleNegativeLiteral= ruleNegativeLiteral EOF
             {
              newCompositeNode(grammarAccess.getNegativeLiteralRule()); 
             pushFollow(FOLLOW_1);
@@ -2038,7 +2557,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleNegativeLiteral"
-    // InternalProblem.g:783:1: ruleNegativeLiteral returns [EObject current=null] : (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) ) ;
+    // InternalProblem.g:952:1: ruleNegativeLiteral returns [EObject current=null] : (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) ) ;
     public final EObject ruleNegativeLiteral() throws RecognitionException {
         EObject current = null;
 
@@ -2050,21 +2569,21 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:789:2: ( (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) ) )
-            // InternalProblem.g:790:2: (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) )
+            // InternalProblem.g:958:2: ( (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) ) )
+            // InternalProblem.g:959:2: (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) )
             {
-            // InternalProblem.g:790:2: (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) )
-            // InternalProblem.g:791:3: otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) )
+            // InternalProblem.g:959:2: (otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) ) )
+            // InternalProblem.g:960:3: otherlv_0= '!' ( (lv_atom_1_0= ruleAtom ) )
             {
-            otherlv_0=(Token)match(input,31,FOLLOW_8); 
+            otherlv_0=(Token)match(input,32,FOLLOW_8); 
 
                                 newLeafNode(otherlv_0, grammarAccess.getNegativeLiteralAccess().getExclamationMarkKeyword_0());
                         
-            // InternalProblem.g:795:3: ( (lv_atom_1_0= ruleAtom ) )
-            // InternalProblem.g:796:4: (lv_atom_1_0= ruleAtom )
+            // InternalProblem.g:964:3: ( (lv_atom_1_0= ruleAtom ) )
+            // InternalProblem.g:965:4: (lv_atom_1_0= ruleAtom )
             {
-            // InternalProblem.g:796:4: (lv_atom_1_0= ruleAtom )
-            // InternalProblem.g:797:5: lv_atom_1_0= ruleAtom
+            // InternalProblem.g:965:4: (lv_atom_1_0= ruleAtom )
+            // InternalProblem.g:966:5: lv_atom_1_0= ruleAtom
             {
 
                                                 newCompositeNode(grammarAccess.getNegativeLiteralAccess().getAtomAtomParserRuleCall_1_0());
@@ -2114,7 +2633,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAtom"
-    // InternalProblem.g:818:1: entryRuleAtom returns [EObject current=null] : iv_ruleAtom= ruleAtom EOF ;
+    // InternalProblem.g:987:1: entryRuleAtom returns [EObject current=null] : iv_ruleAtom= ruleAtom EOF ;
     public final EObject entryRuleAtom() throws RecognitionException {
         EObject current = null;
 
@@ -2122,8 +2641,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:818:45: (iv_ruleAtom= ruleAtom EOF )
-            // InternalProblem.g:819:2: iv_ruleAtom= ruleAtom EOF
+            // InternalProblem.g:987:45: (iv_ruleAtom= ruleAtom EOF )
+            // InternalProblem.g:988:2: iv_ruleAtom= ruleAtom EOF
             {
              newCompositeNode(grammarAccess.getAtomRule()); 
             pushFollow(FOLLOW_1);
@@ -2150,7 +2669,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAtom"
-    // InternalProblem.g:825:1: ruleAtom returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' ) ;
+    // InternalProblem.g:994:1: ruleAtom returns [EObject current=null] : ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' ) ;
     public final EObject ruleAtom() throws RecognitionException {
         EObject current = null;
 
@@ -2167,17 +2686,17 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:831:2: ( ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' ) )
-            // InternalProblem.g:832:2: ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' )
+            // InternalProblem.g:1000:2: ( ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' ) )
+            // InternalProblem.g:1001:2: ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' )
             {
-            // InternalProblem.g:832:2: ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' )
-            // InternalProblem.g:833:3: ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')'
+            // InternalProblem.g:1001:2: ( ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')' )
+            // InternalProblem.g:1002:3: ( ( ruleQualifiedName ) ) ( (lv_transitiveClosure_1_0= '+' ) )? otherlv_2= '(' ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )? otherlv_6= ')'
             {
-            // InternalProblem.g:833:3: ( ( ruleQualifiedName ) )
-            // InternalProblem.g:834:4: ( ruleQualifiedName )
+            // InternalProblem.g:1002:3: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:1003:4: ( ruleQualifiedName )
             {
-            // InternalProblem.g:834:4: ( ruleQualifiedName )
-            // InternalProblem.g:835:5: ruleQualifiedName
+            // InternalProblem.g:1003:4: ( ruleQualifiedName )
+            // InternalProblem.g:1004:5: ruleQualifiedName
             {
 
                                                 if (current==null) {
@@ -2187,7 +2706,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                                 newCompositeNode(grammarAccess.getAtomAccess().getRelationRelationCrossReference_0_0());
                                         
-            pushFollow(FOLLOW_24);
+            pushFollow(FOLLOW_28);
             ruleQualifiedName();
 
             state._fsp--;
@@ -2201,21 +2720,21 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:849:3: ( (lv_transitiveClosure_1_0= '+' ) )?
-            int alt21=2;
-            int LA21_0 = input.LA(1);
+            // InternalProblem.g:1018:3: ( (lv_transitiveClosure_1_0= '+' ) )?
+            int alt26=2;
+            int LA26_0 = input.LA(1);
 
-            if ( (LA21_0==32) ) {
-                alt21=1;
+            if ( (LA26_0==33) ) {
+                alt26=1;
             }
-            switch (alt21) {
+            switch (alt26) {
                 case 1 :
-                    // InternalProblem.g:850:4: (lv_transitiveClosure_1_0= '+' )
+                    // InternalProblem.g:1019:4: (lv_transitiveClosure_1_0= '+' )
                     {
-                    // InternalProblem.g:850:4: (lv_transitiveClosure_1_0= '+' )
-                    // InternalProblem.g:851:5: lv_transitiveClosure_1_0= '+'
+                    // InternalProblem.g:1019:4: (lv_transitiveClosure_1_0= '+' )
+                    // InternalProblem.g:1020:5: lv_transitiveClosure_1_0= '+'
                     {
-                    lv_transitiveClosure_1_0=(Token)match(input,32,FOLLOW_17); 
+                    lv_transitiveClosure_1_0=(Token)match(input,33,FOLLOW_21); 
 
                                                         newLeafNode(lv_transitiveClosure_1_0, grammarAccess.getAtomAccess().getTransitiveClosurePlusSignKeyword_1_0());
                                                 
@@ -2234,31 +2753,31 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_2=(Token)match(input,28,FOLLOW_18); 
+            otherlv_2=(Token)match(input,29,FOLLOW_22); 
 
                                 newLeafNode(otherlv_2, grammarAccess.getAtomAccess().getLeftParenthesisKeyword_2());
                         
-            // InternalProblem.g:867:3: ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )?
-            int alt23=2;
-            int LA23_0 = input.LA(1);
+            // InternalProblem.g:1036:3: ( ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )* )?
+            int alt28=2;
+            int LA28_0 = input.LA(1);
 
-            if ( (LA23_0==RULE_ID) ) {
-                alt23=1;
+            if ( (LA28_0==RULE_ID||LA28_0==RULE_QUOTED_ID||(LA28_0>=40 && LA28_0<=41)) ) {
+                alt28=1;
             }
-            switch (alt23) {
+            switch (alt28) {
                 case 1 :
-                    // InternalProblem.g:868:4: ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )*
+                    // InternalProblem.g:1037:4: ( (lv_arguments_3_0= ruleArgument ) ) (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )*
                     {
-                    // InternalProblem.g:868:4: ( (lv_arguments_3_0= ruleArgument ) )
-                    // InternalProblem.g:869:5: (lv_arguments_3_0= ruleArgument )
+                    // InternalProblem.g:1037:4: ( (lv_arguments_3_0= ruleArgument ) )
+                    // InternalProblem.g:1038:5: (lv_arguments_3_0= ruleArgument )
                     {
-                    // InternalProblem.g:869:5: (lv_arguments_3_0= ruleArgument )
-                    // InternalProblem.g:870:6: lv_arguments_3_0= ruleArgument
+                    // InternalProblem.g:1038:5: (lv_arguments_3_0= ruleArgument )
+                    // InternalProblem.g:1039:6: lv_arguments_3_0= ruleArgument
                     {
 
                                                                 newCompositeNode(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_0_0());
                                                         
-                    pushFollow(FOLLOW_19);
+                    pushFollow(FOLLOW_23);
                     lv_arguments_3_0=ruleArgument();
 
                     state._fsp--;
@@ -2280,35 +2799,35 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:887:4: (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )*
-                    loop22:
+                    // InternalProblem.g:1056:4: (otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) ) )*
+                    loop27:
                     do {
-                        int alt22=2;
-                        int LA22_0 = input.LA(1);
+                        int alt27=2;
+                        int LA27_0 = input.LA(1);
 
-                        if ( (LA22_0==17) ) {
-                            alt22=1;
+                        if ( (LA27_0==17) ) {
+                            alt27=1;
                         }
 
 
-                        switch (alt22) {
+                        switch (alt27) {
                         case 1 :
-                            // InternalProblem.g:888:5: otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) )
+                            // InternalProblem.g:1057:5: otherlv_4= ',' ( (lv_arguments_5_0= ruleArgument ) )
                             {
-                            otherlv_4=(Token)match(input,17,FOLLOW_3); 
+                            otherlv_4=(Token)match(input,17,FOLLOW_8); 
 
                                                                 newLeafNode(otherlv_4, grammarAccess.getAtomAccess().getCommaKeyword_3_1_0());
                                                         
-                            // InternalProblem.g:892:5: ( (lv_arguments_5_0= ruleArgument ) )
-                            // InternalProblem.g:893:6: (lv_arguments_5_0= ruleArgument )
+                            // InternalProblem.g:1061:5: ( (lv_arguments_5_0= ruleArgument ) )
+                            // InternalProblem.g:1062:6: (lv_arguments_5_0= ruleArgument )
                             {
-                            // InternalProblem.g:893:6: (lv_arguments_5_0= ruleArgument )
-                            // InternalProblem.g:894:7: lv_arguments_5_0= ruleArgument
+                            // InternalProblem.g:1062:6: (lv_arguments_5_0= ruleArgument )
+                            // InternalProblem.g:1063:7: lv_arguments_5_0= ruleArgument
                             {
 
                                                                                 newCompositeNode(grammarAccess.getAtomAccess().getArgumentsArgumentParserRuleCall_3_1_1_0());
                                                                         
-                            pushFollow(FOLLOW_19);
+                            pushFollow(FOLLOW_23);
                             lv_arguments_5_0=ruleArgument();
 
                             state._fsp--;
@@ -2335,7 +2854,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                             break;
 
                         default :
-                            break loop22;
+                            break loop27;
                         }
                     } while (true);
 
@@ -2345,7 +2864,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_6=(Token)match(input,29,FOLLOW_2); 
+            otherlv_6=(Token)match(input,30,FOLLOW_2); 
 
                                 newLeafNode(otherlv_6, grammarAccess.getAtomAccess().getRightParenthesisKeyword_4());
                         
@@ -2372,7 +2891,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleArgument"
-    // InternalProblem.g:921:1: entryRuleArgument returns [EObject current=null] : iv_ruleArgument= ruleArgument EOF ;
+    // InternalProblem.g:1090:1: entryRuleArgument returns [EObject current=null] : iv_ruleArgument= ruleArgument EOF ;
     public final EObject entryRuleArgument() throws RecognitionException {
         EObject current = null;
 
@@ -2380,8 +2899,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:921:49: (iv_ruleArgument= ruleArgument EOF )
-            // InternalProblem.g:922:2: iv_ruleArgument= ruleArgument EOF
+            // InternalProblem.g:1090:49: (iv_ruleArgument= ruleArgument EOF )
+            // InternalProblem.g:1091:2: iv_ruleArgument= ruleArgument EOF
             {
              newCompositeNode(grammarAccess.getArgumentRule()); 
             pushFollow(FOLLOW_1);
@@ -2408,33 +2927,38 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleArgument"
-    // InternalProblem.g:928:1: ruleArgument returns [EObject current=null] : ( (otherlv_0= RULE_ID ) ) ;
+    // InternalProblem.g:1097:1: ruleArgument returns [EObject current=null] : ( ( ruleQualifiedName ) ) ;
     public final EObject ruleArgument() throws RecognitionException {
         EObject current = null;
 
-        Token otherlv_0=null;
-
 
                 enterRule();
 
         try {
-            // InternalProblem.g:934:2: ( ( (otherlv_0= RULE_ID ) ) )
-            // InternalProblem.g:935:2: ( (otherlv_0= RULE_ID ) )
+            // InternalProblem.g:1103:2: ( ( ( ruleQualifiedName ) ) )
+            // InternalProblem.g:1104:2: ( ( ruleQualifiedName ) )
             {
-            // InternalProblem.g:935:2: ( (otherlv_0= RULE_ID ) )
-            // InternalProblem.g:936:3: (otherlv_0= RULE_ID )
+            // InternalProblem.g:1104:2: ( ( ruleQualifiedName ) )
+            // InternalProblem.g:1105:3: ( ruleQualifiedName )
             {
-            // InternalProblem.g:936:3: (otherlv_0= RULE_ID )
-            // InternalProblem.g:937:4: otherlv_0= RULE_ID
+            // InternalProblem.g:1105:3: ( ruleQualifiedName )
+            // InternalProblem.g:1106:4: ruleQualifiedName
             {
 
                                         if (current==null) {
                                                 current = createModelElement(grammarAccess.getArgumentRule());
                                         }
                                 
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_2); 
 
-                                        newLeafNode(otherlv_0, grammarAccess.getArgumentAccess().getVariableVariableCrossReference_0());
+                                        newCompositeNode(grammarAccess.getArgumentAccess().getVariableOrNodeVariableOrNodeCrossReference_0());
+                                
+            pushFollow(FOLLOW_2);
+            ruleQualifiedName();
+
+            state._fsp--;
+
+
+                                        afterParserOrEnumRuleCall();
                                 
 
             }
@@ -2462,7 +2986,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleAssertion"
-    // InternalProblem.g:951:1: entryRuleAssertion returns [EObject current=null] : iv_ruleAssertion= ruleAssertion EOF ;
+    // InternalProblem.g:1123:1: entryRuleAssertion returns [EObject current=null] : iv_ruleAssertion= ruleAssertion EOF ;
     public final EObject entryRuleAssertion() throws RecognitionException {
         EObject current = null;
 
@@ -2470,8 +2994,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:951:50: (iv_ruleAssertion= ruleAssertion EOF )
-            // InternalProblem.g:952:2: iv_ruleAssertion= ruleAssertion EOF
+            // InternalProblem.g:1123:50: (iv_ruleAssertion= ruleAssertion EOF )
+            // InternalProblem.g:1124:2: iv_ruleAssertion= ruleAssertion EOF
             {
              newCompositeNode(grammarAccess.getAssertionRule()); 
             pushFollow(FOLLOW_1);
@@ -2498,7 +3022,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleAssertion"
-    // InternalProblem.g:958:1: ruleAssertion returns [EObject current=null] : ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' ) ;
+    // InternalProblem.g:1130:1: ruleAssertion returns [EObject current=null] : ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' ) ;
     public final EObject ruleAssertion() throws RecognitionException {
         EObject current = null;
 
@@ -2519,27 +3043,27 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:964:2: ( ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' ) )
-            // InternalProblem.g:965:2: ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' )
+            // InternalProblem.g:1136:2: ( ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' ) )
+            // InternalProblem.g:1137:2: ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' )
             {
-            // InternalProblem.g:965:2: ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' )
-            // InternalProblem.g:966:3: ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.'
+            // InternalProblem.g:1137:2: ( ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.' )
+            // InternalProblem.g:1138:3: ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) ) otherlv_15= '.'
             {
-            // InternalProblem.g:966:3: ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) )
-            int alt29=2;
-            alt29 = dfa29.predict(input);
-            switch (alt29) {
+            // InternalProblem.g:1138:3: ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) )
+            int alt34=2;
+            alt34 = dfa34.predict(input);
+            switch (alt34) {
                 case 1 :
-                    // InternalProblem.g:967:4: ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) )
+                    // InternalProblem.g:1139:4: ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) )
                     {
-                    // InternalProblem.g:967:4: ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) )
-                    // InternalProblem.g:968:5: ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) )
+                    // InternalProblem.g:1139:4: ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) )
+                    // InternalProblem.g:1140:5: ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) )
                     {
-                    // InternalProblem.g:968:5: ( ( ruleQualifiedName ) )
-                    // InternalProblem.g:969:6: ( ruleQualifiedName )
+                    // InternalProblem.g:1140:5: ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:1141:6: ( ruleQualifiedName )
                     {
-                    // InternalProblem.g:969:6: ( ruleQualifiedName )
-                    // InternalProblem.g:970:7: ruleQualifiedName
+                    // InternalProblem.g:1141:6: ( ruleQualifiedName )
+                    // InternalProblem.g:1142:7: ruleQualifiedName
                     {
 
                                                                         if (current==null) {
@@ -2549,7 +3073,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                                                         newCompositeNode(grammarAccess.getAssertionAccess().getRelationRelationCrossReference_0_0_0_0());
                                                                 
-                    pushFollow(FOLLOW_17);
+                    pushFollow(FOLLOW_21);
                     ruleQualifiedName();
 
                     state._fsp--;
@@ -2563,26 +3087,26 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_1=(Token)match(input,28,FOLLOW_25); 
+                    otherlv_1=(Token)match(input,29,FOLLOW_22); 
 
                                                         newLeafNode(otherlv_1, grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_0_1());
                                                 
-                    // InternalProblem.g:988:5: ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )?
-                    int alt25=2;
-                    int LA25_0 = input.LA(1);
+                    // InternalProblem.g:1160:5: ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )?
+                    int alt30=2;
+                    int LA30_0 = input.LA(1);
 
-                    if ( (LA25_0==RULE_ID||LA25_0==RULE_QUOTED_ID) ) {
-                        alt25=1;
+                    if ( (LA30_0==RULE_ID||LA30_0==RULE_QUOTED_ID||(LA30_0>=40 && LA30_0<=41)) ) {
+                        alt30=1;
                     }
-                    switch (alt25) {
+                    switch (alt30) {
                         case 1 :
-                            // InternalProblem.g:989:6: ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )*
+                            // InternalProblem.g:1161:6: ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )*
                             {
-                            // InternalProblem.g:989:6: ( ( ruleQualifiedName ) )
-                            // InternalProblem.g:990:7: ( ruleQualifiedName )
+                            // InternalProblem.g:1161:6: ( ( ruleQualifiedName ) )
+                            // InternalProblem.g:1162:7: ( ruleQualifiedName )
                             {
-                            // InternalProblem.g:990:7: ( ruleQualifiedName )
-                            // InternalProblem.g:991:8: ruleQualifiedName
+                            // InternalProblem.g:1162:7: ( ruleQualifiedName )
+                            // InternalProblem.g:1163:8: ruleQualifiedName
                             {
 
                                                                                         if (current==null) {
@@ -2592,7 +3116,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                                                                         newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_0_0());
                                                                                 
-                            pushFollow(FOLLOW_19);
+                            pushFollow(FOLLOW_23);
                             ruleQualifiedName();
 
                             state._fsp--;
@@ -2606,30 +3130,30 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalProblem.g:1005:6: (otherlv_3= ',' ( ( ruleQualifiedName ) ) )*
-                            loop24:
+                            // InternalProblem.g:1177:6: (otherlv_3= ',' ( ( ruleQualifiedName ) ) )*
+                            loop29:
                             do {
-                                int alt24=2;
-                                int LA24_0 = input.LA(1);
+                                int alt29=2;
+                                int LA29_0 = input.LA(1);
 
-                                if ( (LA24_0==17) ) {
-                                    alt24=1;
+                                if ( (LA29_0==17) ) {
+                                    alt29=1;
                                 }
 
 
-                                switch (alt24) {
+                                switch (alt29) {
                                 case 1 :
-                                    // InternalProblem.g:1006:7: otherlv_3= ',' ( ( ruleQualifiedName ) )
+                                    // InternalProblem.g:1178:7: otherlv_3= ',' ( ( ruleQualifiedName ) )
                                     {
                                     otherlv_3=(Token)match(input,17,FOLLOW_8); 
 
                                                                                         newLeafNode(otherlv_3, grammarAccess.getAssertionAccess().getCommaKeyword_0_0_2_1_0());
                                                                                 
-                                    // InternalProblem.g:1010:7: ( ( ruleQualifiedName ) )
-                                    // InternalProblem.g:1011:8: ( ruleQualifiedName )
+                                    // InternalProblem.g:1182:7: ( ( ruleQualifiedName ) )
+                                    // InternalProblem.g:1183:8: ( ruleQualifiedName )
                                     {
-                                    // InternalProblem.g:1011:8: ( ruleQualifiedName )
-                                    // InternalProblem.g:1012:9: ruleQualifiedName
+                                    // InternalProblem.g:1183:8: ( ruleQualifiedName )
+                                    // InternalProblem.g:1184:9: ruleQualifiedName
                                     {
 
                                                                                                         if (current==null) {
@@ -2639,7 +3163,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                                                                                         newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_0_2_1_1_0());
                                                                                                 
-                                    pushFollow(FOLLOW_19);
+                                    pushFollow(FOLLOW_23);
                                     ruleQualifiedName();
 
                                     state._fsp--;
@@ -2658,7 +3182,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                     break;
 
                                 default :
-                                    break loop24;
+                                    break loop29;
                                 }
                             } while (true);
 
@@ -2668,19 +3192,19 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_5=(Token)match(input,29,FOLLOW_26); 
+                    otherlv_5=(Token)match(input,30,FOLLOW_29); 
 
                                                         newLeafNode(otherlv_5, grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_0_3());
                                                 
-                    otherlv_6=(Token)match(input,33,FOLLOW_27); 
+                    otherlv_6=(Token)match(input,34,FOLLOW_30); 
 
                                                         newLeafNode(otherlv_6, grammarAccess.getAssertionAccess().getColonKeyword_0_0_4());
                                                 
-                    // InternalProblem.g:1036:5: ( (lv_value_7_0= ruleLogicValue ) )
-                    // InternalProblem.g:1037:6: (lv_value_7_0= ruleLogicValue )
+                    // InternalProblem.g:1208:5: ( (lv_value_7_0= ruleLogicValue ) )
+                    // InternalProblem.g:1209:6: (lv_value_7_0= ruleLogicValue )
                     {
-                    // InternalProblem.g:1037:6: (lv_value_7_0= ruleLogicValue )
-                    // InternalProblem.g:1038:7: lv_value_7_0= ruleLogicValue
+                    // InternalProblem.g:1209:6: (lv_value_7_0= ruleLogicValue )
+                    // InternalProblem.g:1210:7: lv_value_7_0= ruleLogicValue
                     {
 
                                                                         newCompositeNode(grammarAccess.getAssertionAccess().getValueLogicValueEnumRuleCall_0_0_5_0());
@@ -2714,24 +3238,24 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1057:4: ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' )
+                    // InternalProblem.g:1229:4: ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' )
                     {
-                    // InternalProblem.g:1057:4: ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' )
-                    // InternalProblem.g:1058:5: ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')'
+                    // InternalProblem.g:1229:4: ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' )
+                    // InternalProblem.g:1230:5: ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')'
                     {
-                    // InternalProblem.g:1058:5: ( (lv_value_8_0= ruleShortLogicValue ) )?
-                    int alt26=2;
-                    int LA26_0 = input.LA(1);
+                    // InternalProblem.g:1230:5: ( (lv_value_8_0= ruleShortLogicValue ) )?
+                    int alt31=2;
+                    int LA31_0 = input.LA(1);
 
-                    if ( (LA26_0==31||LA26_0==42) ) {
-                        alt26=1;
+                    if ( (LA31_0==32||LA31_0==43) ) {
+                        alt31=1;
                     }
-                    switch (alt26) {
+                    switch (alt31) {
                         case 1 :
-                            // InternalProblem.g:1059:6: (lv_value_8_0= ruleShortLogicValue )
+                            // InternalProblem.g:1231:6: (lv_value_8_0= ruleShortLogicValue )
                             {
-                            // InternalProblem.g:1059:6: (lv_value_8_0= ruleShortLogicValue )
-                            // InternalProblem.g:1060:7: lv_value_8_0= ruleShortLogicValue
+                            // InternalProblem.g:1231:6: (lv_value_8_0= ruleShortLogicValue )
+                            // InternalProblem.g:1232:7: lv_value_8_0= ruleShortLogicValue
                             {
 
                                                                                 newCompositeNode(grammarAccess.getAssertionAccess().getValueShortLogicValueEnumRuleCall_0_1_0_0());
@@ -2761,11 +3285,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    // InternalProblem.g:1077:5: ( ( ruleQualifiedName ) )
-                    // InternalProblem.g:1078:6: ( ruleQualifiedName )
+                    // InternalProblem.g:1249:5: ( ( ruleQualifiedName ) )
+                    // InternalProblem.g:1250:6: ( ruleQualifiedName )
                     {
-                    // InternalProblem.g:1078:6: ( ruleQualifiedName )
-                    // InternalProblem.g:1079:7: ruleQualifiedName
+                    // InternalProblem.g:1250:6: ( ruleQualifiedName )
+                    // InternalProblem.g:1251:7: ruleQualifiedName
                     {
 
                                                                         if (current==null) {
@@ -2775,7 +3299,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                                                         newCompositeNode(grammarAccess.getAssertionAccess().getRelationRelationCrossReference_0_1_1_0());
                                                                 
-                    pushFollow(FOLLOW_17);
+                    pushFollow(FOLLOW_21);
                     ruleQualifiedName();
 
                     state._fsp--;
@@ -2789,26 +3313,26 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_10=(Token)match(input,28,FOLLOW_25); 
+                    otherlv_10=(Token)match(input,29,FOLLOW_22); 
 
                                                         newLeafNode(otherlv_10, grammarAccess.getAssertionAccess().getLeftParenthesisKeyword_0_1_2());
                                                 
-                    // InternalProblem.g:1097:5: ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )?
-                    int alt28=2;
-                    int LA28_0 = input.LA(1);
+                    // InternalProblem.g:1269:5: ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )?
+                    int alt33=2;
+                    int LA33_0 = input.LA(1);
 
-                    if ( (LA28_0==RULE_ID||LA28_0==RULE_QUOTED_ID) ) {
-                        alt28=1;
+                    if ( (LA33_0==RULE_ID||LA33_0==RULE_QUOTED_ID||(LA33_0>=40 && LA33_0<=41)) ) {
+                        alt33=1;
                     }
-                    switch (alt28) {
+                    switch (alt33) {
                         case 1 :
-                            // InternalProblem.g:1098:6: ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )*
+                            // InternalProblem.g:1270:6: ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )*
                             {
-                            // InternalProblem.g:1098:6: ( ( ruleQualifiedName ) )
-                            // InternalProblem.g:1099:7: ( ruleQualifiedName )
+                            // InternalProblem.g:1270:6: ( ( ruleQualifiedName ) )
+                            // InternalProblem.g:1271:7: ( ruleQualifiedName )
                             {
-                            // InternalProblem.g:1099:7: ( ruleQualifiedName )
-                            // InternalProblem.g:1100:8: ruleQualifiedName
+                            // InternalProblem.g:1271:7: ( ruleQualifiedName )
+                            // InternalProblem.g:1272:8: ruleQualifiedName
                             {
 
                                                                                         if (current==null) {
@@ -2818,7 +3342,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                                                                         newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_0_0());
                                                                                 
-                            pushFollow(FOLLOW_19);
+                            pushFollow(FOLLOW_23);
                             ruleQualifiedName();
 
                             state._fsp--;
@@ -2832,30 +3356,30 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                             }
 
-                            // InternalProblem.g:1114:6: (otherlv_12= ',' ( ( ruleQualifiedName ) ) )*
-                            loop27:
+                            // InternalProblem.g:1286:6: (otherlv_12= ',' ( ( ruleQualifiedName ) ) )*
+                            loop32:
                             do {
-                                int alt27=2;
-                                int LA27_0 = input.LA(1);
+                                int alt32=2;
+                                int LA32_0 = input.LA(1);
 
-                                if ( (LA27_0==17) ) {
-                                    alt27=1;
+                                if ( (LA32_0==17) ) {
+                                    alt32=1;
                                 }
 
 
-                                switch (alt27) {
+                                switch (alt32) {
                                 case 1 :
-                                    // InternalProblem.g:1115:7: otherlv_12= ',' ( ( ruleQualifiedName ) )
+                                    // InternalProblem.g:1287:7: otherlv_12= ',' ( ( ruleQualifiedName ) )
                                     {
                                     otherlv_12=(Token)match(input,17,FOLLOW_8); 
 
                                                                                         newLeafNode(otherlv_12, grammarAccess.getAssertionAccess().getCommaKeyword_0_1_3_1_0());
                                                                                 
-                                    // InternalProblem.g:1119:7: ( ( ruleQualifiedName ) )
-                                    // InternalProblem.g:1120:8: ( ruleQualifiedName )
+                                    // InternalProblem.g:1291:7: ( ( ruleQualifiedName ) )
+                                    // InternalProblem.g:1292:8: ( ruleQualifiedName )
                                     {
-                                    // InternalProblem.g:1120:8: ( ruleQualifiedName )
-                                    // InternalProblem.g:1121:9: ruleQualifiedName
+                                    // InternalProblem.g:1292:8: ( ruleQualifiedName )
+                                    // InternalProblem.g:1293:9: ruleQualifiedName
                                     {
 
                                                                                                         if (current==null) {
@@ -2865,7 +3389,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                                                                                                         newCompositeNode(grammarAccess.getAssertionAccess().getArgumentsNodeCrossReference_0_1_3_1_1_0());
                                                                                                 
-                                    pushFollow(FOLLOW_19);
+                                    pushFollow(FOLLOW_23);
                                     ruleQualifiedName();
 
                                     state._fsp--;
@@ -2884,7 +3408,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                                     break;
 
                                 default :
-                                    break loop27;
+                                    break loop32;
                                 }
                             } while (true);
 
@@ -2894,7 +3418,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
                     }
 
-                    otherlv_14=(Token)match(input,29,FOLLOW_4); 
+                    otherlv_14=(Token)match(input,30,FOLLOW_4); 
 
                                                         newLeafNode(otherlv_14, grammarAccess.getAssertionAccess().getRightParenthesisKeyword_0_1_4());
                                                 
@@ -2934,7 +3458,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleScopeDeclaration"
-    // InternalProblem.g:1151:1: entryRuleScopeDeclaration returns [EObject current=null] : iv_ruleScopeDeclaration= ruleScopeDeclaration EOF ;
+    // InternalProblem.g:1323:1: entryRuleScopeDeclaration returns [EObject current=null] : iv_ruleScopeDeclaration= ruleScopeDeclaration EOF ;
     public final EObject entryRuleScopeDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -2942,8 +3466,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1151:57: (iv_ruleScopeDeclaration= ruleScopeDeclaration EOF )
-            // InternalProblem.g:1152:2: iv_ruleScopeDeclaration= ruleScopeDeclaration EOF
+            // InternalProblem.g:1323:57: (iv_ruleScopeDeclaration= ruleScopeDeclaration EOF )
+            // InternalProblem.g:1324:2: iv_ruleScopeDeclaration= ruleScopeDeclaration EOF
             {
              newCompositeNode(grammarAccess.getScopeDeclarationRule()); 
             pushFollow(FOLLOW_1);
@@ -2970,7 +3494,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleScopeDeclaration"
-    // InternalProblem.g:1158:1: ruleScopeDeclaration returns [EObject current=null] : (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' ) ;
+    // InternalProblem.g:1330:1: ruleScopeDeclaration returns [EObject current=null] : (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' ) ;
     public final EObject ruleScopeDeclaration() throws RecognitionException {
         EObject current = null;
 
@@ -2986,26 +3510,26 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1164:2: ( (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' ) )
-            // InternalProblem.g:1165:2: (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' )
+            // InternalProblem.g:1336:2: ( (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' ) )
+            // InternalProblem.g:1337:2: (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' )
             {
-            // InternalProblem.g:1165:2: (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' )
-            // InternalProblem.g:1166:3: otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.'
+            // InternalProblem.g:1337:2: (otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.' )
+            // InternalProblem.g:1338:3: otherlv_0= 'scope' ( (lv_typeScopes_1_0= ruleTypeScope ) ) (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )* otherlv_4= '.'
             {
-            otherlv_0=(Token)match(input,34,FOLLOW_3); 
+            otherlv_0=(Token)match(input,35,FOLLOW_31); 
 
                                 newLeafNode(otherlv_0, grammarAccess.getScopeDeclarationAccess().getScopeKeyword_0());
                         
-            // InternalProblem.g:1170:3: ( (lv_typeScopes_1_0= ruleTypeScope ) )
-            // InternalProblem.g:1171:4: (lv_typeScopes_1_0= ruleTypeScope )
+            // InternalProblem.g:1342:3: ( (lv_typeScopes_1_0= ruleTypeScope ) )
+            // InternalProblem.g:1343:4: (lv_typeScopes_1_0= ruleTypeScope )
             {
-            // InternalProblem.g:1171:4: (lv_typeScopes_1_0= ruleTypeScope )
-            // InternalProblem.g:1172:5: lv_typeScopes_1_0= ruleTypeScope
+            // InternalProblem.g:1343:4: (lv_typeScopes_1_0= ruleTypeScope )
+            // InternalProblem.g:1344:5: lv_typeScopes_1_0= ruleTypeScope
             {
 
                                                 newCompositeNode(grammarAccess.getScopeDeclarationAccess().getTypeScopesTypeScopeParserRuleCall_1_0());
                                         
-            pushFollow(FOLLOW_28);
+            pushFollow(FOLLOW_32);
             lv_typeScopes_1_0=ruleTypeScope();
 
             state._fsp--;
@@ -3027,35 +3551,35 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:1189:3: (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )*
-            loop30:
+            // InternalProblem.g:1361:3: (otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) ) )*
+            loop35:
             do {
-                int alt30=2;
-                int LA30_0 = input.LA(1);
+                int alt35=2;
+                int LA35_0 = input.LA(1);
 
-                if ( (LA30_0==17) ) {
-                    alt30=1;
+                if ( (LA35_0==17) ) {
+                    alt35=1;
                 }
 
 
-                switch (alt30) {
+                switch (alt35) {
                 case 1 :
-                    // InternalProblem.g:1190:4: otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) )
+                    // InternalProblem.g:1362:4: otherlv_2= ',' ( (lv_typeScopes_3_0= ruleTypeScope ) )
                     {
-                    otherlv_2=(Token)match(input,17,FOLLOW_3); 
+                    otherlv_2=(Token)match(input,17,FOLLOW_31); 
 
                                                 newLeafNode(otherlv_2, grammarAccess.getScopeDeclarationAccess().getCommaKeyword_2_0());
                                         
-                    // InternalProblem.g:1194:4: ( (lv_typeScopes_3_0= ruleTypeScope ) )
-                    // InternalProblem.g:1195:5: (lv_typeScopes_3_0= ruleTypeScope )
+                    // InternalProblem.g:1366:4: ( (lv_typeScopes_3_0= ruleTypeScope ) )
+                    // InternalProblem.g:1367:5: (lv_typeScopes_3_0= ruleTypeScope )
                     {
-                    // InternalProblem.g:1195:5: (lv_typeScopes_3_0= ruleTypeScope )
-                    // InternalProblem.g:1196:6: lv_typeScopes_3_0= ruleTypeScope
+                    // InternalProblem.g:1367:5: (lv_typeScopes_3_0= ruleTypeScope )
+                    // InternalProblem.g:1368:6: lv_typeScopes_3_0= ruleTypeScope
                     {
 
                                                                 newCompositeNode(grammarAccess.getScopeDeclarationAccess().getTypeScopesTypeScopeParserRuleCall_2_1_0());
                                                         
-                    pushFollow(FOLLOW_28);
+                    pushFollow(FOLLOW_32);
                     lv_typeScopes_3_0=ruleTypeScope();
 
                     state._fsp--;
@@ -3082,7 +3606,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     break;
 
                 default :
-                    break loop30;
+                    break loop35;
                 }
             } while (true);
 
@@ -3113,7 +3637,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleTypeScope"
-    // InternalProblem.g:1222:1: entryRuleTypeScope returns [EObject current=null] : iv_ruleTypeScope= ruleTypeScope EOF ;
+    // InternalProblem.g:1394:1: entryRuleTypeScope returns [EObject current=null] : iv_ruleTypeScope= ruleTypeScope EOF ;
     public final EObject entryRuleTypeScope() throws RecognitionException {
         EObject current = null;
 
@@ -3121,8 +3645,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1222:50: (iv_ruleTypeScope= ruleTypeScope EOF )
-            // InternalProblem.g:1223:2: iv_ruleTypeScope= ruleTypeScope EOF
+            // InternalProblem.g:1394:50: (iv_ruleTypeScope= ruleTypeScope EOF )
+            // InternalProblem.g:1395:2: iv_ruleTypeScope= ruleTypeScope EOF
             {
              newCompositeNode(grammarAccess.getTypeScopeRule()); 
             pushFollow(FOLLOW_1);
@@ -3149,7 +3673,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleTypeScope"
-    // InternalProblem.g:1229:1: ruleTypeScope returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) ) ;
+    // InternalProblem.g:1401:1: ruleTypeScope returns [EObject current=null] : ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) ) ;
     public final EObject ruleTypeScope() throws RecognitionException {
         EObject current = null;
 
@@ -3163,24 +3687,24 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1235:2: ( ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) ) )
-            // InternalProblem.g:1236:2: ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) )
+            // InternalProblem.g:1407:2: ( ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) ) )
+            // InternalProblem.g:1408:2: ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) )
             {
-            // InternalProblem.g:1236:2: ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) )
-            // InternalProblem.g:1237:3: ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) )
+            // InternalProblem.g:1408:2: ( ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) ) )
+            // InternalProblem.g:1409:3: ( (otherlv_0= RULE_ID ) ) ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' ) ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) )
             {
-            // InternalProblem.g:1237:3: ( (otherlv_0= RULE_ID ) )
-            // InternalProblem.g:1238:4: (otherlv_0= RULE_ID )
+            // InternalProblem.g:1409:3: ( (otherlv_0= RULE_ID ) )
+            // InternalProblem.g:1410:4: (otherlv_0= RULE_ID )
             {
-            // InternalProblem.g:1238:4: (otherlv_0= RULE_ID )
-            // InternalProblem.g:1239:5: otherlv_0= RULE_ID
+            // InternalProblem.g:1410:4: (otherlv_0= RULE_ID )
+            // InternalProblem.g:1411:5: otherlv_0= RULE_ID
             {
 
                                                 if (current==null) {
                                                         current = createModelElement(grammarAccess.getTypeScopeRule());
                                                 }
                                         
-            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_29); 
+            otherlv_0=(Token)match(input,RULE_ID,FOLLOW_33); 
 
                                                 newLeafNode(otherlv_0, grammarAccess.getTypeScopeAccess().getTargetTypeClassDeclarationCrossReference_0_0());
                                         
@@ -3190,33 +3714,33 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:1250:3: ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' )
-            int alt31=2;
-            int LA31_0 = input.LA(1);
+            // InternalProblem.g:1422:3: ( ( (lv_increment_1_0= '+=' ) ) | otherlv_2= '=' )
+            int alt36=2;
+            int LA36_0 = input.LA(1);
 
-            if ( (LA31_0==35) ) {
-                alt31=1;
+            if ( (LA36_0==36) ) {
+                alt36=1;
             }
-            else if ( (LA31_0==36) ) {
-                alt31=2;
+            else if ( (LA36_0==37) ) {
+                alt36=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 31, 0, input);
+                    new NoViableAltException("", 36, 0, input);
 
                 throw nvae;
             }
-            switch (alt31) {
+            switch (alt36) {
                 case 1 :
-                    // InternalProblem.g:1251:4: ( (lv_increment_1_0= '+=' ) )
+                    // InternalProblem.g:1423:4: ( (lv_increment_1_0= '+=' ) )
                     {
-                    // InternalProblem.g:1251:4: ( (lv_increment_1_0= '+=' ) )
-                    // InternalProblem.g:1252:5: (lv_increment_1_0= '+=' )
+                    // InternalProblem.g:1423:4: ( (lv_increment_1_0= '+=' ) )
+                    // InternalProblem.g:1424:5: (lv_increment_1_0= '+=' )
                     {
-                    // InternalProblem.g:1252:5: (lv_increment_1_0= '+=' )
-                    // InternalProblem.g:1253:6: lv_increment_1_0= '+='
+                    // InternalProblem.g:1424:5: (lv_increment_1_0= '+=' )
+                    // InternalProblem.g:1425:6: lv_increment_1_0= '+='
                     {
-                    lv_increment_1_0=(Token)match(input,35,FOLLOW_13); 
+                    lv_increment_1_0=(Token)match(input,36,FOLLOW_17); 
 
                                                                 newLeafNode(lv_increment_1_0, grammarAccess.getTypeScopeAccess().getIncrementPlusSignEqualsSignKeyword_1_0_0());
                                                         
@@ -3236,9 +3760,9 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1266:4: otherlv_2= '='
+                    // InternalProblem.g:1438:4: otherlv_2= '='
                     {
-                    otherlv_2=(Token)match(input,36,FOLLOW_13); 
+                    otherlv_2=(Token)match(input,37,FOLLOW_17); 
 
                                                 newLeafNode(otherlv_2, grammarAccess.getTypeScopeAccess().getEqualsSignKeyword_1_1());
                                         
@@ -3248,11 +3772,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            // InternalProblem.g:1271:3: ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) )
-            // InternalProblem.g:1272:4: (lv_multiplicity_3_0= ruleDefiniteMultiplicity )
+            // InternalProblem.g:1443:3: ( (lv_multiplicity_3_0= ruleDefiniteMultiplicity ) )
+            // InternalProblem.g:1444:4: (lv_multiplicity_3_0= ruleDefiniteMultiplicity )
             {
-            // InternalProblem.g:1272:4: (lv_multiplicity_3_0= ruleDefiniteMultiplicity )
-            // InternalProblem.g:1273:5: lv_multiplicity_3_0= ruleDefiniteMultiplicity
+            // InternalProblem.g:1444:4: (lv_multiplicity_3_0= ruleDefiniteMultiplicity )
+            // InternalProblem.g:1445:5: lv_multiplicity_3_0= ruleDefiniteMultiplicity
             {
 
                                                 newCompositeNode(grammarAccess.getTypeScopeAccess().getMultiplicityDefiniteMultiplicityParserRuleCall_2_0());
@@ -3302,7 +3826,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleMultiplicity"
-    // InternalProblem.g:1294:1: entryRuleMultiplicity returns [EObject current=null] : iv_ruleMultiplicity= ruleMultiplicity EOF ;
+    // InternalProblem.g:1466:1: entryRuleMultiplicity returns [EObject current=null] : iv_ruleMultiplicity= ruleMultiplicity EOF ;
     public final EObject entryRuleMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3310,8 +3834,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1294:53: (iv_ruleMultiplicity= ruleMultiplicity EOF )
-            // InternalProblem.g:1295:2: iv_ruleMultiplicity= ruleMultiplicity EOF
+            // InternalProblem.g:1466:53: (iv_ruleMultiplicity= ruleMultiplicity EOF )
+            // InternalProblem.g:1467:2: iv_ruleMultiplicity= ruleMultiplicity EOF
             {
              newCompositeNode(grammarAccess.getMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -3338,7 +3862,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleMultiplicity"
-    // InternalProblem.g:1301:1: ruleMultiplicity returns [EObject current=null] : (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity ) ;
+    // InternalProblem.g:1473:1: ruleMultiplicity returns [EObject current=null] : (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity ) ;
     public final EObject ruleMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3351,28 +3875,28 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1307:2: ( (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity ) )
-            // InternalProblem.g:1308:2: (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity )
+            // InternalProblem.g:1479:2: ( (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity ) )
+            // InternalProblem.g:1480:2: (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity )
             {
-            // InternalProblem.g:1308:2: (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity )
-            int alt32=2;
-            int LA32_0 = input.LA(1);
+            // InternalProblem.g:1480:2: (this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity | this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity )
+            int alt37=2;
+            int LA37_0 = input.LA(1);
 
-            if ( (LA32_0==EOF||LA32_0==24) ) {
-                alt32=1;
+            if ( (LA37_0==EOF||LA37_0==25) ) {
+                alt37=1;
             }
-            else if ( (LA32_0==RULE_INT) ) {
-                alt32=2;
+            else if ( (LA37_0==RULE_INT) ) {
+                alt37=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 32, 0, input);
+                    new NoViableAltException("", 37, 0, input);
 
                 throw nvae;
             }
-            switch (alt32) {
+            switch (alt37) {
                 case 1 :
-                    // InternalProblem.g:1309:3: this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity
+                    // InternalProblem.g:1481:3: this_UnboundedMultiplicity_0= ruleUnboundedMultiplicity
                     {
 
                                         newCompositeNode(grammarAccess.getMultiplicityAccess().getUnboundedMultiplicityParserRuleCall_0());
@@ -3390,7 +3914,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1318:3: this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity
+                    // InternalProblem.g:1490:3: this_DefiniteMultiplicity_1= ruleDefiniteMultiplicity
                     {
 
                                         newCompositeNode(grammarAccess.getMultiplicityAccess().getDefiniteMultiplicityParserRuleCall_1());
@@ -3430,7 +3954,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleDefiniteMultiplicity"
-    // InternalProblem.g:1330:1: entryRuleDefiniteMultiplicity returns [EObject current=null] : iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF ;
+    // InternalProblem.g:1502:1: entryRuleDefiniteMultiplicity returns [EObject current=null] : iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF ;
     public final EObject entryRuleDefiniteMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3438,8 +3962,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1330:61: (iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF )
-            // InternalProblem.g:1331:2: iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF
+            // InternalProblem.g:1502:61: (iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF )
+            // InternalProblem.g:1503:2: iv_ruleDefiniteMultiplicity= ruleDefiniteMultiplicity EOF
             {
              newCompositeNode(grammarAccess.getDefiniteMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -3466,7 +3990,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleDefiniteMultiplicity"
-    // InternalProblem.g:1337:1: ruleDefiniteMultiplicity returns [EObject current=null] : (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity ) ;
+    // InternalProblem.g:1509:1: ruleDefiniteMultiplicity returns [EObject current=null] : (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity ) ;
     public final EObject ruleDefiniteMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3479,38 +4003,38 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1343:2: ( (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity ) )
-            // InternalProblem.g:1344:2: (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity )
+            // InternalProblem.g:1515:2: ( (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity ) )
+            // InternalProblem.g:1516:2: (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity )
             {
-            // InternalProblem.g:1344:2: (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity )
-            int alt33=2;
-            int LA33_0 = input.LA(1);
+            // InternalProblem.g:1516:2: (this_RangeMultiplicity_0= ruleRangeMultiplicity | this_ExactMultiplicity_1= ruleExactMultiplicity )
+            int alt38=2;
+            int LA38_0 = input.LA(1);
 
-            if ( (LA33_0==RULE_INT) ) {
-                int LA33_1 = input.LA(2);
+            if ( (LA38_0==RULE_INT) ) {
+                int LA38_1 = input.LA(2);
 
-                if ( (LA33_1==37) ) {
-                    alt33=1;
+                if ( (LA38_1==38) ) {
+                    alt38=1;
                 }
-                else if ( (LA33_1==EOF||LA33_1==13||LA33_1==17||LA33_1==24) ) {
-                    alt33=2;
+                else if ( (LA38_1==EOF||LA38_1==13||LA38_1==17||LA38_1==25) ) {
+                    alt38=2;
                 }
                 else {
                     NoViableAltException nvae =
-                        new NoViableAltException("", 33, 1, input);
+                        new NoViableAltException("", 38, 1, input);
 
                     throw nvae;
                 }
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 33, 0, input);
+                    new NoViableAltException("", 38, 0, input);
 
                 throw nvae;
             }
-            switch (alt33) {
+            switch (alt38) {
                 case 1 :
-                    // InternalProblem.g:1345:3: this_RangeMultiplicity_0= ruleRangeMultiplicity
+                    // InternalProblem.g:1517:3: this_RangeMultiplicity_0= ruleRangeMultiplicity
                     {
 
                                         newCompositeNode(grammarAccess.getDefiniteMultiplicityAccess().getRangeMultiplicityParserRuleCall_0());
@@ -3528,7 +4052,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1354:3: this_ExactMultiplicity_1= ruleExactMultiplicity
+                    // InternalProblem.g:1526:3: this_ExactMultiplicity_1= ruleExactMultiplicity
                     {
 
                                         newCompositeNode(grammarAccess.getDefiniteMultiplicityAccess().getExactMultiplicityParserRuleCall_1());
@@ -3568,7 +4092,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleUnboundedMultiplicity"
-    // InternalProblem.g:1366:1: entryRuleUnboundedMultiplicity returns [EObject current=null] : iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF ;
+    // InternalProblem.g:1538:1: entryRuleUnboundedMultiplicity returns [EObject current=null] : iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF ;
     public final EObject entryRuleUnboundedMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3576,8 +4100,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1366:62: (iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF )
-            // InternalProblem.g:1367:2: iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF
+            // InternalProblem.g:1538:62: (iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF )
+            // InternalProblem.g:1539:2: iv_ruleUnboundedMultiplicity= ruleUnboundedMultiplicity EOF
             {
              newCompositeNode(grammarAccess.getUnboundedMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -3604,7 +4128,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleUnboundedMultiplicity"
-    // InternalProblem.g:1373:1: ruleUnboundedMultiplicity returns [EObject current=null] : () ;
+    // InternalProblem.g:1545:1: ruleUnboundedMultiplicity returns [EObject current=null] : () ;
     public final EObject ruleUnboundedMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3612,11 +4136,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1379:2: ( () )
-            // InternalProblem.g:1380:2: ()
+            // InternalProblem.g:1551:2: ( () )
+            // InternalProblem.g:1552:2: ()
             {
-            // InternalProblem.g:1380:2: ()
-            // InternalProblem.g:1381:3: 
+            // InternalProblem.g:1552:2: ()
+            // InternalProblem.g:1553:3: 
             {
 
                                 current = forceCreateModelElement(
@@ -3641,7 +4165,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleRangeMultiplicity"
-    // InternalProblem.g:1390:1: entryRuleRangeMultiplicity returns [EObject current=null] : iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF ;
+    // InternalProblem.g:1562:1: entryRuleRangeMultiplicity returns [EObject current=null] : iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF ;
     public final EObject entryRuleRangeMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3649,8 +4173,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1390:58: (iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF )
-            // InternalProblem.g:1391:2: iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF
+            // InternalProblem.g:1562:58: (iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF )
+            // InternalProblem.g:1563:2: iv_ruleRangeMultiplicity= ruleRangeMultiplicity EOF
             {
              newCompositeNode(grammarAccess.getRangeMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -3677,7 +4201,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleRangeMultiplicity"
-    // InternalProblem.g:1397:1: ruleRangeMultiplicity returns [EObject current=null] : ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) ) ;
+    // InternalProblem.g:1569:1: ruleRangeMultiplicity returns [EObject current=null] : ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) ) ;
     public final EObject ruleRangeMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3690,19 +4214,19 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1403:2: ( ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) ) )
-            // InternalProblem.g:1404:2: ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) )
+            // InternalProblem.g:1575:2: ( ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) ) )
+            // InternalProblem.g:1576:2: ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) )
             {
-            // InternalProblem.g:1404:2: ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) )
-            // InternalProblem.g:1405:3: ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) )
+            // InternalProblem.g:1576:2: ( ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) ) )
+            // InternalProblem.g:1577:3: ( (lv_lowerBound_0_0= RULE_INT ) ) otherlv_1= '..' ( (lv_upperBound_2_0= ruleUpperBound ) )
             {
-            // InternalProblem.g:1405:3: ( (lv_lowerBound_0_0= RULE_INT ) )
-            // InternalProblem.g:1406:4: (lv_lowerBound_0_0= RULE_INT )
+            // InternalProblem.g:1577:3: ( (lv_lowerBound_0_0= RULE_INT ) )
+            // InternalProblem.g:1578:4: (lv_lowerBound_0_0= RULE_INT )
             {
-            // InternalProblem.g:1406:4: (lv_lowerBound_0_0= RULE_INT )
-            // InternalProblem.g:1407:5: lv_lowerBound_0_0= RULE_INT
+            // InternalProblem.g:1578:4: (lv_lowerBound_0_0= RULE_INT )
+            // InternalProblem.g:1579:5: lv_lowerBound_0_0= RULE_INT
             {
-            lv_lowerBound_0_0=(Token)match(input,RULE_INT,FOLLOW_30); 
+            lv_lowerBound_0_0=(Token)match(input,RULE_INT,FOLLOW_34); 
 
                                                 newLeafNode(lv_lowerBound_0_0, grammarAccess.getRangeMultiplicityAccess().getLowerBoundINTTerminalRuleCall_0_0());
                                         
@@ -3722,15 +4246,15 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
             }
 
-            otherlv_1=(Token)match(input,37,FOLLOW_31); 
+            otherlv_1=(Token)match(input,38,FOLLOW_35); 
 
                                 newLeafNode(otherlv_1, grammarAccess.getRangeMultiplicityAccess().getFullStopFullStopKeyword_1());
                         
-            // InternalProblem.g:1427:3: ( (lv_upperBound_2_0= ruleUpperBound ) )
-            // InternalProblem.g:1428:4: (lv_upperBound_2_0= ruleUpperBound )
+            // InternalProblem.g:1599:3: ( (lv_upperBound_2_0= ruleUpperBound ) )
+            // InternalProblem.g:1600:4: (lv_upperBound_2_0= ruleUpperBound )
             {
-            // InternalProblem.g:1428:4: (lv_upperBound_2_0= ruleUpperBound )
-            // InternalProblem.g:1429:5: lv_upperBound_2_0= ruleUpperBound
+            // InternalProblem.g:1600:4: (lv_upperBound_2_0= ruleUpperBound )
+            // InternalProblem.g:1601:5: lv_upperBound_2_0= ruleUpperBound
             {
 
                                                 newCompositeNode(grammarAccess.getRangeMultiplicityAccess().getUpperBoundUpperBoundParserRuleCall_2_0());
@@ -3780,7 +4304,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleExactMultiplicity"
-    // InternalProblem.g:1450:1: entryRuleExactMultiplicity returns [EObject current=null] : iv_ruleExactMultiplicity= ruleExactMultiplicity EOF ;
+    // InternalProblem.g:1622:1: entryRuleExactMultiplicity returns [EObject current=null] : iv_ruleExactMultiplicity= ruleExactMultiplicity EOF ;
     public final EObject entryRuleExactMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3788,8 +4312,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1450:58: (iv_ruleExactMultiplicity= ruleExactMultiplicity EOF )
-            // InternalProblem.g:1451:2: iv_ruleExactMultiplicity= ruleExactMultiplicity EOF
+            // InternalProblem.g:1622:58: (iv_ruleExactMultiplicity= ruleExactMultiplicity EOF )
+            // InternalProblem.g:1623:2: iv_ruleExactMultiplicity= ruleExactMultiplicity EOF
             {
              newCompositeNode(grammarAccess.getExactMultiplicityRule()); 
             pushFollow(FOLLOW_1);
@@ -3816,7 +4340,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleExactMultiplicity"
-    // InternalProblem.g:1457:1: ruleExactMultiplicity returns [EObject current=null] : ( (lv_exactValue_0_0= RULE_INT ) ) ;
+    // InternalProblem.g:1629:1: ruleExactMultiplicity returns [EObject current=null] : ( (lv_exactValue_0_0= RULE_INT ) ) ;
     public final EObject ruleExactMultiplicity() throws RecognitionException {
         EObject current = null;
 
@@ -3826,14 +4350,14 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1463:2: ( ( (lv_exactValue_0_0= RULE_INT ) ) )
-            // InternalProblem.g:1464:2: ( (lv_exactValue_0_0= RULE_INT ) )
+            // InternalProblem.g:1635:2: ( ( (lv_exactValue_0_0= RULE_INT ) ) )
+            // InternalProblem.g:1636:2: ( (lv_exactValue_0_0= RULE_INT ) )
             {
-            // InternalProblem.g:1464:2: ( (lv_exactValue_0_0= RULE_INT ) )
-            // InternalProblem.g:1465:3: (lv_exactValue_0_0= RULE_INT )
+            // InternalProblem.g:1636:2: ( (lv_exactValue_0_0= RULE_INT ) )
+            // InternalProblem.g:1637:3: (lv_exactValue_0_0= RULE_INT )
             {
-            // InternalProblem.g:1465:3: (lv_exactValue_0_0= RULE_INT )
-            // InternalProblem.g:1466:4: lv_exactValue_0_0= RULE_INT
+            // InternalProblem.g:1637:3: (lv_exactValue_0_0= RULE_INT )
+            // InternalProblem.g:1638:4: lv_exactValue_0_0= RULE_INT
             {
             lv_exactValue_0_0=(Token)match(input,RULE_INT,FOLLOW_2); 
 
@@ -3875,7 +4399,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "entryRuleUpperBound"
-    // InternalProblem.g:1485:1: entryRuleUpperBound returns [String current=null] : iv_ruleUpperBound= ruleUpperBound EOF ;
+    // InternalProblem.g:1657:1: entryRuleUpperBound returns [String current=null] : iv_ruleUpperBound= ruleUpperBound EOF ;
     public final String entryRuleUpperBound() throws RecognitionException {
         String current = null;
 
@@ -3883,8 +4407,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1485:50: (iv_ruleUpperBound= ruleUpperBound EOF )
-            // InternalProblem.g:1486:2: iv_ruleUpperBound= ruleUpperBound EOF
+            // InternalProblem.g:1657:50: (iv_ruleUpperBound= ruleUpperBound EOF )
+            // InternalProblem.g:1658:2: iv_ruleUpperBound= ruleUpperBound EOF
             {
              newCompositeNode(grammarAccess.getUpperBoundRule()); 
             pushFollow(FOLLOW_1);
@@ -3911,7 +4435,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleUpperBound"
-    // InternalProblem.g:1492:1: ruleUpperBound returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_INT_0= RULE_INT | kw= '*' ) ;
+    // InternalProblem.g:1664:1: ruleUpperBound returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_INT_0= RULE_INT | kw= '*' ) ;
     public final AntlrDatatypeRuleToken ruleUpperBound() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
@@ -3922,28 +4446,28 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1498:2: ( (this_INT_0= RULE_INT | kw= '*' ) )
-            // InternalProblem.g:1499:2: (this_INT_0= RULE_INT | kw= '*' )
+            // InternalProblem.g:1670:2: ( (this_INT_0= RULE_INT | kw= '*' ) )
+            // InternalProblem.g:1671:2: (this_INT_0= RULE_INT | kw= '*' )
             {
-            // InternalProblem.g:1499:2: (this_INT_0= RULE_INT | kw= '*' )
-            int alt34=2;
-            int LA34_0 = input.LA(1);
+            // InternalProblem.g:1671:2: (this_INT_0= RULE_INT | kw= '*' )
+            int alt39=2;
+            int LA39_0 = input.LA(1);
 
-            if ( (LA34_0==RULE_INT) ) {
-                alt34=1;
+            if ( (LA39_0==RULE_INT) ) {
+                alt39=1;
             }
-            else if ( (LA34_0==38) ) {
-                alt34=2;
+            else if ( (LA39_0==39) ) {
+                alt39=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 34, 0, input);
+                    new NoViableAltException("", 39, 0, input);
 
                 throw nvae;
             }
-            switch (alt34) {
+            switch (alt39) {
                 case 1 :
-                    // InternalProblem.g:1500:3: this_INT_0= RULE_INT
+                    // InternalProblem.g:1672:3: this_INT_0= RULE_INT
                     {
                     this_INT_0=(Token)match(input,RULE_INT,FOLLOW_2); 
 
@@ -3956,9 +4480,9 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1508:3: kw= '*'
+                    // InternalProblem.g:1680:3: kw= '*'
                     {
-                    kw=(Token)match(input,38,FOLLOW_2); 
+                    kw=(Token)match(input,39,FOLLOW_2); 
 
                                         current.merge(kw);
                                         newLeafNode(kw, grammarAccess.getUpperBoundAccess().getAsteriskKeyword_1());
@@ -3988,8 +4512,132 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     // $ANTLR end "ruleUpperBound"
 
 
+    // $ANTLR start "entryRuleQuotedOrUnquotedId"
+    // InternalProblem.g:1689:1: entryRuleQuotedOrUnquotedId returns [String current=null] : iv_ruleQuotedOrUnquotedId= ruleQuotedOrUnquotedId EOF ;
+    public final String entryRuleQuotedOrUnquotedId() throws RecognitionException {
+        String current = null;
+
+        AntlrDatatypeRuleToken iv_ruleQuotedOrUnquotedId = null;
+
+
+        try {
+            // InternalProblem.g:1689:58: (iv_ruleQuotedOrUnquotedId= ruleQuotedOrUnquotedId EOF )
+            // InternalProblem.g:1690:2: iv_ruleQuotedOrUnquotedId= ruleQuotedOrUnquotedId EOF
+            {
+             newCompositeNode(grammarAccess.getQuotedOrUnquotedIdRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleQuotedOrUnquotedId=ruleQuotedOrUnquotedId();
+
+            state._fsp--;
+
+             current =iv_ruleQuotedOrUnquotedId.getText(); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleQuotedOrUnquotedId"
+
+
+    // $ANTLR start "ruleQuotedOrUnquotedId"
+    // InternalProblem.g:1696:1: ruleQuotedOrUnquotedId returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QUOTED_ID_0= RULE_QUOTED_ID | this_Identifier_1= ruleIdentifier ) ;
+    public final AntlrDatatypeRuleToken ruleQuotedOrUnquotedId() throws RecognitionException {
+        AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+        Token this_QUOTED_ID_0=null;
+        AntlrDatatypeRuleToken this_Identifier_1 = null;
+
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:1702:2: ( (this_QUOTED_ID_0= RULE_QUOTED_ID | this_Identifier_1= ruleIdentifier ) )
+            // InternalProblem.g:1703:2: (this_QUOTED_ID_0= RULE_QUOTED_ID | this_Identifier_1= ruleIdentifier )
+            {
+            // InternalProblem.g:1703:2: (this_QUOTED_ID_0= RULE_QUOTED_ID | this_Identifier_1= ruleIdentifier )
+            int alt40=2;
+            int LA40_0 = input.LA(1);
+
+            if ( (LA40_0==RULE_QUOTED_ID) ) {
+                alt40=1;
+            }
+            else if ( (LA40_0==RULE_ID||(LA40_0>=40 && LA40_0<=41)) ) {
+                alt40=2;
+            }
+            else {
+                NoViableAltException nvae =
+                    new NoViableAltException("", 40, 0, input);
+
+                throw nvae;
+            }
+            switch (alt40) {
+                case 1 :
+                    // InternalProblem.g:1704:3: this_QUOTED_ID_0= RULE_QUOTED_ID
+                    {
+                    this_QUOTED_ID_0=(Token)match(input,RULE_QUOTED_ID,FOLLOW_2); 
+
+                                        current.merge(this_QUOTED_ID_0);
+                                
+
+                                        newLeafNode(this_QUOTED_ID_0, grammarAccess.getQuotedOrUnquotedIdAccess().getQUOTED_IDTerminalRuleCall_0());
+                                
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:1712:3: this_Identifier_1= ruleIdentifier
+                    {
+
+                                        newCompositeNode(grammarAccess.getQuotedOrUnquotedIdAccess().getIdentifierParserRuleCall_1());
+                                
+                    pushFollow(FOLLOW_2);
+                    this_Identifier_1=ruleIdentifier();
+
+                    state._fsp--;
+
+
+                                        current.merge(this_Identifier_1);
+                                
+
+                                        afterParserOrEnumRuleCall();
+                                
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleQuotedOrUnquotedId"
+
+
     // $ANTLR start "entryRuleQualifiedName"
-    // InternalProblem.g:1517:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
+    // InternalProblem.g:1726:1: entryRuleQualifiedName returns [String current=null] : iv_ruleQualifiedName= ruleQualifiedName EOF ;
     public final String entryRuleQualifiedName() throws RecognitionException {
         String current = null;
 
@@ -3997,8 +4645,8 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
         try {
-            // InternalProblem.g:1517:53: (iv_ruleQualifiedName= ruleQualifiedName EOF )
-            // InternalProblem.g:1518:2: iv_ruleQualifiedName= ruleQualifiedName EOF
+            // InternalProblem.g:1726:53: (iv_ruleQualifiedName= ruleQualifiedName EOF )
+            // InternalProblem.g:1727:2: iv_ruleQualifiedName= ruleQualifiedName EOF
             {
              newCompositeNode(grammarAccess.getQualifiedNameRule()); 
             pushFollow(FOLLOW_1);
@@ -4025,42 +4673,44 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleQualifiedName"
-    // InternalProblem.g:1524:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) ) ;
+    // InternalProblem.g:1733:1: ruleQualifiedName returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_Identifier_1= ruleIdentifier (kw= ':' this_Identifier_3= ruleIdentifier )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) ) ;
     public final AntlrDatatypeRuleToken ruleQualifiedName() throws RecognitionException {
         AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
 
         Token this_QUOTED_ID_0=null;
-        Token this_ID_1=null;
         Token kw=null;
-        Token this_ID_3=null;
         Token this_QUOTED_ID_5=null;
+        AntlrDatatypeRuleToken this_Identifier_1 = null;
+
+        AntlrDatatypeRuleToken this_Identifier_3 = null;
+
 
 
                 enterRule();
 
         try {
-            // InternalProblem.g:1530:2: ( (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) ) )
-            // InternalProblem.g:1531:2: (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) )
+            // InternalProblem.g:1739:2: ( (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_Identifier_1= ruleIdentifier (kw= ':' this_Identifier_3= ruleIdentifier )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) ) )
+            // InternalProblem.g:1740:2: (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_Identifier_1= ruleIdentifier (kw= ':' this_Identifier_3= ruleIdentifier )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) )
             {
-            // InternalProblem.g:1531:2: (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) )
-            int alt37=2;
-            int LA37_0 = input.LA(1);
+            // InternalProblem.g:1740:2: (this_QUOTED_ID_0= RULE_QUOTED_ID | (this_Identifier_1= ruleIdentifier (kw= ':' this_Identifier_3= ruleIdentifier )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? ) )
+            int alt43=2;
+            int LA43_0 = input.LA(1);
 
-            if ( (LA37_0==RULE_QUOTED_ID) ) {
-                alt37=1;
+            if ( (LA43_0==RULE_QUOTED_ID) ) {
+                alt43=1;
             }
-            else if ( (LA37_0==RULE_ID) ) {
-                alt37=2;
+            else if ( (LA43_0==RULE_ID||(LA43_0>=40 && LA43_0<=41)) ) {
+                alt43=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 37, 0, input);
+                    new NoViableAltException("", 43, 0, input);
 
                 throw nvae;
             }
-            switch (alt37) {
+            switch (alt43) {
                 case 1 :
-                    // InternalProblem.g:1532:3: this_QUOTED_ID_0= RULE_QUOTED_ID
+                    // InternalProblem.g:1741:3: this_QUOTED_ID_0= RULE_QUOTED_ID
                     {
                     this_QUOTED_ID_0=(Token)match(input,RULE_QUOTED_ID,FOLLOW_2); 
 
@@ -4073,72 +4723,86 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1540:3: (this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? )
+                    // InternalProblem.g:1749:3: (this_Identifier_1= ruleIdentifier (kw= ':' this_Identifier_3= ruleIdentifier )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? )
                     {
-                    // InternalProblem.g:1540:3: (this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? )
-                    // InternalProblem.g:1541:4: this_ID_1= RULE_ID (kw= ':' this_ID_3= RULE_ID )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )?
+                    // InternalProblem.g:1749:3: (this_Identifier_1= ruleIdentifier (kw= ':' this_Identifier_3= ruleIdentifier )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )? )
+                    // InternalProblem.g:1750:4: this_Identifier_1= ruleIdentifier (kw= ':' this_Identifier_3= ruleIdentifier )* (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )?
                     {
-                    this_ID_1=(Token)match(input,RULE_ID,FOLLOW_32); 
 
-                                                current.merge(this_ID_1);
+                                                newCompositeNode(grammarAccess.getQualifiedNameAccess().getIdentifierParserRuleCall_1_0());
+                                        
+                    pushFollow(FOLLOW_36);
+                    this_Identifier_1=ruleIdentifier();
+
+                    state._fsp--;
+
+
+                                                current.merge(this_Identifier_1);
                                         
 
-                                                newLeafNode(this_ID_1, grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_0());
+                                                afterParserOrEnumRuleCall();
                                         
-                    // InternalProblem.g:1548:4: (kw= ':' this_ID_3= RULE_ID )*
-                    loop35:
+                    // InternalProblem.g:1760:4: (kw= ':' this_Identifier_3= ruleIdentifier )*
+                    loop41:
                     do {
-                        int alt35=2;
-                        int LA35_0 = input.LA(1);
+                        int alt41=2;
+                        int LA41_0 = input.LA(1);
 
-                        if ( (LA35_0==33) ) {
-                            int LA35_1 = input.LA(2);
+                        if ( (LA41_0==34) ) {
+                            int LA41_1 = input.LA(2);
 
-                            if ( (LA35_1==RULE_ID) ) {
-                                alt35=1;
+                            if ( (LA41_1==RULE_ID||(LA41_1>=40 && LA41_1<=41)) ) {
+                                alt41=1;
                             }
 
 
                         }
 
 
-                        switch (alt35) {
+                        switch (alt41) {
                         case 1 :
-                            // InternalProblem.g:1549:5: kw= ':' this_ID_3= RULE_ID
+                            // InternalProblem.g:1761:5: kw= ':' this_Identifier_3= ruleIdentifier
                             {
-                            kw=(Token)match(input,33,FOLLOW_3); 
+                            kw=(Token)match(input,34,FOLLOW_3); 
 
                                                                 current.merge(kw);
                                                                 newLeafNode(kw, grammarAccess.getQualifiedNameAccess().getColonKeyword_1_1_0());
                                                         
-                            this_ID_3=(Token)match(input,RULE_ID,FOLLOW_32); 
 
-                                                                current.merge(this_ID_3);
+                                                                newCompositeNode(grammarAccess.getQualifiedNameAccess().getIdentifierParserRuleCall_1_1_1());
                                                         
+                            pushFollow(FOLLOW_36);
+                            this_Identifier_3=ruleIdentifier();
+
+                            state._fsp--;
+
 
-                                                                newLeafNode(this_ID_3, grammarAccess.getQualifiedNameAccess().getIDTerminalRuleCall_1_1_1());
+                                                                current.merge(this_Identifier_3);
+                                                        
+
+                                                                afterParserOrEnumRuleCall();
                                                         
 
                             }
                             break;
 
                         default :
-                            break loop35;
+                            break loop41;
                         }
                     } while (true);
 
-                    // InternalProblem.g:1562:4: (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )?
-                    int alt36=2;
-                    int LA36_0 = input.LA(1);
+                    // InternalProblem.g:1777:4: (kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID )?
+                    int alt42=2;
+                    int LA42_0 = input.LA(1);
 
-                    if ( (LA36_0==33) ) {
-                        alt36=1;
+                    if ( (LA42_0==34) ) {
+                        alt42=1;
                     }
-                    switch (alt36) {
+                    switch (alt42) {
                         case 1 :
-                            // InternalProblem.g:1563:5: kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID
+                            // InternalProblem.g:1778:5: kw= ':' this_QUOTED_ID_5= RULE_QUOTED_ID
                             {
-                            kw=(Token)match(input,33,FOLLOW_33); 
+                            kw=(Token)match(input,34,FOLLOW_37); 
 
                                                                 current.merge(kw);
                                                                 newLeafNode(kw, grammarAccess.getQualifiedNameAccess().getColonKeyword_1_2_0());
@@ -4184,8 +4848,142 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     // $ANTLR end "ruleQualifiedName"
 
 
+    // $ANTLR start "entryRuleIdentifier"
+    // InternalProblem.g:1796:1: entryRuleIdentifier returns [String current=null] : iv_ruleIdentifier= ruleIdentifier EOF ;
+    public final String entryRuleIdentifier() throws RecognitionException {
+        String current = null;
+
+        AntlrDatatypeRuleToken iv_ruleIdentifier = null;
+
+
+        try {
+            // InternalProblem.g:1796:50: (iv_ruleIdentifier= ruleIdentifier EOF )
+            // InternalProblem.g:1797:2: iv_ruleIdentifier= ruleIdentifier EOF
+            {
+             newCompositeNode(grammarAccess.getIdentifierRule()); 
+            pushFollow(FOLLOW_1);
+            iv_ruleIdentifier=ruleIdentifier();
+
+            state._fsp--;
+
+             current =iv_ruleIdentifier.getText(); 
+            match(input,EOF,FOLLOW_2); 
+
+            }
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "entryRuleIdentifier"
+
+
+    // $ANTLR start "ruleIdentifier"
+    // InternalProblem.g:1803:1: ruleIdentifier returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] : (this_ID_0= RULE_ID | kw= 'true' | kw= 'false' ) ;
+    public final AntlrDatatypeRuleToken ruleIdentifier() throws RecognitionException {
+        AntlrDatatypeRuleToken current = new AntlrDatatypeRuleToken();
+
+        Token this_ID_0=null;
+        Token kw=null;
+
+
+                enterRule();
+
+        try {
+            // InternalProblem.g:1809:2: ( (this_ID_0= RULE_ID | kw= 'true' | kw= 'false' ) )
+            // InternalProblem.g:1810:2: (this_ID_0= RULE_ID | kw= 'true' | kw= 'false' )
+            {
+            // InternalProblem.g:1810:2: (this_ID_0= RULE_ID | kw= 'true' | kw= 'false' )
+            int alt44=3;
+            switch ( input.LA(1) ) {
+            case RULE_ID:
+                {
+                alt44=1;
+                }
+                break;
+            case 40:
+                {
+                alt44=2;
+                }
+                break;
+            case 41:
+                {
+                alt44=3;
+                }
+                break;
+            default:
+                NoViableAltException nvae =
+                    new NoViableAltException("", 44, 0, input);
+
+                throw nvae;
+            }
+
+            switch (alt44) {
+                case 1 :
+                    // InternalProblem.g:1811:3: this_ID_0= RULE_ID
+                    {
+                    this_ID_0=(Token)match(input,RULE_ID,FOLLOW_2); 
+
+                                        current.merge(this_ID_0);
+                                
+
+                                        newLeafNode(this_ID_0, grammarAccess.getIdentifierAccess().getIDTerminalRuleCall_0());
+                                
+
+                    }
+                    break;
+                case 2 :
+                    // InternalProblem.g:1819:3: kw= 'true'
+                    {
+                    kw=(Token)match(input,40,FOLLOW_2); 
+
+                                        current.merge(kw);
+                                        newLeafNode(kw, grammarAccess.getIdentifierAccess().getTrueKeyword_1());
+                                
+
+                    }
+                    break;
+                case 3 :
+                    // InternalProblem.g:1825:3: kw= 'false'
+                    {
+                    kw=(Token)match(input,41,FOLLOW_2); 
+
+                                        current.merge(kw);
+                                        newLeafNode(kw, grammarAccess.getIdentifierAccess().getFalseKeyword_2());
+                                
+
+                    }
+                    break;
+
+            }
+
+
+            }
+
+
+                leaveRule();
+
+        }
+
+            catch (RecognitionException re) {
+                recover(input,re);
+                appendSkippedTokens();
+            }
+        finally {
+        }
+        return current;
+    }
+    // $ANTLR end "ruleIdentifier"
+
+
     // $ANTLR start "ruleLogicValue"
-    // InternalProblem.g:1581:1: ruleLogicValue returns [Enumerator current=null] : ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) ) ;
+    // InternalProblem.g:1834:1: ruleLogicValue returns [Enumerator current=null] : ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) ) ;
     public final Enumerator ruleLogicValue() throws RecognitionException {
         Enumerator current = null;
 
@@ -4197,42 +4995,42 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1587:2: ( ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) ) )
-            // InternalProblem.g:1588:2: ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) )
+            // InternalProblem.g:1840:2: ( ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) ) )
+            // InternalProblem.g:1841:2: ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) )
             {
-            // InternalProblem.g:1588:2: ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) )
-            int alt38=3;
+            // InternalProblem.g:1841:2: ( (enumLiteral_0= 'true' ) | (enumLiteral_1= 'false' ) | (enumLiteral_2= 'unknown' ) )
+            int alt45=3;
             switch ( input.LA(1) ) {
-            case 39:
+            case 40:
                 {
-                alt38=1;
+                alt45=1;
                 }
                 break;
-            case 40:
+            case 41:
                 {
-                alt38=2;
+                alt45=2;
                 }
                 break;
-            case 41:
+            case 42:
                 {
-                alt38=3;
+                alt45=3;
                 }
                 break;
             default:
                 NoViableAltException nvae =
-                    new NoViableAltException("", 38, 0, input);
+                    new NoViableAltException("", 45, 0, input);
 
                 throw nvae;
             }
 
-            switch (alt38) {
+            switch (alt45) {
                 case 1 :
-                    // InternalProblem.g:1589:3: (enumLiteral_0= 'true' )
+                    // InternalProblem.g:1842:3: (enumLiteral_0= 'true' )
                     {
-                    // InternalProblem.g:1589:3: (enumLiteral_0= 'true' )
-                    // InternalProblem.g:1590:4: enumLiteral_0= 'true'
+                    // InternalProblem.g:1842:3: (enumLiteral_0= 'true' )
+                    // InternalProblem.g:1843:4: enumLiteral_0= 'true'
                     {
-                    enumLiteral_0=(Token)match(input,39,FOLLOW_2); 
+                    enumLiteral_0=(Token)match(input,40,FOLLOW_2); 
 
                                                 current = grammarAccess.getLogicValueAccess().getTRUEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                                                 newLeafNode(enumLiteral_0, grammarAccess.getLogicValueAccess().getTRUEEnumLiteralDeclaration_0());
@@ -4244,12 +5042,12 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1597:3: (enumLiteral_1= 'false' )
+                    // InternalProblem.g:1850:3: (enumLiteral_1= 'false' )
                     {
-                    // InternalProblem.g:1597:3: (enumLiteral_1= 'false' )
-                    // InternalProblem.g:1598:4: enumLiteral_1= 'false'
+                    // InternalProblem.g:1850:3: (enumLiteral_1= 'false' )
+                    // InternalProblem.g:1851:4: enumLiteral_1= 'false'
                     {
-                    enumLiteral_1=(Token)match(input,40,FOLLOW_2); 
+                    enumLiteral_1=(Token)match(input,41,FOLLOW_2); 
 
                                                 current = grammarAccess.getLogicValueAccess().getFALSEEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                                                 newLeafNode(enumLiteral_1, grammarAccess.getLogicValueAccess().getFALSEEnumLiteralDeclaration_1());
@@ -4261,12 +5059,12 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 3 :
-                    // InternalProblem.g:1605:3: (enumLiteral_2= 'unknown' )
+                    // InternalProblem.g:1858:3: (enumLiteral_2= 'unknown' )
                     {
-                    // InternalProblem.g:1605:3: (enumLiteral_2= 'unknown' )
-                    // InternalProblem.g:1606:4: enumLiteral_2= 'unknown'
+                    // InternalProblem.g:1858:3: (enumLiteral_2= 'unknown' )
+                    // InternalProblem.g:1859:4: enumLiteral_2= 'unknown'
                     {
-                    enumLiteral_2=(Token)match(input,41,FOLLOW_2); 
+                    enumLiteral_2=(Token)match(input,42,FOLLOW_2); 
 
                                                 current = grammarAccess.getLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_2().getEnumLiteral().getInstance();
                                                 newLeafNode(enumLiteral_2, grammarAccess.getLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_2());
@@ -4300,7 +5098,7 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
 
 
     // $ANTLR start "ruleShortLogicValue"
-    // InternalProblem.g:1616:1: ruleShortLogicValue returns [Enumerator current=null] : ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) ) ;
+    // InternalProblem.g:1869:1: ruleShortLogicValue returns [Enumerator current=null] : ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) ) ;
     public final Enumerator ruleShortLogicValue() throws RecognitionException {
         Enumerator current = null;
 
@@ -4311,33 +5109,33 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                 enterRule();
 
         try {
-            // InternalProblem.g:1622:2: ( ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) ) )
-            // InternalProblem.g:1623:2: ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) )
+            // InternalProblem.g:1875:2: ( ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) ) )
+            // InternalProblem.g:1876:2: ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) )
             {
-            // InternalProblem.g:1623:2: ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) )
-            int alt39=2;
-            int LA39_0 = input.LA(1);
+            // InternalProblem.g:1876:2: ( (enumLiteral_0= '!' ) | (enumLiteral_1= '?' ) )
+            int alt46=2;
+            int LA46_0 = input.LA(1);
 
-            if ( (LA39_0==31) ) {
-                alt39=1;
+            if ( (LA46_0==32) ) {
+                alt46=1;
             }
-            else if ( (LA39_0==42) ) {
-                alt39=2;
+            else if ( (LA46_0==43) ) {
+                alt46=2;
             }
             else {
                 NoViableAltException nvae =
-                    new NoViableAltException("", 39, 0, input);
+                    new NoViableAltException("", 46, 0, input);
 
                 throw nvae;
             }
-            switch (alt39) {
+            switch (alt46) {
                 case 1 :
-                    // InternalProblem.g:1624:3: (enumLiteral_0= '!' )
+                    // InternalProblem.g:1877:3: (enumLiteral_0= '!' )
                     {
-                    // InternalProblem.g:1624:3: (enumLiteral_0= '!' )
-                    // InternalProblem.g:1625:4: enumLiteral_0= '!'
+                    // InternalProblem.g:1877:3: (enumLiteral_0= '!' )
+                    // InternalProblem.g:1878:4: enumLiteral_0= '!'
                     {
-                    enumLiteral_0=(Token)match(input,31,FOLLOW_2); 
+                    enumLiteral_0=(Token)match(input,32,FOLLOW_2); 
 
                                                 current = grammarAccess.getShortLogicValueAccess().getFALSEEnumLiteralDeclaration_0().getEnumLiteral().getInstance();
                                                 newLeafNode(enumLiteral_0, grammarAccess.getShortLogicValueAccess().getFALSEEnumLiteralDeclaration_0());
@@ -4349,12 +5147,12 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
                     }
                     break;
                 case 2 :
-                    // InternalProblem.g:1632:3: (enumLiteral_1= '?' )
+                    // InternalProblem.g:1885:3: (enumLiteral_1= '?' )
                     {
-                    // InternalProblem.g:1632:3: (enumLiteral_1= '?' )
-                    // InternalProblem.g:1633:4: enumLiteral_1= '?'
+                    // InternalProblem.g:1885:3: (enumLiteral_1= '?' )
+                    // InternalProblem.g:1886:4: enumLiteral_1= '?'
                     {
-                    enumLiteral_1=(Token)match(input,42,FOLLOW_2); 
+                    enumLiteral_1=(Token)match(input,43,FOLLOW_2); 
 
                                                 current = grammarAccess.getShortLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_1().getEnumLiteral().getInstance();
                                                 newLeafNode(enumLiteral_1, grammarAccess.getShortLogicValueAccess().getUNKNOWNEnumLiteralDeclaration_1());
@@ -4389,34 +5187,46 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     // Delegated rules
 
 
-    protected DFA29 dfa29 = new DFA29(this);
-    static final String dfa_1s = "\25\uffff";
-    static final String dfa_2s = "\1\4\2\34\1\uffff\2\4\2\21\1\15\2\34\2\4\1\uffff\4\21\1\4\2\21";
-    static final String dfa_3s = "\1\52\1\34\1\41\1\uffff\1\35\1\6\1\35\2\41\1\34\1\41\2\6\1\uffff\1\35\1\41\1\35\1\41\1\6\1\35\1\41";
-    static final String dfa_4s = "\3\uffff\1\2\11\uffff\1\1\7\uffff";
-    static final String dfa_5s = "\25\uffff}>";
+    protected DFA34 dfa34 = new DFA34(this);
+    static final String dfa_1s = "\41\uffff";
+    static final String dfa_2s = "\1\4\4\35\1\uffff\2\4\4\21\1\15\4\35\2\4\1\uffff\10\21\1\4\4\21";
+    static final String dfa_3s = "\1\53\1\35\3\42\1\uffff\2\51\1\36\7\42\1\35\2\51\1\uffff\1\36\6\42\1\36\1\51\3\42\1\36";
+    static final String dfa_4s = "\5\uffff\1\2\15\uffff\1\1\15\uffff";
+    static final String dfa_5s = "\41\uffff}>";
     static final String[] dfa_6s = {
-            "\1\2\1\uffff\1\1\30\uffff\1\3\12\uffff\1\3",
-            "\1\4",
-            "\1\4\4\uffff\1\5",
+            "\1\2\1\uffff\1\1\31\uffff\1\5\7\uffff\1\3\1\4\1\uffff\1\5",
+            "\1\6",
+            "\1\6\4\uffff\1\7",
+            "\1\6\4\uffff\1\7",
+            "\1\6\4\uffff\1\7",
             "",
-            "\1\7\1\uffff\1\6\26\uffff\1\10",
-            "\1\12\1\uffff\1\11",
-            "\1\13\13\uffff\1\10",
-            "\1\13\13\uffff\1\10\3\uffff\1\14",
-            "\1\3\23\uffff\1\15",
-            "\1\4",
-            "\1\4\4\uffff\1\5",
-            "\1\17\1\uffff\1\16",
-            "\1\21\1\uffff\1\20",
+            "\1\11\1\uffff\1\10\27\uffff\1\14\11\uffff\1\12\1\13",
+            "\1\15\1\uffff\1\20\41\uffff\1\16\1\17",
+            "\1\21\14\uffff\1\14",
+            "\1\21\14\uffff\1\14\3\uffff\1\22",
+            "\1\21\14\uffff\1\14\3\uffff\1\22",
+            "\1\21\14\uffff\1\14\3\uffff\1\22",
+            "\1\5\24\uffff\1\23",
+            "\1\6\4\uffff\1\7",
+            "\1\6\4\uffff\1\7",
+            "\1\6\4\uffff\1\7",
+            "\1\6",
+            "\1\25\1\uffff\1\24\41\uffff\1\26\1\27",
+            "\1\30\1\uffff\1\33\41\uffff\1\31\1\32",
             "",
-            "\1\13\13\uffff\1\10",
-            "\1\13\13\uffff\1\10\3\uffff\1\22",
-            "\1\13\13\uffff\1\10",
-            "\1\13\13\uffff\1\10\3\uffff\1\14",
-            "\1\24\1\uffff\1\23",
-            "\1\13\13\uffff\1\10",
-            "\1\13\13\uffff\1\10\3\uffff\1\22"
+            "\1\21\14\uffff\1\14",
+            "\1\21\14\uffff\1\14\3\uffff\1\34",
+            "\1\21\14\uffff\1\14\3\uffff\1\34",
+            "\1\21\14\uffff\1\14\3\uffff\1\34",
+            "\1\21\14\uffff\1\14\3\uffff\1\22",
+            "\1\21\14\uffff\1\14\3\uffff\1\22",
+            "\1\21\14\uffff\1\14\3\uffff\1\22",
+            "\1\21\14\uffff\1\14",
+            "\1\35\1\uffff\1\40\41\uffff\1\36\1\37",
+            "\1\21\14\uffff\1\14\3\uffff\1\34",
+            "\1\21\14\uffff\1\14\3\uffff\1\34",
+            "\1\21\14\uffff\1\14\3\uffff\1\34",
+            "\1\21\14\uffff\1\14"
     };
 
     static final short[] dfa_1 = DFA.unpackEncodedString(dfa_1s);
@@ -4426,11 +5236,11 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
     static final short[] dfa_5 = DFA.unpackEncodedString(dfa_5s);
     static final short[][] dfa_6 = unpackEncodedStringArray(dfa_6s);
 
-    class DFA29 extends DFA {
+    class DFA34 extends DFA {
 
-        public DFA29(BaseRecognizer recognizer) {
+        public DFA34(BaseRecognizer recognizer) {
             this.recognizer = recognizer;
-            this.decisionNumber = 29;
+            this.decisionNumber = 34;
             this.eot = dfa_1;
             this.eof = dfa_1;
             this.min = dfa_2;
@@ -4440,43 +5250,47 @@ public class InternalProblemParser extends AbstractInternalAntlrParser {
             this.transition = dfa_6;
         }
         public String getDescription() {
-            return "966:3: ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) )";
+            return "1138:3: ( ( ( ( ruleQualifiedName ) ) otherlv_1= '(' ( ( ( ruleQualifiedName ) ) (otherlv_3= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_5= ')' otherlv_6= ':' ( (lv_value_7_0= ruleLogicValue ) ) ) | ( ( (lv_value_8_0= ruleShortLogicValue ) )? ( ( ruleQualifiedName ) ) otherlv_10= '(' ( ( ( ruleQualifiedName ) ) (otherlv_12= ',' ( ( ruleQualifiedName ) ) )* )? otherlv_14= ')' ) )";
         }
     }
  
 
     public static final BitSet FOLLOW_1 = new BitSet(new long[]{0x0000000000000000L});
     public static final BitSet FOLLOW_2 = new BitSet(new long[]{0x0000000000000002L});
-    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_3 = new BitSet(new long[]{0x0000030000000010L});
     public static final BitSet FOLLOW_4 = new BitSet(new long[]{0x0000000000002000L});
-    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x000004048C00C052L});
+    public static final BitSet FOLLOW_5 = new BitSet(new long[]{0x00000B091820C052L});
     public static final BitSet FOLLOW_6 = new BitSet(new long[]{0x0000000000008000L});
     public static final BitSet FOLLOW_7 = new BitSet(new long[]{0x0000000000052000L});
-    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000000000000050L});
+    public static final BitSet FOLLOW_8 = new BitSet(new long[]{0x0000030000000050L});
     public static final BitSet FOLLOW_9 = new BitSet(new long[]{0x0000000000062000L});
-    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000000000700000L});
-    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000000000780000L});
-    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000800010L});
-    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000000000000020L});
-    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x0000000001000000L});
-    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000002000002L});
-    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000000008000010L});
-    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000010000000L});
-    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000020000010L});
-    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000020020000L});
-    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000000040002000L});
-    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000080000050L});
-    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000000000082000L});
-    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000000020002L});
-    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000110000000L});
-    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000000020000050L});
-    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000200000000L});
-    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000038000000000L});
-    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000000022000L});
-    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000001800000000L});
-    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000002000000000L});
-    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000004000000020L});
-    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000200000002L});
-    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000000000000040L});
+    public static final BitSet FOLLOW_10 = new BitSet(new long[]{0x0000030000D00050L});
+    public static final BitSet FOLLOW_11 = new BitSet(new long[]{0x0000030000D80050L});
+    public static final BitSet FOLLOW_12 = new BitSet(new long[]{0x0000000000042000L});
+    public static final BitSet FOLLOW_13 = new BitSet(new long[]{0x0000030000100050L});
+    public static final BitSet FOLLOW_14 = new BitSet(new long[]{0x00000000001A0000L});
+    public static final BitSet FOLLOW_15 = new BitSet(new long[]{0x0000000000100000L});
+    public static final BitSet FOLLOW_16 = new BitSet(new long[]{0x0000030001000010L});
+    public static final BitSet FOLLOW_17 = new BitSet(new long[]{0x0000000000000020L});
+    public static final BitSet FOLLOW_18 = new BitSet(new long[]{0x0000000002000000L});
+    public static final BitSet FOLLOW_19 = new BitSet(new long[]{0x0000000004000002L});
+    public static final BitSet FOLLOW_20 = new BitSet(new long[]{0x0000030010000010L});
+    public static final BitSet FOLLOW_21 = new BitSet(new long[]{0x0000000020000000L});
+    public static final BitSet FOLLOW_22 = new BitSet(new long[]{0x0000030040000050L});
+    public static final BitSet FOLLOW_23 = new BitSet(new long[]{0x0000000040020000L});
+    public static final BitSet FOLLOW_24 = new BitSet(new long[]{0x0000000080002000L});
+    public static final BitSet FOLLOW_25 = new BitSet(new long[]{0x0000030100000050L});
+    public static final BitSet FOLLOW_26 = new BitSet(new long[]{0x0000000000082000L});
+    public static final BitSet FOLLOW_27 = new BitSet(new long[]{0x0000000000020002L});
+    public static final BitSet FOLLOW_28 = new BitSet(new long[]{0x0000000220000000L});
+    public static final BitSet FOLLOW_29 = new BitSet(new long[]{0x0000000400000000L});
+    public static final BitSet FOLLOW_30 = new BitSet(new long[]{0x0000070000000000L});
+    public static final BitSet FOLLOW_31 = new BitSet(new long[]{0x0000000000000010L});
+    public static final BitSet FOLLOW_32 = new BitSet(new long[]{0x0000000000022000L});
+    public static final BitSet FOLLOW_33 = new BitSet(new long[]{0x0000003000000000L});
+    public static final BitSet FOLLOW_34 = new BitSet(new long[]{0x0000004000000000L});
+    public static final BitSet FOLLOW_35 = new BitSet(new long[]{0x0000008000000020L});
+    public static final BitSet FOLLOW_36 = new BitSet(new long[]{0x0000000400000002L});
+    public static final BitSet FOLLOW_37 = new BitSet(new long[]{0x0000000000000040L});
 
 }
\ No newline at end of file