175 files changed, 16554 insertions, 9095 deletions
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Aggregation.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Aggregation.java
new file mode 100644
index 00000000..8641f197
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Aggregation.java
@@ -0,0 +1,96 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Aggregation</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Aggregation#getOp <em>Op</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Aggregation#getBody <em>Body</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Aggregation#getCondition <em>Condition</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getAggregation()
+ * @model
+ * @generated
+ */
+public interface Aggregation extends Expression
+{
+  /**
+   * Returns the value of the '<em><b>Op</b></em>' attribute.
+   * The literals are from the enumeration {@link org.eclipse.viatra.solver.language.solverLanguage.AggregationOp}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Op</em>' attribute.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.AggregationOp
+   * @see #setOp(AggregationOp)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getAggregation_Op()
+   * @model
+   * @generated
+   */
+  AggregationOp getOp();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Aggregation#getOp <em>Op</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Op</em>' attribute.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.AggregationOp
+   * @see #getOp()
+   * @generated
+   */
+  void setOp(AggregationOp value);
+  /**
+   * Returns the value of the '<em><b>Body</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Body</em>' containment reference.
+   * @see #setBody(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getAggregation_Body()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getBody();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Aggregation#getBody <em>Body</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Body</em>' containment reference.
+   * @see #getBody()
+   * @generated
+   */
+  void setBody(Expression value);
+  /**
+   * Returns the value of the '<em><b>Condition</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Condition</em>' containment reference.
+   * @see #setCondition(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getAggregation_Condition()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getCondition();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Aggregation#getCondition <em>Condition</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Condition</em>' containment reference.
+   * @see #getCondition()
+   * @generated
+   */
+  void setCondition(Expression value);
+} // Aggregation
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/AggregationOp.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/AggregationOp.java
new file mode 100644
index 00000000..1a0664ed
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/AggregationOp.java
@@ -0,0 +1,317 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.eclipse.emf.common.util.Enumerator;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Aggregation Op</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getAggregationOp()
+ * @model
+ * @generated
+ */
+public enum AggregationOp implements Enumerator
+{
+  /**
+   * The '<em><b>ONLY</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #ONLY_VALUE
+   * @generated
+   * @ordered
+   */
+  ONLY(0, "ONLY", "only"),
+  /**
+   * The '<em><b>SUM</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #SUM_VALUE
+   * @generated
+   * @ordered
+   */
+  SUM(1, "SUM", "sum"),
+  /**
+   * The '<em><b>PROD</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #PROD_VALUE
+   * @generated
+   * @ordered
+   */
+  PROD(2, "PROD", "prod"),
+  /**
+   * The '<em><b>AVG</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #AVG_VALUE
+   * @generated
+   * @ordered
+   */
+  AVG(3, "AVG", "avg"),
+  /**
+   * The '<em><b>MIN</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #MIN_VALUE
+   * @generated
+   * @ordered
+   */
+  MIN(4, "MIN", "min"),
+  /**
+   * The '<em><b>MAX</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #MAX_VALUE
+   * @generated
+   * @ordered
+   */
+  MAX(5, "MAX", "max");
+  /**
+   * The '<em><b>ONLY</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #ONLY
+   * @model literal="only"
+   * @generated
+   * @ordered
+   */
+  public static final int ONLY_VALUE = 0;
+  /**
+   * The '<em><b>SUM</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #SUM
+   * @model literal="sum"
+   * @generated
+   * @ordered
+   */
+  public static final int SUM_VALUE = 1;
+  /**
+   * The '<em><b>PROD</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #PROD
+   * @model literal="prod"
+   * @generated
+   * @ordered
+   */
+  public static final int PROD_VALUE = 2;
+  /**
+   * The '<em><b>AVG</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #AVG
+   * @model literal="avg"
+   * @generated
+   * @ordered
+   */
+  public static final int AVG_VALUE = 3;
+  /**
+   * The '<em><b>MIN</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #MIN
+   * @model literal="min"
+   * @generated
+   * @ordered
+   */
+  public static final int MIN_VALUE = 4;
+  /**
+   * The '<em><b>MAX</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #MAX
+   * @model literal="max"
+   * @generated
+   * @ordered
+   */
+  public static final int MAX_VALUE = 5;
+  /**
+   * An array of all the '<em><b>Aggregation Op</b></em>' enumerators.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private static final AggregationOp[] VALUES_ARRAY =
+    new AggregationOp[]
+    {
+      ONLY,
+      SUM,
+      PROD,
+      AVG,
+      MIN,
+      MAX,
+    };
+  /**
+   * A public read-only list of all the '<em><b>Aggregation Op</b></em>' enumerators.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static final List<AggregationOp> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+  /**
+   * Returns the '<em><b>Aggregation Op</b></em>' literal with the specified literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static AggregationOp get(String literal)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      AggregationOp result = VALUES_ARRAY[i];
+      if (result.toString().equals(literal))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+  /**
+   * Returns the '<em><b>Aggregation Op</b></em>' literal with the specified name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static AggregationOp getByName(String name)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      AggregationOp result = VALUES_ARRAY[i];
+      if (result.getName().equals(name))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+  /**
+   * Returns the '<em><b>Aggregation Op</b></em>' literal with the specified integer value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static AggregationOp get(int value)
+  {
+    switch (value)
+    {
+      case ONLY_VALUE: return ONLY;
+      case SUM_VALUE: return SUM;
+      case PROD_VALUE: return PROD;
+      case AVG_VALUE: return AVG;
+      case MIN_VALUE: return MIN;
+      case MAX_VALUE: return MAX;
+    }
+    return null;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final int value;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final String name;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final String literal;
+  /**
+   * Only this class can construct instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private AggregationOp(int value, String name, String literal)
+  {
+    this.value = value;
+    this.name = name;
+    this.literal = literal;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public int getValue()
+  {
+    return value;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getName()
+  {
+    return name;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getLiteral()
+  {
+    return literal;
+  }
+  /**
+   * Returns the literal value of the enumerator, which is its string representation.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    return literal;
+  }
+  
+} //AggregationOp
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/AllInstances.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/AllInstances.java
deleted file mode 100644
index 17cb45fb..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/AllInstances.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>All Instances</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.AllInstances#getSymbol <em>Symbol</em>}</li>
- * </ul>
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getAllInstances()
- * @model
- * @generated
- */
-public interface AllInstances extends ComplexObject
-{
-  /**
-   * Returns the value of the '<em><b>Symbol</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Symbol</em>' containment reference.
-   * @see #setSymbol(Symbol)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getAllInstances_Symbol()
-   * @model containment="true"
-   * @generated
-   */
-  Symbol getSymbol();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.AllInstances#getSymbol <em>Symbol</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Symbol</em>' containment reference.
-   * @see #getSymbol()
-   * @generated
-   */
-  void setSymbol(Symbol value);
-} // AllInstances
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/AllObjects.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/AllObjects.java
deleted file mode 100644
index fbb18046..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/AllObjects.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>All Objects</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getAllObjects()
- * @model
- * @generated
- */
-public interface AllObjects extends ComplexObject
-{
-} // AllObjects
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Polarity.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Argument.java
index ba30c6ad..73c79940 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Polarity.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Argument.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage;
@@ -7,14 +7,14 @@ import org.eclipse.emf.ecore.EObject;
 /**
 * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Polarity</b></em>'.
+ * A representation of the model object '<em><b>Argument</b></em>'.
 * <!-- end-user-doc -->
 *
 *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getPolarity()
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getArgument()
 * @model
 * @generated
 */
-public interface Polarity extends EObject
+public interface Argument extends EObject
 {
-} // Polarity
+} // Argument
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/PatternBody.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ArgumentList.java
index 62be12a1..4a932fea 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/PatternBody.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ArgumentList.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage;
@@ -9,32 +9,32 @@ import org.eclipse.emf.ecore.EObject;
 /**
 * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Pattern Body</b></em>'.
+ * A representation of the model object '<em><b>Argument List</b></em>'.
 * <!-- end-user-doc -->
 *
 * <p>
 * The following features are supported:
 * </p>
 * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.PatternBody#getConstraints <em>Constraints</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.ArgumentList#getArguments <em>Arguments</em>}</li>
 * </ul>
 *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getPatternBody()
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getArgumentList()
 * @model
 * @generated
 */
-public interface PatternBody extends EObject
+public interface ArgumentList extends EObject
 {
  /**
-   * Returns the value of the '<em><b>Constraints</b></em>' containment reference list.
+   * Returns the value of the '<em><b>Arguments</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.viatra.solver.language.solverLanguage.Constraint}.
+   * The list contents are of type {@link org.eclipse.viatra.solver.language.solverLanguage.Argument}.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the value of the '<em>Constraints</em>' containment reference list.
+   * @return the value of the '<em>Arguments</em>' containment reference list.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getPatternBody_Constraints()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getArgumentList_Arguments()
   * @model containment="true"
   * @generated
   */
-  EList<Constraint> getConstraints();
+  EList<Argument> getArguments();
-} // PatternBody
+} // ArgumentList
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Assertion.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Assertion.java
new file mode 100644
index 00000000..b67d81ca
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Assertion.java
@@ -0,0 +1,70 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Assertion</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Assertion#getBody <em>Body</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Assertion#getRange <em>Range</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getAssertion()
+ * @model
+ * @generated
+ */
+public interface Assertion extends Statement
+{
+  /**
+   * Returns the value of the '<em><b>Body</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Body</em>' containment reference.
+   * @see #setBody(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getAssertion_Body()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getBody();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Assertion#getBody <em>Body</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Body</em>' containment reference.
+   * @see #getBody()
+   * @generated
+   */
+  void setBody(Expression value);
+  /**
+   * Returns the value of the '<em><b>Range</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Range</em>' containment reference.
+   * @see #setRange(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getAssertion_Range()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getRange();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Assertion#getRange <em>Range</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Range</em>' containment reference.
+   * @see #getRange()
+   * @generated
+   */
+  void setRange(Expression value);
+} // Assertion
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BasicInterpretation.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BasicInterpretation.java
deleted file mode 100644
index b4226d4a..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BasicInterpretation.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-import org.eclipse.emf.common.util.EList;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Basic Interpretation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation#getSymbol <em>Symbol</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation#getObjects <em>Objects</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation#getValue <em>Value</em>}</li>
- * </ul>
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBasicInterpretation()
- * @model
- * @generated
- */
-public interface BasicInterpretation extends Interpretation
-{
-  /**
-   * Returns the value of the '<em><b>Symbol</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Symbol</em>' containment reference.
-   * @see #setSymbol(Symbol)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBasicInterpretation_Symbol()
-   * @model containment="true"
-   * @generated
-   */
-  Symbol getSymbol();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation#getSymbol <em>Symbol</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Symbol</em>' containment reference.
-   * @see #getSymbol()
-   * @generated
-   */
-  void setSymbol(Symbol value);
-  /**
-   * Returns the value of the '<em><b>Objects</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.viatra.solver.language.solverLanguage.ComplexObject}.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Objects</em>' containment reference list.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBasicInterpretation_Objects()
-   * @model containment="true"
-   * @generated
-   */
-  EList<ComplexObject> getObjects();
-  /**
-   * Returns the value of the '<em><b>Value</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Value</em>' containment reference.
-   * @see #setValue(TruthValue)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBasicInterpretation_Value()
-   * @model containment="true"
-   * @generated
-   */
-  TruthValue getValue();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation#getValue <em>Value</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Value</em>' containment reference.
-   * @see #getValue()
-   * @generated
-   */
-  void setValue(TruthValue value);
-} // BasicInterpretation
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BinaryExpression.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BinaryExpression.java
new file mode 100644
index 00000000..8a81e68b
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BinaryExpression.java
@@ -0,0 +1,96 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Binary Expression</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression#getLeft <em>Left</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression#getOp <em>Op</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression#getRight <em>Right</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBinaryExpression()
+ * @model
+ * @generated
+ */
+public interface BinaryExpression extends Expression
+{
+  /**
+   * Returns the value of the '<em><b>Left</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Left</em>' containment reference.
+   * @see #setLeft(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBinaryExpression_Left()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getLeft();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression#getLeft <em>Left</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Left</em>' containment reference.
+   * @see #getLeft()
+   * @generated
+   */
+  void setLeft(Expression value);
+  /**
+   * Returns the value of the '<em><b>Op</b></em>' attribute.
+   * The literals are from the enumeration {@link org.eclipse.viatra.solver.language.solverLanguage.BinaryOperator}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Op</em>' attribute.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BinaryOperator
+   * @see #setOp(BinaryOperator)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBinaryExpression_Op()
+   * @model
+   * @generated
+   */
+  BinaryOperator getOp();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression#getOp <em>Op</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Op</em>' attribute.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BinaryOperator
+   * @see #getOp()
+   * @generated
+   */
+  void setOp(BinaryOperator value);
+  /**
+   * Returns the value of the '<em><b>Right</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Right</em>' containment reference.
+   * @see #setRight(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBinaryExpression_Right()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getRight();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression#getRight <em>Right</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Right</em>' containment reference.
+   * @see #getRight()
+   * @generated
+   */
+  void setRight(Expression value);
+} // BinaryExpression
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BinaryOperator.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BinaryOperator.java
new file mode 100644
index 00000000..9e8e073a
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BinaryOperator.java
@@ -0,0 +1,455 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.eclipse.emf.common.util.Enumerator;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Binary Operator</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBinaryOperator()
+ * @model
+ * @generated
+ */
+public enum BinaryOperator implements Enumerator
+{
+  /**
+   * The '<em><b>EQ</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #EQ_VALUE
+   * @generated
+   * @ordered
+   */
+  EQ(0, "EQ", "EQ"),
+  /**
+   * The '<em><b>NOT EQ</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #NOT_EQ_VALUE
+   * @generated
+   * @ordered
+   */
+  NOT_EQ(1, "NOT_EQ", "NOT_EQ"),
+  /**
+   * The '<em><b>LESS</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #LESS_VALUE
+   * @generated
+   * @ordered
+   */
+  LESS(2, "LESS", "LESS"),
+  /**
+   * The '<em><b>LESS EQ</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #LESS_EQ_VALUE
+   * @generated
+   * @ordered
+   */
+  LESS_EQ(3, "LESS_EQ", "LESS_EQ"),
+  /**
+   * The '<em><b>GREATER</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #GREATER_VALUE
+   * @generated
+   * @ordered
+   */
+  GREATER(4, "GREATER", "GREATER"),
+  /**
+   * The '<em><b>GREATER EQ</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #GREATER_EQ_VALUE
+   * @generated
+   * @ordered
+   */
+  GREATER_EQ(5, "GREATER_EQ", "GREATER_EQ"),
+  /**
+   * The '<em><b>IN</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #IN_VALUE
+   * @generated
+   * @ordered
+   */
+  IN(6, "IN", "IN"),
+  /**
+   * The '<em><b>ADD</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #ADD_VALUE
+   * @generated
+   * @ordered
+   */
+  ADD(7, "ADD", "ADD"),
+  /**
+   * The '<em><b>SUB</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #SUB_VALUE
+   * @generated
+   * @ordered
+   */
+  SUB(8, "SUB", "SUB"),
+  /**
+   * The '<em><b>MUL</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #MUL_VALUE
+   * @generated
+   * @ordered
+   */
+  MUL(9, "MUL", "MUL"),
+  /**
+   * The '<em><b>DIV</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #DIV_VALUE
+   * @generated
+   * @ordered
+   */
+  DIV(10, "DIV", "DIV"),
+  /**
+   * The '<em><b>POW</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #POW_VALUE
+   * @generated
+   * @ordered
+   */
+  POW(11, "POW", "POW");
+  /**
+   * The '<em><b>EQ</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #EQ
+   * @model
+   * @generated
+   * @ordered
+   */
+  public static final int EQ_VALUE = 0;
+  /**
+   * The '<em><b>NOT EQ</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #NOT_EQ
+   * @model
+   * @generated
+   * @ordered
+   */
+  public static final int NOT_EQ_VALUE = 1;
+  /**
+   * The '<em><b>LESS</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #LESS
+   * @model
+   * @generated
+   * @ordered
+   */
+  public static final int LESS_VALUE = 2;
+  /**
+   * The '<em><b>LESS EQ</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #LESS_EQ
+   * @model
+   * @generated
+   * @ordered
+   */
+  public static final int LESS_EQ_VALUE = 3;
+  /**
+   * The '<em><b>GREATER</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #GREATER
+   * @model
+   * @generated
+   * @ordered
+   */
+  public static final int GREATER_VALUE = 4;
+  /**
+   * The '<em><b>GREATER EQ</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #GREATER_EQ
+   * @model
+   * @generated
+   * @ordered
+   */
+  public static final int GREATER_EQ_VALUE = 5;
+  /**
+   * The '<em><b>IN</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #IN
+   * @model
+   * @generated
+   * @ordered
+   */
+  public static final int IN_VALUE = 6;
+  /**
+   * The '<em><b>ADD</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #ADD
+   * @model
+   * @generated
+   * @ordered
+   */
+  public static final int ADD_VALUE = 7;
+  /**
+   * The '<em><b>SUB</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #SUB
+   * @model
+   * @generated
+   * @ordered
+   */
+  public static final int SUB_VALUE = 8;
+  /**
+   * The '<em><b>MUL</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #MUL
+   * @model
+   * @generated
+   * @ordered
+   */
+  public static final int MUL_VALUE = 9;
+  /**
+   * The '<em><b>DIV</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #DIV
+   * @model
+   * @generated
+   * @ordered
+   */
+  public static final int DIV_VALUE = 10;
+  /**
+   * The '<em><b>POW</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #POW
+   * @model
+   * @generated
+   * @ordered
+   */
+  public static final int POW_VALUE = 11;
+  /**
+   * An array of all the '<em><b>Binary Operator</b></em>' enumerators.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private static final BinaryOperator[] VALUES_ARRAY =
+    new BinaryOperator[]
+    {
+      EQ,
+      NOT_EQ,
+      LESS,
+      LESS_EQ,
+      GREATER,
+      GREATER_EQ,
+      IN,
+      ADD,
+      SUB,
+      MUL,
+      DIV,
+      POW,
+    };
+  /**
+   * A public read-only list of all the '<em><b>Binary Operator</b></em>' enumerators.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static final List<BinaryOperator> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+  /**
+   * Returns the '<em><b>Binary Operator</b></em>' literal with the specified literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static BinaryOperator get(String literal)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      BinaryOperator result = VALUES_ARRAY[i];
+      if (result.toString().equals(literal))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+  /**
+   * Returns the '<em><b>Binary Operator</b></em>' literal with the specified name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static BinaryOperator getByName(String name)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      BinaryOperator result = VALUES_ARRAY[i];
+      if (result.getName().equals(name))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+  /**
+   * Returns the '<em><b>Binary Operator</b></em>' literal with the specified integer value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static BinaryOperator get(int value)
+  {
+    switch (value)
+    {
+      case EQ_VALUE: return EQ;
+      case NOT_EQ_VALUE: return NOT_EQ;
+      case LESS_VALUE: return LESS;
+      case LESS_EQ_VALUE: return LESS_EQ;
+      case GREATER_VALUE: return GREATER;
+      case GREATER_EQ_VALUE: return GREATER_EQ;
+      case IN_VALUE: return IN;
+      case ADD_VALUE: return ADD;
+      case SUB_VALUE: return SUB;
+      case MUL_VALUE: return MUL;
+      case DIV_VALUE: return DIV;
+      case POW_VALUE: return POW;
+    }
+    return null;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final int value;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final String name;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final String literal;
+  /**
+   * Only this class can construct instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private BinaryOperator(int value, String name, String literal)
+  {
+    this.value = value;
+    this.name = name;
+    this.literal = literal;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public int getValue()
+  {
+    return value;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getName()
+  {
+    return name;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getLiteral()
+  {
+    return literal;
+  }
+  /**
+   * Returns the literal value of the enumerator, which is its string representation.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    return literal;
+  }
+  
+} //BinaryOperator
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BooleanFalse.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BooleanFalse.java
deleted file mode 100644
index 678e8fee..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BooleanFalse.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Boolean False</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBooleanFalse()
- * @model
- * @generated
- */
-public interface BooleanFalse extends BooleanValue
-{
-} // BooleanFalse
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BooleanObject.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BooleanObject.java
deleted file mode 100644
index c2c652ab..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BooleanObject.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Boolean Object</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.BooleanObject#getValue <em>Value</em>}</li>
- * </ul>
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBooleanObject()
- * @model
- * @generated
- */
-public interface BooleanObject extends DataObject
-{
-  /**
-   * Returns the value of the '<em><b>Value</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Value</em>' containment reference.
-   * @see #setValue(BooleanValue)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBooleanObject_Value()
-   * @model containment="true"
-   * @generated
-   */
-  BooleanValue getValue();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.BooleanObject#getValue <em>Value</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Value</em>' containment reference.
-   * @see #getValue()
-   * @generated
-   */
-  void setValue(BooleanValue value);
-} // BooleanObject
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BooleanSymbol.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BooleanSymbol.java
deleted file mode 100644
index 4760c96c..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BooleanSymbol.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Boolean Symbol</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBooleanSymbol()
- * @model
- * @generated
- */
-public interface BooleanSymbol extends DataSymbol
-{
-} // BooleanSymbol
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BooleanTrue.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BooleanTrue.java
deleted file mode 100644
index 7c72ec36..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BooleanTrue.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Boolean True</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBooleanTrue()
- * @model
- * @generated
- */
-public interface BooleanTrue extends BooleanValue
-{
-} // BooleanTrue
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BooleanValue.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BooleanValue.java
deleted file mode 100644
index 8fe67a48..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BooleanValue.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-import org.eclipse.emf.ecore.EObject;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Boolean Value</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBooleanValue()
- * @model
- * @generated
- */
-public interface BooleanValue extends EObject
-{
-} // BooleanValue
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BoundedMultiplicity.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BoundedMultiplicity.java
new file mode 100644
index 00000000..8e81e1a2
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BoundedMultiplicity.java
@@ -0,0 +1,70 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Bounded Multiplicity</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.BoundedMultiplicity#getLowerBound <em>Lower Bound</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.BoundedMultiplicity#getUpperBound <em>Upper Bound</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBoundedMultiplicity()
+ * @model
+ * @generated
+ */
+public interface BoundedMultiplicity extends Multiplicity
+{
+  /**
+   * Returns the value of the '<em><b>Lower Bound</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Lower Bound</em>' attribute.
+   * @see #setLowerBound(int)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBoundedMultiplicity_LowerBound()
+   * @model
+   * @generated
+   */
+  int getLowerBound();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.BoundedMultiplicity#getLowerBound <em>Lower Bound</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Lower Bound</em>' attribute.
+   * @see #getLowerBound()
+   * @generated
+   */
+  void setLowerBound(int value);
+  /**
+   * Returns the value of the '<em><b>Upper Bound</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Upper Bound</em>' attribute.
+   * @see #setUpperBound(int)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBoundedMultiplicity_UpperBound()
+   * @model
+   * @generated
+   */
+  int getUpperBound();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.BoundedMultiplicity#getUpperBound <em>Upper Bound</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Upper Bound</em>' attribute.
+   * @see #getUpperBound()
+   * @generated
+   */
+  void setUpperBound(int value);
+} // BoundedMultiplicity
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BoundedScopeDefinition.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BoundedScopeDefinition.java
new file mode 100644
index 00000000..1e76e86a
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/BoundedScopeDefinition.java
@@ -0,0 +1,70 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Bounded Scope Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.BoundedScopeDefinition#getLowerBound <em>Lower Bound</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.BoundedScopeDefinition#getUpperBound <em>Upper Bound</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBoundedScopeDefinition()
+ * @model
+ * @generated
+ */
+public interface BoundedScopeDefinition extends ScopeDefinition
+{
+  /**
+   * Returns the value of the '<em><b>Lower Bound</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Lower Bound</em>' attribute.
+   * @see #setLowerBound(int)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBoundedScopeDefinition_LowerBound()
+   * @model
+   * @generated
+   */
+  int getLowerBound();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.BoundedScopeDefinition#getLowerBound <em>Lower Bound</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Lower Bound</em>' attribute.
+   * @see #getLowerBound()
+   * @generated
+   */
+  void setLowerBound(int value);
+  /**
+   * Returns the value of the '<em><b>Upper Bound</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Upper Bound</em>' attribute.
+   * @see #setUpperBound(int)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getBoundedScopeDefinition_UpperBound()
+   * @model
+   * @generated
+   */
+  int getUpperBound();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.BoundedScopeDefinition#getUpperBound <em>Upper Bound</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Upper Bound</em>' attribute.
+   * @see #getUpperBound()
+   * @generated
+   */
+  void setUpperBound(int value);
+} // BoundedScopeDefinition
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/CDInterpretation.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/CDInterpretation.java
deleted file mode 100644
index 9a69fc8a..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/CDInterpretation.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>CD Interpretation</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getCDInterpretation()
- * @model
- * @generated
- */
-public interface CDInterpretation extends Interpretation
-{
-} // CDInterpretation
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Call.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Call.java
new file mode 100644
index 00000000..538ac75c
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Call.java
@@ -0,0 +1,116 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Call</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Call#getFunctor <em>Functor</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Call#getArgumentList <em>Argument List</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Call#isTransitiveClosure <em>Transitive Closure</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Call#isReflexiveTransitiveClosure <em>Reflexive Transitive Closure</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getCall()
+ * @model
+ * @generated
+ */
+public interface Call extends Expression
+{
+  /**
+   * Returns the value of the '<em><b>Functor</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Functor</em>' containment reference.
+   * @see #setFunctor(Reference)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getCall_Functor()
+   * @model containment="true"
+   * @generated
+   */
+  Reference getFunctor();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Call#getFunctor <em>Functor</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Functor</em>' containment reference.
+   * @see #getFunctor()
+   * @generated
+   */
+  void setFunctor(Reference value);
+  /**
+   * Returns the value of the '<em><b>Argument List</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Argument List</em>' containment reference.
+   * @see #setArgumentList(ArgumentList)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getCall_ArgumentList()
+   * @model containment="true"
+   * @generated
+   */
+  ArgumentList getArgumentList();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Call#getArgumentList <em>Argument List</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Argument List</em>' containment reference.
+   * @see #getArgumentList()
+   * @generated
+   */
+  void setArgumentList(ArgumentList value);
+  /**
+   * Returns the value of the '<em><b>Transitive Closure</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Transitive Closure</em>' attribute.
+   * @see #setTransitiveClosure(boolean)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getCall_TransitiveClosure()
+   * @model
+   * @generated
+   */
+  boolean isTransitiveClosure();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Call#isTransitiveClosure <em>Transitive Closure</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Transitive Closure</em>' attribute.
+   * @see #isTransitiveClosure()
+   * @generated
+   */
+  void setTransitiveClosure(boolean value);
+  /**
+   * Returns the value of the '<em><b>Reflexive Transitive Closure</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Reflexive Transitive Closure</em>' attribute.
+   * @see #setReflexiveTransitiveClosure(boolean)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getCall_ReflexiveTransitiveClosure()
+   * @model
+   * @generated
+   */
+  boolean isReflexiveTransitiveClosure();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Call#isReflexiveTransitiveClosure <em>Reflexive Transitive Closure</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Reflexive Transitive Closure</em>' attribute.
+   * @see #isReflexiveTransitiveClosure()
+   * @generated
+   */
+  void setReflexiveTransitiveClosure(boolean value);
+} // Call
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Case.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Case.java
new file mode 100644
index 00000000..970d1de2
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Case.java
@@ -0,0 +1,70 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Case</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Case#getCondition <em>Condition</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Case#getBody <em>Body</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getCase()
+ * @model
+ * @generated
+ */
+public interface Case extends Expression
+{
+  /**
+   * Returns the value of the '<em><b>Condition</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Condition</em>' containment reference.
+   * @see #setCondition(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getCase_Condition()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getCondition();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Case#getCondition <em>Condition</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Condition</em>' containment reference.
+   * @see #getCondition()
+   * @generated
+   */
+  void setCondition(Expression value);
+  /**
+   * Returns the value of the '<em><b>Body</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Body</em>' containment reference.
+   * @see #setBody(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getCase_Body()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getBody();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Case#getBody <em>Body</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Body</em>' containment reference.
+   * @see #getBody()
+   * @generated
+   */
+  void setBody(Expression value);
+} // Case
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ClassInterpretation.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ClassInterpretation.java
deleted file mode 100644
index 777e0c50..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ClassInterpretation.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-import org.eclipse.emf.common.util.EList;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Class Interpretation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation#isAbstract <em>Abstract</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation#getSymbol <em>Symbol</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation#getSupertypes <em>Supertypes</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation#getFielt <em>Fielt</em>}</li>
- * </ul>
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getClassInterpretation()
- * @model
- * @generated
- */
-public interface ClassInterpretation extends CDInterpretation
-{
-  /**
-   * Returns the value of the '<em><b>Abstract</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Abstract</em>' attribute.
-   * @see #setAbstract(boolean)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getClassInterpretation_Abstract()
-   * @model
-   * @generated
-   */
-  boolean isAbstract();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation#isAbstract <em>Abstract</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Abstract</em>' attribute.
-   * @see #isAbstract()
-   * @generated
-   */
-  void setAbstract(boolean value);
-  /**
-   * Returns the value of the '<em><b>Symbol</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Symbol</em>' containment reference.
-   * @see #setSymbol(ModelSymbol)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getClassInterpretation_Symbol()
-   * @model containment="true"
-   * @generated
-   */
-  ModelSymbol getSymbol();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation#getSymbol <em>Symbol</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Symbol</em>' containment reference.
-   * @see #getSymbol()
-   * @generated
-   */
-  void setSymbol(ModelSymbol value);
-  /**
-   * Returns the value of the '<em><b>Supertypes</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol}.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Supertypes</em>' containment reference list.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getClassInterpretation_Supertypes()
-   * @model containment="true"
-   * @generated
-   */
-  EList<ModelSymbol> getSupertypes();
-  /**
-   * Returns the value of the '<em><b>Fielt</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation}.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Fielt</em>' containment reference list.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getClassInterpretation_Fielt()
-   * @model containment="true"
-   * @generated
-   */
-  EList<FieldRelationInterpretation> getFielt();
-} // ClassInterpretation
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Comparison.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Comparison.java
new file mode 100644
index 00000000..43e9341a
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Comparison.java
@@ -0,0 +1,96 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Comparison</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Comparison#getLeft <em>Left</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Comparison#getOp <em>Op</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Comparison#getRight <em>Right</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getComparison()
+ * @model
+ * @generated
+ */
+public interface Comparison extends Expression
+{
+  /**
+   * Returns the value of the '<em><b>Left</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Left</em>' containment reference.
+   * @see #setLeft(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getComparison_Left()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getLeft();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Comparison#getLeft <em>Left</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Left</em>' containment reference.
+   * @see #getLeft()
+   * @generated
+   */
+  void setLeft(Expression value);
+  /**
+   * Returns the value of the '<em><b>Op</b></em>' attribute.
+   * The literals are from the enumeration {@link org.eclipse.viatra.solver.language.solverLanguage.BinaryOperator}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Op</em>' attribute.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BinaryOperator
+   * @see #setOp(BinaryOperator)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getComparison_Op()
+   * @model
+   * @generated
+   */
+  BinaryOperator getOp();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Comparison#getOp <em>Op</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Op</em>' attribute.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BinaryOperator
+   * @see #getOp()
+   * @generated
+   */
+  void setOp(BinaryOperator value);
+  /**
+   * Returns the value of the '<em><b>Right</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Right</em>' containment reference.
+   * @see #setRight(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getComparison_Right()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getRight();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Comparison#getRight <em>Right</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Right</em>' containment reference.
+   * @see #getRight()
+   * @generated
+   */
+  void setRight(Expression value);
+} // Comparison
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ComplexObject.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ComplexObject.java
deleted file mode 100644
index e266f231..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ComplexObject.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-import org.eclipse.emf.ecore.EObject;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Complex Object</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getComplexObject()
- * @model
- * @generated
- */
-public interface ComplexObject extends EObject
-{
-} // ComplexObject
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Conjunction.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Conjunction.java
new file mode 100644
index 00000000..9f1967c0
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Conjunction.java
@@ -0,0 +1,38 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+import org.eclipse.emf.common.util.EList;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Conjunction</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Conjunction#getChildren <em>Children</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getConjunction()
+ * @model
+ * @generated
+ */
+public interface Conjunction extends Expression
+{
+  /**
+   * Returns the value of the '<em><b>Children</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.viatra.solver.language.solverLanguage.Expression}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Children</em>' containment reference list.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getConjunction_Children()
+   * @model containment="true"
+   * @generated
+   */
+  EList<Expression> getChildren();
+} // Conjunction
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Constraint.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Constraint.java
deleted file mode 100644
index 9c957def..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Constraint.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Constraint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Constraint#getPolarity <em>Polarity</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Constraint#getSymbol <em>Symbol</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Constraint#getParams <em>Params</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Constraint#getClosureType <em>Closure Type</em>}</li>
- * </ul>
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getConstraint()
- * @model
- * @generated
- */
-public interface Constraint extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Polarity</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Polarity</em>' containment reference.
-   * @see #setPolarity(Polarity)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getConstraint_Polarity()
-   * @model containment="true"
-   * @generated
-   */
-  Polarity getPolarity();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Constraint#getPolarity <em>Polarity</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Polarity</em>' containment reference.
-   * @see #getPolarity()
-   * @generated
-   */
-  void setPolarity(Polarity value);
-  /**
-   * Returns the value of the '<em><b>Symbol</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Symbol</em>' containment reference.
-   * @see #setSymbol(ModelSymbol)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getConstraint_Symbol()
-   * @model containment="true"
-   * @generated
-   */
-  ModelSymbol getSymbol();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Constraint#getSymbol <em>Symbol</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Symbol</em>' containment reference.
-   * @see #getSymbol()
-   * @generated
-   */
-  void setSymbol(ModelSymbol value);
-  /**
-   * Returns the value of the '<em><b>Params</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.viatra.solver.language.solverLanguage.Literal}.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Params</em>' containment reference list.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getConstraint_Params()
-   * @model containment="true"
-   * @generated
-   */
-  EList<Literal> getParams();
-  /**
-   * Returns the value of the '<em><b>Closure Type</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Closure Type</em>' containment reference.
-   * @see #setClosureType(ClosureType)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getConstraint_ClosureType()
-   * @model containment="true"
-   * @generated
-   */
-  ClosureType getClosureType();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Constraint#getClosureType <em>Closure Type</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Closure Type</em>' containment reference.
-   * @see #getClosureType()
-   * @generated
-   */
-  void setClosureType(ClosureType value);
-} // Constraint
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Count.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Count.java
new file mode 100644
index 00000000..f4b95a1e
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Count.java
@@ -0,0 +1,47 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Count</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Count#getBody <em>Body</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getCount()
+ * @model
+ * @generated
+ */
+public interface Count extends Expression
+{
+  /**
+   * Returns the value of the '<em><b>Body</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Body</em>' containment reference.
+   * @see #setBody(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getCount_Body()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getBody();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Count#getBody <em>Body</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Body</em>' containment reference.
+   * @see #getBody()
+   * @generated
+   */
+  void setBody(Expression value);
+} // Count
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/DataObject.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/DataObject.java
deleted file mode 100644
index 79a0af43..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/DataObject.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Data Object</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getDataObject()
- * @model
- * @generated
- */
-public interface DataObject extends org.eclipse.viatra.solver.language.solverLanguage.Object, Literal
-{
-} // DataObject
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/DataSymbol.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/DataSymbol.java
deleted file mode 100644
index eae8175a..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/DataSymbol.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Data Symbol</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getDataSymbol()
- * @model
- * @generated
- */
-public interface DataSymbol extends Symbol
-{
-} // DataSymbol
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/DefaultDefinition.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/DefaultDefinition.java
new file mode 100644
index 00000000..c088f8d7
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/DefaultDefinition.java
@@ -0,0 +1,70 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Default Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.DefaultDefinition#getHead <em>Head</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.DefaultDefinition#getRange <em>Range</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getDefaultDefinition()
+ * @model
+ * @generated
+ */
+public interface DefaultDefinition extends Statement
+{
+  /**
+   * Returns the value of the '<em><b>Head</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Head</em>' containment reference.
+   * @see #setHead(Call)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getDefaultDefinition_Head()
+   * @model containment="true"
+   * @generated
+   */
+  Call getHead();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.DefaultDefinition#getHead <em>Head</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Head</em>' containment reference.
+   * @see #getHead()
+   * @generated
+   */
+  void setHead(Call value);
+  /**
+   * Returns the value of the '<em><b>Range</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Range</em>' containment reference.
+   * @see #setRange(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getDefaultDefinition_Range()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getRange();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.DefaultDefinition#getRange <em>Range</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Range</em>' containment reference.
+   * @see #getRange()
+   * @generated
+   */
+  void setRange(Expression value);
+} // DefaultDefinition
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/DefaultInterpretation.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/DefaultInterpretation.java
deleted file mode 100644
index 2e9209f6..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/DefaultInterpretation.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Default Interpretation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation#getInterpretation <em>Interpretation</em>}</li>
- * </ul>
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getDefaultInterpretation()
- * @model
- * @generated
- */
-public interface DefaultInterpretation extends Interpretation
-{
-  /**
-   * Returns the value of the '<em><b>Interpretation</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Interpretation</em>' containment reference.
-   * @see #setInterpretation(BasicInterpretation)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getDefaultInterpretation_Interpretation()
-   * @model containment="true"
-   * @generated
-   */
-  BasicInterpretation getInterpretation();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation#getInterpretation <em>Interpretation</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Interpretation</em>' containment reference.
-   * @see #getInterpretation()
-   * @generated
-   */
-  void setInterpretation(BasicInterpretation value);
-} // DefaultInterpretation
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Disjunction.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Disjunction.java
new file mode 100644
index 00000000..724fc04a
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Disjunction.java
@@ -0,0 +1,38 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+import org.eclipse.emf.common.util.EList;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Disjunction</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Disjunction#getChildren <em>Children</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getDisjunction()
+ * @model
+ * @generated
+ */
+public interface Disjunction extends Expression
+{
+  /**
+   * Returns the value of the '<em><b>Children</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.viatra.solver.language.solverLanguage.Expression}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Children</em>' containment reference list.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getDisjunction_Children()
+   * @model containment="true"
+   * @generated
+   */
+  EList<Expression> getChildren();
+} // Disjunction
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/EmptyIntervalLiteral.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/EmptyIntervalLiteral.java
new file mode 100644
index 00000000..03f09681
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/EmptyIntervalLiteral.java
@@ -0,0 +1,19 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Empty Interval Literal</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getEmptyIntervalLiteral()
+ * @model
+ * @generated
+ */
+public interface EmptyIntervalLiteral extends Literal
+{
+} // EmptyIntervalLiteral
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/EnumInterpretation.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/EnumInterpretation.java
deleted file mode 100644
index 8d48c0df..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/EnumInterpretation.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-import org.eclipse.emf.common.util.EList;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Enum Interpretation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation#getSymbol <em>Symbol</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation#getObjects <em>Objects</em>}</li>
- * </ul>
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getEnumInterpretation()
- * @model
- * @generated
- */
-public interface EnumInterpretation extends CDInterpretation
-{
-  /**
-   * Returns the value of the '<em><b>Symbol</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Symbol</em>' containment reference.
-   * @see #setSymbol(ModelSymbol)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getEnumInterpretation_Symbol()
-   * @model containment="true"
-   * @generated
-   */
-  ModelSymbol getSymbol();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation#getSymbol <em>Symbol</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Symbol</em>' containment reference.
-   * @see #getSymbol()
-   * @generated
-   */
-  void setSymbol(ModelSymbol value);
-  /**
-   * Returns the value of the '<em><b>Objects</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.viatra.solver.language.solverLanguage.NamedObject}.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Objects</em>' containment reference list.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getEnumInterpretation_Objects()
-   * @model containment="true"
-   * @generated
-   */
-  EList<NamedObject> getObjects();
-} // EnumInterpretation
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/EqualsSymbol.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/EqualsSymbol.java
deleted file mode 100644
index 1edb994f..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/EqualsSymbol.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Equals Symbol</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getEqualsSymbol()
- * @model
- * @generated
- */
-public interface EqualsSymbol extends PartialitySymbol
-{
-} // EqualsSymbol
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Error.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Error.java
deleted file mode 100644
index bf99bc42..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Error.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Error</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getError()
- * @model
- * @generated
- */
-public interface Error extends TruthValue
-{
-} // Error
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ExactMultiplicity.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ExactMultiplicity.java
new file mode 100644
index 00000000..33e88fc4
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ExactMultiplicity.java
@@ -0,0 +1,47 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Exact Multiplicity</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.ExactMultiplicity#getMultiplicity <em>Multiplicity</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getExactMultiplicity()
+ * @model
+ * @generated
+ */
+public interface ExactMultiplicity extends Multiplicity
+{
+  /**
+   * Returns the value of the '<em><b>Multiplicity</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Multiplicity</em>' attribute.
+   * @see #setMultiplicity(int)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getExactMultiplicity_Multiplicity()
+   * @model
+   * @generated
+   */
+  int getMultiplicity();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.ExactMultiplicity#getMultiplicity <em>Multiplicity</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Multiplicity</em>' attribute.
+   * @see #getMultiplicity()
+   * @generated
+   */
+  void setMultiplicity(int value);
+} // ExactMultiplicity
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ExactScopeDefinition.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ExactScopeDefinition.java
new file mode 100644
index 00000000..50eb6a00
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ExactScopeDefinition.java
@@ -0,0 +1,47 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Exact Scope Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.ExactScopeDefinition#getExactScope <em>Exact Scope</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getExactScopeDefinition()
+ * @model
+ * @generated
+ */
+public interface ExactScopeDefinition extends ScopeDefinition
+{
+  /**
+   * Returns the value of the '<em><b>Exact Scope</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Exact Scope</em>' attribute.
+   * @see #setExactScope(int)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getExactScopeDefinition_ExactScope()
+   * @model
+   * @generated
+   */
+  int getExactScope();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.ExactScopeDefinition#getExactScope <em>Exact Scope</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Exact Scope</em>' attribute.
+   * @see #getExactScope()
+   * @generated
+   */
+  void setExactScope(int value);
+} // ExactScopeDefinition
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ExistSymbol.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ExistSymbol.java
deleted file mode 100644
index 4dad3295..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ExistSymbol.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Exist Symbol</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getExistSymbol()
- * @model
- * @generated
- */
-public interface ExistSymbol extends PartialitySymbol
-{
-} // ExistSymbol
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Object.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Expression.java
index 908ae5a6..1ecd89a5 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Object.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Expression.java
@@ -1,19 +1,19 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage;
 /**
 * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Object</b></em>'.
+ * A representation of the model object '<em><b>Expression</b></em>'.
 * <!-- end-user-doc -->
 *
 *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getObject()
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getExpression()
 * @model
 * @generated
 */
-public interface Object extends ComplexObject
+public interface Expression extends Statement
 {
-} // Object
+} // Expression
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ExpressionArgument.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ExpressionArgument.java
new file mode 100644
index 00000000..518693a1
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ExpressionArgument.java
@@ -0,0 +1,47 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Expression Argument</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.ExpressionArgument#getBody <em>Body</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getExpressionArgument()
+ * @model
+ * @generated
+ */
+public interface ExpressionArgument extends Argument
+{
+  /**
+   * Returns the value of the '<em><b>Body</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Body</em>' containment reference.
+   * @see #setBody(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getExpressionArgument_Body()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getBody();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.ExpressionArgument#getBody <em>Body</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Body</em>' containment reference.
+   * @see #getBody()
+   * @generated
+   */
+  void setBody(Expression value);
+} // ExpressionArgument
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ExternMetricDefinition.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ExternMetricDefinition.java
new file mode 100644
index 00000000..086c4b27
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ExternMetricDefinition.java
@@ -0,0 +1,73 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Extern Metric Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.ExternMetricDefinition#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.ExternMetricDefinition#getHead <em>Head</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getExternMetricDefinition()
+ * @model
+ * @generated
+ */
+public interface ExternMetricDefinition extends Statement
+{
+  /**
+   * Returns the value of the '<em><b>Type</b></em>' attribute.
+   * The literals are from the enumeration {@link org.eclipse.viatra.solver.language.solverLanguage.MetricType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Type</em>' attribute.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.MetricType
+   * @see #setType(MetricType)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getExternMetricDefinition_Type()
+   * @model
+   * @generated
+   */
+  MetricType getType();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.ExternMetricDefinition#getType <em>Type</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Type</em>' attribute.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.MetricType
+   * @see #getType()
+   * @generated
+   */
+  void setType(MetricType value);
+  /**
+   * Returns the value of the '<em><b>Head</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Head</em>' containment reference.
+   * @see #setHead(Call)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getExternMetricDefinition_Head()
+   * @model containment="true"
+   * @generated
+   */
+  Call getHead();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.ExternMetricDefinition#getHead <em>Head</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Head</em>' containment reference.
+   * @see #getHead()
+   * @generated
+   */
+  void setHead(Call value);
+} // ExternMetricDefinition
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ExternPredicateDefinition.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ExternPredicateDefinition.java
new file mode 100644
index 00000000..56e6b645
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ExternPredicateDefinition.java
@@ -0,0 +1,47 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Extern Predicate Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.ExternPredicateDefinition#getHead <em>Head</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getExternPredicateDefinition()
+ * @model
+ * @generated
+ */
+public interface ExternPredicateDefinition extends Statement
+{
+  /**
+   * Returns the value of the '<em><b>Head</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Head</em>' containment reference.
+   * @see #setHead(Call)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getExternPredicateDefinition_Head()
+   * @model containment="true"
+   * @generated
+   */
+  Call getHead();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.ExternPredicateDefinition#getHead <em>Head</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Head</em>' containment reference.
+   * @see #getHead()
+   * @generated
+   */
+  void setHead(Call value);
+} // ExternPredicateDefinition
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/False.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/False.java
deleted file mode 100644
index 71947237..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/False.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>False</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getFalse()
- * @model
- * @generated
- */
-public interface False extends TruthValue
-{
-} // False
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/FieldRelationInterpretation.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/FieldRelationInterpretation.java
deleted file mode 100644
index eccf49e0..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/FieldRelationInterpretation.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-import org.eclipse.emf.ecore.EObject;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Field Relation Interpretation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation#isContainment <em>Containment</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation#getSymbol <em>Symbol</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation#getMultiplicity <em>Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation#getTarget <em>Target</em>}</li>
- * </ul>
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getFieldRelationInterpretation()
- * @model
- * @generated
- */
-public interface FieldRelationInterpretation extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Containment</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Containment</em>' attribute.
-   * @see #setContainment(boolean)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getFieldRelationInterpretation_Containment()
-   * @model
-   * @generated
-   */
-  boolean isContainment();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation#isContainment <em>Containment</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Containment</em>' attribute.
-   * @see #isContainment()
-   * @generated
-   */
-  void setContainment(boolean value);
-  /**
-   * Returns the value of the '<em><b>Symbol</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Symbol</em>' containment reference.
-   * @see #setSymbol(ModelSymbol)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getFieldRelationInterpretation_Symbol()
-   * @model containment="true"
-   * @generated
-   */
-  ModelSymbol getSymbol();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation#getSymbol <em>Symbol</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Symbol</em>' containment reference.
-   * @see #getSymbol()
-   * @generated
-   */
-  void setSymbol(ModelSymbol value);
-  /**
-   * Returns the value of the '<em><b>Multiplicity</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Multiplicity</em>' containment reference.
-   * @see #setMultiplicity(MultiplicityDefinition)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getFieldRelationInterpretation_Multiplicity()
-   * @model containment="true"
-   * @generated
-   */
-  MultiplicityDefinition getMultiplicity();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation#getMultiplicity <em>Multiplicity</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Multiplicity</em>' containment reference.
-   * @see #getMultiplicity()
-   * @generated
-   */
-  void setMultiplicity(MultiplicityDefinition value);
-  /**
-   * Returns the value of the '<em><b>Target</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Target</em>' containment reference.
-   * @see #setTarget(Symbol)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getFieldRelationInterpretation_Target()
-   * @model containment="true"
-   * @generated
-   */
-  Symbol getTarget();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation#getTarget <em>Target</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Target</em>' containment reference.
-   * @see #getTarget()
-   * @generated
-   */
-  void setTarget(Symbol value);
-} // FieldRelationInterpretation
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/GlobalRelationInterpretation.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/GlobalRelationInterpretation.java
deleted file mode 100644
index 59ab4278..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/GlobalRelationInterpretation.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Global Relation Interpretation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#isContainment <em>Containment</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getSymbol <em>Symbol</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getSourceMultiplicity <em>Source Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getTargetMultiplicity <em>Target Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getTarget <em>Target</em>}</li>
- * </ul>
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getGlobalRelationInterpretation()
- * @model
- * @generated
- */
-public interface GlobalRelationInterpretation extends CDInterpretation
-{
-  /**
-   * Returns the value of the '<em><b>Containment</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Containment</em>' attribute.
-   * @see #setContainment(boolean)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getGlobalRelationInterpretation_Containment()
-   * @model
-   * @generated
-   */
-  boolean isContainment();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#isContainment <em>Containment</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Containment</em>' attribute.
-   * @see #isContainment()
-   * @generated
-   */
-  void setContainment(boolean value);
-  /**
-   * Returns the value of the '<em><b>Symbol</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Symbol</em>' containment reference.
-   * @see #setSymbol(ModelSymbol)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getGlobalRelationInterpretation_Symbol()
-   * @model containment="true"
-   * @generated
-   */
-  ModelSymbol getSymbol();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getSymbol <em>Symbol</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Symbol</em>' containment reference.
-   * @see #getSymbol()
-   * @generated
-   */
-  void setSymbol(ModelSymbol value);
-  /**
-   * Returns the value of the '<em><b>Source Multiplicity</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Source Multiplicity</em>' containment reference.
-   * @see #setSourceMultiplicity(MultiplicityDefinition)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getGlobalRelationInterpretation_SourceMultiplicity()
-   * @model containment="true"
-   * @generated
-   */
-  MultiplicityDefinition getSourceMultiplicity();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getSourceMultiplicity <em>Source Multiplicity</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Source Multiplicity</em>' containment reference.
-   * @see #getSourceMultiplicity()
-   * @generated
-   */
-  void setSourceMultiplicity(MultiplicityDefinition value);
-  /**
-   * Returns the value of the '<em><b>Source</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Source</em>' containment reference.
-   * @see #setSource(Symbol)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getGlobalRelationInterpretation_Source()
-   * @model containment="true"
-   * @generated
-   */
-  Symbol getSource();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getSource <em>Source</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Source</em>' containment reference.
-   * @see #getSource()
-   * @generated
-   */
-  void setSource(Symbol value);
-  /**
-   * Returns the value of the '<em><b>Target Multiplicity</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Target Multiplicity</em>' containment reference.
-   * @see #setTargetMultiplicity(MultiplicityDefinition)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getGlobalRelationInterpretation_TargetMultiplicity()
-   * @model containment="true"
-   * @generated
-   */
-  MultiplicityDefinition getTargetMultiplicity();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getTargetMultiplicity <em>Target Multiplicity</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Target Multiplicity</em>' containment reference.
-   * @see #getTargetMultiplicity()
-   * @generated
-   */
-  void setTargetMultiplicity(MultiplicityDefinition value);
-  /**
-   * Returns the value of the '<em><b>Target</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Target</em>' containment reference.
-   * @see #setTarget(Symbol)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getGlobalRelationInterpretation_Target()
-   * @model containment="true"
-   * @generated
-   */
-  Symbol getTarget();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getTarget <em>Target</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Target</em>' containment reference.
-   * @see #getTarget()
-   * @generated
-   */
-  void setTarget(Symbol value);
-} // GlobalRelationInterpretation
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/IfElse.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/IfElse.java
new file mode 100644
index 00000000..f08a8420
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/IfElse.java
@@ -0,0 +1,93 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>If Else</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.IfElse#getCondition <em>Condition</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.IfElse#getThen <em>Then</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.IfElse#getElse <em>Else</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getIfElse()
+ * @model
+ * @generated
+ */
+public interface IfElse extends Expression
+{
+  /**
+   * Returns the value of the '<em><b>Condition</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Condition</em>' containment reference.
+   * @see #setCondition(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getIfElse_Condition()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getCondition();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.IfElse#getCondition <em>Condition</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Condition</em>' containment reference.
+   * @see #getCondition()
+   * @generated
+   */
+  void setCondition(Expression value);
+  /**
+   * Returns the value of the '<em><b>Then</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Then</em>' containment reference.
+   * @see #setThen(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getIfElse_Then()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getThen();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.IfElse#getThen <em>Then</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Then</em>' containment reference.
+   * @see #getThen()
+   * @generated
+   */
+  void setThen(Expression value);
+  /**
+   * Returns the value of the '<em><b>Else</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Else</em>' containment reference.
+   * @see #setElse(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getIfElse_Else()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getElse();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.IfElse#getElse <em>Else</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Else</em>' containment reference.
+   * @see #getElse()
+   * @generated
+   */
+  void setElse(Expression value);
+} // IfElse
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/InfinityLiteral.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/InfinityLiteral.java
new file mode 100644
index 00000000..24e9633b
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/InfinityLiteral.java
@@ -0,0 +1,19 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Infinity Literal</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getInfinityLiteral()
+ * @model
+ * @generated
+ */
+public interface InfinityLiteral extends Literal
+{
+} // InfinityLiteral
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/IntegerSymbol.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/IntegerSymbol.java
deleted file mode 100644
index d1472499..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/IntegerSymbol.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Integer Symbol</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getIntegerSymbol()
- * @model
- * @generated
- */
-public interface IntegerSymbol extends DataSymbol
-{
-} // IntegerSymbol
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Interpretation.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Interpretation.java
deleted file mode 100644
index 56541016..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Interpretation.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Interpretation</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getInterpretation()
- * @model
- * @generated
- */
-public interface Interpretation extends Statement
-{
-} // Interpretation
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Interval.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Interval.java
new file mode 100644
index 00000000..3431ef8b
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Interval.java
@@ -0,0 +1,70 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Interval</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Interval#getLowerBound <em>Lower Bound</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Interval#getUpperBound <em>Upper Bound</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getInterval()
+ * @model
+ * @generated
+ */
+public interface Interval extends Expression
+{
+  /**
+   * Returns the value of the '<em><b>Lower Bound</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Lower Bound</em>' containment reference.
+   * @see #setLowerBound(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getInterval_LowerBound()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getLowerBound();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Interval#getLowerBound <em>Lower Bound</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Lower Bound</em>' containment reference.
+   * @see #getLowerBound()
+   * @generated
+   */
+  void setLowerBound(Expression value);
+  /**
+   * Returns the value of the '<em><b>Upper Bound</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Upper Bound</em>' containment reference.
+   * @see #setUpperBound(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getInterval_UpperBound()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getUpperBound();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Interval#getUpperBound <em>Upper Bound</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Upper Bound</em>' containment reference.
+   * @see #getUpperBound()
+   * @generated
+   */
+  void setUpperBound(Expression value);
+} // Interval
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/IrreflexiveClosure.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/IrreflexiveClosure.java
deleted file mode 100644
index eca04f1e..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/IrreflexiveClosure.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Irreflexive Closure</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getIrreflexiveClosure()
- * @model
- * @generated
- */
-public interface IrreflexiveClosure extends ClosureType
-{
-} // IrreflexiveClosure
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Literal.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Literal.java
index 259abe8c..67d4e64f 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Literal.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Literal.java
@@ -1,9 +1,8 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage;
-import org.eclipse.emf.ecore.EObject;
 /**
 * <!-- begin-user-doc -->
@@ -15,6 +14,6 @@ import org.eclipse.emf.ecore.EObject;
 * @model
 * @generated
 */
-public interface Literal extends EObject
+public interface Literal extends Expression
 {
 } // Literal
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/IntObject.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/LogicLiteral.java
index 1a42b0c3..b3eb1523 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/IntObject.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/LogicLiteral.java
@@ -1,47 +1,50 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage;
 /**
 * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Int Object</b></em>'.
+ * A representation of the model object '<em><b>Logic Literal</b></em>'.
 * <!-- end-user-doc -->
 *
 * <p>
 * The following features are supported:
 * </p>
 * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.IntObject#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.LogicLiteral#getValue <em>Value</em>}</li>
 * </ul>
 *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getIntObject()
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getLogicLiteral()
 * @model
 * @generated
 */
-public interface IntObject extends DataObject
+public interface LogicLiteral extends Literal
 {
  /**
   * Returns the value of the '<em><b>Value</b></em>' attribute.
+   * The literals are from the enumeration {@link org.eclipse.viatra.solver.language.solverLanguage.LogicValue}.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @return the value of the '<em>Value</em>' attribute.
-   * @see #setValue(int)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.LogicValue
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getIntObject_Value()
+   * @see #setValue(LogicValue)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getLogicLiteral_Value()
   * @model
   * @generated
   */
-  int getValue();
+  LogicValue getValue();
  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.IntObject#getValue <em>Value</em>}' attribute.
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.LogicLiteral#getValue <em>Value</em>}' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @param value the new value of the '<em>Value</em>' attribute.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.LogicValue
   * @see #getValue()
   * @generated
   */
-  void setValue(int value);
+  void setValue(LogicValue value);
-} // IntObject
+} // LogicLiteral
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/LogicValue.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/LogicValue.java
new file mode 100644
index 00000000..61be81f7
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/LogicValue.java
@@ -0,0 +1,271 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.eclipse.emf.common.util.Enumerator;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Logic Value</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getLogicValue()
+ * @model
+ * @generated
+ */
+public enum LogicValue implements Enumerator
+{
+  /**
+   * The '<em><b>TRUE</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #TRUE_VALUE
+   * @generated
+   * @ordered
+   */
+  TRUE(0, "TRUE", "true"),
+  /**
+   * The '<em><b>FALSE</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #FALSE_VALUE
+   * @generated
+   * @ordered
+   */
+  FALSE(1, "FALSE", "false"),
+  /**
+   * The '<em><b>UNKNOWN</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #UNKNOWN_VALUE
+   * @generated
+   * @ordered
+   */
+  UNKNOWN(2, "UNKNOWN", "unknown"),
+  /**
+   * The '<em><b>ERROR</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #ERROR_VALUE
+   * @generated
+   * @ordered
+   */
+  ERROR(3, "ERROR", "error");
+  /**
+   * The '<em><b>TRUE</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #TRUE
+   * @model literal="true"
+   * @generated
+   * @ordered
+   */
+  public static final int TRUE_VALUE = 0;
+  /**
+   * The '<em><b>FALSE</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #FALSE
+   * @model literal="false"
+   * @generated
+   * @ordered
+   */
+  public static final int FALSE_VALUE = 1;
+  /**
+   * The '<em><b>UNKNOWN</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #UNKNOWN
+   * @model literal="unknown"
+   * @generated
+   * @ordered
+   */
+  public static final int UNKNOWN_VALUE = 2;
+  /**
+   * The '<em><b>ERROR</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #ERROR
+   * @model literal="error"
+   * @generated
+   * @ordered
+   */
+  public static final int ERROR_VALUE = 3;
+  /**
+   * An array of all the '<em><b>Logic Value</b></em>' enumerators.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private static final LogicValue[] VALUES_ARRAY =
+    new LogicValue[]
+    {
+      TRUE,
+      FALSE,
+      UNKNOWN,
+      ERROR,
+    };
+  /**
+   * A public read-only list of all the '<em><b>Logic Value</b></em>' enumerators.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static final List<LogicValue> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+  /**
+   * Returns the '<em><b>Logic Value</b></em>' literal with the specified literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static LogicValue get(String literal)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      LogicValue result = VALUES_ARRAY[i];
+      if (result.toString().equals(literal))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+  /**
+   * Returns the '<em><b>Logic Value</b></em>' literal with the specified name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static LogicValue getByName(String name)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      LogicValue result = VALUES_ARRAY[i];
+      if (result.getName().equals(name))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+  /**
+   * Returns the '<em><b>Logic Value</b></em>' literal with the specified integer value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static LogicValue get(int value)
+  {
+    switch (value)
+    {
+      case TRUE_VALUE: return TRUE;
+      case FALSE_VALUE: return FALSE;
+      case UNKNOWN_VALUE: return UNKNOWN;
+      case ERROR_VALUE: return ERROR;
+    }
+    return null;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final int value;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final String name;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final String literal;
+  /**
+   * Only this class can construct instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private LogicValue(int value, String name, String literal)
+  {
+    this.value = value;
+    this.name = name;
+    this.literal = literal;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public int getValue()
+  {
+    return value;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getName()
+  {
+    return name;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getLiteral()
+  {
+    return literal;
+  }
+  /**
+   * Returns the literal value of the enumerator, which is its string representation.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    return literal;
+  }
+  
+} //LogicValue
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/LowerBoundedScopeDefinition.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/LowerBoundedScopeDefinition.java
new file mode 100644
index 00000000..57edcfda
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/LowerBoundedScopeDefinition.java
@@ -0,0 +1,47 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Lower Bounded Scope Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.LowerBoundedScopeDefinition#getLowerBound <em>Lower Bound</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getLowerBoundedScopeDefinition()
+ * @model
+ * @generated
+ */
+public interface LowerBoundedScopeDefinition extends ScopeDefinition
+{
+  /**
+   * Returns the value of the '<em><b>Lower Bound</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Lower Bound</em>' attribute.
+   * @see #setLowerBound(int)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getLowerBoundedScopeDefinition_LowerBound()
+   * @model
+   * @generated
+   */
+  int getLowerBound();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.LowerBoundedScopeDefinition#getLowerBound <em>Lower Bound</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Lower Bound</em>' attribute.
+   * @see #getLowerBound()
+   * @generated
+   */
+  void setLowerBound(int value);
+} // LowerBoundedScopeDefinition
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ManyMultiplicity.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ManyMultiplicity.java
new file mode 100644
index 00000000..4a667d4a
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ManyMultiplicity.java
@@ -0,0 +1,19 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Many Multiplicity</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getManyMultiplicity()
+ * @model
+ * @generated
+ */
+public interface ManyMultiplicity extends Multiplicity
+{
+} // ManyMultiplicity
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/MemberDefinition.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/MemberDefinition.java
new file mode 100644
index 00000000..3b413c11
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/MemberDefinition.java
@@ -0,0 +1,140 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+import org.eclipse.emf.ecore.EObject;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Member Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#isContainment <em>Containment</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#getMultiplicity <em>Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#getOpposite <em>Opposite</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getMemberDefinition()
+ * @model
+ * @generated
+ */
+public interface MemberDefinition extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Containment</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Containment</em>' attribute.
+   * @see #setContainment(boolean)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getMemberDefinition_Containment()
+   * @model
+   * @generated
+   */
+  boolean isContainment();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#isContainment <em>Containment</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Containment</em>' attribute.
+   * @see #isContainment()
+   * @generated
+   */
+  void setContainment(boolean value);
+  /**
+   * Returns the value of the '<em><b>Type</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Type</em>' reference.
+   * @see #setType(NamedElement)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getMemberDefinition_Type()
+   * @model
+   * @generated
+   */
+  NamedElement getType();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#getType <em>Type</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Type</em>' reference.
+   * @see #getType()
+   * @generated
+   */
+  void setType(NamedElement value);
+  /**
+   * Returns the value of the '<em><b>Multiplicity</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Multiplicity</em>' containment reference.
+   * @see #setMultiplicity(Multiplicity)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getMemberDefinition_Multiplicity()
+   * @model containment="true"
+   * @generated
+   */
+  Multiplicity getMultiplicity();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#getMultiplicity <em>Multiplicity</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Multiplicity</em>' containment reference.
+   * @see #getMultiplicity()
+   * @generated
+   */
+  void setMultiplicity(Multiplicity value);
+  /**
+   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getMemberDefinition_Name()
+   * @model
+   * @generated
+   */
+  String getName();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#getName <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
+  void setName(String value);
+  /**
+   * Returns the value of the '<em><b>Opposite</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Opposite</em>' reference.
+   * @see #setOpposite(NamedElement)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getMemberDefinition_Opposite()
+   * @model
+   * @generated
+   */
+  NamedElement getOpposite();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#getOpposite <em>Opposite</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Opposite</em>' reference.
+   * @see #getOpposite()
+   * @generated
+   */
+  void setOpposite(NamedElement value);
+} // MemberDefinition
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/MetricDefinition.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/MetricDefinition.java
new file mode 100644
index 00000000..a35ab60c
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/MetricDefinition.java
@@ -0,0 +1,96 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Metric Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.MetricDefinition#getHead <em>Head</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.MetricDefinition#getBody <em>Body</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.MetricDefinition#getType <em>Type</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getMetricDefinition()
+ * @model
+ * @generated
+ */
+public interface MetricDefinition extends Statement
+{
+  /**
+   * Returns the value of the '<em><b>Head</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Head</em>' containment reference.
+   * @see #setHead(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getMetricDefinition_Head()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getHead();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.MetricDefinition#getHead <em>Head</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Head</em>' containment reference.
+   * @see #getHead()
+   * @generated
+   */
+  void setHead(Expression value);
+  /**
+   * Returns the value of the '<em><b>Body</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Body</em>' containment reference.
+   * @see #setBody(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getMetricDefinition_Body()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getBody();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.MetricDefinition#getBody <em>Body</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Body</em>' containment reference.
+   * @see #getBody()
+   * @generated
+   */
+  void setBody(Expression value);
+  /**
+   * Returns the value of the '<em><b>Type</b></em>' attribute.
+   * The literals are from the enumeration {@link org.eclipse.viatra.solver.language.solverLanguage.MetricType}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Type</em>' attribute.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.MetricType
+   * @see #setType(MetricType)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getMetricDefinition_Type()
+   * @model
+   * @generated
+   */
+  MetricType getType();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.MetricDefinition#getType <em>Type</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Type</em>' attribute.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.MetricType
+   * @see #getType()
+   * @generated
+   */
+  void setType(MetricType value);
+} // MetricDefinition
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/MetricType.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/MetricType.java
new file mode 100644
index 00000000..0aa6a805
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/MetricType.java
@@ -0,0 +1,225 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.eclipse.emf.common.util.Enumerator;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Metric Type</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getMetricType()
+ * @model
+ * @generated
+ */
+public enum MetricType implements Enumerator
+{
+  /**
+   * The '<em><b>INT</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #INT_VALUE
+   * @generated
+   * @ordered
+   */
+  INT(0, "INT", "int"),
+  /**
+   * The '<em><b>REAL</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #REAL_VALUE
+   * @generated
+   * @ordered
+   */
+  REAL(1, "REAL", "real");
+  /**
+   * The '<em><b>INT</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #INT
+   * @model literal="int"
+   * @generated
+   * @ordered
+   */
+  public static final int INT_VALUE = 0;
+  /**
+   * The '<em><b>REAL</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #REAL
+   * @model literal="real"
+   * @generated
+   * @ordered
+   */
+  public static final int REAL_VALUE = 1;
+  /**
+   * An array of all the '<em><b>Metric Type</b></em>' enumerators.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private static final MetricType[] VALUES_ARRAY =
+    new MetricType[]
+    {
+      INT,
+      REAL,
+    };
+  /**
+   * A public read-only list of all the '<em><b>Metric Type</b></em>' enumerators.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static final List<MetricType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+  /**
+   * Returns the '<em><b>Metric Type</b></em>' literal with the specified literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static MetricType get(String literal)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      MetricType result = VALUES_ARRAY[i];
+      if (result.toString().equals(literal))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+  /**
+   * Returns the '<em><b>Metric Type</b></em>' literal with the specified name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static MetricType getByName(String name)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      MetricType result = VALUES_ARRAY[i];
+      if (result.getName().equals(name))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+  /**
+   * Returns the '<em><b>Metric Type</b></em>' literal with the specified integer value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static MetricType get(int value)
+  {
+    switch (value)
+    {
+      case INT_VALUE: return INT;
+      case REAL_VALUE: return REAL;
+    }
+    return null;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final int value;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final String name;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final String literal;
+  /**
+   * Only this class can construct instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private MetricType(int value, String name, String literal)
+  {
+    this.value = value;
+    this.name = name;
+    this.literal = literal;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public int getValue()
+  {
+    return value;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getName()
+  {
+    return name;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getLiteral()
+  {
+    return literal;
+  }
+  /**
+   * Returns the literal value of the enumerator, which is its string representation.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    return literal;
+  }
+  
+} //MetricType
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ClosureType.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Multiplicity.java
index f9d8dc28..1cbfadd6 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ClosureType.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Multiplicity.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage;
@@ -7,14 +7,14 @@ import org.eclipse.emf.ecore.EObject;
 /**
 * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Closure Type</b></em>'.
+ * A representation of the model object '<em><b>Multiplicity</b></em>'.
 * <!-- end-user-doc -->
 *
 *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getClosureType()
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getMultiplicity()
 * @model
 * @generated
 */
-public interface ClosureType extends EObject
+public interface Multiplicity extends EObject
 {
-} // ClosureType
+} // Multiplicity
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/MultiplicityDefinition.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/MultiplicityDefinition.java
deleted file mode 100644
index 9b4def59..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/MultiplicityDefinition.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-import org.eclipse.emf.ecore.EObject;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Multiplicity Definition</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition#getLower <em>Lower</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition#getUpper <em>Upper</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition#isUnlimitedUpper <em>Unlimited Upper</em>}</li>
- * </ul>
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getMultiplicityDefinition()
- * @model
- * @generated
- */
-public interface MultiplicityDefinition extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Lower</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Lower</em>' attribute.
-   * @see #setLower(int)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getMultiplicityDefinition_Lower()
-   * @model
-   * @generated
-   */
-  int getLower();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition#getLower <em>Lower</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Lower</em>' attribute.
-   * @see #getLower()
-   * @generated
-   */
-  void setLower(int value);
-  /**
-   * Returns the value of the '<em><b>Upper</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Upper</em>' attribute.
-   * @see #setUpper(int)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getMultiplicityDefinition_Upper()
-   * @model
-   * @generated
-   */
-  int getUpper();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition#getUpper <em>Upper</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Upper</em>' attribute.
-   * @see #getUpper()
-   * @generated
-   */
-  void setUpper(int value);
-  /**
-   * Returns the value of the '<em><b>Unlimited Upper</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Unlimited Upper</em>' attribute.
-   * @see #setUnlimitedUpper(boolean)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getMultiplicityDefinition_UnlimitedUpper()
-   * @model
-   * @generated
-   */
-  boolean isUnlimitedUpper();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition#isUnlimitedUpper <em>Unlimited Upper</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Unlimited Upper</em>' attribute.
-   * @see #isUnlimitedUpper()
-   * @generated
-   */
-  void setUnlimitedUpper(boolean value);
-} // MultiplicityDefinition
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ModelSymbol.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/NamedElement.java
index 0d91b791..0372da14 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ModelSymbol.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/NamedElement.java
@@ -1,26 +1,27 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage;
+import org.eclipse.emf.ecore.EObject;
 /**
 * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Model Symbol</b></em>'.
+ * A representation of the model object '<em><b>Named Element</b></em>'.
 * <!-- end-user-doc -->
 *
 * <p>
 * The following features are supported:
 * </p>
 * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.NamedElement#getName <em>Name</em>}</li>
 * </ul>
 *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getModelSymbol()
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getNamedElement()
 * @model
 * @generated
 */
-public interface ModelSymbol extends Symbol
+public interface NamedElement extends EObject
 {
  /**
   * Returns the value of the '<em><b>Name</b></em>' attribute.
@@ -28,14 +29,14 @@ public interface ModelSymbol extends Symbol
   * <!-- end-user-doc -->
   * @return the value of the '<em>Name</em>' attribute.
   * @see #setName(String)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getModelSymbol_Name()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getNamedElement_Name()
   * @model
   * @generated
   */
  String getName();
  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol#getName <em>Name</em>}' attribute.
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.NamedElement#getName <em>Name</em>}' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @param value the new value of the '<em>Name</em>' attribute.
@@ -44,4 +45,4 @@ public interface ModelSymbol extends Symbol
   */
  void setName(String value);
-} // ModelSymbol
+} // NamedElement
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/NamedObject.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/NamedObject.java
deleted file mode 100644
index b44ef060..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/NamedObject.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Named Object</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.NamedObject#getName <em>Name</em>}</li>
- * </ul>
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getNamedObject()
- * @model
- * @generated
- */
-public interface NamedObject extends org.eclipse.viatra.solver.language.solverLanguage.Object, Literal
-{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getNamedObject_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.NamedObject#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-  void setName(String value);
-} // NamedObject
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Negative.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Negative.java
deleted file mode 100644
index 5d735fec..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Negative.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Negative</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getNegative()
- * @model
- * @generated
- */
-public interface Negative extends Polarity
-{
-} // Negative
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/RealObject.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/NumericLiteral.java
index 12e8be3e..9e30d508 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/RealObject.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/NumericLiteral.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage;
@@ -7,21 +7,21 @@ import java.math.BigDecimal;
 /**
 * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Real Object</b></em>'.
+ * A representation of the model object '<em><b>Numeric Literal</b></em>'.
 * <!-- end-user-doc -->
 *
 * <p>
 * The following features are supported:
 * </p>
 * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.RealObject#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.NumericLiteral#getValue <em>Value</em>}</li>
 * </ul>
 *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getRealObject()
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getNumericLiteral()
 * @model
 * @generated
 */
-public interface RealObject extends DataObject
+public interface NumericLiteral extends Literal
 {
  /**
   * Returns the value of the '<em><b>Value</b></em>' attribute.
@@ -29,14 +29,14 @@ public interface RealObject extends DataObject
   * <!-- end-user-doc -->
   * @return the value of the '<em>Value</em>' attribute.
   * @see #setValue(BigDecimal)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getRealObject_Value()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getNumericLiteral_Value()
   * @model
   * @generated
   */
  BigDecimal getValue();
  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.RealObject#getValue <em>Value</em>}' attribute.
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.NumericLiteral#getValue <em>Value</em>}' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @param value the new value of the '<em>Value</em>' attribute.
@@ -45,4 +45,4 @@ public interface RealObject extends DataObject
   */
  void setValue(BigDecimal value);
-} // RealObject
+} // NumericLiteral
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ObjectiveDefinition.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ObjectiveDefinition.java
new file mode 100644
index 00000000..417a389c
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ObjectiveDefinition.java
@@ -0,0 +1,73 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Objective Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.ObjectiveDefinition#getKind <em>Kind</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.ObjectiveDefinition#getObjective <em>Objective</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getObjectiveDefinition()
+ * @model
+ * @generated
+ */
+public interface ObjectiveDefinition extends Statement
+{
+  /**
+   * Returns the value of the '<em><b>Kind</b></em>' attribute.
+   * The literals are from the enumeration {@link org.eclipse.viatra.solver.language.solverLanguage.ObjectiveKind}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Kind</em>' attribute.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ObjectiveKind
+   * @see #setKind(ObjectiveKind)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getObjectiveDefinition_Kind()
+   * @model
+   * @generated
+   */
+  ObjectiveKind getKind();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.ObjectiveDefinition#getKind <em>Kind</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Kind</em>' attribute.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ObjectiveKind
+   * @see #getKind()
+   * @generated
+   */
+  void setKind(ObjectiveKind value);
+  /**
+   * Returns the value of the '<em><b>Objective</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Objective</em>' containment reference.
+   * @see #setObjective(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getObjectiveDefinition_Objective()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getObjective();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.ObjectiveDefinition#getObjective <em>Objective</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Objective</em>' containment reference.
+   * @see #getObjective()
+   * @generated
+   */
+  void setObjective(Expression value);
+} // ObjectiveDefinition
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ObjectiveKind.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ObjectiveKind.java
new file mode 100644
index 00000000..d3a4f626
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ObjectiveKind.java
@@ -0,0 +1,225 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.eclipse.emf.common.util.Enumerator;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Objective Kind</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getObjectiveKind()
+ * @model
+ * @generated
+ */
+public enum ObjectiveKind implements Enumerator
+{
+  /**
+   * The '<em><b>MINIMIZE</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #MINIMIZE_VALUE
+   * @generated
+   * @ordered
+   */
+  MINIMIZE(0, "MINIMIZE", "minimize"),
+  /**
+   * The '<em><b>MAXIMIZE</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #MAXIMIZE_VALUE
+   * @generated
+   * @ordered
+   */
+  MAXIMIZE(1, "MAXIMIZE", "maximize");
+  /**
+   * The '<em><b>MINIMIZE</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #MINIMIZE
+   * @model literal="minimize"
+   * @generated
+   * @ordered
+   */
+  public static final int MINIMIZE_VALUE = 0;
+  /**
+   * The '<em><b>MAXIMIZE</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #MAXIMIZE
+   * @model literal="maximize"
+   * @generated
+   * @ordered
+   */
+  public static final int MAXIMIZE_VALUE = 1;
+  /**
+   * An array of all the '<em><b>Objective Kind</b></em>' enumerators.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private static final ObjectiveKind[] VALUES_ARRAY =
+    new ObjectiveKind[]
+    {
+      MINIMIZE,
+      MAXIMIZE,
+    };
+  /**
+   * A public read-only list of all the '<em><b>Objective Kind</b></em>' enumerators.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static final List<ObjectiveKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+  /**
+   * Returns the '<em><b>Objective Kind</b></em>' literal with the specified literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static ObjectiveKind get(String literal)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      ObjectiveKind result = VALUES_ARRAY[i];
+      if (result.toString().equals(literal))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+  /**
+   * Returns the '<em><b>Objective Kind</b></em>' literal with the specified name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static ObjectiveKind getByName(String name)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      ObjectiveKind result = VALUES_ARRAY[i];
+      if (result.getName().equals(name))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+  /**
+   * Returns the '<em><b>Objective Kind</b></em>' literal with the specified integer value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static ObjectiveKind get(int value)
+  {
+    switch (value)
+    {
+      case MINIMIZE_VALUE: return MINIMIZE;
+      case MAXIMIZE_VALUE: return MAXIMIZE;
+    }
+    return null;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final int value;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final String name;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final String literal;
+  /**
+   * Only this class can construct instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private ObjectiveKind(int value, String name, String literal)
+  {
+    this.value = value;
+    this.name = name;
+    this.literal = literal;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public int getValue()
+  {
+    return value;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getName()
+  {
+    return name;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getLiteral()
+  {
+    return literal;
+  }
+  /**
+   * Returns the literal value of the enumerator, which is its string representation.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    return literal;
+  }
+  
+} //ObjectiveKind
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Parameter.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Parameter.java
deleted file mode 100644
index e4ef1c28..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Parameter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-import org.eclipse.emf.ecore.EObject;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Parameter</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Parameter#getVariable <em>Variable</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Parameter#getType <em>Type</em>}</li>
- * </ul>
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getParameter()
- * @model
- * @generated
- */
-public interface Parameter extends EObject
-{
-  /**
-   * Returns the value of the '<em><b>Variable</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Variable</em>' containment reference.
-   * @see #setVariable(Variable)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getParameter_Variable()
-   * @model containment="true"
-   * @generated
-   */
-  Variable getVariable();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Parameter#getVariable <em>Variable</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Variable</em>' containment reference.
-   * @see #getVariable()
-   * @generated
-   */
-  void setVariable(Variable value);
-  /**
-   * Returns the value of the '<em><b>Type</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Type</em>' containment reference.
-   * @see #setType(Symbol)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getParameter_Type()
-   * @model containment="true"
-   * @generated
-   */
-  Symbol getType();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Parameter#getType <em>Type</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Type</em>' containment reference.
-   * @see #getType()
-   * @generated
-   */
-  void setType(Symbol value);
-} // Parameter
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/PartialitySymbol.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/PartialitySymbol.java
deleted file mode 100644
index a4331248..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/PartialitySymbol.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Partiality Symbol</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getPartialitySymbol()
- * @model
- * @generated
- */
-public interface PartialitySymbol extends Symbol
-{
-} // PartialitySymbol
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Positive.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Positive.java
deleted file mode 100644
index 075a865f..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Positive.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Positive</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getPositive()
- * @model
- * @generated
- */
-public interface Positive extends Polarity
-{
-} // Positive
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Predicate.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Predicate.java
deleted file mode 100644
index 7892fd57..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Predicate.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-import org.eclipse.emf.common.util.EList;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Predicate</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#isIsError <em>Is Error</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#getSymbol <em>Symbol</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#getParameters <em>Parameters</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#getBodies <em>Bodies</em>}</li>
- * </ul>
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getPredicate()
- * @model
- * @generated
- */
-public interface Predicate extends Statement
-{
-  /**
-   * Returns the value of the '<em><b>Is Error</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Is Error</em>' attribute.
-   * @see #setIsError(boolean)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getPredicate_IsError()
-   * @model
-   * @generated
-   */
-  boolean isIsError();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#isIsError <em>Is Error</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Is Error</em>' attribute.
-   * @see #isIsError()
-   * @generated
-   */
-  void setIsError(boolean value);
-  /**
-   * Returns the value of the '<em><b>Symbol</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Symbol</em>' containment reference.
-   * @see #setSymbol(ModelSymbol)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getPredicate_Symbol()
-   * @model containment="true"
-   * @generated
-   */
-  ModelSymbol getSymbol();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#getSymbol <em>Symbol</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Symbol</em>' containment reference.
-   * @see #getSymbol()
-   * @generated
-   */
-  void setSymbol(ModelSymbol value);
-  /**
-   * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.viatra.solver.language.solverLanguage.Parameter}.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Parameters</em>' containment reference list.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getPredicate_Parameters()
-   * @model containment="true"
-   * @generated
-   */
-  EList<Parameter> getParameters();
-  /**
-   * Returns the value of the '<em><b>Bodies</b></em>' containment reference list.
-   * The list contents are of type {@link org.eclipse.viatra.solver.language.solverLanguage.PatternBody}.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Bodies</em>' containment reference list.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getPredicate_Bodies()
-   * @model containment="true"
-   * @generated
-   */
-  EList<PatternBody> getBodies();
-} // Predicate
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/PredicateDefinition.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/PredicateDefinition.java
new file mode 100644
index 00000000..256cb5ac
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/PredicateDefinition.java
@@ -0,0 +1,116 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Predicate Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition#getHead <em>Head</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition#getBody <em>Body</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition#isFunctional <em>Functional</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition#isError <em>Error</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getPredicateDefinition()
+ * @model
+ * @generated
+ */
+public interface PredicateDefinition extends Statement
+{
+  /**
+   * Returns the value of the '<em><b>Head</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Head</em>' containment reference.
+   * @see #setHead(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getPredicateDefinition_Head()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getHead();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition#getHead <em>Head</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Head</em>' containment reference.
+   * @see #getHead()
+   * @generated
+   */
+  void setHead(Expression value);
+  /**
+   * Returns the value of the '<em><b>Body</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Body</em>' containment reference.
+   * @see #setBody(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getPredicateDefinition_Body()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getBody();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition#getBody <em>Body</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Body</em>' containment reference.
+   * @see #getBody()
+   * @generated
+   */
+  void setBody(Expression value);
+  /**
+   * Returns the value of the '<em><b>Functional</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Functional</em>' attribute.
+   * @see #setFunctional(boolean)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getPredicateDefinition_Functional()
+   * @model
+   * @generated
+   */
+  boolean isFunctional();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition#isFunctional <em>Functional</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Functional</em>' attribute.
+   * @see #isFunctional()
+   * @generated
+   */
+  void setFunctional(boolean value);
+  /**
+   * Returns the value of the '<em><b>Error</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Error</em>' attribute.
+   * @see #setError(boolean)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getPredicateDefinition_Error()
+   * @model
+   * @generated
+   */
+  boolean isError();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition#isError <em>Error</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Error</em>' attribute.
+   * @see #isError()
+   * @generated
+   */
+  void setError(boolean value);
+} // PredicateDefinition
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Problem.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Problem.java
index 91967617..2383bf18 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Problem.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Problem.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage;
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/RealSymbol.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/RealSymbol.java
deleted file mode 100644
index 06dd35fc..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/RealSymbol.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Real Symbol</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getRealSymbol()
- * @model
- * @generated
- */
-public interface RealSymbol extends DataSymbol
-{
-} // RealSymbol
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Reference.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Reference.java
new file mode 100644
index 00000000..6adb6a9d
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Reference.java
@@ -0,0 +1,47 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Reference</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Reference#getReferred <em>Referred</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getReference()
+ * @model
+ * @generated
+ */
+public interface Reference extends Expression
+{
+  /**
+   * Returns the value of the '<em><b>Referred</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Referred</em>' reference.
+   * @see #setReferred(NamedElement)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getReference_Referred()
+   * @model
+   * @generated
+   */
+  NamedElement getReferred();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Reference#getReferred <em>Referred</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Referred</em>' reference.
+   * @see #getReferred()
+   * @generated
+   */
+  void setReferred(NamedElement value);
+} // Reference
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ReflexiveClosure.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ReflexiveClosure.java
deleted file mode 100644
index 3eb30271..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ReflexiveClosure.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Reflexive Closure</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getReflexiveClosure()
- * @model
- * @generated
- */
-public interface ReflexiveClosure extends ClosureType
-{
-} // ReflexiveClosure
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ScopeDefinition.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ScopeDefinition.java
new file mode 100644
index 00000000..42fb6513
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/ScopeDefinition.java
@@ -0,0 +1,47 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Scope Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.ScopeDefinition#getType <em>Type</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getScopeDefinition()
+ * @model
+ * @generated
+ */
+public interface ScopeDefinition extends Statement
+{
+  /**
+   * Returns the value of the '<em><b>Type</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Type</em>' reference.
+   * @see #setType(NamedElement)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getScopeDefinition_Type()
+   * @model
+   * @generated
+   */
+  NamedElement getType();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.ScopeDefinition#getType <em>Type</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Type</em>' reference.
+   * @see #getType()
+   * @generated
+   */
+  void setType(NamedElement value);
+} // ScopeDefinition
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguageFactory.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguageFactory.java
index c5d4cbff..cf5c8e62 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguageFactory.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguageFactory.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage;
@@ -42,454 +42,400 @@ public interface SolverLanguageFactory extends EFactory
  Statement createStatement();
  /**
-   * Returns a new object of class '<em>Boolean Value</em>'.
+   * Returns a new object of class '<em>Predicate Definition</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Boolean Value</em>'.
+   * @return a new object of class '<em>Predicate Definition</em>'.
   * @generated
   */
-  BooleanValue createBooleanValue();
+  PredicateDefinition createPredicateDefinition();
  /**
-   * Returns a new object of class '<em>Truth Value</em>'.
+   * Returns a new object of class '<em>Unnamed Error Prediate Definition</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Truth Value</em>'.
+   * @return a new object of class '<em>Unnamed Error Prediate Definition</em>'.
   * @generated
   */
-  TruthValue createTruthValue();
+  UnnamedErrorPrediateDefinition createUnnamedErrorPrediateDefinition();
  /**
-   * Returns a new object of class '<em>Interpretation</em>'.
+   * Returns a new object of class '<em>Default Definition</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Interpretation</em>'.
+   * @return a new object of class '<em>Default Definition</em>'.
   * @generated
   */
-  Interpretation createInterpretation();
+  DefaultDefinition createDefaultDefinition();
  /**
-   * Returns a new object of class '<em>Basic Interpretation</em>'.
+   * Returns a new object of class '<em>Extern Predicate Definition</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Basic Interpretation</em>'.
+   * @return a new object of class '<em>Extern Predicate Definition</em>'.
   * @generated
   */
-  BasicInterpretation createBasicInterpretation();
+  ExternPredicateDefinition createExternPredicateDefinition();
  /**
-   * Returns a new object of class '<em>Symbol</em>'.
+   * Returns a new object of class '<em>Metric Definition</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Symbol</em>'.
+   * @return a new object of class '<em>Metric Definition</em>'.
   * @generated
   */
-  Symbol createSymbol();
+  MetricDefinition createMetricDefinition();
  /**
-   * Returns a new object of class '<em>Model Symbol</em>'.
+   * Returns a new object of class '<em>Extern Metric Definition</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Model Symbol</em>'.
+   * @return a new object of class '<em>Extern Metric Definition</em>'.
   * @generated
   */
-  ModelSymbol createModelSymbol();
+  ExternMetricDefinition createExternMetricDefinition();
  /**
-   * Returns a new object of class '<em>Partiality Symbol</em>'.
+   * Returns a new object of class '<em>Expression</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Partiality Symbol</em>'.
+   * @return a new object of class '<em>Expression</em>'.
   * @generated
   */
-  PartialitySymbol createPartialitySymbol();
+  Expression createExpression();
  /**
-   * Returns a new object of class '<em>Exist Symbol</em>'.
+   * Returns a new object of class '<em>If Else</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Exist Symbol</em>'.
+   * @return a new object of class '<em>If Else</em>'.
   * @generated
   */
-  ExistSymbol createExistSymbol();
+  IfElse createIfElse();
  /**
-   * Returns a new object of class '<em>Equals Symbol</em>'.
+   * Returns a new object of class '<em>Case</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Equals Symbol</em>'.
+   * @return a new object of class '<em>Case</em>'.
   * @generated
   */
-  EqualsSymbol createEqualsSymbol();
+  Case createCase();
  /**
-   * Returns a new object of class '<em>Data Symbol</em>'.
+   * Returns a new object of class '<em>Count</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Data Symbol</em>'.
+   * @return a new object of class '<em>Count</em>'.
   * @generated
   */
-  DataSymbol createDataSymbol();
+  Count createCount();
  /**
-   * Returns a new object of class '<em>Boolean Symbol</em>'.
+   * Returns a new object of class '<em>Aggregation</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Boolean Symbol</em>'.
+   * @return a new object of class '<em>Aggregation</em>'.
   * @generated
   */
-  BooleanSymbol createBooleanSymbol();
+  Aggregation createAggregation();
  /**
-   * Returns a new object of class '<em>Integer Symbol</em>'.
+   * Returns a new object of class '<em>Call</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Integer Symbol</em>'.
+   * @return a new object of class '<em>Call</em>'.
   * @generated
   */
-  IntegerSymbol createIntegerSymbol();
+  Call createCall();
  /**
-   * Returns a new object of class '<em>Real Symbol</em>'.
+   * Returns a new object of class '<em>Argument List</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Real Symbol</em>'.
+   * @return a new object of class '<em>Argument List</em>'.
   * @generated
   */
-  RealSymbol createRealSymbol();
+  ArgumentList createArgumentList();
  /**
-   * Returns a new object of class '<em>String Symbol</em>'.
+   * Returns a new object of class '<em>Argument</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>String Symbol</em>'.
+   * @return a new object of class '<em>Argument</em>'.
   * @generated
   */
-  StringSymbol createStringSymbol();
+  Argument createArgument();
  /**
-   * Returns a new object of class '<em>Complex Object</em>'.
+   * Returns a new object of class '<em>Expression Argument</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Complex Object</em>'.
+   * @return a new object of class '<em>Expression Argument</em>'.
   * @generated
   */
-  ComplexObject createComplexObject();
+  ExpressionArgument createExpressionArgument();
  /**
-   * Returns a new object of class '<em>Object</em>'.
+   * Returns a new object of class '<em>Star Argument</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Object</em>'.
+   * @return a new object of class '<em>Star Argument</em>'.
   * @generated
   */
-  Object createObject();
+  StarArgument createStarArgument();
  /**
-   * Returns a new object of class '<em>Named Object</em>'.
+   * Returns a new object of class '<em>Typed Argument</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Named Object</em>'.
+   * @return a new object of class '<em>Typed Argument</em>'.
   * @generated
   */
-  NamedObject createNamedObject();
+  TypedArgument createTypedArgument();
  /**
-   * Returns a new object of class '<em>Unnamed Object</em>'.
+   * Returns a new object of class '<em>Typed Star Argument</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Unnamed Object</em>'.
+   * @return a new object of class '<em>Typed Star Argument</em>'.
   * @generated
   */
-  UnnamedObject createUnnamedObject();
+  TypedStarArgument createTypedStarArgument();
  /**
-   * Returns a new object of class '<em>Data Object</em>'.
+   * Returns a new object of class '<em>Reference</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Data Object</em>'.
+   * @return a new object of class '<em>Reference</em>'.
   * @generated
   */
-  DataObject createDataObject();
+  Reference createReference();
  /**
-   * Returns a new object of class '<em>Boolean Object</em>'.
+   * Returns a new object of class '<em>Interval</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Boolean Object</em>'.
+   * @return a new object of class '<em>Interval</em>'.
   * @generated
   */
-  BooleanObject createBooleanObject();
+  Interval createInterval();
  /**
-   * Returns a new object of class '<em>Int Object</em>'.
+   * Returns a new object of class '<em>Literal</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Int Object</em>'.
-   * @generated
-   */
-  IntObject createIntObject();
-  /**
-   * Returns a new object of class '<em>Real Object</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Real Object</em>'.
-   * @generated
-   */
-  RealObject createRealObject();
-  /**
-   * Returns a new object of class '<em>String Object</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>String Object</em>'.
-   * @generated
-   */
-  StringObject createStringObject();
-  /**
-   * Returns a new object of class '<em>Predicate</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Predicate</em>'.
-   * @generated
-   */
-  Predicate createPredicate();
-  /**
-   * Returns a new object of class '<em>Parameter</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Parameter</em>'.
-   * @generated
-   */
-  Parameter createParameter();
-  /**
-   * Returns a new object of class '<em>Pattern Body</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Pattern Body</em>'.
-   * @generated
-   */
-  PatternBody createPatternBody();
-  /**
-   * Returns a new object of class '<em>Polarity</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Polarity</em>'.
+   * @return a new object of class '<em>Literal</em>'.
   * @generated
   */
-  Polarity createPolarity();
+  Literal createLiteral();
  /**
-   * Returns a new object of class '<em>Constraint</em>'.
+   * Returns a new object of class '<em>Logic Literal</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Constraint</em>'.
+   * @return a new object of class '<em>Logic Literal</em>'.
   * @generated
   */
-  Constraint createConstraint();
+  LogicLiteral createLogicLiteral();
  /**
-   * Returns a new object of class '<em>Closure Type</em>'.
+   * Returns a new object of class '<em>Numeric Literal</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Closure Type</em>'.
+   * @return a new object of class '<em>Numeric Literal</em>'.
   * @generated
   */
-  ClosureType createClosureType();
+  NumericLiteral createNumericLiteral();
  /**
-   * Returns a new object of class '<em>Literal</em>'.
+   * Returns a new object of class '<em>Infinity Literal</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Literal</em>'.
+   * @return a new object of class '<em>Infinity Literal</em>'.
   * @generated
   */
-  Literal createLiteral();
+  InfinityLiteral createInfinityLiteral();
  /**
-   * Returns a new object of class '<em>Variable</em>'.
+   * Returns a new object of class '<em>Empty Interval Literal</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Variable</em>'.
+   * @return a new object of class '<em>Empty Interval Literal</em>'.
   * @generated
   */
-  Variable createVariable();
+  EmptyIntervalLiteral createEmptyIntervalLiteral();
  /**
-   * Returns a new object of class '<em>All Instances</em>'.
+   * Returns a new object of class '<em>String Literal</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>All Instances</em>'.
+   * @return a new object of class '<em>String Literal</em>'.
   * @generated
   */
-  AllInstances createAllInstances();
+  StringLiteral createStringLiteral();
  /**
-   * Returns a new object of class '<em>All Objects</em>'.
+   * Returns a new object of class '<em>Member Definition</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>All Objects</em>'.
+   * @return a new object of class '<em>Member Definition</em>'.
   * @generated
   */
-  AllObjects createAllObjects();
+  MemberDefinition createMemberDefinition();
  /**
-   * Returns a new object of class '<em>Default Interpretation</em>'.
+   * Returns a new object of class '<em>Multiplicity</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Default Interpretation</em>'.
+   * @return a new object of class '<em>Multiplicity</em>'.
   * @generated
   */
-  DefaultInterpretation createDefaultInterpretation();
+  Multiplicity createMultiplicity();
  /**
-   * Returns a new object of class '<em>CD Interpretation</em>'.
+   * Returns a new object of class '<em>Many Multiplicity</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>CD Interpretation</em>'.
+   * @return a new object of class '<em>Many Multiplicity</em>'.
   * @generated
   */
-  CDInterpretation createCDInterpretation();
+  ManyMultiplicity createManyMultiplicity();
  /**
-   * Returns a new object of class '<em>Class Interpretation</em>'.
+   * Returns a new object of class '<em>Exact Multiplicity</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Class Interpretation</em>'.
+   * @return a new object of class '<em>Exact Multiplicity</em>'.
   * @generated
   */
-  ClassInterpretation createClassInterpretation();
+  ExactMultiplicity createExactMultiplicity();
  /**
-   * Returns a new object of class '<em>Enum Interpretation</em>'.
+   * Returns a new object of class '<em>Bounded Multiplicity</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Enum Interpretation</em>'.
+   * @return a new object of class '<em>Bounded Multiplicity</em>'.
   * @generated
   */
-  EnumInterpretation createEnumInterpretation();
+  BoundedMultiplicity createBoundedMultiplicity();
  /**
-   * Returns a new object of class '<em>Field Relation Interpretation</em>'.
+   * Returns a new object of class '<em>Scope Definition</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Field Relation Interpretation</em>'.
+   * @return a new object of class '<em>Scope Definition</em>'.
   * @generated
   */
-  FieldRelationInterpretation createFieldRelationInterpretation();
+  ScopeDefinition createScopeDefinition();
  /**
-   * Returns a new object of class '<em>Global Relation Interpretation</em>'.
+   * Returns a new object of class '<em>Exact Scope Definition</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Global Relation Interpretation</em>'.
+   * @return a new object of class '<em>Exact Scope Definition</em>'.
   * @generated
   */
-  GlobalRelationInterpretation createGlobalRelationInterpretation();
+  ExactScopeDefinition createExactScopeDefinition();
  /**
-   * Returns a new object of class '<em>Multiplicity Definition</em>'.
+   * Returns a new object of class '<em>Bounded Scope Definition</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Multiplicity Definition</em>'.
+   * @return a new object of class '<em>Bounded Scope Definition</em>'.
   * @generated
   */
-  MultiplicityDefinition createMultiplicityDefinition();
+  BoundedScopeDefinition createBoundedScopeDefinition();
  /**
-   * Returns a new object of class '<em>Boolean True</em>'.
+   * Returns a new object of class '<em>Lower Bounded Scope Definition</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Boolean True</em>'.
+   * @return a new object of class '<em>Lower Bounded Scope Definition</em>'.
   * @generated
   */
-  BooleanTrue createBooleanTrue();
+  LowerBoundedScopeDefinition createLowerBoundedScopeDefinition();
  /**
-   * Returns a new object of class '<em>Boolean False</em>'.
+   * Returns a new object of class '<em>Objective Definition</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Boolean False</em>'.
+   * @return a new object of class '<em>Objective Definition</em>'.
   * @generated
   */
-  BooleanFalse createBooleanFalse();
+  ObjectiveDefinition createObjectiveDefinition();
  /**
-   * Returns a new object of class '<em>True</em>'.
+   * Returns a new object of class '<em>Named Element</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>True</em>'.
+   * @return a new object of class '<em>Named Element</em>'.
   * @generated
   */
-  True createTrue();
+  NamedElement createNamedElement();
  /**
-   * Returns a new object of class '<em>False</em>'.
+   * Returns a new object of class '<em>Assertion</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>False</em>'.
+   * @return a new object of class '<em>Assertion</em>'.
   * @generated
   */
-  False createFalse();
+  Assertion createAssertion();
  /**
-   * Returns a new object of class '<em>Unknown</em>'.
+   * Returns a new object of class '<em>Disjunction</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Unknown</em>'.
+   * @return a new object of class '<em>Disjunction</em>'.
   * @generated
   */
-  Unknown createUnknown();
+  Disjunction createDisjunction();
  /**
-   * Returns a new object of class '<em>Error</em>'.
+   * Returns a new object of class '<em>Switch</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Error</em>'.
+   * @return a new object of class '<em>Switch</em>'.
   * @generated
   */
-  Error createError();
+  Switch createSwitch();
  /**
-   * Returns a new object of class '<em>Positive</em>'.
+   * Returns a new object of class '<em>Conjunction</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Positive</em>'.
+   * @return a new object of class '<em>Conjunction</em>'.
   * @generated
   */
-  Positive createPositive();
+  Conjunction createConjunction();
  /**
-   * Returns a new object of class '<em>Negative</em>'.
+   * Returns a new object of class '<em>Comparison</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Negative</em>'.
+   * @return a new object of class '<em>Comparison</em>'.
   * @generated
   */
-  Negative createNegative();
+  Comparison createComparison();
  /**
-   * Returns a new object of class '<em>Reflexive Closure</em>'.
+   * Returns a new object of class '<em>Binary Expression</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Reflexive Closure</em>'.
+   * @return a new object of class '<em>Binary Expression</em>'.
   * @generated
   */
-  ReflexiveClosure createReflexiveClosure();
+  BinaryExpression createBinaryExpression();
  /**
-   * Returns a new object of class '<em>Irreflexive Closure</em>'.
+   * Returns a new object of class '<em>Unary Expression</em>'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Irreflexive Closure</em>'.
+   * @return a new object of class '<em>Unary Expression</em>'.
   * @generated
   */
-  IrreflexiveClosure createIrreflexiveClosure();
+  UnaryExpression createUnaryExpression();
  /**
   * Returns the package supported by this factory.
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguagePackage.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguagePackage.java
index 9767d002..d34acdb8 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguagePackage.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/SolverLanguagePackage.java
@@ -1,10 +1,11 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
@@ -96,145 +97,232 @@ public interface SolverLanguagePackage extends EPackage
  int STATEMENT = 1;
  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int STATEMENT__ABSTRACT = 0;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int STATEMENT__NAME = 1;
+  /**
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int STATEMENT__SUPERCLASSES = 2;
+  /**
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int STATEMENT__MEMBERS = 3;
+  /**
   * The number of structural features of the '<em>Statement</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int STATEMENT_FEATURE_COUNT = 0;
+  int STATEMENT_FEATURE_COUNT = 4;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanValueImpl <em>Boolean Value</em>}' class.
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateDefinitionImpl <em>Predicate Definition</em>}' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanValueImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateDefinitionImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBooleanValue()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPredicateDefinition()
   * @generated
   */
-  int BOOLEAN_VALUE = 2;
+  int PREDICATE_DEFINITION = 2;
  /**
-   * The number of structural features of the '<em>Boolean Value</em>' class.
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int BOOLEAN_VALUE_FEATURE_COUNT = 0;
+  int PREDICATE_DEFINITION__ABSTRACT = STATEMENT__ABSTRACT;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.TruthValueImpl <em>Truth Value</em>}' class.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.TruthValueImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getTruthValue()
   * @generated
+   * @ordered
   */
-  int TRUTH_VALUE = 3;
+  int PREDICATE_DEFINITION__NAME = STATEMENT__NAME;
  /**
-   * The number of structural features of the '<em>Truth Value</em>' class.
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int TRUTH_VALUE_FEATURE_COUNT = 0;
+  int PREDICATE_DEFINITION__SUPERCLASSES = STATEMENT__SUPERCLASSES;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.InterpretationImpl <em>Interpretation</em>}' class.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.InterpretationImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getInterpretation()
   * @generated
+   * @ordered
   */
-  int INTERPRETATION = 4;
+  int PREDICATE_DEFINITION__MEMBERS = STATEMENT__MEMBERS;
  /**
-   * The number of structural features of the '<em>Interpretation</em>' class.
+   * The feature id for the '<em><b>Head</b></em>' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int INTERPRETATION_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 0;
+  int PREDICATE_DEFINITION__HEAD = STATEMENT_FEATURE_COUNT + 0;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BasicInterpretationImpl <em>Basic Interpretation</em>}' class.
+   * The feature id for the '<em><b>Body</b></em>' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.BasicInterpretationImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBasicInterpretation()
   * @generated
+   * @ordered
   */
-  int BASIC_INTERPRETATION = 5;
+  int PREDICATE_DEFINITION__BODY = STATEMENT_FEATURE_COUNT + 1;
  /**
-   * The feature id for the '<em><b>Symbol</b></em>' containment reference.
+   * The feature id for the '<em><b>Functional</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int BASIC_INTERPRETATION__SYMBOL = INTERPRETATION_FEATURE_COUNT + 0;
+  int PREDICATE_DEFINITION__FUNCTIONAL = STATEMENT_FEATURE_COUNT + 2;
  /**
-   * The feature id for the '<em><b>Objects</b></em>' containment reference list.
+   * The feature id for the '<em><b>Error</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int BASIC_INTERPRETATION__OBJECTS = INTERPRETATION_FEATURE_COUNT + 1;
+  int PREDICATE_DEFINITION__ERROR = STATEMENT_FEATURE_COUNT + 3;
  /**
-   * The feature id for the '<em><b>Value</b></em>' containment reference.
+   * The number of structural features of the '<em>Predicate Definition</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int BASIC_INTERPRETATION__VALUE = INTERPRETATION_FEATURE_COUNT + 2;
+  int PREDICATE_DEFINITION_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 4;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.UnnamedErrorPrediateDefinitionImpl <em>Unnamed Error Prediate Definition</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.UnnamedErrorPrediateDefinitionImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getUnnamedErrorPrediateDefinition()
+   * @generated
+   */
+  int UNNAMED_ERROR_PREDIATE_DEFINITION = 3;
  /**
-   * The number of structural features of the '<em>Basic Interpretation</em>' class.
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int BASIC_INTERPRETATION_FEATURE_COUNT = INTERPRETATION_FEATURE_COUNT + 3;
+  int UNNAMED_ERROR_PREDIATE_DEFINITION__ABSTRACT = STATEMENT__ABSTRACT;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.SymbolImpl <em>Symbol</em>}' class.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SymbolImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getSymbol()
   * @generated
+   * @ordered
   */
-  int SYMBOL = 6;
+  int UNNAMED_ERROR_PREDIATE_DEFINITION__NAME = STATEMENT__NAME;
  /**
-   * The number of structural features of the '<em>Symbol</em>' class.
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int SYMBOL_FEATURE_COUNT = 0;
+  int UNNAMED_ERROR_PREDIATE_DEFINITION__SUPERCLASSES = STATEMENT__SUPERCLASSES;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ModelSymbolImpl <em>Model Symbol</em>}' class.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ModelSymbolImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getModelSymbol()
   * @generated
+   * @ordered
   */
-  int MODEL_SYMBOL = 7;
+  int UNNAMED_ERROR_PREDIATE_DEFINITION__MEMBERS = STATEMENT__MEMBERS;
+  /**
+   * The feature id for the '<em><b>Argument List</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int UNNAMED_ERROR_PREDIATE_DEFINITION__ARGUMENT_LIST = STATEMENT_FEATURE_COUNT + 0;
+  /**
+   * The feature id for the '<em><b>Body</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int UNNAMED_ERROR_PREDIATE_DEFINITION__BODY = STATEMENT_FEATURE_COUNT + 1;
+  /**
+   * The number of structural features of the '<em>Unnamed Error Prediate Definition</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int UNNAMED_ERROR_PREDIATE_DEFINITION_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 2;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.DefaultDefinitionImpl <em>Default Definition</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.DefaultDefinitionImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getDefaultDefinition()
+   * @generated
+   */
+  int DEFAULT_DEFINITION = 4;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int DEFAULT_DEFINITION__ABSTRACT = STATEMENT__ABSTRACT;
  /**
   * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -243,216 +331,290 @@ public interface SolverLanguagePackage extends EPackage
   * @generated
   * @ordered
   */
-  int MODEL_SYMBOL__NAME = SYMBOL_FEATURE_COUNT + 0;
+  int DEFAULT_DEFINITION__NAME = STATEMENT__NAME;
+  /**
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int DEFAULT_DEFINITION__SUPERCLASSES = STATEMENT__SUPERCLASSES;
+  /**
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int DEFAULT_DEFINITION__MEMBERS = STATEMENT__MEMBERS;
+  /**
+   * The feature id for the '<em><b>Head</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int DEFAULT_DEFINITION__HEAD = STATEMENT_FEATURE_COUNT + 0;
+  /**
+   * The feature id for the '<em><b>Range</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int DEFAULT_DEFINITION__RANGE = STATEMENT_FEATURE_COUNT + 1;
  /**
-   * The number of structural features of the '<em>Model Symbol</em>' class.
+   * The number of structural features of the '<em>Default Definition</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int MODEL_SYMBOL_FEATURE_COUNT = SYMBOL_FEATURE_COUNT + 1;
+  int DEFAULT_DEFINITION_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 2;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExternPredicateDefinitionImpl <em>Extern Predicate Definition</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ExternPredicateDefinitionImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getExternPredicateDefinition()
+   * @generated
+   */
+  int EXTERN_PREDICATE_DEFINITION = 5;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PartialitySymbolImpl <em>Partiality Symbol</em>}' class.
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.PartialitySymbolImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPartialitySymbol()
   * @generated
+   * @ordered
   */
-  int PARTIALITY_SYMBOL = 8;
+  int EXTERN_PREDICATE_DEFINITION__ABSTRACT = STATEMENT__ABSTRACT;
  /**
-   * The number of structural features of the '<em>Partiality Symbol</em>' class.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int PARTIALITY_SYMBOL_FEATURE_COUNT = SYMBOL_FEATURE_COUNT + 0;
+  int EXTERN_PREDICATE_DEFINITION__NAME = STATEMENT__NAME;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExistSymbolImpl <em>Exist Symbol</em>}' class.
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ExistSymbolImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getExistSymbol()
   * @generated
+   * @ordered
   */
-  int EXIST_SYMBOL = 9;
+  int EXTERN_PREDICATE_DEFINITION__SUPERCLASSES = STATEMENT__SUPERCLASSES;
  /**
-   * The number of structural features of the '<em>Exist Symbol</em>' class.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int EXIST_SYMBOL_FEATURE_COUNT = PARTIALITY_SYMBOL_FEATURE_COUNT + 0;
+  int EXTERN_PREDICATE_DEFINITION__MEMBERS = STATEMENT__MEMBERS;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.EqualsSymbolImpl <em>Equals Symbol</em>}' class.
+   * The feature id for the '<em><b>Head</b></em>' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.EqualsSymbolImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getEqualsSymbol()
   * @generated
+   * @ordered
   */
-  int EQUALS_SYMBOL = 10;
+  int EXTERN_PREDICATE_DEFINITION__HEAD = STATEMENT_FEATURE_COUNT + 0;
  /**
-   * The number of structural features of the '<em>Equals Symbol</em>' class.
+   * The number of structural features of the '<em>Extern Predicate Definition</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int EQUALS_SYMBOL_FEATURE_COUNT = PARTIALITY_SYMBOL_FEATURE_COUNT + 0;
+  int EXTERN_PREDICATE_DEFINITION_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 1;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.DataSymbolImpl <em>Data Symbol</em>}' class.
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MetricDefinitionImpl <em>Metric Definition</em>}' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.DataSymbolImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.MetricDefinitionImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getDataSymbol()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getMetricDefinition()
   * @generated
   */
-  int DATA_SYMBOL = 11;
+  int METRIC_DEFINITION = 6;
  /**
-   * The number of structural features of the '<em>Data Symbol</em>' class.
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int METRIC_DEFINITION__ABSTRACT = STATEMENT__ABSTRACT;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int DATA_SYMBOL_FEATURE_COUNT = SYMBOL_FEATURE_COUNT + 0;
+  int METRIC_DEFINITION__NAME = STATEMENT__NAME;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanSymbolImpl <em>Boolean Symbol</em>}' class.
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanSymbolImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBooleanSymbol()
   * @generated
+   * @ordered
   */
-  int BOOLEAN_SYMBOL = 12;
+  int METRIC_DEFINITION__SUPERCLASSES = STATEMENT__SUPERCLASSES;
  /**
-   * The number of structural features of the '<em>Boolean Symbol</em>' class.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int BOOLEAN_SYMBOL_FEATURE_COUNT = DATA_SYMBOL_FEATURE_COUNT + 0;
+  int METRIC_DEFINITION__MEMBERS = STATEMENT__MEMBERS;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.IntegerSymbolImpl <em>Integer Symbol</em>}' class.
+   * The feature id for the '<em><b>Head</b></em>' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.IntegerSymbolImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getIntegerSymbol()
   * @generated
+   * @ordered
   */
-  int INTEGER_SYMBOL = 13;
+  int METRIC_DEFINITION__HEAD = STATEMENT_FEATURE_COUNT + 0;
  /**
-   * The number of structural features of the '<em>Integer Symbol</em>' class.
+   * The feature id for the '<em><b>Body</b></em>' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int INTEGER_SYMBOL_FEATURE_COUNT = DATA_SYMBOL_FEATURE_COUNT + 0;
+  int METRIC_DEFINITION__BODY = STATEMENT_FEATURE_COUNT + 1;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.RealSymbolImpl <em>Real Symbol</em>}' class.
+   * The feature id for the '<em><b>Type</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.RealSymbolImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getRealSymbol()
   * @generated
+   * @ordered
   */
-  int REAL_SYMBOL = 14;
+  int METRIC_DEFINITION__TYPE = STATEMENT_FEATURE_COUNT + 2;
  /**
-   * The number of structural features of the '<em>Real Symbol</em>' class.
+   * The number of structural features of the '<em>Metric Definition</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int REAL_SYMBOL_FEATURE_COUNT = DATA_SYMBOL_FEATURE_COUNT + 0;
+  int METRIC_DEFINITION_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 3;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.StringSymbolImpl <em>String Symbol</em>}' class.
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExternMetricDefinitionImpl <em>Extern Metric Definition</em>}' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.StringSymbolImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ExternMetricDefinitionImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getStringSymbol()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getExternMetricDefinition()
   * @generated
   */
-  int STRING_SYMBOL = 15;
+  int EXTERN_METRIC_DEFINITION = 7;
  /**
-   * The number of structural features of the '<em>String Symbol</em>' class.
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int EXTERN_METRIC_DEFINITION__ABSTRACT = STATEMENT__ABSTRACT;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int STRING_SYMBOL_FEATURE_COUNT = DATA_SYMBOL_FEATURE_COUNT + 0;
+  int EXTERN_METRIC_DEFINITION__NAME = STATEMENT__NAME;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ComplexObjectImpl <em>Complex Object</em>}' class.
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ComplexObjectImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getComplexObject()
   * @generated
+   * @ordered
   */
-  int COMPLEX_OBJECT = 16;
+  int EXTERN_METRIC_DEFINITION__SUPERCLASSES = STATEMENT__SUPERCLASSES;
  /**
-   * The number of structural features of the '<em>Complex Object</em>' class.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int COMPLEX_OBJECT_FEATURE_COUNT = 0;
+  int EXTERN_METRIC_DEFINITION__MEMBERS = STATEMENT__MEMBERS;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ObjectImpl <em>Object</em>}' class.
+   * The feature id for the '<em><b>Type</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ObjectImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getObject()
   * @generated
+   * @ordered
   */
-  int OBJECT = 17;
+  int EXTERN_METRIC_DEFINITION__TYPE = STATEMENT_FEATURE_COUNT + 0;
  /**
-   * The number of structural features of the '<em>Object</em>' class.
+   * The feature id for the '<em><b>Head</b></em>' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int OBJECT_FEATURE_COUNT = COMPLEX_OBJECT_FEATURE_COUNT + 0;
+  int EXTERN_METRIC_DEFINITION__HEAD = STATEMENT_FEATURE_COUNT + 1;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.NamedObjectImpl <em>Named Object</em>}' class.
+   * The number of structural features of the '<em>Extern Metric Definition</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.NamedObjectImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getNamedObject()
   * @generated
+   * @ordered
   */
-  int NAMED_OBJECT = 18;
+  int EXTERN_METRIC_DEFINITION_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 2;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExpressionImpl <em>Expression</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ExpressionImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getExpression()
+   * @generated
+   */
+  int EXPRESSION = 8;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int EXPRESSION__ABSTRACT = STATEMENT__ABSTRACT;
  /**
   * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -461,26 +623,53 @@ public interface SolverLanguagePackage extends EPackage
   * @generated
   * @ordered
   */
-  int NAMED_OBJECT__NAME = OBJECT_FEATURE_COUNT + 0;
+  int EXPRESSION__NAME = STATEMENT__NAME;
+  /**
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int EXPRESSION__SUPERCLASSES = STATEMENT__SUPERCLASSES;
  /**
-   * The number of structural features of the '<em>Named Object</em>' class.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int NAMED_OBJECT_FEATURE_COUNT = OBJECT_FEATURE_COUNT + 1;
+  int EXPRESSION__MEMBERS = STATEMENT__MEMBERS;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.UnnamedObjectImpl <em>Unnamed Object</em>}' class.
+   * The number of structural features of the '<em>Expression</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.UnnamedObjectImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getUnnamedObject()
   * @generated
+   * @ordered
   */
-  int UNNAMED_OBJECT = 19;
+  int EXPRESSION_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 0;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.IfElseImpl <em>If Else</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.IfElseImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getIfElse()
+   * @generated
+   */
+  int IF_ELSE = 9;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int IF_ELSE__ABSTRACT = EXPRESSION__ABSTRACT;
  /**
   * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -489,360 +678,667 @@ public interface SolverLanguagePackage extends EPackage
   * @generated
   * @ordered
   */
-  int UNNAMED_OBJECT__NAME = OBJECT_FEATURE_COUNT + 0;
+  int IF_ELSE__NAME = EXPRESSION__NAME;
  /**
-   * The number of structural features of the '<em>Unnamed Object</em>' class.
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int UNNAMED_OBJECT_FEATURE_COUNT = OBJECT_FEATURE_COUNT + 1;
+  int IF_ELSE__SUPERCLASSES = EXPRESSION__SUPERCLASSES;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.DataObjectImpl <em>Data Object</em>}' class.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.DataObjectImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getDataObject()
   * @generated
+   * @ordered
   */
-  int DATA_OBJECT = 20;
+  int IF_ELSE__MEMBERS = EXPRESSION__MEMBERS;
  /**
-   * The number of structural features of the '<em>Data Object</em>' class.
+   * The feature id for the '<em><b>Condition</b></em>' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int DATA_OBJECT_FEATURE_COUNT = OBJECT_FEATURE_COUNT + 0;
+  int IF_ELSE__CONDITION = EXPRESSION_FEATURE_COUNT + 0;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanObjectImpl <em>Boolean Object</em>}' class.
+   * The feature id for the '<em><b>Then</b></em>' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanObjectImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBooleanObject()
   * @generated
+   * @ordered
   */
-  int BOOLEAN_OBJECT = 21;
+  int IF_ELSE__THEN = EXPRESSION_FEATURE_COUNT + 1;
  /**
-   * The feature id for the '<em><b>Value</b></em>' containment reference.
+   * The feature id for the '<em><b>Else</b></em>' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int BOOLEAN_OBJECT__VALUE = DATA_OBJECT_FEATURE_COUNT + 0;
+  int IF_ELSE__ELSE = EXPRESSION_FEATURE_COUNT + 2;
  /**
-   * The number of structural features of the '<em>Boolean Object</em>' class.
+   * The number of structural features of the '<em>If Else</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int BOOLEAN_OBJECT_FEATURE_COUNT = DATA_OBJECT_FEATURE_COUNT + 1;
+  int IF_ELSE_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 3;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.IntObjectImpl <em>Int Object</em>}' class.
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CaseImpl <em>Case</em>}' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.IntObjectImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.CaseImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getIntObject()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getCase()
   * @generated
   */
-  int INT_OBJECT = 22;
+  int CASE = 10;
  /**
-   * The feature id for the '<em><b>Value</b></em>' attribute.
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int INT_OBJECT__VALUE = DATA_OBJECT_FEATURE_COUNT + 0;
+  int CASE__ABSTRACT = EXPRESSION__ABSTRACT;
  /**
-   * The number of structural features of the '<em>Int Object</em>' class.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int INT_OBJECT_FEATURE_COUNT = DATA_OBJECT_FEATURE_COUNT + 1;
+  int CASE__NAME = EXPRESSION__NAME;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.RealObjectImpl <em>Real Object</em>}' class.
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.RealObjectImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getRealObject()
   * @generated
+   * @ordered
   */
-  int REAL_OBJECT = 23;
+  int CASE__SUPERCLASSES = EXPRESSION__SUPERCLASSES;
  /**
-   * The feature id for the '<em><b>Value</b></em>' attribute.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int REAL_OBJECT__VALUE = DATA_OBJECT_FEATURE_COUNT + 0;
+  int CASE__MEMBERS = EXPRESSION__MEMBERS;
  /**
-   * The number of structural features of the '<em>Real Object</em>' class.
+   * The feature id for the '<em><b>Condition</b></em>' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int REAL_OBJECT_FEATURE_COUNT = DATA_OBJECT_FEATURE_COUNT + 1;
+  int CASE__CONDITION = EXPRESSION_FEATURE_COUNT + 0;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.StringObjectImpl <em>String Object</em>}' class.
+   * The feature id for the '<em><b>Body</b></em>' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.StringObjectImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getStringObject()
   * @generated
+   * @ordered
   */
-  int STRING_OBJECT = 24;
+  int CASE__BODY = EXPRESSION_FEATURE_COUNT + 1;
  /**
-   * The feature id for the '<em><b>Value</b></em>' attribute.
+   * The number of structural features of the '<em>Case</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int STRING_OBJECT__VALUE = DATA_OBJECT_FEATURE_COUNT + 0;
+  int CASE_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 2;
  /**
-   * The number of structural features of the '<em>String Object</em>' class.
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CountImpl <em>Count</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.CountImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getCount()
+   * @generated
+   */
+  int COUNT = 11;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int COUNT__ABSTRACT = EXPRESSION__ABSTRACT;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int STRING_OBJECT_FEATURE_COUNT = DATA_OBJECT_FEATURE_COUNT + 1;
+  int COUNT__NAME = EXPRESSION__NAME;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateImpl <em>Predicate</em>}' class.
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPredicate()
   * @generated
+   * @ordered
   */
-  int PREDICATE = 25;
+  int COUNT__SUPERCLASSES = EXPRESSION__SUPERCLASSES;
  /**
-   * The feature id for the '<em><b>Is Error</b></em>' attribute.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int PREDICATE__IS_ERROR = STATEMENT_FEATURE_COUNT + 0;
+  int COUNT__MEMBERS = EXPRESSION__MEMBERS;
  /**
-   * The feature id for the '<em><b>Symbol</b></em>' containment reference.
+   * The feature id for the '<em><b>Body</b></em>' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int PREDICATE__SYMBOL = STATEMENT_FEATURE_COUNT + 1;
+  int COUNT__BODY = EXPRESSION_FEATURE_COUNT + 0;
  /**
-   * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
+   * The number of structural features of the '<em>Count</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int PREDICATE__PARAMETERS = STATEMENT_FEATURE_COUNT + 2;
+  int COUNT_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 1;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AggregationImpl <em>Aggregation</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.AggregationImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getAggregation()
+   * @generated
+   */
+  int AGGREGATION = 12;
  /**
-   * The feature id for the '<em><b>Bodies</b></em>' containment reference list.
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int PREDICATE__BODIES = STATEMENT_FEATURE_COUNT + 3;
+  int AGGREGATION__ABSTRACT = EXPRESSION__ABSTRACT;
  /**
-   * The number of structural features of the '<em>Predicate</em>' class.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int PREDICATE_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 4;
+  int AGGREGATION__NAME = EXPRESSION__NAME;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ParameterImpl <em>Parameter</em>}' class.
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ParameterImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getParameter()
   * @generated
+   * @ordered
   */
-  int PARAMETER = 26;
+  int AGGREGATION__SUPERCLASSES = EXPRESSION__SUPERCLASSES;
  /**
-   * The feature id for the '<em><b>Variable</b></em>' containment reference.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int PARAMETER__VARIABLE = 0;
+  int AGGREGATION__MEMBERS = EXPRESSION__MEMBERS;
  /**
-   * The feature id for the '<em><b>Type</b></em>' containment reference.
+   * The feature id for the '<em><b>Op</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int PARAMETER__TYPE = 1;
+  int AGGREGATION__OP = EXPRESSION_FEATURE_COUNT + 0;
  /**
-   * The number of structural features of the '<em>Parameter</em>' class.
+   * The feature id for the '<em><b>Body</b></em>' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int PARAMETER_FEATURE_COUNT = 2;
+  int AGGREGATION__BODY = EXPRESSION_FEATURE_COUNT + 1;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PatternBodyImpl <em>Pattern Body</em>}' class.
+   * The feature id for the '<em><b>Condition</b></em>' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.PatternBodyImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPatternBody()
   * @generated
+   * @ordered
   */
-  int PATTERN_BODY = 27;
+  int AGGREGATION__CONDITION = EXPRESSION_FEATURE_COUNT + 2;
  /**
-   * The feature id for the '<em><b>Constraints</b></em>' containment reference list.
+   * The number of structural features of the '<em>Aggregation</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int PATTERN_BODY__CONSTRAINTS = 0;
+  int AGGREGATION_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 3;
  /**
-   * The number of structural features of the '<em>Pattern Body</em>' class.
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CallImpl <em>Call</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.CallImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getCall()
+   * @generated
+   */
+  int CALL = 13;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int PATTERN_BODY_FEATURE_COUNT = 1;
+  int CALL__ABSTRACT = EXPRESSION__ABSTRACT;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PolarityImpl <em>Polarity</em>}' class.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.PolarityImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPolarity()
   * @generated
+   * @ordered
   */
-  int POLARITY = 28;
+  int CALL__NAME = EXPRESSION__NAME;
  /**
-   * The number of structural features of the '<em>Polarity</em>' class.
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int POLARITY_FEATURE_COUNT = 0;
+  int CALL__SUPERCLASSES = EXPRESSION__SUPERCLASSES;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ConstraintImpl <em>Constraint</em>}' class.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ConstraintImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getConstraint()
   * @generated
+   * @ordered
   */
-  int CONSTRAINT = 29;
+  int CALL__MEMBERS = EXPRESSION__MEMBERS;
  /**
-   * The feature id for the '<em><b>Polarity</b></em>' containment reference.
+   * The feature id for the '<em><b>Functor</b></em>' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int CONSTRAINT__POLARITY = 0;
+  int CALL__FUNCTOR = EXPRESSION_FEATURE_COUNT + 0;
  /**
-   * The feature id for the '<em><b>Symbol</b></em>' containment reference.
+   * The feature id for the '<em><b>Argument List</b></em>' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int CONSTRAINT__SYMBOL = 1;
+  int CALL__ARGUMENT_LIST = EXPRESSION_FEATURE_COUNT + 1;
  /**
-   * The feature id for the '<em><b>Params</b></em>' containment reference list.
+   * The feature id for the '<em><b>Transitive Closure</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int CONSTRAINT__PARAMS = 2;
+  int CALL__TRANSITIVE_CLOSURE = EXPRESSION_FEATURE_COUNT + 2;
  /**
-   * The feature id for the '<em><b>Closure Type</b></em>' containment reference.
+   * The feature id for the '<em><b>Reflexive Transitive Closure</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int CONSTRAINT__CLOSURE_TYPE = 3;
+  int CALL__REFLEXIVE_TRANSITIVE_CLOSURE = EXPRESSION_FEATURE_COUNT + 3;
  /**
-   * The number of structural features of the '<em>Constraint</em>' class.
+   * The number of structural features of the '<em>Call</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int CONSTRAINT_FEATURE_COUNT = 4;
+  int CALL_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 4;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ArgumentListImpl <em>Argument List</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ArgumentListImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getArgumentList()
+   * @generated
+   */
+  int ARGUMENT_LIST = 14;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ClosureTypeImpl <em>Closure Type</em>}' class.
+   * The feature id for the '<em><b>Arguments</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ClosureTypeImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getClosureType()
   * @generated
+   * @ordered
   */
-  int CLOSURE_TYPE = 30;
+  int ARGUMENT_LIST__ARGUMENTS = 0;
  /**
-   * The number of structural features of the '<em>Closure Type</em>' class.
+   * The number of structural features of the '<em>Argument List</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int CLOSURE_TYPE_FEATURE_COUNT = 0;
+  int ARGUMENT_LIST_FEATURE_COUNT = 1;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ArgumentImpl <em>Argument</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ArgumentImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getArgument()
+   * @generated
+   */
+  int ARGUMENT = 15;
+  /**
+   * The number of structural features of the '<em>Argument</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int ARGUMENT_FEATURE_COUNT = 0;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExpressionArgumentImpl <em>Expression Argument</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ExpressionArgumentImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getExpressionArgument()
+   * @generated
+   */
+  int EXPRESSION_ARGUMENT = 16;
+  /**
+   * The feature id for the '<em><b>Body</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int EXPRESSION_ARGUMENT__BODY = ARGUMENT_FEATURE_COUNT + 0;
+  /**
+   * The number of structural features of the '<em>Expression Argument</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int EXPRESSION_ARGUMENT_FEATURE_COUNT = ARGUMENT_FEATURE_COUNT + 1;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.StarArgumentImpl <em>Star Argument</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.StarArgumentImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getStarArgument()
+   * @generated
+   */
+  int STAR_ARGUMENT = 17;
+  /**
+   * The number of structural features of the '<em>Star Argument</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int STAR_ARGUMENT_FEATURE_COUNT = ARGUMENT_FEATURE_COUNT + 0;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.TypedArgumentImpl <em>Typed Argument</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.TypedArgumentImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getTypedArgument()
+   * @generated
+   */
+  int TYPED_ARGUMENT = 18;
+  /**
+   * The feature id for the '<em><b>Type</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int TYPED_ARGUMENT__TYPE = ARGUMENT_FEATURE_COUNT + 0;
+  /**
+   * The feature id for the '<em><b>Variable</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int TYPED_ARGUMENT__VARIABLE = ARGUMENT_FEATURE_COUNT + 1;
+  /**
+   * The number of structural features of the '<em>Typed Argument</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int TYPED_ARGUMENT_FEATURE_COUNT = ARGUMENT_FEATURE_COUNT + 2;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.TypedStarArgumentImpl <em>Typed Star Argument</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.TypedStarArgumentImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getTypedStarArgument()
+   * @generated
+   */
+  int TYPED_STAR_ARGUMENT = 19;
+  /**
+   * The feature id for the '<em><b>Type</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int TYPED_STAR_ARGUMENT__TYPE = ARGUMENT_FEATURE_COUNT + 0;
+  /**
+   * The number of structural features of the '<em>Typed Star Argument</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int TYPED_STAR_ARGUMENT_FEATURE_COUNT = ARGUMENT_FEATURE_COUNT + 1;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ReferenceImpl <em>Reference</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ReferenceImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getReference()
+   * @generated
+   */
+  int REFERENCE = 20;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int REFERENCE__ABSTRACT = EXPRESSION__ABSTRACT;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int REFERENCE__NAME = EXPRESSION__NAME;
+  /**
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int REFERENCE__SUPERCLASSES = EXPRESSION__SUPERCLASSES;
+  /**
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int REFERENCE__MEMBERS = EXPRESSION__MEMBERS;
+  /**
+   * The feature id for the '<em><b>Referred</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int REFERENCE__REFERRED = EXPRESSION_FEATURE_COUNT + 0;
+  /**
+   * The number of structural features of the '<em>Reference</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int REFERENCE_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 1;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.IntervalImpl <em>Interval</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.IntervalImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getInterval()
+   * @generated
+   */
+  int INTERVAL = 21;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int INTERVAL__ABSTRACT = EXPRESSION__ABSTRACT;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int INTERVAL__NAME = EXPRESSION__NAME;
+  /**
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int INTERVAL__SUPERCLASSES = EXPRESSION__SUPERCLASSES;
+  /**
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int INTERVAL__MEMBERS = EXPRESSION__MEMBERS;
+  /**
+   * The feature id for the '<em><b>Lower Bound</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int INTERVAL__LOWER_BOUND = EXPRESSION_FEATURE_COUNT + 0;
+  /**
+   * The feature id for the '<em><b>Upper Bound</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int INTERVAL__UPPER_BOUND = EXPRESSION_FEATURE_COUNT + 1;
+  /**
+   * The number of structural features of the '<em>Interval</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int INTERVAL_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 2;
  /**
   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.LiteralImpl <em>Literal</em>}' class.
@@ -852,7 +1348,43 @@ public interface SolverLanguagePackage extends EPackage
   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getLiteral()
   * @generated
   */
-  int LITERAL = 31;
+  int LITERAL = 22;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int LITERAL__ABSTRACT = EXPRESSION__ABSTRACT;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int LITERAL__NAME = EXPRESSION__NAME;
+  /**
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int LITERAL__SUPERCLASSES = EXPRESSION__SUPERCLASSES;
+  /**
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int LITERAL__MEMBERS = EXPRESSION__MEMBERS;
  /**
   * The number of structural features of the '<em>Literal</em>' class.
@@ -861,17 +1393,26 @@ public interface SolverLanguagePackage extends EPackage
   * @generated
   * @ordered
   */
-  int LITERAL_FEATURE_COUNT = 0;
+  int LITERAL_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 0;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.VariableImpl <em>Variable</em>}' class.
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.LogicLiteralImpl <em>Logic Literal</em>}' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.VariableImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.LogicLiteralImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getVariable()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getLogicLiteral()
   * @generated
   */
-  int VARIABLE = 32;
+  int LOGIC_LITERAL = 23;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int LOGIC_LITERAL__ABSTRACT = LITERAL__ABSTRACT;
  /**
   * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -880,120 +1421,117 @@ public interface SolverLanguagePackage extends EPackage
   * @generated
   * @ordered
   */
-  int VARIABLE__NAME = LITERAL_FEATURE_COUNT + 0;
+  int LOGIC_LITERAL__NAME = LITERAL__NAME;
  /**
-   * The number of structural features of the '<em>Variable</em>' class.
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int VARIABLE_FEATURE_COUNT = LITERAL_FEATURE_COUNT + 1;
+  int LOGIC_LITERAL__SUPERCLASSES = LITERAL__SUPERCLASSES;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AllInstancesImpl <em>All Instances</em>}' class.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.AllInstancesImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getAllInstances()
   * @generated
+   * @ordered
   */
-  int ALL_INSTANCES = 33;
+  int LOGIC_LITERAL__MEMBERS = LITERAL__MEMBERS;
  /**
-   * The feature id for the '<em><b>Symbol</b></em>' containment reference.
+   * The feature id for the '<em><b>Value</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int ALL_INSTANCES__SYMBOL = COMPLEX_OBJECT_FEATURE_COUNT + 0;
+  int LOGIC_LITERAL__VALUE = LITERAL_FEATURE_COUNT + 0;
  /**
-   * The number of structural features of the '<em>All Instances</em>' class.
+   * The number of structural features of the '<em>Logic Literal</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int ALL_INSTANCES_FEATURE_COUNT = COMPLEX_OBJECT_FEATURE_COUNT + 1;
+  int LOGIC_LITERAL_FEATURE_COUNT = LITERAL_FEATURE_COUNT + 1;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AllObjectsImpl <em>All Objects</em>}' class.
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.NumericLiteralImpl <em>Numeric Literal</em>}' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.AllObjectsImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.NumericLiteralImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getAllObjects()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getNumericLiteral()
   * @generated
   */
-  int ALL_OBJECTS = 34;
+  int NUMERIC_LITERAL = 24;
  /**
-   * The number of structural features of the '<em>All Objects</em>' class.
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int ALL_OBJECTS_FEATURE_COUNT = COMPLEX_OBJECT_FEATURE_COUNT + 0;
+  int NUMERIC_LITERAL__ABSTRACT = LITERAL__ABSTRACT;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.DefaultInterpretationImpl <em>Default Interpretation</em>}' class.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.DefaultInterpretationImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getDefaultInterpretation()
   * @generated
+   * @ordered
   */
-  int DEFAULT_INTERPRETATION = 35;
+  int NUMERIC_LITERAL__NAME = LITERAL__NAME;
  /**
-   * The feature id for the '<em><b>Interpretation</b></em>' containment reference.
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int DEFAULT_INTERPRETATION__INTERPRETATION = INTERPRETATION_FEATURE_COUNT + 0;
+  int NUMERIC_LITERAL__SUPERCLASSES = LITERAL__SUPERCLASSES;
  /**
-   * The number of structural features of the '<em>Default Interpretation</em>' class.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int DEFAULT_INTERPRETATION_FEATURE_COUNT = INTERPRETATION_FEATURE_COUNT + 1;
+  int NUMERIC_LITERAL__MEMBERS = LITERAL__MEMBERS;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CDInterpretationImpl <em>CD Interpretation</em>}' class.
+   * The feature id for the '<em><b>Value</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.CDInterpretationImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getCDInterpretation()
   * @generated
+   * @ordered
   */
-  int CD_INTERPRETATION = 36;
+  int NUMERIC_LITERAL__VALUE = LITERAL_FEATURE_COUNT + 0;
  /**
-   * The number of structural features of the '<em>CD Interpretation</em>' class.
+   * The number of structural features of the '<em>Numeric Literal</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int CD_INTERPRETATION_FEATURE_COUNT = INTERPRETATION_FEATURE_COUNT + 0;
+  int NUMERIC_LITERAL_FEATURE_COUNT = LITERAL_FEATURE_COUNT + 1;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ClassInterpretationImpl <em>Class Interpretation</em>}' class.
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.InfinityLiteralImpl <em>Infinity Literal</em>}' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ClassInterpretationImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.InfinityLiteralImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getClassInterpretation()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getInfinityLiteral()
   * @generated
   */
-  int CLASS_INTERPRETATION = 37;
+  int INFINITY_LITERAL = 25;
  /**
   * The feature id for the '<em><b>Abstract</b></em>' attribute.
@@ -1002,90 +1540,172 @@ public interface SolverLanguagePackage extends EPackage
   * @generated
   * @ordered
   */
-  int CLASS_INTERPRETATION__ABSTRACT = CD_INTERPRETATION_FEATURE_COUNT + 0;
+  int INFINITY_LITERAL__ABSTRACT = LITERAL__ABSTRACT;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int INFINITY_LITERAL__NAME = LITERAL__NAME;
+  /**
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int INFINITY_LITERAL__SUPERCLASSES = LITERAL__SUPERCLASSES;
+  /**
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int INFINITY_LITERAL__MEMBERS = LITERAL__MEMBERS;
+  /**
+   * The number of structural features of the '<em>Infinity Literal</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int INFINITY_LITERAL_FEATURE_COUNT = LITERAL_FEATURE_COUNT + 0;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.EmptyIntervalLiteralImpl <em>Empty Interval Literal</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.EmptyIntervalLiteralImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getEmptyIntervalLiteral()
+   * @generated
+   */
+  int EMPTY_INTERVAL_LITERAL = 26;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int EMPTY_INTERVAL_LITERAL__ABSTRACT = LITERAL__ABSTRACT;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int EMPTY_INTERVAL_LITERAL__NAME = LITERAL__NAME;
+  /**
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int EMPTY_INTERVAL_LITERAL__SUPERCLASSES = LITERAL__SUPERCLASSES;
  /**
-   * The feature id for the '<em><b>Symbol</b></em>' containment reference.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int CLASS_INTERPRETATION__SYMBOL = CD_INTERPRETATION_FEATURE_COUNT + 1;
+  int EMPTY_INTERVAL_LITERAL__MEMBERS = LITERAL__MEMBERS;
  /**
-   * The feature id for the '<em><b>Supertypes</b></em>' containment reference list.
+   * The number of structural features of the '<em>Empty Interval Literal</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int CLASS_INTERPRETATION__SUPERTYPES = CD_INTERPRETATION_FEATURE_COUNT + 2;
+  int EMPTY_INTERVAL_LITERAL_FEATURE_COUNT = LITERAL_FEATURE_COUNT + 0;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.StringLiteralImpl <em>String Literal</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.StringLiteralImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getStringLiteral()
+   * @generated
+   */
+  int STRING_LITERAL = 27;
  /**
-   * The feature id for the '<em><b>Fielt</b></em>' containment reference list.
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int CLASS_INTERPRETATION__FIELT = CD_INTERPRETATION_FEATURE_COUNT + 3;
+  int STRING_LITERAL__ABSTRACT = LITERAL__ABSTRACT;
  /**
-   * The number of structural features of the '<em>Class Interpretation</em>' class.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int CLASS_INTERPRETATION_FEATURE_COUNT = CD_INTERPRETATION_FEATURE_COUNT + 4;
+  int STRING_LITERAL__NAME = LITERAL__NAME;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.EnumInterpretationImpl <em>Enum Interpretation</em>}' class.
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.EnumInterpretationImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getEnumInterpretation()
   * @generated
+   * @ordered
   */
-  int ENUM_INTERPRETATION = 38;
+  int STRING_LITERAL__SUPERCLASSES = LITERAL__SUPERCLASSES;
  /**
-   * The feature id for the '<em><b>Symbol</b></em>' containment reference.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int ENUM_INTERPRETATION__SYMBOL = CD_INTERPRETATION_FEATURE_COUNT + 0;
+  int STRING_LITERAL__MEMBERS = LITERAL__MEMBERS;
  /**
-   * The feature id for the '<em><b>Objects</b></em>' containment reference list.
+   * The feature id for the '<em><b>Value</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int ENUM_INTERPRETATION__OBJECTS = CD_INTERPRETATION_FEATURE_COUNT + 1;
+  int STRING_LITERAL__VALUE = LITERAL_FEATURE_COUNT + 0;
  /**
-   * The number of structural features of the '<em>Enum Interpretation</em>' class.
+   * The number of structural features of the '<em>String Literal</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int ENUM_INTERPRETATION_FEATURE_COUNT = CD_INTERPRETATION_FEATURE_COUNT + 2;
+  int STRING_LITERAL_FEATURE_COUNT = LITERAL_FEATURE_COUNT + 1;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FieldRelationInterpretationImpl <em>Field Relation Interpretation</em>}' class.
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MemberDefinitionImpl <em>Member Definition</em>}' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.FieldRelationInterpretationImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.MemberDefinitionImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getFieldRelationInterpretation()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getMemberDefinition()
   * @generated
   */
-  int FIELD_RELATION_INTERPRETATION = 39;
+  int MEMBER_DEFINITION = 28;
  /**
   * The feature id for the '<em><b>Containment</b></em>' attribute.
@@ -1094,16 +1714,16 @@ public interface SolverLanguagePackage extends EPackage
   * @generated
   * @ordered
   */
-  int FIELD_RELATION_INTERPRETATION__CONTAINMENT = 0;
+  int MEMBER_DEFINITION__CONTAINMENT = 0;
  /**
-   * The feature id for the '<em><b>Symbol</b></em>' containment reference.
+   * The feature id for the '<em><b>Type</b></em>' reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int FIELD_RELATION_INTERPRETATION__SYMBOL = 1;
+  int MEMBER_DEFINITION__TYPE = 1;
  /**
   * The feature id for the '<em><b>Multiplicity</b></em>' containment reference.
@@ -1112,334 +1732,1092 @@ public interface SolverLanguagePackage extends EPackage
   * @generated
   * @ordered
   */
-  int FIELD_RELATION_INTERPRETATION__MULTIPLICITY = 2;
+  int MEMBER_DEFINITION__MULTIPLICITY = 2;
  /**
-   * The feature id for the '<em><b>Target</b></em>' containment reference.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int FIELD_RELATION_INTERPRETATION__TARGET = 3;
+  int MEMBER_DEFINITION__NAME = 3;
  /**
-   * The number of structural features of the '<em>Field Relation Interpretation</em>' class.
+   * The feature id for the '<em><b>Opposite</b></em>' reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int FIELD_RELATION_INTERPRETATION_FEATURE_COUNT = 4;
+  int MEMBER_DEFINITION__OPPOSITE = 4;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.GlobalRelationInterpretationImpl <em>Global Relation Interpretation</em>}' class.
+   * The number of structural features of the '<em>Member Definition</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.GlobalRelationInterpretationImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getGlobalRelationInterpretation()
   * @generated
+   * @ordered
   */
-  int GLOBAL_RELATION_INTERPRETATION = 40;
+  int MEMBER_DEFINITION_FEATURE_COUNT = 5;
  /**
-   * The feature id for the '<em><b>Containment</b></em>' attribute.
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MultiplicityImpl <em>Multiplicity</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.MultiplicityImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getMultiplicity()
+   * @generated
+   */
+  int MULTIPLICITY = 29;
+  /**
+   * The number of structural features of the '<em>Multiplicity</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int MULTIPLICITY_FEATURE_COUNT = 0;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ManyMultiplicityImpl <em>Many Multiplicity</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ManyMultiplicityImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getManyMultiplicity()
+   * @generated
+   */
+  int MANY_MULTIPLICITY = 30;
+  /**
+   * The number of structural features of the '<em>Many Multiplicity</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int MANY_MULTIPLICITY_FEATURE_COUNT = MULTIPLICITY_FEATURE_COUNT + 0;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExactMultiplicityImpl <em>Exact Multiplicity</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ExactMultiplicityImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getExactMultiplicity()
+   * @generated
+   */
+  int EXACT_MULTIPLICITY = 31;
+  /**
+   * The feature id for the '<em><b>Multiplicity</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int GLOBAL_RELATION_INTERPRETATION__CONTAINMENT = CD_INTERPRETATION_FEATURE_COUNT + 0;
+  int EXACT_MULTIPLICITY__MULTIPLICITY = MULTIPLICITY_FEATURE_COUNT + 0;
  /**
-   * The feature id for the '<em><b>Symbol</b></em>' containment reference.
+   * The number of structural features of the '<em>Exact Multiplicity</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int GLOBAL_RELATION_INTERPRETATION__SYMBOL = CD_INTERPRETATION_FEATURE_COUNT + 1;
+  int EXACT_MULTIPLICITY_FEATURE_COUNT = MULTIPLICITY_FEATURE_COUNT + 1;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BoundedMultiplicityImpl <em>Bounded Multiplicity</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.BoundedMultiplicityImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBoundedMultiplicity()
+   * @generated
+   */
+  int BOUNDED_MULTIPLICITY = 32;
  /**
-   * The feature id for the '<em><b>Source Multiplicity</b></em>' containment reference.
+   * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int GLOBAL_RELATION_INTERPRETATION__SOURCE_MULTIPLICITY = CD_INTERPRETATION_FEATURE_COUNT + 2;
+  int BOUNDED_MULTIPLICITY__LOWER_BOUND = MULTIPLICITY_FEATURE_COUNT + 0;
  /**
-   * The feature id for the '<em><b>Source</b></em>' containment reference.
+   * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int GLOBAL_RELATION_INTERPRETATION__SOURCE = CD_INTERPRETATION_FEATURE_COUNT + 3;
+  int BOUNDED_MULTIPLICITY__UPPER_BOUND = MULTIPLICITY_FEATURE_COUNT + 1;
  /**
-   * The feature id for the '<em><b>Target Multiplicity</b></em>' containment reference.
+   * The number of structural features of the '<em>Bounded Multiplicity</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int GLOBAL_RELATION_INTERPRETATION__TARGET_MULTIPLICITY = CD_INTERPRETATION_FEATURE_COUNT + 4;
+  int BOUNDED_MULTIPLICITY_FEATURE_COUNT = MULTIPLICITY_FEATURE_COUNT + 2;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ScopeDefinitionImpl <em>Scope Definition</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ScopeDefinitionImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getScopeDefinition()
+   * @generated
+   */
+  int SCOPE_DEFINITION = 33;
  /**
-   * The feature id for the '<em><b>Target</b></em>' containment reference.
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int GLOBAL_RELATION_INTERPRETATION__TARGET = CD_INTERPRETATION_FEATURE_COUNT + 5;
+  int SCOPE_DEFINITION__ABSTRACT = STATEMENT__ABSTRACT;
  /**
-   * The number of structural features of the '<em>Global Relation Interpretation</em>' class.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int GLOBAL_RELATION_INTERPRETATION_FEATURE_COUNT = CD_INTERPRETATION_FEATURE_COUNT + 6;
+  int SCOPE_DEFINITION__NAME = STATEMENT__NAME;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MultiplicityDefinitionImpl <em>Multiplicity Definition</em>}' class.
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.MultiplicityDefinitionImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getMultiplicityDefinition()
   * @generated
+   * @ordered
   */
-  int MULTIPLICITY_DEFINITION = 41;
+  int SCOPE_DEFINITION__SUPERCLASSES = STATEMENT__SUPERCLASSES;
  /**
-   * The feature id for the '<em><b>Lower</b></em>' attribute.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int MULTIPLICITY_DEFINITION__LOWER = 0;
+  int SCOPE_DEFINITION__MEMBERS = STATEMENT__MEMBERS;
  /**
-   * The feature id for the '<em><b>Upper</b></em>' attribute.
+   * The feature id for the '<em><b>Type</b></em>' reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int MULTIPLICITY_DEFINITION__UPPER = 1;
+  int SCOPE_DEFINITION__TYPE = STATEMENT_FEATURE_COUNT + 0;
  /**
-   * The feature id for the '<em><b>Unlimited Upper</b></em>' attribute.
+   * The number of structural features of the '<em>Scope Definition</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int MULTIPLICITY_DEFINITION__UNLIMITED_UPPER = 2;
+  int SCOPE_DEFINITION_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 1;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExactScopeDefinitionImpl <em>Exact Scope Definition</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ExactScopeDefinitionImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getExactScopeDefinition()
+   * @generated
+   */
+  int EXACT_SCOPE_DEFINITION = 34;
  /**
-   * The number of structural features of the '<em>Multiplicity Definition</em>' class.
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int MULTIPLICITY_DEFINITION_FEATURE_COUNT = 3;
+  int EXACT_SCOPE_DEFINITION__ABSTRACT = SCOPE_DEFINITION__ABSTRACT;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanTrueImpl <em>Boolean True</em>}' class.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanTrueImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBooleanTrue()
   * @generated
+   * @ordered
   */
-  int BOOLEAN_TRUE = 42;
+  int EXACT_SCOPE_DEFINITION__NAME = SCOPE_DEFINITION__NAME;
  /**
-   * The number of structural features of the '<em>Boolean True</em>' class.
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int BOOLEAN_TRUE_FEATURE_COUNT = BOOLEAN_VALUE_FEATURE_COUNT + 0;
+  int EXACT_SCOPE_DEFINITION__SUPERCLASSES = SCOPE_DEFINITION__SUPERCLASSES;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanFalseImpl <em>Boolean False</em>}' class.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanFalseImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBooleanFalse()
   * @generated
+   * @ordered
   */
-  int BOOLEAN_FALSE = 43;
+  int EXACT_SCOPE_DEFINITION__MEMBERS = SCOPE_DEFINITION__MEMBERS;
  /**
-   * The number of structural features of the '<em>Boolean False</em>' class.
+   * The feature id for the '<em><b>Type</b></em>' reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int BOOLEAN_FALSE_FEATURE_COUNT = BOOLEAN_VALUE_FEATURE_COUNT + 0;
+  int EXACT_SCOPE_DEFINITION__TYPE = SCOPE_DEFINITION__TYPE;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.TrueImpl <em>True</em>}' class.
+   * The feature id for the '<em><b>Exact Scope</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.TrueImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getTrue()
   * @generated
+   * @ordered
   */
-  int TRUE = 44;
+  int EXACT_SCOPE_DEFINITION__EXACT_SCOPE = SCOPE_DEFINITION_FEATURE_COUNT + 0;
  /**
-   * The number of structural features of the '<em>True</em>' class.
+   * The number of structural features of the '<em>Exact Scope Definition</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int TRUE_FEATURE_COUNT = TRUTH_VALUE_FEATURE_COUNT + 0;
+  int EXACT_SCOPE_DEFINITION_FEATURE_COUNT = SCOPE_DEFINITION_FEATURE_COUNT + 1;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FalseImpl <em>False</em>}' class.
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BoundedScopeDefinitionImpl <em>Bounded Scope Definition</em>}' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.FalseImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.BoundedScopeDefinitionImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getFalse()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBoundedScopeDefinition()
   * @generated
   */
-  int FALSE = 45;
+  int BOUNDED_SCOPE_DEFINITION = 35;
  /**
-   * The number of structural features of the '<em>False</em>' class.
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int FALSE_FEATURE_COUNT = TRUTH_VALUE_FEATURE_COUNT + 0;
+  int BOUNDED_SCOPE_DEFINITION__ABSTRACT = SCOPE_DEFINITION__ABSTRACT;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.UnknownImpl <em>Unknown</em>}' class.
+   * The feature id for the '<em><b>Name</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.UnknownImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getUnknown()
   * @generated
+   * @ordered
   */
-  int UNKNOWN = 46;
+  int BOUNDED_SCOPE_DEFINITION__NAME = SCOPE_DEFINITION__NAME;
  /**
-   * The number of structural features of the '<em>Unknown</em>' class.
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int UNKNOWN_FEATURE_COUNT = TRUTH_VALUE_FEATURE_COUNT + 0;
+  int BOUNDED_SCOPE_DEFINITION__SUPERCLASSES = SCOPE_DEFINITION__SUPERCLASSES;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ErrorImpl <em>Error</em>}' class.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ErrorImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getError()
   * @generated
+   * @ordered
   */
-  int ERROR = 47;
+  int BOUNDED_SCOPE_DEFINITION__MEMBERS = SCOPE_DEFINITION__MEMBERS;
  /**
-   * The number of structural features of the '<em>Error</em>' class.
+   * The feature id for the '<em><b>Type</b></em>' reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int ERROR_FEATURE_COUNT = TRUTH_VALUE_FEATURE_COUNT + 0;
+  int BOUNDED_SCOPE_DEFINITION__TYPE = SCOPE_DEFINITION__TYPE;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PositiveImpl <em>Positive</em>}' class.
+   * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.PositiveImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPositive()
   * @generated
+   * @ordered
   */
-  int POSITIVE = 48;
+  int BOUNDED_SCOPE_DEFINITION__LOWER_BOUND = SCOPE_DEFINITION_FEATURE_COUNT + 0;
  /**
-   * The number of structural features of the '<em>Positive</em>' class.
+   * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int POSITIVE_FEATURE_COUNT = POLARITY_FEATURE_COUNT + 0;
+  int BOUNDED_SCOPE_DEFINITION__UPPER_BOUND = SCOPE_DEFINITION_FEATURE_COUNT + 1;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.NegativeImpl <em>Negative</em>}' class.
+   * The number of structural features of the '<em>Bounded Scope Definition</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.NegativeImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getNegative()
   * @generated
+   * @ordered
   */
-  int NEGATIVE = 49;
+  int BOUNDED_SCOPE_DEFINITION_FEATURE_COUNT = SCOPE_DEFINITION_FEATURE_COUNT + 2;
  /**
-   * The number of structural features of the '<em>Negative</em>' class.
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.LowerBoundedScopeDefinitionImpl <em>Lower Bounded Scope Definition</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.LowerBoundedScopeDefinitionImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getLowerBoundedScopeDefinition()
+   * @generated
+   */
+  int LOWER_BOUNDED_SCOPE_DEFINITION = 36;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int LOWER_BOUNDED_SCOPE_DEFINITION__ABSTRACT = SCOPE_DEFINITION__ABSTRACT;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int LOWER_BOUNDED_SCOPE_DEFINITION__NAME = SCOPE_DEFINITION__NAME;
+  /**
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int NEGATIVE_FEATURE_COUNT = POLARITY_FEATURE_COUNT + 0;
+  int LOWER_BOUNDED_SCOPE_DEFINITION__SUPERCLASSES = SCOPE_DEFINITION__SUPERCLASSES;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ReflexiveClosureImpl <em>Reflexive Closure</em>}' class.
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ReflexiveClosureImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getReflexiveClosure()
   * @generated
+   * @ordered
   */
-  int REFLEXIVE_CLOSURE = 50;
+  int LOWER_BOUNDED_SCOPE_DEFINITION__MEMBERS = SCOPE_DEFINITION__MEMBERS;
  /**
-   * The number of structural features of the '<em>Reflexive Closure</em>' class.
+   * The feature id for the '<em><b>Type</b></em>' reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int REFLEXIVE_CLOSURE_FEATURE_COUNT = CLOSURE_TYPE_FEATURE_COUNT + 0;
+  int LOWER_BOUNDED_SCOPE_DEFINITION__TYPE = SCOPE_DEFINITION__TYPE;
  /**
-   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.IrreflexiveClosureImpl <em>Irreflexive Closure</em>}' class.
+   * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.IrreflexiveClosureImpl
-   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getIrreflexiveClosure()
   * @generated
+   * @ordered
   */
-  int IRREFLEXIVE_CLOSURE = 51;
+  int LOWER_BOUNDED_SCOPE_DEFINITION__LOWER_BOUND = SCOPE_DEFINITION_FEATURE_COUNT + 0;
  /**
-   * The number of structural features of the '<em>Irreflexive Closure</em>' class.
+   * The number of structural features of the '<em>Lower Bounded Scope Definition</em>' class.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   * @ordered
   */
-  int IRREFLEXIVE_CLOSURE_FEATURE_COUNT = CLOSURE_TYPE_FEATURE_COUNT + 0;
+  int LOWER_BOUNDED_SCOPE_DEFINITION_FEATURE_COUNT = SCOPE_DEFINITION_FEATURE_COUNT + 1;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ObjectiveDefinitionImpl <em>Objective Definition</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ObjectiveDefinitionImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getObjectiveDefinition()
+   * @generated
+   */
+  int OBJECTIVE_DEFINITION = 37;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int OBJECTIVE_DEFINITION__ABSTRACT = STATEMENT__ABSTRACT;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int OBJECTIVE_DEFINITION__NAME = STATEMENT__NAME;
+  /**
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int OBJECTIVE_DEFINITION__SUPERCLASSES = STATEMENT__SUPERCLASSES;
+  /**
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int OBJECTIVE_DEFINITION__MEMBERS = STATEMENT__MEMBERS;
+  /**
+   * The feature id for the '<em><b>Kind</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int OBJECTIVE_DEFINITION__KIND = STATEMENT_FEATURE_COUNT + 0;
+  /**
+   * The feature id for the '<em><b>Objective</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int OBJECTIVE_DEFINITION__OBJECTIVE = STATEMENT_FEATURE_COUNT + 1;
+  /**
+   * The number of structural features of the '<em>Objective Definition</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int OBJECTIVE_DEFINITION_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 2;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.NamedElementImpl <em>Named Element</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.NamedElementImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getNamedElement()
+   * @generated
+   */
+  int NAMED_ELEMENT = 38;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int NAMED_ELEMENT__NAME = 0;
+  /**
+   * The number of structural features of the '<em>Named Element</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int NAMED_ELEMENT_FEATURE_COUNT = 1;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AssertionImpl <em>Assertion</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.AssertionImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getAssertion()
+   * @generated
+   */
+  int ASSERTION = 39;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int ASSERTION__ABSTRACT = STATEMENT__ABSTRACT;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int ASSERTION__NAME = STATEMENT__NAME;
+  /**
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int ASSERTION__SUPERCLASSES = STATEMENT__SUPERCLASSES;
+  /**
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int ASSERTION__MEMBERS = STATEMENT__MEMBERS;
+  /**
+   * The feature id for the '<em><b>Body</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int ASSERTION__BODY = STATEMENT_FEATURE_COUNT + 0;
+  /**
+   * The feature id for the '<em><b>Range</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int ASSERTION__RANGE = STATEMENT_FEATURE_COUNT + 1;
+  /**
+   * The number of structural features of the '<em>Assertion</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int ASSERTION_FEATURE_COUNT = STATEMENT_FEATURE_COUNT + 2;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.DisjunctionImpl <em>Disjunction</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.DisjunctionImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getDisjunction()
+   * @generated
+   */
+  int DISJUNCTION = 40;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int DISJUNCTION__ABSTRACT = EXPRESSION__ABSTRACT;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int DISJUNCTION__NAME = EXPRESSION__NAME;
+  /**
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int DISJUNCTION__SUPERCLASSES = EXPRESSION__SUPERCLASSES;
+  /**
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int DISJUNCTION__MEMBERS = EXPRESSION__MEMBERS;
+  /**
+   * The feature id for the '<em><b>Children</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int DISJUNCTION__CHILDREN = EXPRESSION_FEATURE_COUNT + 0;
+  /**
+   * The number of structural features of the '<em>Disjunction</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int DISJUNCTION_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 1;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.SwitchImpl <em>Switch</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SwitchImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getSwitch()
+   * @generated
+   */
+  int SWITCH = 41;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int SWITCH__ABSTRACT = EXPRESSION__ABSTRACT;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int SWITCH__NAME = EXPRESSION__NAME;
+  /**
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int SWITCH__SUPERCLASSES = EXPRESSION__SUPERCLASSES;
+  /**
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int SWITCH__MEMBERS = EXPRESSION__MEMBERS;
+  /**
+   * The feature id for the '<em><b>Cases</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int SWITCH__CASES = EXPRESSION_FEATURE_COUNT + 0;
+  /**
+   * The number of structural features of the '<em>Switch</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int SWITCH_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 1;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ConjunctionImpl <em>Conjunction</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ConjunctionImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getConjunction()
+   * @generated
+   */
+  int CONJUNCTION = 42;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int CONJUNCTION__ABSTRACT = EXPRESSION__ABSTRACT;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int CONJUNCTION__NAME = EXPRESSION__NAME;
+  /**
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int CONJUNCTION__SUPERCLASSES = EXPRESSION__SUPERCLASSES;
+  /**
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int CONJUNCTION__MEMBERS = EXPRESSION__MEMBERS;
+  /**
+   * The feature id for the '<em><b>Children</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int CONJUNCTION__CHILDREN = EXPRESSION_FEATURE_COUNT + 0;
+  /**
+   * The number of structural features of the '<em>Conjunction</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int CONJUNCTION_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 1;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ComparisonImpl <em>Comparison</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ComparisonImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getComparison()
+   * @generated
+   */
+  int COMPARISON = 43;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int COMPARISON__ABSTRACT = EXPRESSION__ABSTRACT;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int COMPARISON__NAME = EXPRESSION__NAME;
+  /**
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int COMPARISON__SUPERCLASSES = EXPRESSION__SUPERCLASSES;
+  /**
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int COMPARISON__MEMBERS = EXPRESSION__MEMBERS;
+  /**
+   * The feature id for the '<em><b>Left</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int COMPARISON__LEFT = EXPRESSION_FEATURE_COUNT + 0;
+  /**
+   * The feature id for the '<em><b>Op</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int COMPARISON__OP = EXPRESSION_FEATURE_COUNT + 1;
+  /**
+   * The feature id for the '<em><b>Right</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int COMPARISON__RIGHT = EXPRESSION_FEATURE_COUNT + 2;
+  /**
+   * The number of structural features of the '<em>Comparison</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int COMPARISON_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 3;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BinaryExpressionImpl <em>Binary Expression</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.BinaryExpressionImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBinaryExpression()
+   * @generated
+   */
+  int BINARY_EXPRESSION = 44;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BINARY_EXPRESSION__ABSTRACT = EXPRESSION__ABSTRACT;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BINARY_EXPRESSION__NAME = EXPRESSION__NAME;
+  /**
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BINARY_EXPRESSION__SUPERCLASSES = EXPRESSION__SUPERCLASSES;
+  /**
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BINARY_EXPRESSION__MEMBERS = EXPRESSION__MEMBERS;
+  /**
+   * The feature id for the '<em><b>Left</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BINARY_EXPRESSION__LEFT = EXPRESSION_FEATURE_COUNT + 0;
+  /**
+   * The feature id for the '<em><b>Op</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BINARY_EXPRESSION__OP = EXPRESSION_FEATURE_COUNT + 1;
+  /**
+   * The feature id for the '<em><b>Right</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BINARY_EXPRESSION__RIGHT = EXPRESSION_FEATURE_COUNT + 2;
+  /**
+   * The number of structural features of the '<em>Binary Expression</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int BINARY_EXPRESSION_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 3;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.UnaryExpressionImpl <em>Unary Expression</em>}' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.UnaryExpressionImpl
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getUnaryExpression()
+   * @generated
+   */
+  int UNARY_EXPRESSION = 45;
+  /**
+   * The feature id for the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int UNARY_EXPRESSION__ABSTRACT = EXPRESSION__ABSTRACT;
+  /**
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int UNARY_EXPRESSION__NAME = EXPRESSION__NAME;
+  /**
+   * The feature id for the '<em><b>Superclasses</b></em>' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int UNARY_EXPRESSION__SUPERCLASSES = EXPRESSION__SUPERCLASSES;
+  /**
+   * The feature id for the '<em><b>Members</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int UNARY_EXPRESSION__MEMBERS = EXPRESSION__MEMBERS;
+  /**
+   * The feature id for the '<em><b>Op</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int UNARY_EXPRESSION__OP = EXPRESSION_FEATURE_COUNT + 0;
+  /**
+   * The feature id for the '<em><b>Body</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int UNARY_EXPRESSION__BODY = EXPRESSION_FEATURE_COUNT + 1;
+  /**
+   * The number of structural features of the '<em>Unary Expression</em>' class.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   * @ordered
+   */
+  int UNARY_EXPRESSION_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 2;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.MetricType <em>Metric Type</em>}' enum.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.MetricType
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getMetricType()
+   * @generated
+   */
+  int METRIC_TYPE = 46;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.BinaryOperator <em>Binary Operator</em>}' enum.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BinaryOperator
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBinaryOperator()
+   * @generated
+   */
+  int BINARY_OPERATOR = 47;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.UnaryOp <em>Unary Op</em>}' enum.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.UnaryOp
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getUnaryOp()
+   * @generated
+   */
+  int UNARY_OP = 48;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.AggregationOp <em>Aggregation Op</em>}' enum.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.AggregationOp
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getAggregationOp()
+   * @generated
+   */
+  int AGGREGATION_OP = 49;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.LogicValue <em>Logic Value</em>}' enum.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.LogicValue
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getLogicValue()
+   * @generated
+   */
+  int LOGIC_VALUE = 50;
+  /**
+   * The meta object id for the '{@link org.eclipse.viatra.solver.language.solverLanguage.ObjectiveKind <em>Objective Kind</em>}' enum.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ObjectiveKind
+   * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getObjectiveKind()
+   * @generated
+   */
+  int OBJECTIVE_KIND = 51;
  /**
@@ -1474,525 +2852,633 @@ public interface SolverLanguagePackage extends EPackage
  EClass getStatement();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.BooleanValue <em>Boolean Value</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.Statement#isAbstract <em>Abstract</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Boolean Value</em>'.
+   * @return the meta object for the attribute '<em>Abstract</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.BooleanValue
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Statement#isAbstract()
+   * @see #getStatement()
   * @generated
   */
-  EClass getBooleanValue();
+  EAttribute getStatement_Abstract();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.TruthValue <em>Truth Value</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.Statement#getName <em>Name</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Truth Value</em>'.
+   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.TruthValue
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Statement#getName()
+   * @see #getStatement()
   * @generated
   */
-  EClass getTruthValue();
+  EAttribute getStatement_Name();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Interpretation <em>Interpretation</em>}'.
+   * Returns the meta object for the reference list '{@link org.eclipse.viatra.solver.language.solverLanguage.Statement#getSuperclasses <em>Superclasses</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Interpretation</em>'.
+   * @return the meta object for the reference list '<em>Superclasses</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Interpretation
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Statement#getSuperclasses()
+   * @see #getStatement()
   * @generated
   */
-  EClass getInterpretation();
+  EReference getStatement_Superclasses();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation <em>Basic Interpretation</em>}'.
+   * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.solverLanguage.Statement#getMembers <em>Members</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Basic Interpretation</em>'.
+   * @return the meta object for the containment reference list '<em>Members</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Statement#getMembers()
+   * @see #getStatement()
   * @generated
   */
-  EClass getBasicInterpretation();
+  EReference getStatement_Members();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation#getSymbol <em>Symbol</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition <em>Predicate Definition</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Symbol</em>'.
+   * @return the meta object for class '<em>Predicate Definition</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation#getSymbol()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition
-   * @see #getBasicInterpretation()
   * @generated
   */
-  EReference getBasicInterpretation_Symbol();
+  EClass getPredicateDefinition();
  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation#getObjects <em>Objects</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition#getHead <em>Head</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Objects</em>'.
+   * @return the meta object for the containment reference '<em>Head</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation#getObjects()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition#getHead()
-   * @see #getBasicInterpretation()
+   * @see #getPredicateDefinition()
   * @generated
   */
-  EReference getBasicInterpretation_Objects();
+  EReference getPredicateDefinition_Head();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation#getValue <em>Value</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition#getBody <em>Body</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Value</em>'.
+   * @return the meta object for the containment reference '<em>Body</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation#getValue()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition#getBody()
-   * @see #getBasicInterpretation()
+   * @see #getPredicateDefinition()
   * @generated
   */
-  EReference getBasicInterpretation_Value();
+  EReference getPredicateDefinition_Body();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Symbol <em>Symbol</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition#isFunctional <em>Functional</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Symbol</em>'.
+   * @return the meta object for the attribute '<em>Functional</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Symbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition#isFunctional()
+   * @see #getPredicateDefinition()
   * @generated
   */
-  EClass getSymbol();
+  EAttribute getPredicateDefinition_Functional();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol <em>Model Symbol</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition#isError <em>Error</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Model Symbol</em>'.
+   * @return the meta object for the attribute '<em>Error</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition#isError()
+   * @see #getPredicateDefinition()
   * @generated
   */
-  EClass getModelSymbol();
+  EAttribute getPredicateDefinition_Error();
  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol#getName <em>Name</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.UnnamedErrorPrediateDefinition <em>Unnamed Error Prediate Definition</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
+   * @return the meta object for class '<em>Unnamed Error Prediate Definition</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol#getName()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.UnnamedErrorPrediateDefinition
-   * @see #getModelSymbol()
   * @generated
   */
-  EAttribute getModelSymbol_Name();
+  EClass getUnnamedErrorPrediateDefinition();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.PartialitySymbol <em>Partiality Symbol</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.UnnamedErrorPrediateDefinition#getArgumentList <em>Argument List</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Partiality Symbol</em>'.
+   * @return the meta object for the containment reference '<em>Argument List</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.PartialitySymbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.UnnamedErrorPrediateDefinition#getArgumentList()
+   * @see #getUnnamedErrorPrediateDefinition()
   * @generated
   */
-  EClass getPartialitySymbol();
+  EReference getUnnamedErrorPrediateDefinition_ArgumentList();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.ExistSymbol <em>Exist Symbol</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.UnnamedErrorPrediateDefinition#getBody <em>Body</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Exist Symbol</em>'.
+   * @return the meta object for the containment reference '<em>Body</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.ExistSymbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.UnnamedErrorPrediateDefinition#getBody()
+   * @see #getUnnamedErrorPrediateDefinition()
   * @generated
   */
-  EClass getExistSymbol();
+  EReference getUnnamedErrorPrediateDefinition_Body();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.EqualsSymbol <em>Equals Symbol</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.DefaultDefinition <em>Default Definition</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Equals Symbol</em>'.
+   * @return the meta object for class '<em>Default Definition</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.EqualsSymbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.DefaultDefinition
   * @generated
   */
-  EClass getEqualsSymbol();
+  EClass getDefaultDefinition();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.DataSymbol <em>Data Symbol</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.DefaultDefinition#getHead <em>Head</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Data Symbol</em>'.
+   * @return the meta object for the containment reference '<em>Head</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.DataSymbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.DefaultDefinition#getHead()
+   * @see #getDefaultDefinition()
   * @generated
   */
-  EClass getDataSymbol();
+  EReference getDefaultDefinition_Head();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.BooleanSymbol <em>Boolean Symbol</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.DefaultDefinition#getRange <em>Range</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Boolean Symbol</em>'.
+   * @return the meta object for the containment reference '<em>Range</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.BooleanSymbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.DefaultDefinition#getRange()
+   * @see #getDefaultDefinition()
   * @generated
   */
-  EClass getBooleanSymbol();
+  EReference getDefaultDefinition_Range();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.IntegerSymbol <em>Integer Symbol</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.ExternPredicateDefinition <em>Extern Predicate Definition</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Integer Symbol</em>'.
+   * @return the meta object for class '<em>Extern Predicate Definition</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.IntegerSymbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ExternPredicateDefinition
   * @generated
   */
-  EClass getIntegerSymbol();
+  EClass getExternPredicateDefinition();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.RealSymbol <em>Real Symbol</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.ExternPredicateDefinition#getHead <em>Head</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Real Symbol</em>'.
+   * @return the meta object for the containment reference '<em>Head</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.RealSymbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ExternPredicateDefinition#getHead()
+   * @see #getExternPredicateDefinition()
   * @generated
   */
-  EClass getRealSymbol();
+  EReference getExternPredicateDefinition_Head();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.StringSymbol <em>String Symbol</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.MetricDefinition <em>Metric Definition</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>String Symbol</em>'.
+   * @return the meta object for class '<em>Metric Definition</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.StringSymbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.MetricDefinition
   * @generated
   */
-  EClass getStringSymbol();
+  EClass getMetricDefinition();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.ComplexObject <em>Complex Object</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.MetricDefinition#getHead <em>Head</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Complex Object</em>'.
+   * @return the meta object for the containment reference '<em>Head</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.ComplexObject
+   * @see org.eclipse.viatra.solver.language.solverLanguage.MetricDefinition#getHead()
+   * @see #getMetricDefinition()
   * @generated
   */
-  EClass getComplexObject();
+  EReference getMetricDefinition_Head();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Object <em>Object</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.MetricDefinition#getBody <em>Body</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Object</em>'.
+   * @return the meta object for the containment reference '<em>Body</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Object
+   * @see org.eclipse.viatra.solver.language.solverLanguage.MetricDefinition#getBody()
+   * @see #getMetricDefinition()
   * @generated
   */
-  EClass getObject();
+  EReference getMetricDefinition_Body();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.NamedObject <em>Named Object</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.MetricDefinition#getType <em>Type</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Named Object</em>'.
+   * @return the meta object for the attribute '<em>Type</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.NamedObject
+   * @see org.eclipse.viatra.solver.language.solverLanguage.MetricDefinition#getType()
+   * @see #getMetricDefinition()
   * @generated
   */
-  EClass getNamedObject();
+  EAttribute getMetricDefinition_Type();
  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.NamedObject#getName <em>Name</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.ExternMetricDefinition <em>Extern Metric Definition</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
+   * @return the meta object for class '<em>Extern Metric Definition</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.NamedObject#getName()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ExternMetricDefinition
-   * @see #getNamedObject()
   * @generated
   */
-  EAttribute getNamedObject_Name();
+  EClass getExternMetricDefinition();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.UnnamedObject <em>Unnamed Object</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.ExternMetricDefinition#getType <em>Type</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Unnamed Object</em>'.
+   * @return the meta object for the attribute '<em>Type</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.UnnamedObject
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ExternMetricDefinition#getType()
+   * @see #getExternMetricDefinition()
   * @generated
   */
-  EClass getUnnamedObject();
+  EAttribute getExternMetricDefinition_Type();
  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.UnnamedObject#getName <em>Name</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.ExternMetricDefinition#getHead <em>Head</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Name</em>'.
+   * @return the meta object for the containment reference '<em>Head</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.UnnamedObject#getName()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ExternMetricDefinition#getHead()
-   * @see #getUnnamedObject()
+   * @see #getExternMetricDefinition()
   * @generated
   */
-  EAttribute getUnnamedObject_Name();
+  EReference getExternMetricDefinition_Head();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.DataObject <em>Data Object</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Expression <em>Expression</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Data Object</em>'.
+   * @return the meta object for class '<em>Expression</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.DataObject
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Expression
   * @generated
   */
-  EClass getDataObject();
+  EClass getExpression();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.BooleanObject <em>Boolean Object</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.IfElse <em>If Else</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Boolean Object</em>'.
+   * @return the meta object for class '<em>If Else</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.BooleanObject
+   * @see org.eclipse.viatra.solver.language.solverLanguage.IfElse
   * @generated
   */
-  EClass getBooleanObject();
+  EClass getIfElse();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.BooleanObject#getValue <em>Value</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.IfElse#getCondition <em>Condition</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Value</em>'.
+   * @return the meta object for the containment reference '<em>Condition</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.BooleanObject#getValue()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.IfElse#getCondition()
-   * @see #getBooleanObject()
+   * @see #getIfElse()
   * @generated
   */
-  EReference getBooleanObject_Value();
+  EReference getIfElse_Condition();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.IntObject <em>Int Object</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.IfElse#getThen <em>Then</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Int Object</em>'.
+   * @return the meta object for the containment reference '<em>Then</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.IntObject
+   * @see org.eclipse.viatra.solver.language.solverLanguage.IfElse#getThen()
+   * @see #getIfElse()
   * @generated
   */
-  EClass getIntObject();
+  EReference getIfElse_Then();
  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.IntObject#getValue <em>Value</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.IfElse#getElse <em>Else</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Value</em>'.
+   * @return the meta object for the containment reference '<em>Else</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.IntObject#getValue()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.IfElse#getElse()
-   * @see #getIntObject()
+   * @see #getIfElse()
   * @generated
   */
-  EAttribute getIntObject_Value();
+  EReference getIfElse_Else();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.RealObject <em>Real Object</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Case <em>Case</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Real Object</em>'.
+   * @return the meta object for class '<em>Case</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.RealObject
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Case
   * @generated
   */
-  EClass getRealObject();
+  EClass getCase();
  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.RealObject#getValue <em>Value</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Case#getCondition <em>Condition</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Value</em>'.
+   * @return the meta object for the containment reference '<em>Condition</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.RealObject#getValue()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Case#getCondition()
-   * @see #getRealObject()
+   * @see #getCase()
   * @generated
   */
-  EAttribute getRealObject_Value();
+  EReference getCase_Condition();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.StringObject <em>String Object</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Case#getBody <em>Body</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>String Object</em>'.
+   * @return the meta object for the containment reference '<em>Body</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.StringObject
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Case#getBody()
+   * @see #getCase()
   * @generated
   */
-  EClass getStringObject();
+  EReference getCase_Body();
  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.StringObject#getValue <em>Value</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Count <em>Count</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Value</em>'.
+   * @return the meta object for class '<em>Count</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.StringObject#getValue()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Count
-   * @see #getStringObject()
+   * @generated
+   */
+  EClass getCount();
+  /**
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Count#getBody <em>Body</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference '<em>Body</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Count#getBody()
+   * @see #getCount()
+   * @generated
+   */
+  EReference getCount_Body();
+  /**
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Aggregation <em>Aggregation</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Aggregation</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Aggregation
+   * @generated
+   */
+  EClass getAggregation();
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.Aggregation#getOp <em>Op</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Op</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Aggregation#getOp()
+   * @see #getAggregation()
+   * @generated
+   */
+  EAttribute getAggregation_Op();
+  /**
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Aggregation#getBody <em>Body</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference '<em>Body</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Aggregation#getBody()
+   * @see #getAggregation()
+   * @generated
+   */
+  EReference getAggregation_Body();
+  /**
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Aggregation#getCondition <em>Condition</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference '<em>Condition</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Aggregation#getCondition()
+   * @see #getAggregation()
   * @generated
   */
-  EAttribute getStringObject_Value();
+  EReference getAggregation_Condition();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate <em>Predicate</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Call <em>Call</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Predicate</em>'.
+   * @return the meta object for class '<em>Call</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Predicate
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Call
   * @generated
   */
-  EClass getPredicate();
+  EClass getCall();
  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#isIsError <em>Is Error</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Call#getFunctor <em>Functor</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Is Error</em>'.
+   * @return the meta object for the containment reference '<em>Functor</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Predicate#isIsError()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Call#getFunctor()
-   * @see #getPredicate()
+   * @see #getCall()
   * @generated
   */
-  EAttribute getPredicate_IsError();
+  EReference getCall_Functor();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#getSymbol <em>Symbol</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Call#getArgumentList <em>Argument List</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Symbol</em>'.
+   * @return the meta object for the containment reference '<em>Argument List</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Predicate#getSymbol()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Call#getArgumentList()
-   * @see #getPredicate()
+   * @see #getCall()
   * @generated
   */
-  EReference getPredicate_Symbol();
+  EReference getCall_ArgumentList();
  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#getParameters <em>Parameters</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.Call#isTransitiveClosure <em>Transitive Closure</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Parameters</em>'.
+   * @return the meta object for the attribute '<em>Transitive Closure</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Predicate#getParameters()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Call#isTransitiveClosure()
-   * @see #getPredicate()
+   * @see #getCall()
   * @generated
   */
-  EReference getPredicate_Parameters();
+  EAttribute getCall_TransitiveClosure();
  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate#getBodies <em>Bodies</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.Call#isReflexiveTransitiveClosure <em>Reflexive Transitive Closure</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Bodies</em>'.
+   * @return the meta object for the attribute '<em>Reflexive Transitive Closure</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Predicate#getBodies()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Call#isReflexiveTransitiveClosure()
-   * @see #getPredicate()
+   * @see #getCall()
   * @generated
   */
-  EReference getPredicate_Bodies();
+  EAttribute getCall_ReflexiveTransitiveClosure();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Parameter <em>Parameter</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.ArgumentList <em>Argument List</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Parameter</em>'.
+   * @return the meta object for class '<em>Argument List</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Parameter
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ArgumentList
   * @generated
   */
-  EClass getParameter();
+  EClass getArgumentList();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Parameter#getVariable <em>Variable</em>}'.
+   * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.solverLanguage.ArgumentList#getArguments <em>Arguments</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Variable</em>'.
+   * @return the meta object for the containment reference list '<em>Arguments</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Parameter#getVariable()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ArgumentList#getArguments()
-   * @see #getParameter()
+   * @see #getArgumentList()
   * @generated
   */
-  EReference getParameter_Variable();
+  EReference getArgumentList_Arguments();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Parameter#getType <em>Type</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Argument <em>Argument</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Type</em>'.
+   * @return the meta object for class '<em>Argument</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Parameter#getType()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Argument
-   * @see #getParameter()
   * @generated
   */
-  EReference getParameter_Type();
+  EClass getArgument();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.PatternBody <em>Pattern Body</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.ExpressionArgument <em>Expression Argument</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Pattern Body</em>'.
+   * @return the meta object for class '<em>Expression Argument</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.PatternBody
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ExpressionArgument
   * @generated
   */
-  EClass getPatternBody();
+  EClass getExpressionArgument();
  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.solverLanguage.PatternBody#getConstraints <em>Constraints</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.ExpressionArgument#getBody <em>Body</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Constraints</em>'.
+   * @return the meta object for the containment reference '<em>Body</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.PatternBody#getConstraints()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ExpressionArgument#getBody()
-   * @see #getPatternBody()
+   * @see #getExpressionArgument()
   * @generated
   */
-  EReference getPatternBody_Constraints();
+  EReference getExpressionArgument_Body();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Polarity <em>Polarity</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.StarArgument <em>Star Argument</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Polarity</em>'.
+   * @return the meta object for class '<em>Star Argument</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Polarity
+   * @see org.eclipse.viatra.solver.language.solverLanguage.StarArgument
   * @generated
   */
-  EClass getPolarity();
+  EClass getStarArgument();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Constraint <em>Constraint</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.TypedArgument <em>Typed Argument</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Constraint</em>'.
+   * @return the meta object for class '<em>Typed Argument</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Constraint
+   * @see org.eclipse.viatra.solver.language.solverLanguage.TypedArgument
   * @generated
   */
-  EClass getConstraint();
+  EClass getTypedArgument();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Constraint#getPolarity <em>Polarity</em>}'.
+   * Returns the meta object for the reference '{@link org.eclipse.viatra.solver.language.solverLanguage.TypedArgument#getType <em>Type</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Polarity</em>'.
+   * @return the meta object for the reference '<em>Type</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Constraint#getPolarity()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.TypedArgument#getType()
-   * @see #getConstraint()
+   * @see #getTypedArgument()
   * @generated
   */
-  EReference getConstraint_Polarity();
+  EReference getTypedArgument_Type();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Constraint#getSymbol <em>Symbol</em>}'.
+   * Returns the meta object for the reference '{@link org.eclipse.viatra.solver.language.solverLanguage.TypedArgument#getVariable <em>Variable</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Symbol</em>'.
+   * @return the meta object for the reference '<em>Variable</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Constraint#getSymbol()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.TypedArgument#getVariable()
-   * @see #getConstraint()
+   * @see #getTypedArgument()
   * @generated
   */
-  EReference getConstraint_Symbol();
+  EReference getTypedArgument_Variable();
  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.solverLanguage.Constraint#getParams <em>Params</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.TypedStarArgument <em>Typed Star Argument</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Params</em>'.
+   * @return the meta object for class '<em>Typed Star Argument</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Constraint#getParams()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.TypedStarArgument
-   * @see #getConstraint()
   * @generated
   */
-  EReference getConstraint_Params();
+  EClass getTypedStarArgument();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Constraint#getClosureType <em>Closure Type</em>}'.
+   * Returns the meta object for the reference '{@link org.eclipse.viatra.solver.language.solverLanguage.TypedStarArgument#getType <em>Type</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Closure Type</em>'.
+   * @return the meta object for the reference '<em>Type</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Constraint#getClosureType()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.TypedStarArgument#getType()
-   * @see #getConstraint()
+   * @see #getTypedStarArgument()
   * @generated
   */
-  EReference getConstraint_ClosureType();
+  EReference getTypedStarArgument_Type();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.ClosureType <em>Closure Type</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Reference <em>Reference</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Closure Type</em>'.
+   * @return the meta object for class '<em>Reference</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.ClosureType
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Reference
   * @generated
   */
-  EClass getClosureType();
+  EClass getReference();
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Reference#getReferred <em>Referred</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference '<em>Referred</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Reference#getReferred()
+   * @see #getReference()
+   * @generated
+   */
+  EReference getReference_Referred();
+  /**
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Interval <em>Interval</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Interval</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Interval
+   * @generated
+   */
+  EClass getInterval();
+  /**
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Interval#getLowerBound <em>Lower Bound</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference '<em>Lower Bound</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Interval#getLowerBound()
+   * @see #getInterval()
+   * @generated
+   */
+  EReference getInterval_LowerBound();
+  /**
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Interval#getUpperBound <em>Upper Bound</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference '<em>Upper Bound</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Interval#getUpperBound()
+   * @see #getInterval()
+   * @generated
+   */
+  EReference getInterval_UpperBound();
  /**
   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Literal <em>Literal</em>}'.
@@ -2005,446 +3491,646 @@ public interface SolverLanguagePackage extends EPackage
  EClass getLiteral();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Variable <em>Variable</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.LogicLiteral <em>Logic Literal</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Variable</em>'.
+   * @return the meta object for class '<em>Logic Literal</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Variable
+   * @see org.eclipse.viatra.solver.language.solverLanguage.LogicLiteral
   * @generated
   */
-  EClass getVariable();
+  EClass getLogicLiteral();
  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.Variable#getName <em>Name</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.LogicLiteral#getValue <em>Value</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Value</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.LogicLiteral#getValue()
+   * @see #getLogicLiteral()
+   * @generated
+   */
+  EAttribute getLogicLiteral_Value();
+  /**
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.NumericLiteral <em>Numeric Literal</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Numeric Literal</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.NumericLiteral
+   * @generated
+   */
+  EClass getNumericLiteral();
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.NumericLiteral#getValue <em>Value</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Value</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.NumericLiteral#getValue()
+   * @see #getNumericLiteral()
+   * @generated
+   */
+  EAttribute getNumericLiteral_Value();
+  /**
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.InfinityLiteral <em>Infinity Literal</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Infinity Literal</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.InfinityLiteral
+   * @generated
+   */
+  EClass getInfinityLiteral();
+  /**
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.EmptyIntervalLiteral <em>Empty Interval Literal</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Empty Interval Literal</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.EmptyIntervalLiteral
+   * @generated
+   */
+  EClass getEmptyIntervalLiteral();
+  /**
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.StringLiteral <em>String Literal</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>String Literal</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.StringLiteral
+   * @generated
+   */
+  EClass getStringLiteral();
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.StringLiteral#getValue <em>Value</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Value</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.StringLiteral#getValue()
+   * @see #getStringLiteral()
+   * @generated
+   */
+  EAttribute getStringLiteral_Value();
+  /**
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition <em>Member Definition</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Member Definition</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition
+   * @generated
+   */
+  EClass getMemberDefinition();
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#isContainment <em>Containment</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Containment</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#isContainment()
+   * @see #getMemberDefinition()
+   * @generated
+   */
+  EAttribute getMemberDefinition_Containment();
+  /**
+   * Returns the meta object for the reference '{@link org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#getType <em>Type</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the reference '<em>Type</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#getType()
+   * @see #getMemberDefinition()
+   * @generated
+   */
+  EReference getMemberDefinition_Type();
+  /**
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#getMultiplicity <em>Multiplicity</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference '<em>Multiplicity</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#getMultiplicity()
+   * @see #getMemberDefinition()
+   * @generated
+   */
+  EReference getMemberDefinition_Multiplicity();
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#getName <em>Name</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @return the meta object for the attribute '<em>Name</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Variable#getName()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#getName()
-   * @see #getVariable()
+   * @see #getMemberDefinition()
   * @generated
   */
-  EAttribute getVariable_Name();
+  EAttribute getMemberDefinition_Name();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.AllInstances <em>All Instances</em>}'.
+   * Returns the meta object for the reference '{@link org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#getOpposite <em>Opposite</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>All Instances</em>'.
+   * @return the meta object for the reference '<em>Opposite</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.AllInstances
+   * @see org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition#getOpposite()
+   * @see #getMemberDefinition()
   * @generated
   */
-  EClass getAllInstances();
+  EReference getMemberDefinition_Opposite();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.AllInstances#getSymbol <em>Symbol</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Multiplicity <em>Multiplicity</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Symbol</em>'.
+   * @return the meta object for class '<em>Multiplicity</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.AllInstances#getSymbol()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Multiplicity
-   * @see #getAllInstances()
   * @generated
   */
-  EReference getAllInstances_Symbol();
+  EClass getMultiplicity();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.AllObjects <em>All Objects</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.ManyMultiplicity <em>Many Multiplicity</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>All Objects</em>'.
+   * @return the meta object for class '<em>Many Multiplicity</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.AllObjects
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ManyMultiplicity
   * @generated
   */
-  EClass getAllObjects();
+  EClass getManyMultiplicity();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation <em>Default Interpretation</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.ExactMultiplicity <em>Exact Multiplicity</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Default Interpretation</em>'.
+   * @return the meta object for class '<em>Exact Multiplicity</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ExactMultiplicity
   * @generated
   */
-  EClass getDefaultInterpretation();
+  EClass getExactMultiplicity();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation#getInterpretation <em>Interpretation</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.ExactMultiplicity#getMultiplicity <em>Multiplicity</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Interpretation</em>'.
+   * @return the meta object for the attribute '<em>Multiplicity</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation#getInterpretation()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ExactMultiplicity#getMultiplicity()
-   * @see #getDefaultInterpretation()
+   * @see #getExactMultiplicity()
   * @generated
   */
-  EReference getDefaultInterpretation_Interpretation();
+  EAttribute getExactMultiplicity_Multiplicity();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.CDInterpretation <em>CD Interpretation</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.BoundedMultiplicity <em>Bounded Multiplicity</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>CD Interpretation</em>'.
+   * @return the meta object for class '<em>Bounded Multiplicity</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.CDInterpretation
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BoundedMultiplicity
   * @generated
   */
-  EClass getCDInterpretation();
+  EClass getBoundedMultiplicity();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation <em>Class Interpretation</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.BoundedMultiplicity#getLowerBound <em>Lower Bound</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Class Interpretation</em>'.
+   * @return the meta object for the attribute '<em>Lower Bound</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BoundedMultiplicity#getLowerBound()
+   * @see #getBoundedMultiplicity()
   * @generated
   */
-  EClass getClassInterpretation();
+  EAttribute getBoundedMultiplicity_LowerBound();
  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation#isAbstract <em>Abstract</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.BoundedMultiplicity#getUpperBound <em>Upper Bound</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Abstract</em>'.
+   * @return the meta object for the attribute '<em>Upper Bound</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation#isAbstract()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BoundedMultiplicity#getUpperBound()
-   * @see #getClassInterpretation()
+   * @see #getBoundedMultiplicity()
   * @generated
   */
-  EAttribute getClassInterpretation_Abstract();
+  EAttribute getBoundedMultiplicity_UpperBound();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation#getSymbol <em>Symbol</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.ScopeDefinition <em>Scope Definition</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Symbol</em>'.
+   * @return the meta object for class '<em>Scope Definition</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation#getSymbol()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ScopeDefinition
-   * @see #getClassInterpretation()
   * @generated
   */
-  EReference getClassInterpretation_Symbol();
+  EClass getScopeDefinition();
  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation#getSupertypes <em>Supertypes</em>}'.
+   * Returns the meta object for the reference '{@link org.eclipse.viatra.solver.language.solverLanguage.ScopeDefinition#getType <em>Type</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Supertypes</em>'.
+   * @return the meta object for the reference '<em>Type</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation#getSupertypes()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ScopeDefinition#getType()
-   * @see #getClassInterpretation()
+   * @see #getScopeDefinition()
   * @generated
   */
-  EReference getClassInterpretation_Supertypes();
+  EReference getScopeDefinition_Type();
  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation#getFielt <em>Fielt</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.ExactScopeDefinition <em>Exact Scope Definition</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Fielt</em>'.
+   * @return the meta object for class '<em>Exact Scope Definition</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation#getFielt()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ExactScopeDefinition
-   * @see #getClassInterpretation()
   * @generated
   */
-  EReference getClassInterpretation_Fielt();
+  EClass getExactScopeDefinition();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation <em>Enum Interpretation</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.ExactScopeDefinition#getExactScope <em>Exact Scope</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Enum Interpretation</em>'.
+   * @return the meta object for the attribute '<em>Exact Scope</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ExactScopeDefinition#getExactScope()
+   * @see #getExactScopeDefinition()
   * @generated
   */
-  EClass getEnumInterpretation();
+  EAttribute getExactScopeDefinition_ExactScope();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation#getSymbol <em>Symbol</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.BoundedScopeDefinition <em>Bounded Scope Definition</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Symbol</em>'.
+   * @return the meta object for class '<em>Bounded Scope Definition</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation#getSymbol()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BoundedScopeDefinition
-   * @see #getEnumInterpretation()
   * @generated
   */
-  EReference getEnumInterpretation_Symbol();
+  EClass getBoundedScopeDefinition();
  /**
-   * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation#getObjects <em>Objects</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.BoundedScopeDefinition#getLowerBound <em>Lower Bound</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Objects</em>'.
+   * @return the meta object for the attribute '<em>Lower Bound</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation#getObjects()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BoundedScopeDefinition#getLowerBound()
-   * @see #getEnumInterpretation()
+   * @see #getBoundedScopeDefinition()
   * @generated
   */
-  EReference getEnumInterpretation_Objects();
+  EAttribute getBoundedScopeDefinition_LowerBound();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation <em>Field Relation Interpretation</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.BoundedScopeDefinition#getUpperBound <em>Upper Bound</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Field Relation Interpretation</em>'.
+   * @return the meta object for the attribute '<em>Upper Bound</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BoundedScopeDefinition#getUpperBound()
+   * @see #getBoundedScopeDefinition()
   * @generated
   */
-  EClass getFieldRelationInterpretation();
+  EAttribute getBoundedScopeDefinition_UpperBound();
  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation#isContainment <em>Containment</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.LowerBoundedScopeDefinition <em>Lower Bounded Scope Definition</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Containment</em>'.
+   * @return the meta object for class '<em>Lower Bounded Scope Definition</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation#isContainment()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.LowerBoundedScopeDefinition
-   * @see #getFieldRelationInterpretation()
   * @generated
   */
-  EAttribute getFieldRelationInterpretation_Containment();
+  EClass getLowerBoundedScopeDefinition();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation#getSymbol <em>Symbol</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.LowerBoundedScopeDefinition#getLowerBound <em>Lower Bound</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Symbol</em>'.
+   * @return the meta object for the attribute '<em>Lower Bound</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation#getSymbol()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.LowerBoundedScopeDefinition#getLowerBound()
-   * @see #getFieldRelationInterpretation()
+   * @see #getLowerBoundedScopeDefinition()
   * @generated
   */
-  EReference getFieldRelationInterpretation_Symbol();
+  EAttribute getLowerBoundedScopeDefinition_LowerBound();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation#getMultiplicity <em>Multiplicity</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.ObjectiveDefinition <em>Objective Definition</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Multiplicity</em>'.
+   * @return the meta object for class '<em>Objective Definition</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation#getMultiplicity()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ObjectiveDefinition
-   * @see #getFieldRelationInterpretation()
   * @generated
   */
-  EReference getFieldRelationInterpretation_Multiplicity();
+  EClass getObjectiveDefinition();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation#getTarget <em>Target</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.ObjectiveDefinition#getKind <em>Kind</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Target</em>'.
+   * @return the meta object for the attribute '<em>Kind</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation#getTarget()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ObjectiveDefinition#getKind()
-   * @see #getFieldRelationInterpretation()
+   * @see #getObjectiveDefinition()
   * @generated
   */
-  EReference getFieldRelationInterpretation_Target();
+  EAttribute getObjectiveDefinition_Kind();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation <em>Global Relation Interpretation</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.ObjectiveDefinition#getObjective <em>Objective</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Global Relation Interpretation</em>'.
+   * @return the meta object for the containment reference '<em>Objective</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ObjectiveDefinition#getObjective()
+   * @see #getObjectiveDefinition()
   * @generated
   */
-  EClass getGlobalRelationInterpretation();
+  EReference getObjectiveDefinition_Objective();
  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#isContainment <em>Containment</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.NamedElement <em>Named Element</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Containment</em>'.
+   * @return the meta object for class '<em>Named Element</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#isContainment()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.NamedElement
-   * @see #getGlobalRelationInterpretation()
+   * @generated
+   */
+  EClass getNamedElement();
+  /**
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.NamedElement#getName <em>Name</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the attribute '<em>Name</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.NamedElement#getName()
+   * @see #getNamedElement()
+   * @generated
+   */
+  EAttribute getNamedElement_Name();
+  /**
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Assertion <em>Assertion</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Assertion</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Assertion
+   * @generated
+   */
+  EClass getAssertion();
+  /**
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Assertion#getBody <em>Body</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference '<em>Body</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Assertion#getBody()
+   * @see #getAssertion()
+   * @generated
+   */
+  EReference getAssertion_Body();
+  /**
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Assertion#getRange <em>Range</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference '<em>Range</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Assertion#getRange()
+   * @see #getAssertion()
+   * @generated
+   */
+  EReference getAssertion_Range();
+  /**
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Disjunction <em>Disjunction</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Disjunction</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Disjunction
+   * @generated
+   */
+  EClass getDisjunction();
+  /**
+   * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.solverLanguage.Disjunction#getChildren <em>Children</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>Children</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Disjunction#getChildren()
+   * @see #getDisjunction()
+   * @generated
+   */
+  EReference getDisjunction_Children();
+  /**
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Switch <em>Switch</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for class '<em>Switch</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Switch
+   * @generated
+   */
+  EClass getSwitch();
+  /**
+   * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.solverLanguage.Switch#getCases <em>Cases</em>}'.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the meta object for the containment reference list '<em>Cases</em>'.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Switch#getCases()
+   * @see #getSwitch()
   * @generated
   */
-  EAttribute getGlobalRelationInterpretation_Containment();
+  EReference getSwitch_Cases();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getSymbol <em>Symbol</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Conjunction <em>Conjunction</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Symbol</em>'.
+   * @return the meta object for class '<em>Conjunction</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getSymbol()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Conjunction
-   * @see #getGlobalRelationInterpretation()
   * @generated
   */
-  EReference getGlobalRelationInterpretation_Symbol();
+  EClass getConjunction();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getSourceMultiplicity <em>Source Multiplicity</em>}'.
+   * Returns the meta object for the containment reference list '{@link org.eclipse.viatra.solver.language.solverLanguage.Conjunction#getChildren <em>Children</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Source Multiplicity</em>'.
+   * @return the meta object for the containment reference list '<em>Children</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getSourceMultiplicity()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Conjunction#getChildren()
-   * @see #getGlobalRelationInterpretation()
+   * @see #getConjunction()
   * @generated
   */
-  EReference getGlobalRelationInterpretation_SourceMultiplicity();
+  EReference getConjunction_Children();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getSource <em>Source</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Comparison <em>Comparison</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Source</em>'.
+   * @return the meta object for class '<em>Comparison</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getSource()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Comparison
-   * @see #getGlobalRelationInterpretation()
   * @generated
   */
-  EReference getGlobalRelationInterpretation_Source();
+  EClass getComparison();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getTargetMultiplicity <em>Target Multiplicity</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Comparison#getLeft <em>Left</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Target Multiplicity</em>'.
+   * @return the meta object for the containment reference '<em>Left</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getTargetMultiplicity()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Comparison#getLeft()
-   * @see #getGlobalRelationInterpretation()
+   * @see #getComparison()
   * @generated
   */
-  EReference getGlobalRelationInterpretation_TargetMultiplicity();
+  EReference getComparison_Left();
  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getTarget <em>Target</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.Comparison#getOp <em>Op</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Target</em>'.
+   * @return the meta object for the attribute '<em>Op</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation#getTarget()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Comparison#getOp()
-   * @see #getGlobalRelationInterpretation()
+   * @see #getComparison()
   * @generated
   */
-  EReference getGlobalRelationInterpretation_Target();
+  EAttribute getComparison_Op();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition <em>Multiplicity Definition</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.Comparison#getRight <em>Right</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Multiplicity Definition</em>'.
+   * @return the meta object for the containment reference '<em>Right</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Comparison#getRight()
+   * @see #getComparison()
   * @generated
   */
-  EClass getMultiplicityDefinition();
+  EReference getComparison_Right();
  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition#getLower <em>Lower</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression <em>Binary Expression</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Lower</em>'.
+   * @return the meta object for class '<em>Binary Expression</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition#getLower()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression
-   * @see #getMultiplicityDefinition()
   * @generated
   */
-  EAttribute getMultiplicityDefinition_Lower();
+  EClass getBinaryExpression();
  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition#getUpper <em>Upper</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression#getLeft <em>Left</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Upper</em>'.
+   * @return the meta object for the containment reference '<em>Left</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition#getUpper()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression#getLeft()
-   * @see #getMultiplicityDefinition()
+   * @see #getBinaryExpression()
   * @generated
   */
-  EAttribute getMultiplicityDefinition_Upper();
+  EReference getBinaryExpression_Left();
  /**
-   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition#isUnlimitedUpper <em>Unlimited Upper</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression#getOp <em>Op</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Unlimited Upper</em>'.
+   * @return the meta object for the attribute '<em>Op</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition#isUnlimitedUpper()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression#getOp()
-   * @see #getMultiplicityDefinition()
+   * @see #getBinaryExpression()
   * @generated
   */
-  EAttribute getMultiplicityDefinition_UnlimitedUpper();
+  EAttribute getBinaryExpression_Op();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.BooleanTrue <em>Boolean True</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression#getRight <em>Right</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Boolean True</em>'.
+   * @return the meta object for the containment reference '<em>Right</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.BooleanTrue
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression#getRight()
+   * @see #getBinaryExpression()
   * @generated
   */
-  EClass getBooleanTrue();
+  EReference getBinaryExpression_Right();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.BooleanFalse <em>Boolean False</em>}'.
+   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.UnaryExpression <em>Unary Expression</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Boolean False</em>'.
+   * @return the meta object for class '<em>Unary Expression</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.BooleanFalse
+   * @see org.eclipse.viatra.solver.language.solverLanguage.UnaryExpression
   * @generated
   */
-  EClass getBooleanFalse();
+  EClass getUnaryExpression();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.True <em>True</em>}'.
+   * Returns the meta object for the attribute '{@link org.eclipse.viatra.solver.language.solverLanguage.UnaryExpression#getOp <em>Op</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>True</em>'.
+   * @return the meta object for the attribute '<em>Op</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.True
+   * @see org.eclipse.viatra.solver.language.solverLanguage.UnaryExpression#getOp()
+   * @see #getUnaryExpression()
   * @generated
   */
-  EClass getTrue();
+  EAttribute getUnaryExpression_Op();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.False <em>False</em>}'.
+   * Returns the meta object for the containment reference '{@link org.eclipse.viatra.solver.language.solverLanguage.UnaryExpression#getBody <em>Body</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>False</em>'.
+   * @return the meta object for the containment reference '<em>Body</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.False
+   * @see org.eclipse.viatra.solver.language.solverLanguage.UnaryExpression#getBody()
+   * @see #getUnaryExpression()
   * @generated
   */
-  EClass getFalse();
+  EReference getUnaryExpression_Body();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Unknown <em>Unknown</em>}'.
+   * Returns the meta object for enum '{@link org.eclipse.viatra.solver.language.solverLanguage.MetricType <em>Metric Type</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Unknown</em>'.
+   * @return the meta object for enum '<em>Metric Type</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Unknown
+   * @see org.eclipse.viatra.solver.language.solverLanguage.MetricType
   * @generated
   */
-  EClass getUnknown();
+  EEnum getMetricType();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Error <em>Error</em>}'.
+   * Returns the meta object for enum '{@link org.eclipse.viatra.solver.language.solverLanguage.BinaryOperator <em>Binary Operator</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Error</em>'.
+   * @return the meta object for enum '<em>Binary Operator</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Error
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BinaryOperator
   * @generated
   */
-  EClass getError();
+  EEnum getBinaryOperator();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Positive <em>Positive</em>}'.
+   * Returns the meta object for enum '{@link org.eclipse.viatra.solver.language.solverLanguage.UnaryOp <em>Unary Op</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Positive</em>'.
+   * @return the meta object for enum '<em>Unary Op</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Positive
+   * @see org.eclipse.viatra.solver.language.solverLanguage.UnaryOp
   * @generated
   */
-  EClass getPositive();
+  EEnum getUnaryOp();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.Negative <em>Negative</em>}'.
+   * Returns the meta object for enum '{@link org.eclipse.viatra.solver.language.solverLanguage.AggregationOp <em>Aggregation Op</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Negative</em>'.
+   * @return the meta object for enum '<em>Aggregation Op</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Negative
+   * @see org.eclipse.viatra.solver.language.solverLanguage.AggregationOp
   * @generated
   */
-  EClass getNegative();
+  EEnum getAggregationOp();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.ReflexiveClosure <em>Reflexive Closure</em>}'.
+   * Returns the meta object for enum '{@link org.eclipse.viatra.solver.language.solverLanguage.LogicValue <em>Logic Value</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Reflexive Closure</em>'.
+   * @return the meta object for enum '<em>Logic Value</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.ReflexiveClosure
+   * @see org.eclipse.viatra.solver.language.solverLanguage.LogicValue
   * @generated
   */
-  EClass getReflexiveClosure();
+  EEnum getLogicValue();
  /**
-   * Returns the meta object for class '{@link org.eclipse.viatra.solver.language.solverLanguage.IrreflexiveClosure <em>Irreflexive Closure</em>}'.
+   * Returns the meta object for enum '{@link org.eclipse.viatra.solver.language.solverLanguage.ObjectiveKind <em>Objective Kind</em>}'.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Irreflexive Closure</em>'.
+   * @return the meta object for enum '<em>Objective Kind</em>'.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.IrreflexiveClosure
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ObjectiveKind
   * @generated
   */
-  EClass getIrreflexiveClosure();
+  EEnum getObjectiveKind();
  /**
   * Returns the factory that creates the instances of the model.
@@ -2498,462 +4184,516 @@ public interface SolverLanguagePackage extends EPackage
    EClass STATEMENT = eINSTANCE.getStatement();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanValueImpl <em>Boolean Value</em>}' class.
+     * The meta object literal for the '<em><b>Abstract</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanValueImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBooleanValue()
     * @generated
     */
-    EClass BOOLEAN_VALUE = eINSTANCE.getBooleanValue();
+    EAttribute STATEMENT__ABSTRACT = eINSTANCE.getStatement_Abstract();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.TruthValueImpl <em>Truth Value</em>}' class.
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.TruthValueImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getTruthValue()
     * @generated
     */
-    EClass TRUTH_VALUE = eINSTANCE.getTruthValue();
+    EAttribute STATEMENT__NAME = eINSTANCE.getStatement_Name();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.InterpretationImpl <em>Interpretation</em>}' class.
+     * The meta object literal for the '<em><b>Superclasses</b></em>' reference list feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.InterpretationImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getInterpretation()
     * @generated
     */
-    EClass INTERPRETATION = eINSTANCE.getInterpretation();
+    EReference STATEMENT__SUPERCLASSES = eINSTANCE.getStatement_Superclasses();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BasicInterpretationImpl <em>Basic Interpretation</em>}' class.
+     * The meta object literal for the '<em><b>Members</b></em>' containment reference list feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.BasicInterpretationImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBasicInterpretation()
     * @generated
     */
-    EClass BASIC_INTERPRETATION = eINSTANCE.getBasicInterpretation();
+    EReference STATEMENT__MEMBERS = eINSTANCE.getStatement_Members();
    /**
-     * The meta object literal for the '<em><b>Symbol</b></em>' containment reference feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateDefinitionImpl <em>Predicate Definition</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateDefinitionImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPredicateDefinition()
     * @generated
     */
-    EReference BASIC_INTERPRETATION__SYMBOL = eINSTANCE.getBasicInterpretation_Symbol();
+    EClass PREDICATE_DEFINITION = eINSTANCE.getPredicateDefinition();
    /**
-     * The meta object literal for the '<em><b>Objects</b></em>' containment reference list feature.
+     * The meta object literal for the '<em><b>Head</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EReference BASIC_INTERPRETATION__OBJECTS = eINSTANCE.getBasicInterpretation_Objects();
+    EReference PREDICATE_DEFINITION__HEAD = eINSTANCE.getPredicateDefinition_Head();
    /**
-     * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.
+     * The meta object literal for the '<em><b>Body</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EReference BASIC_INTERPRETATION__VALUE = eINSTANCE.getBasicInterpretation_Value();
+    EReference PREDICATE_DEFINITION__BODY = eINSTANCE.getPredicateDefinition_Body();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.SymbolImpl <em>Symbol</em>}' class.
+     * The meta object literal for the '<em><b>Functional</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SymbolImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getSymbol()
     * @generated
     */
-    EClass SYMBOL = eINSTANCE.getSymbol();
+    EAttribute PREDICATE_DEFINITION__FUNCTIONAL = eINSTANCE.getPredicateDefinition_Functional();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ModelSymbolImpl <em>Model Symbol</em>}' class.
+     * The meta object literal for the '<em><b>Error</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ModelSymbolImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getModelSymbol()
     * @generated
     */
-    EClass MODEL_SYMBOL = eINSTANCE.getModelSymbol();
+    EAttribute PREDICATE_DEFINITION__ERROR = eINSTANCE.getPredicateDefinition_Error();
    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.UnnamedErrorPrediateDefinitionImpl <em>Unnamed Error Prediate Definition</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.UnnamedErrorPrediateDefinitionImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getUnnamedErrorPrediateDefinition()
     * @generated
     */
-    EAttribute MODEL_SYMBOL__NAME = eINSTANCE.getModelSymbol_Name();
+    EClass UNNAMED_ERROR_PREDIATE_DEFINITION = eINSTANCE.getUnnamedErrorPrediateDefinition();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PartialitySymbolImpl <em>Partiality Symbol</em>}' class.
+     * The meta object literal for the '<em><b>Argument List</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.PartialitySymbolImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPartialitySymbol()
     * @generated
     */
-    EClass PARTIALITY_SYMBOL = eINSTANCE.getPartialitySymbol();
+    EReference UNNAMED_ERROR_PREDIATE_DEFINITION__ARGUMENT_LIST = eINSTANCE.getUnnamedErrorPrediateDefinition_ArgumentList();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExistSymbolImpl <em>Exist Symbol</em>}' class.
+     * The meta object literal for the '<em><b>Body</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ExistSymbolImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getExistSymbol()
     * @generated
     */
-    EClass EXIST_SYMBOL = eINSTANCE.getExistSymbol();
+    EReference UNNAMED_ERROR_PREDIATE_DEFINITION__BODY = eINSTANCE.getUnnamedErrorPrediateDefinition_Body();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.EqualsSymbolImpl <em>Equals Symbol</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.DefaultDefinitionImpl <em>Default Definition</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.EqualsSymbolImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.DefaultDefinitionImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getEqualsSymbol()
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getDefaultDefinition()
     * @generated
     */
-    EClass EQUALS_SYMBOL = eINSTANCE.getEqualsSymbol();
+    EClass DEFAULT_DEFINITION = eINSTANCE.getDefaultDefinition();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.DataSymbolImpl <em>Data Symbol</em>}' class.
+     * The meta object literal for the '<em><b>Head</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.DataSymbolImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getDataSymbol()
     * @generated
     */
-    EClass DATA_SYMBOL = eINSTANCE.getDataSymbol();
+    EReference DEFAULT_DEFINITION__HEAD = eINSTANCE.getDefaultDefinition_Head();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanSymbolImpl <em>Boolean Symbol</em>}' class.
+     * The meta object literal for the '<em><b>Range</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanSymbolImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBooleanSymbol()
     * @generated
     */
-    EClass BOOLEAN_SYMBOL = eINSTANCE.getBooleanSymbol();
+    EReference DEFAULT_DEFINITION__RANGE = eINSTANCE.getDefaultDefinition_Range();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.IntegerSymbolImpl <em>Integer Symbol</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExternPredicateDefinitionImpl <em>Extern Predicate Definition</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.IntegerSymbolImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ExternPredicateDefinitionImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getIntegerSymbol()
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getExternPredicateDefinition()
     * @generated
     */
-    EClass INTEGER_SYMBOL = eINSTANCE.getIntegerSymbol();
+    EClass EXTERN_PREDICATE_DEFINITION = eINSTANCE.getExternPredicateDefinition();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.RealSymbolImpl <em>Real Symbol</em>}' class.
+     * The meta object literal for the '<em><b>Head</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.RealSymbolImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getRealSymbol()
     * @generated
     */
-    EClass REAL_SYMBOL = eINSTANCE.getRealSymbol();
+    EReference EXTERN_PREDICATE_DEFINITION__HEAD = eINSTANCE.getExternPredicateDefinition_Head();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.StringSymbolImpl <em>String Symbol</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MetricDefinitionImpl <em>Metric Definition</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.StringSymbolImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.MetricDefinitionImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getStringSymbol()
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getMetricDefinition()
     * @generated
     */
-    EClass STRING_SYMBOL = eINSTANCE.getStringSymbol();
+    EClass METRIC_DEFINITION = eINSTANCE.getMetricDefinition();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ComplexObjectImpl <em>Complex Object</em>}' class.
+     * The meta object literal for the '<em><b>Head</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ComplexObjectImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getComplexObject()
     * @generated
     */
-    EClass COMPLEX_OBJECT = eINSTANCE.getComplexObject();
+    EReference METRIC_DEFINITION__HEAD = eINSTANCE.getMetricDefinition_Head();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ObjectImpl <em>Object</em>}' class.
+     * The meta object literal for the '<em><b>Body</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ObjectImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getObject()
     * @generated
     */
-    EClass OBJECT = eINSTANCE.getObject();
+    EReference METRIC_DEFINITION__BODY = eINSTANCE.getMetricDefinition_Body();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.NamedObjectImpl <em>Named Object</em>}' class.
+     * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.NamedObjectImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getNamedObject()
     * @generated
     */
-    EClass NAMED_OBJECT = eINSTANCE.getNamedObject();
+    EAttribute METRIC_DEFINITION__TYPE = eINSTANCE.getMetricDefinition_Type();
    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExternMetricDefinitionImpl <em>Extern Metric Definition</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ExternMetricDefinitionImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getExternMetricDefinition()
     * @generated
     */
-    EAttribute NAMED_OBJECT__NAME = eINSTANCE.getNamedObject_Name();
+    EClass EXTERN_METRIC_DEFINITION = eINSTANCE.getExternMetricDefinition();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.UnnamedObjectImpl <em>Unnamed Object</em>}' class.
+     * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.UnnamedObjectImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getUnnamedObject()
     * @generated
     */
-    EClass UNNAMED_OBJECT = eINSTANCE.getUnnamedObject();
+    EAttribute EXTERN_METRIC_DEFINITION__TYPE = eINSTANCE.getExternMetricDefinition_Type();
    /**
-     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+     * The meta object literal for the '<em><b>Head</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EAttribute UNNAMED_OBJECT__NAME = eINSTANCE.getUnnamedObject_Name();
+    EReference EXTERN_METRIC_DEFINITION__HEAD = eINSTANCE.getExternMetricDefinition_Head();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.DataObjectImpl <em>Data Object</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExpressionImpl <em>Expression</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.DataObjectImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ExpressionImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getDataObject()
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getExpression()
     * @generated
     */
-    EClass DATA_OBJECT = eINSTANCE.getDataObject();
+    EClass EXPRESSION = eINSTANCE.getExpression();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanObjectImpl <em>Boolean Object</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.IfElseImpl <em>If Else</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanObjectImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.IfElseImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBooleanObject()
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getIfElse()
     * @generated
     */
-    EClass BOOLEAN_OBJECT = eINSTANCE.getBooleanObject();
+    EClass IF_ELSE = eINSTANCE.getIfElse();
    /**
-     * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.
+     * The meta object literal for the '<em><b>Condition</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EReference BOOLEAN_OBJECT__VALUE = eINSTANCE.getBooleanObject_Value();
+    EReference IF_ELSE__CONDITION = eINSTANCE.getIfElse_Condition();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.IntObjectImpl <em>Int Object</em>}' class.
+     * The meta object literal for the '<em><b>Then</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.IntObjectImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getIntObject()
     * @generated
     */
-    EClass INT_OBJECT = eINSTANCE.getIntObject();
+    EReference IF_ELSE__THEN = eINSTANCE.getIfElse_Then();
    /**
-     * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+     * The meta object literal for the '<em><b>Else</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EAttribute INT_OBJECT__VALUE = eINSTANCE.getIntObject_Value();
+    EReference IF_ELSE__ELSE = eINSTANCE.getIfElse_Else();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.RealObjectImpl <em>Real Object</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CaseImpl <em>Case</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.RealObjectImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.CaseImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getRealObject()
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getCase()
     * @generated
     */
-    EClass REAL_OBJECT = eINSTANCE.getRealObject();
+    EClass CASE = eINSTANCE.getCase();
    /**
-     * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+     * The meta object literal for the '<em><b>Condition</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EAttribute REAL_OBJECT__VALUE = eINSTANCE.getRealObject_Value();
+    EReference CASE__CONDITION = eINSTANCE.getCase_Condition();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.StringObjectImpl <em>String Object</em>}' class.
+     * The meta object literal for the '<em><b>Body</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.StringObjectImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getStringObject()
     * @generated
     */
-    EClass STRING_OBJECT = eINSTANCE.getStringObject();
+    EReference CASE__BODY = eINSTANCE.getCase_Body();
    /**
-     * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CountImpl <em>Count</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.CountImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getCount()
+     * @generated
+     */
+    EClass COUNT = eINSTANCE.getCount();
+    /**
+     * The meta object literal for the '<em><b>Body</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference COUNT__BODY = eINSTANCE.getCount_Body();
+    /**
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AggregationImpl <em>Aggregation</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.AggregationImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getAggregation()
+     * @generated
+     */
+    EClass AGGREGATION = eINSTANCE.getAggregation();
+    /**
+     * The meta object literal for the '<em><b>Op</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute AGGREGATION__OP = eINSTANCE.getAggregation_Op();
+    /**
+     * The meta object literal for the '<em><b>Body</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference AGGREGATION__BODY = eINSTANCE.getAggregation_Body();
+    /**
+     * The meta object literal for the '<em><b>Condition</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference AGGREGATION__CONDITION = eINSTANCE.getAggregation_Condition();
+    /**
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CallImpl <em>Call</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.CallImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getCall()
     * @generated
     */
-    EAttribute STRING_OBJECT__VALUE = eINSTANCE.getStringObject_Value();
+    EClass CALL = eINSTANCE.getCall();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateImpl <em>Predicate</em>}' class.
+     * The meta object literal for the '<em><b>Functor</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPredicate()
     * @generated
     */
-    EClass PREDICATE = eINSTANCE.getPredicate();
+    EReference CALL__FUNCTOR = eINSTANCE.getCall_Functor();
    /**
-     * The meta object literal for the '<em><b>Is Error</b></em>' attribute feature.
+     * The meta object literal for the '<em><b>Argument List</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EAttribute PREDICATE__IS_ERROR = eINSTANCE.getPredicate_IsError();
+    EReference CALL__ARGUMENT_LIST = eINSTANCE.getCall_ArgumentList();
    /**
-     * The meta object literal for the '<em><b>Symbol</b></em>' containment reference feature.
+     * The meta object literal for the '<em><b>Transitive Closure</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EReference PREDICATE__SYMBOL = eINSTANCE.getPredicate_Symbol();
+    EAttribute CALL__TRANSITIVE_CLOSURE = eINSTANCE.getCall_TransitiveClosure();
    /**
-     * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature.
+     * The meta object literal for the '<em><b>Reflexive Transitive Closure</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EReference PREDICATE__PARAMETERS = eINSTANCE.getPredicate_Parameters();
+    EAttribute CALL__REFLEXIVE_TRANSITIVE_CLOSURE = eINSTANCE.getCall_ReflexiveTransitiveClosure();
    /**
-     * The meta object literal for the '<em><b>Bodies</b></em>' containment reference list feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ArgumentListImpl <em>Argument List</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ArgumentListImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getArgumentList()
     * @generated
     */
-    EReference PREDICATE__BODIES = eINSTANCE.getPredicate_Bodies();
+    EClass ARGUMENT_LIST = eINSTANCE.getArgumentList();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ParameterImpl <em>Parameter</em>}' class.
+     * The meta object literal for the '<em><b>Arguments</b></em>' containment reference list feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ParameterImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getParameter()
     * @generated
     */
-    EClass PARAMETER = eINSTANCE.getParameter();
+    EReference ARGUMENT_LIST__ARGUMENTS = eINSTANCE.getArgumentList_Arguments();
    /**
-     * The meta object literal for the '<em><b>Variable</b></em>' containment reference feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ArgumentImpl <em>Argument</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ArgumentImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getArgument()
     * @generated
     */
-    EReference PARAMETER__VARIABLE = eINSTANCE.getParameter_Variable();
+    EClass ARGUMENT = eINSTANCE.getArgument();
    /**
-     * The meta object literal for the '<em><b>Type</b></em>' containment reference feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExpressionArgumentImpl <em>Expression Argument</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ExpressionArgumentImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getExpressionArgument()
     * @generated
     */
-    EReference PARAMETER__TYPE = eINSTANCE.getParameter_Type();
+    EClass EXPRESSION_ARGUMENT = eINSTANCE.getExpressionArgument();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PatternBodyImpl <em>Pattern Body</em>}' class.
+     * The meta object literal for the '<em><b>Body</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.PatternBodyImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPatternBody()
     * @generated
     */
-    EClass PATTERN_BODY = eINSTANCE.getPatternBody();
+    EReference EXPRESSION_ARGUMENT__BODY = eINSTANCE.getExpressionArgument_Body();
    /**
-     * The meta object literal for the '<em><b>Constraints</b></em>' containment reference list feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.StarArgumentImpl <em>Star Argument</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.StarArgumentImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getStarArgument()
     * @generated
     */
-    EReference PATTERN_BODY__CONSTRAINTS = eINSTANCE.getPatternBody_Constraints();
+    EClass STAR_ARGUMENT = eINSTANCE.getStarArgument();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PolarityImpl <em>Polarity</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.TypedArgumentImpl <em>Typed Argument</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.PolarityImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.TypedArgumentImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPolarity()
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getTypedArgument()
     * @generated
     */
-    EClass POLARITY = eINSTANCE.getPolarity();
+    EClass TYPED_ARGUMENT = eINSTANCE.getTypedArgument();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ConstraintImpl <em>Constraint</em>}' class.
+     * The meta object literal for the '<em><b>Type</b></em>' reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ConstraintImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getConstraint()
     * @generated
     */
-    EClass CONSTRAINT = eINSTANCE.getConstraint();
+    EReference TYPED_ARGUMENT__TYPE = eINSTANCE.getTypedArgument_Type();
    /**
-     * The meta object literal for the '<em><b>Polarity</b></em>' containment reference feature.
+     * The meta object literal for the '<em><b>Variable</b></em>' reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EReference CONSTRAINT__POLARITY = eINSTANCE.getConstraint_Polarity();
+    EReference TYPED_ARGUMENT__VARIABLE = eINSTANCE.getTypedArgument_Variable();
    /**
-     * The meta object literal for the '<em><b>Symbol</b></em>' containment reference feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.TypedStarArgumentImpl <em>Typed Star Argument</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.TypedStarArgumentImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getTypedStarArgument()
     * @generated
     */
-    EReference CONSTRAINT__SYMBOL = eINSTANCE.getConstraint_Symbol();
+    EClass TYPED_STAR_ARGUMENT = eINSTANCE.getTypedStarArgument();
    /**
-     * The meta object literal for the '<em><b>Params</b></em>' containment reference list feature.
+     * The meta object literal for the '<em><b>Type</b></em>' reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EReference CONSTRAINT__PARAMS = eINSTANCE.getConstraint_Params();
+    EReference TYPED_STAR_ARGUMENT__TYPE = eINSTANCE.getTypedStarArgument_Type();
    /**
-     * The meta object literal for the '<em><b>Closure Type</b></em>' containment reference feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ReferenceImpl <em>Reference</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ReferenceImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getReference()
     * @generated
     */
-    EReference CONSTRAINT__CLOSURE_TYPE = eINSTANCE.getConstraint_ClosureType();
+    EClass REFERENCE = eINSTANCE.getReference();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ClosureTypeImpl <em>Closure Type</em>}' class.
+     * The meta object literal for the '<em><b>Referred</b></em>' reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ClosureTypeImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getClosureType()
     * @generated
     */
-    EClass CLOSURE_TYPE = eINSTANCE.getClosureType();
+    EReference REFERENCE__REFERRED = eINSTANCE.getReference_Referred();
+    /**
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.IntervalImpl <em>Interval</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.IntervalImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getInterval()
+     * @generated
+     */
+    EClass INTERVAL = eINSTANCE.getInterval();
+    /**
+     * The meta object literal for the '<em><b>Lower Bound</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference INTERVAL__LOWER_BOUND = eINSTANCE.getInterval_LowerBound();
+    /**
+     * The meta object literal for the '<em><b>Upper Bound</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference INTERVAL__UPPER_BOUND = eINSTANCE.getInterval_UpperBound();
    /**
     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.LiteralImpl <em>Literal</em>}' class.
@@ -2966,14 +4706,112 @@ public interface SolverLanguagePackage extends EPackage
    EClass LITERAL = eINSTANCE.getLiteral();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.VariableImpl <em>Variable</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.LogicLiteralImpl <em>Logic Literal</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.LogicLiteralImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getLogicLiteral()
+     * @generated
+     */
+    EClass LOGIC_LITERAL = eINSTANCE.getLogicLiteral();
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.VariableImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getVariable()
     * @generated
     */
-    EClass VARIABLE = eINSTANCE.getVariable();
+    EAttribute LOGIC_LITERAL__VALUE = eINSTANCE.getLogicLiteral_Value();
+    /**
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.NumericLiteralImpl <em>Numeric Literal</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.NumericLiteralImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getNumericLiteral()
+     * @generated
+     */
+    EClass NUMERIC_LITERAL = eINSTANCE.getNumericLiteral();
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute NUMERIC_LITERAL__VALUE = eINSTANCE.getNumericLiteral_Value();
+    /**
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.InfinityLiteralImpl <em>Infinity Literal</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.InfinityLiteralImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getInfinityLiteral()
+     * @generated
+     */
+    EClass INFINITY_LITERAL = eINSTANCE.getInfinityLiteral();
+    /**
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.EmptyIntervalLiteralImpl <em>Empty Interval Literal</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.EmptyIntervalLiteralImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getEmptyIntervalLiteral()
+     * @generated
+     */
+    EClass EMPTY_INTERVAL_LITERAL = eINSTANCE.getEmptyIntervalLiteral();
+    /**
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.StringLiteralImpl <em>String Literal</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.StringLiteralImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getStringLiteral()
+     * @generated
+     */
+    EClass STRING_LITERAL = eINSTANCE.getStringLiteral();
+    /**
+     * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute STRING_LITERAL__VALUE = eINSTANCE.getStringLiteral_Value();
+    /**
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MemberDefinitionImpl <em>Member Definition</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.MemberDefinitionImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getMemberDefinition()
+     * @generated
+     */
+    EClass MEMBER_DEFINITION = eINSTANCE.getMemberDefinition();
+    /**
+     * The meta object literal for the '<em><b>Containment</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute MEMBER_DEFINITION__CONTAINMENT = eINSTANCE.getMemberDefinition_Containment();
+    /**
+     * The meta object literal for the '<em><b>Type</b></em>' reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference MEMBER_DEFINITION__TYPE = eINSTANCE.getMemberDefinition_Type();
+    /**
+     * The meta object literal for the '<em><b>Multiplicity</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference MEMBER_DEFINITION__MULTIPLICITY = eINSTANCE.getMemberDefinition_Multiplicity();
    /**
     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
@@ -2981,365 +4819,437 @@ public interface SolverLanguagePackage extends EPackage
     * <!-- end-user-doc -->
     * @generated
     */
-    EAttribute VARIABLE__NAME = eINSTANCE.getVariable_Name();
+    EAttribute MEMBER_DEFINITION__NAME = eINSTANCE.getMemberDefinition_Name();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AllInstancesImpl <em>All Instances</em>}' class.
+     * The meta object literal for the '<em><b>Opposite</b></em>' reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.AllInstancesImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getAllInstances()
     * @generated
     */
-    EClass ALL_INSTANCES = eINSTANCE.getAllInstances();
+    EReference MEMBER_DEFINITION__OPPOSITE = eINSTANCE.getMemberDefinition_Opposite();
    /**
-     * The meta object literal for the '<em><b>Symbol</b></em>' containment reference feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MultiplicityImpl <em>Multiplicity</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.MultiplicityImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getMultiplicity()
     * @generated
     */
-    EReference ALL_INSTANCES__SYMBOL = eINSTANCE.getAllInstances_Symbol();
+    EClass MULTIPLICITY = eINSTANCE.getMultiplicity();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AllObjectsImpl <em>All Objects</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ManyMultiplicityImpl <em>Many Multiplicity</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.AllObjectsImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ManyMultiplicityImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getAllObjects()
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getManyMultiplicity()
     * @generated
     */
-    EClass ALL_OBJECTS = eINSTANCE.getAllObjects();
+    EClass MANY_MULTIPLICITY = eINSTANCE.getManyMultiplicity();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.DefaultInterpretationImpl <em>Default Interpretation</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExactMultiplicityImpl <em>Exact Multiplicity</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.DefaultInterpretationImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ExactMultiplicityImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getDefaultInterpretation()
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getExactMultiplicity()
     * @generated
     */
-    EClass DEFAULT_INTERPRETATION = eINSTANCE.getDefaultInterpretation();
+    EClass EXACT_MULTIPLICITY = eINSTANCE.getExactMultiplicity();
    /**
-     * The meta object literal for the '<em><b>Interpretation</b></em>' containment reference feature.
+     * The meta object literal for the '<em><b>Multiplicity</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EReference DEFAULT_INTERPRETATION__INTERPRETATION = eINSTANCE.getDefaultInterpretation_Interpretation();
+    EAttribute EXACT_MULTIPLICITY__MULTIPLICITY = eINSTANCE.getExactMultiplicity_Multiplicity();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CDInterpretationImpl <em>CD Interpretation</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BoundedMultiplicityImpl <em>Bounded Multiplicity</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.CDInterpretationImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.BoundedMultiplicityImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getCDInterpretation()
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBoundedMultiplicity()
     * @generated
     */
-    EClass CD_INTERPRETATION = eINSTANCE.getCDInterpretation();
+    EClass BOUNDED_MULTIPLICITY = eINSTANCE.getBoundedMultiplicity();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ClassInterpretationImpl <em>Class Interpretation</em>}' class.
+     * The meta object literal for the '<em><b>Lower Bound</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ClassInterpretationImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getClassInterpretation()
     * @generated
     */
-    EClass CLASS_INTERPRETATION = eINSTANCE.getClassInterpretation();
+    EAttribute BOUNDED_MULTIPLICITY__LOWER_BOUND = eINSTANCE.getBoundedMultiplicity_LowerBound();
    /**
-     * The meta object literal for the '<em><b>Abstract</b></em>' attribute feature.
+     * The meta object literal for the '<em><b>Upper Bound</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EAttribute CLASS_INTERPRETATION__ABSTRACT = eINSTANCE.getClassInterpretation_Abstract();
+    EAttribute BOUNDED_MULTIPLICITY__UPPER_BOUND = eINSTANCE.getBoundedMultiplicity_UpperBound();
    /**
-     * The meta object literal for the '<em><b>Symbol</b></em>' containment reference feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ScopeDefinitionImpl <em>Scope Definition</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ScopeDefinitionImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getScopeDefinition()
     * @generated
     */
-    EReference CLASS_INTERPRETATION__SYMBOL = eINSTANCE.getClassInterpretation_Symbol();
+    EClass SCOPE_DEFINITION = eINSTANCE.getScopeDefinition();
    /**
-     * The meta object literal for the '<em><b>Supertypes</b></em>' containment reference list feature.
+     * The meta object literal for the '<em><b>Type</b></em>' reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EReference CLASS_INTERPRETATION__SUPERTYPES = eINSTANCE.getClassInterpretation_Supertypes();
+    EReference SCOPE_DEFINITION__TYPE = eINSTANCE.getScopeDefinition_Type();
    /**
-     * The meta object literal for the '<em><b>Fielt</b></em>' containment reference list feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExactScopeDefinitionImpl <em>Exact Scope Definition</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ExactScopeDefinitionImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getExactScopeDefinition()
     * @generated
     */
-    EReference CLASS_INTERPRETATION__FIELT = eINSTANCE.getClassInterpretation_Fielt();
+    EClass EXACT_SCOPE_DEFINITION = eINSTANCE.getExactScopeDefinition();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.EnumInterpretationImpl <em>Enum Interpretation</em>}' class.
+     * The meta object literal for the '<em><b>Exact Scope</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.EnumInterpretationImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getEnumInterpretation()
     * @generated
     */
-    EClass ENUM_INTERPRETATION = eINSTANCE.getEnumInterpretation();
+    EAttribute EXACT_SCOPE_DEFINITION__EXACT_SCOPE = eINSTANCE.getExactScopeDefinition_ExactScope();
    /**
-     * The meta object literal for the '<em><b>Symbol</b></em>' containment reference feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BoundedScopeDefinitionImpl <em>Bounded Scope Definition</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.BoundedScopeDefinitionImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBoundedScopeDefinition()
     * @generated
     */
-    EReference ENUM_INTERPRETATION__SYMBOL = eINSTANCE.getEnumInterpretation_Symbol();
+    EClass BOUNDED_SCOPE_DEFINITION = eINSTANCE.getBoundedScopeDefinition();
    /**
-     * The meta object literal for the '<em><b>Objects</b></em>' containment reference list feature.
+     * The meta object literal for the '<em><b>Lower Bound</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EReference ENUM_INTERPRETATION__OBJECTS = eINSTANCE.getEnumInterpretation_Objects();
+    EAttribute BOUNDED_SCOPE_DEFINITION__LOWER_BOUND = eINSTANCE.getBoundedScopeDefinition_LowerBound();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FieldRelationInterpretationImpl <em>Field Relation Interpretation</em>}' class.
+     * The meta object literal for the '<em><b>Upper Bound</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.FieldRelationInterpretationImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getFieldRelationInterpretation()
     * @generated
     */
-    EClass FIELD_RELATION_INTERPRETATION = eINSTANCE.getFieldRelationInterpretation();
+    EAttribute BOUNDED_SCOPE_DEFINITION__UPPER_BOUND = eINSTANCE.getBoundedScopeDefinition_UpperBound();
    /**
-     * The meta object literal for the '<em><b>Containment</b></em>' attribute feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.LowerBoundedScopeDefinitionImpl <em>Lower Bounded Scope Definition</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.LowerBoundedScopeDefinitionImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getLowerBoundedScopeDefinition()
     * @generated
     */
-    EAttribute FIELD_RELATION_INTERPRETATION__CONTAINMENT = eINSTANCE.getFieldRelationInterpretation_Containment();
+    EClass LOWER_BOUNDED_SCOPE_DEFINITION = eINSTANCE.getLowerBoundedScopeDefinition();
    /**
-     * The meta object literal for the '<em><b>Symbol</b></em>' containment reference feature.
+     * The meta object literal for the '<em><b>Lower Bound</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EReference FIELD_RELATION_INTERPRETATION__SYMBOL = eINSTANCE.getFieldRelationInterpretation_Symbol();
+    EAttribute LOWER_BOUNDED_SCOPE_DEFINITION__LOWER_BOUND = eINSTANCE.getLowerBoundedScopeDefinition_LowerBound();
    /**
-     * The meta object literal for the '<em><b>Multiplicity</b></em>' containment reference feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ObjectiveDefinitionImpl <em>Objective Definition</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ObjectiveDefinitionImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getObjectiveDefinition()
     * @generated
     */
-    EReference FIELD_RELATION_INTERPRETATION__MULTIPLICITY = eINSTANCE.getFieldRelationInterpretation_Multiplicity();
+    EClass OBJECTIVE_DEFINITION = eINSTANCE.getObjectiveDefinition();
    /**
-     * The meta object literal for the '<em><b>Target</b></em>' containment reference feature.
+     * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EReference FIELD_RELATION_INTERPRETATION__TARGET = eINSTANCE.getFieldRelationInterpretation_Target();
+    EAttribute OBJECTIVE_DEFINITION__KIND = eINSTANCE.getObjectiveDefinition_Kind();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.GlobalRelationInterpretationImpl <em>Global Relation Interpretation</em>}' class.
+     * The meta object literal for the '<em><b>Objective</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.GlobalRelationInterpretationImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getGlobalRelationInterpretation()
     * @generated
     */
-    EClass GLOBAL_RELATION_INTERPRETATION = eINSTANCE.getGlobalRelationInterpretation();
+    EReference OBJECTIVE_DEFINITION__OBJECTIVE = eINSTANCE.getObjectiveDefinition_Objective();
    /**
-     * The meta object literal for the '<em><b>Containment</b></em>' attribute feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.NamedElementImpl <em>Named Element</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.NamedElementImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getNamedElement()
+     * @generated
+     */
+    EClass NAMED_ELEMENT = eINSTANCE.getNamedElement();
+    /**
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EAttribute NAMED_ELEMENT__NAME = eINSTANCE.getNamedElement_Name();
+    /**
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AssertionImpl <em>Assertion</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.AssertionImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getAssertion()
+     * @generated
+     */
+    EClass ASSERTION = eINSTANCE.getAssertion();
+    /**
+     * The meta object literal for the '<em><b>Body</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference ASSERTION__BODY = eINSTANCE.getAssertion_Body();
+    /**
+     * The meta object literal for the '<em><b>Range</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference ASSERTION__RANGE = eINSTANCE.getAssertion_Range();
+    /**
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.DisjunctionImpl <em>Disjunction</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.DisjunctionImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getDisjunction()
+     * @generated
+     */
+    EClass DISJUNCTION = eINSTANCE.getDisjunction();
+    /**
+     * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    EReference DISJUNCTION__CHILDREN = eINSTANCE.getDisjunction_Children();
+    /**
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.SwitchImpl <em>Switch</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SwitchImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getSwitch()
+     * @generated
+     */
+    EClass SWITCH = eINSTANCE.getSwitch();
+    /**
+     * The meta object literal for the '<em><b>Cases</b></em>' containment reference list feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EAttribute GLOBAL_RELATION_INTERPRETATION__CONTAINMENT = eINSTANCE.getGlobalRelationInterpretation_Containment();
+    EReference SWITCH__CASES = eINSTANCE.getSwitch_Cases();
    /**
-     * The meta object literal for the '<em><b>Symbol</b></em>' containment reference feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ConjunctionImpl <em>Conjunction</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ConjunctionImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getConjunction()
     * @generated
     */
-    EReference GLOBAL_RELATION_INTERPRETATION__SYMBOL = eINSTANCE.getGlobalRelationInterpretation_Symbol();
+    EClass CONJUNCTION = eINSTANCE.getConjunction();
    /**
-     * The meta object literal for the '<em><b>Source Multiplicity</b></em>' containment reference feature.
+     * The meta object literal for the '<em><b>Children</b></em>' containment reference list feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EReference GLOBAL_RELATION_INTERPRETATION__SOURCE_MULTIPLICITY = eINSTANCE.getGlobalRelationInterpretation_SourceMultiplicity();
+    EReference CONJUNCTION__CHILDREN = eINSTANCE.getConjunction_Children();
    /**
-     * The meta object literal for the '<em><b>Source</b></em>' containment reference feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ComparisonImpl <em>Comparison</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ComparisonImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getComparison()
     * @generated
     */
-    EReference GLOBAL_RELATION_INTERPRETATION__SOURCE = eINSTANCE.getGlobalRelationInterpretation_Source();
+    EClass COMPARISON = eINSTANCE.getComparison();
    /**
-     * The meta object literal for the '<em><b>Target Multiplicity</b></em>' containment reference feature.
+     * The meta object literal for the '<em><b>Left</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EReference GLOBAL_RELATION_INTERPRETATION__TARGET_MULTIPLICITY = eINSTANCE.getGlobalRelationInterpretation_TargetMultiplicity();
+    EReference COMPARISON__LEFT = eINSTANCE.getComparison_Left();
    /**
-     * The meta object literal for the '<em><b>Target</b></em>' containment reference feature.
+     * The meta object literal for the '<em><b>Op</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EReference GLOBAL_RELATION_INTERPRETATION__TARGET = eINSTANCE.getGlobalRelationInterpretation_Target();
+    EAttribute COMPARISON__OP = eINSTANCE.getComparison_Op();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MultiplicityDefinitionImpl <em>Multiplicity Definition</em>}' class.
+     * The meta object literal for the '<em><b>Right</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.MultiplicityDefinitionImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getMultiplicityDefinition()
     * @generated
     */
-    EClass MULTIPLICITY_DEFINITION = eINSTANCE.getMultiplicityDefinition();
+    EReference COMPARISON__RIGHT = eINSTANCE.getComparison_Right();
    /**
-     * The meta object literal for the '<em><b>Lower</b></em>' attribute feature.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BinaryExpressionImpl <em>Binary Expression</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.BinaryExpressionImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBinaryExpression()
     * @generated
     */
-    EAttribute MULTIPLICITY_DEFINITION__LOWER = eINSTANCE.getMultiplicityDefinition_Lower();
+    EClass BINARY_EXPRESSION = eINSTANCE.getBinaryExpression();
    /**
-     * The meta object literal for the '<em><b>Upper</b></em>' attribute feature.
+     * The meta object literal for the '<em><b>Left</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EAttribute MULTIPLICITY_DEFINITION__UPPER = eINSTANCE.getMultiplicityDefinition_Upper();
+    EReference BINARY_EXPRESSION__LEFT = eINSTANCE.getBinaryExpression_Left();
    /**
-     * The meta object literal for the '<em><b>Unlimited Upper</b></em>' attribute feature.
+     * The meta object literal for the '<em><b>Op</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
     * @generated
     */
-    EAttribute MULTIPLICITY_DEFINITION__UNLIMITED_UPPER = eINSTANCE.getMultiplicityDefinition_UnlimitedUpper();
+    EAttribute BINARY_EXPRESSION__OP = eINSTANCE.getBinaryExpression_Op();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanTrueImpl <em>Boolean True</em>}' class.
+     * The meta object literal for the '<em><b>Right</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanTrueImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBooleanTrue()
     * @generated
     */
-    EClass BOOLEAN_TRUE = eINSTANCE.getBooleanTrue();
+    EReference BINARY_EXPRESSION__RIGHT = eINSTANCE.getBinaryExpression_Right();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanFalseImpl <em>Boolean False</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.UnaryExpressionImpl <em>Unary Expression</em>}' class.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanFalseImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.UnaryExpressionImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBooleanFalse()
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getUnaryExpression()
     * @generated
     */
-    EClass BOOLEAN_FALSE = eINSTANCE.getBooleanFalse();
+    EClass UNARY_EXPRESSION = eINSTANCE.getUnaryExpression();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.TrueImpl <em>True</em>}' class.
+     * The meta object literal for the '<em><b>Op</b></em>' attribute feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.TrueImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getTrue()
     * @generated
     */
-    EClass TRUE = eINSTANCE.getTrue();
+    EAttribute UNARY_EXPRESSION__OP = eINSTANCE.getUnaryExpression_Op();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FalseImpl <em>False</em>}' class.
+     * The meta object literal for the '<em><b>Body</b></em>' containment reference feature.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.FalseImpl
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getFalse()
     * @generated
     */
-    EClass FALSE = eINSTANCE.getFalse();
+    EReference UNARY_EXPRESSION__BODY = eINSTANCE.getUnaryExpression_Body();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.UnknownImpl <em>Unknown</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.MetricType <em>Metric Type</em>}' enum.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.UnknownImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.MetricType
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getUnknown()
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getMetricType()
     * @generated
     */
-    EClass UNKNOWN = eINSTANCE.getUnknown();
+    EEnum METRIC_TYPE = eINSTANCE.getMetricType();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ErrorImpl <em>Error</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.BinaryOperator <em>Binary Operator</em>}' enum.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ErrorImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.BinaryOperator
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getError()
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getBinaryOperator()
     * @generated
     */
-    EClass ERROR = eINSTANCE.getError();
+    EEnum BINARY_OPERATOR = eINSTANCE.getBinaryOperator();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PositiveImpl <em>Positive</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.UnaryOp <em>Unary Op</em>}' enum.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.PositiveImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.UnaryOp
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getPositive()
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getUnaryOp()
     * @generated
     */
-    EClass POSITIVE = eINSTANCE.getPositive();
+    EEnum UNARY_OP = eINSTANCE.getUnaryOp();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.NegativeImpl <em>Negative</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.AggregationOp <em>Aggregation Op</em>}' enum.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.NegativeImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.AggregationOp
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getNegative()
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getAggregationOp()
     * @generated
     */
-    EClass NEGATIVE = eINSTANCE.getNegative();
+    EEnum AGGREGATION_OP = eINSTANCE.getAggregationOp();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ReflexiveClosureImpl <em>Reflexive Closure</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.LogicValue <em>Logic Value</em>}' enum.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.ReflexiveClosureImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.LogicValue
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getReflexiveClosure()
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getLogicValue()
     * @generated
     */
-    EClass REFLEXIVE_CLOSURE = eINSTANCE.getReflexiveClosure();
+    EEnum LOGIC_VALUE = eINSTANCE.getLogicValue();
    /**
-     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.impl.IrreflexiveClosureImpl <em>Irreflexive Closure</em>}' class.
+     * The meta object literal for the '{@link org.eclipse.viatra.solver.language.solverLanguage.ObjectiveKind <em>Objective Kind</em>}' enum.
     * <!-- begin-user-doc -->
     * <!-- end-user-doc -->
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.IrreflexiveClosureImpl
+     * @see org.eclipse.viatra.solver.language.solverLanguage.ObjectiveKind
-     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getIrreflexiveClosure()
+     * @see org.eclipse.viatra.solver.language.solverLanguage.impl.SolverLanguagePackageImpl#getObjectiveKind()
     * @generated
     */
-    EClass IRREFLEXIVE_CLOSURE = eINSTANCE.getIrreflexiveClosure();
+    EEnum OBJECTIVE_KIND = eINSTANCE.getObjectiveKind();
  }
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/StringSymbol.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/StarArgument.java
index f3d6d8ee..4e4bed1b 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/StringSymbol.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/StarArgument.java
@@ -1,19 +1,19 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage;
 /**
 * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>String Symbol</b></em>'.
+ * A representation of the model object '<em><b>Star Argument</b></em>'.
 * <!-- end-user-doc -->
 *
 *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getStringSymbol()
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getStarArgument()
 * @model
 * @generated
 */
-public interface StringSymbol extends DataSymbol
+public interface StarArgument extends Argument
 {
-} // StringSymbol
+} // StarArgument
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Statement.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Statement.java
index f3da8f9c..9c3be9d6 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Statement.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Statement.java
@@ -1,8 +1,10 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 /**
@@ -10,6 +12,15 @@ import org.eclipse.emf.ecore.EObject;
 * A representation of the model object '<em><b>Statement</b></em>'.
 * <!-- end-user-doc -->
 *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Statement#isAbstract <em>Abstract</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Statement#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Statement#getSuperclasses <em>Superclasses</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Statement#getMembers <em>Members</em>}</li>
+ * </ul>
 *
 * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getStatement()
 * @model
@@ -17,4 +28,72 @@ import org.eclipse.emf.ecore.EObject;
 */
 public interface Statement extends EObject
 {
+  /**
+   * Returns the value of the '<em><b>Abstract</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Abstract</em>' attribute.
+   * @see #setAbstract(boolean)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getStatement_Abstract()
+   * @model
+   * @generated
+   */
+  boolean isAbstract();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Statement#isAbstract <em>Abstract</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Abstract</em>' attribute.
+   * @see #isAbstract()
+   * @generated
+   */
+  void setAbstract(boolean value);
+  /**
+   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getStatement_Name()
+   * @model
+   * @generated
+   */
+  String getName();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Statement#getName <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
+  void setName(String value);
+  /**
+   * Returns the value of the '<em><b>Superclasses</b></em>' reference list.
+   * The list contents are of type {@link org.eclipse.viatra.solver.language.solverLanguage.NamedElement}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Superclasses</em>' reference list.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getStatement_Superclasses()
+   * @model
+   * @generated
+   */
+  EList<NamedElement> getSuperclasses();
+  /**
+   * Returns the value of the '<em><b>Members</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Members</em>' containment reference list.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getStatement_Members()
+   * @model containment="true"
+   * @generated
+   */
+  EList<MemberDefinition> getMembers();
 } // Statement
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/StringObject.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/StringLiteral.java
index d1d3ee6d..dc4d6487 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/StringObject.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/StringLiteral.java
@@ -1,26 +1,26 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage;
 /**
 * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>String Object</b></em>'.
+ * A representation of the model object '<em><b>String Literal</b></em>'.
 * <!-- end-user-doc -->
 *
 * <p>
 * The following features are supported:
 * </p>
 * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.StringObject#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.StringLiteral#getValue <em>Value</em>}</li>
 * </ul>
 *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getStringObject()
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getStringLiteral()
 * @model
 * @generated
 */
-public interface StringObject extends DataObject
+public interface StringLiteral extends Literal
 {
  /**
   * Returns the value of the '<em><b>Value</b></em>' attribute.
@@ -28,14 +28,14 @@ public interface StringObject extends DataObject
   * <!-- end-user-doc -->
   * @return the value of the '<em>Value</em>' attribute.
   * @see #setValue(String)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getStringObject_Value()
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getStringLiteral_Value()
   * @model
   * @generated
   */
  String getValue();
  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.StringObject#getValue <em>Value</em>}' attribute.
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.StringLiteral#getValue <em>Value</em>}' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @param value the new value of the '<em>Value</em>' attribute.
@@ -44,4 +44,4 @@ public interface StringObject extends DataObject
   */
  void setValue(String value);
-} // StringObject
+} // StringLiteral
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Switch.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Switch.java
new file mode 100644
index 00000000..92504b5d
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Switch.java
@@ -0,0 +1,38 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+import org.eclipse.emf.common.util.EList;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Switch</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Switch#getCases <em>Cases</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getSwitch()
+ * @model
+ * @generated
+ */
+public interface Switch extends Expression
+{
+  /**
+   * Returns the value of the '<em><b>Cases</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.viatra.solver.language.solverLanguage.Case}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Cases</em>' containment reference list.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getSwitch_Cases()
+   * @model containment="true"
+   * @generated
+   */
+  EList<Case> getCases();
+} // Switch
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Symbol.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Symbol.java
deleted file mode 100644
index dcf2a01a..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Symbol.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-import org.eclipse.emf.ecore.EObject;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Symbol</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getSymbol()
- * @model
- * @generated
- */
-public interface Symbol extends EObject
-{
-} // Symbol
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/True.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/True.java
deleted file mode 100644
index d125d86a..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/True.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>True</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getTrue()
- * @model
- * @generated
- */
-public interface True extends TruthValue
-{
-} // True
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/TruthValue.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/TruthValue.java
deleted file mode 100644
index 48e2b8e8..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/TruthValue.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-import org.eclipse.emf.ecore.EObject;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Truth Value</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getTruthValue()
- * @model
- * @generated
- */
-public interface TruthValue extends EObject
-{
-} // TruthValue
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/TypedArgument.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/TypedArgument.java
new file mode 100644
index 00000000..f903338a
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/TypedArgument.java
@@ -0,0 +1,70 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Typed Argument</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.TypedArgument#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.TypedArgument#getVariable <em>Variable</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getTypedArgument()
+ * @model
+ * @generated
+ */
+public interface TypedArgument extends Argument
+{
+  /**
+   * Returns the value of the '<em><b>Type</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Type</em>' reference.
+   * @see #setType(NamedElement)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getTypedArgument_Type()
+   * @model
+   * @generated
+   */
+  NamedElement getType();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.TypedArgument#getType <em>Type</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Type</em>' reference.
+   * @see #getType()
+   * @generated
+   */
+  void setType(NamedElement value);
+  /**
+   * Returns the value of the '<em><b>Variable</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Variable</em>' reference.
+   * @see #setVariable(NamedElement)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getTypedArgument_Variable()
+   * @model
+   * @generated
+   */
+  NamedElement getVariable();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.TypedArgument#getVariable <em>Variable</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Variable</em>' reference.
+   * @see #getVariable()
+   * @generated
+   */
+  void setVariable(NamedElement value);
+} // TypedArgument
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/TypedStarArgument.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/TypedStarArgument.java
new file mode 100644
index 00000000..2b8bc002
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/TypedStarArgument.java
@@ -0,0 +1,47 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Typed Star Argument</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.TypedStarArgument#getType <em>Type</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getTypedStarArgument()
+ * @model
+ * @generated
+ */
+public interface TypedStarArgument extends Argument
+{
+  /**
+   * Returns the value of the '<em><b>Type</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Type</em>' reference.
+   * @see #setType(NamedElement)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getTypedStarArgument_Type()
+   * @model
+   * @generated
+   */
+  NamedElement getType();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.TypedStarArgument#getType <em>Type</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Type</em>' reference.
+   * @see #getType()
+   * @generated
+   */
+  void setType(NamedElement value);
+} // TypedStarArgument
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/UnaryExpression.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/UnaryExpression.java
new file mode 100644
index 00000000..5c2356cd
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/UnaryExpression.java
@@ -0,0 +1,73 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Unary Expression</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.UnaryExpression#getOp <em>Op</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.UnaryExpression#getBody <em>Body</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getUnaryExpression()
+ * @model
+ * @generated
+ */
+public interface UnaryExpression extends Expression
+{
+  /**
+   * Returns the value of the '<em><b>Op</b></em>' attribute.
+   * The literals are from the enumeration {@link org.eclipse.viatra.solver.language.solverLanguage.UnaryOp}.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Op</em>' attribute.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.UnaryOp
+   * @see #setOp(UnaryOp)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getUnaryExpression_Op()
+   * @model
+   * @generated
+   */
+  UnaryOp getOp();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.UnaryExpression#getOp <em>Op</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Op</em>' attribute.
+   * @see org.eclipse.viatra.solver.language.solverLanguage.UnaryOp
+   * @see #getOp()
+   * @generated
+   */
+  void setOp(UnaryOp value);
+  /**
+   * Returns the value of the '<em><b>Body</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Body</em>' containment reference.
+   * @see #setBody(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getUnaryExpression_Body()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getBody();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.UnaryExpression#getBody <em>Body</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Body</em>' containment reference.
+   * @see #getBody()
+   * @generated
+   */
+  void setBody(Expression value);
+} // UnaryExpression
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/UnaryOp.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/UnaryOp.java
new file mode 100644
index 00000000..e426f4f1
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/UnaryOp.java
@@ -0,0 +1,317 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import org.eclipse.emf.common.util.Enumerator;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Unary Op</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getUnaryOp()
+ * @model
+ * @generated
+ */
+public enum UnaryOp implements Enumerator
+{
+  /**
+   * The '<em><b>NEG</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #NEG_VALUE
+   * @generated
+   * @ordered
+   */
+  NEG(0, "NEG", "!"),
+  /**
+   * The '<em><b>PLUS</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #PLUS_VALUE
+   * @generated
+   * @ordered
+   */
+  PLUS(1, "PLUS", "+"),
+  /**
+   * The '<em><b>MINUS</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #MINUS_VALUE
+   * @generated
+   * @ordered
+   */
+  MINUS(2, "MINUS", "-"),
+  /**
+   * The '<em><b>MAY</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #MAY_VALUE
+   * @generated
+   * @ordered
+   */
+  MAY(3, "MAY", "may"),
+  /**
+   * The '<em><b>MUST</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #MUST_VALUE
+   * @generated
+   * @ordered
+   */
+  MUST(4, "MUST", "must"),
+  /**
+   * The '<em><b>CURRENT</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #CURRENT_VALUE
+   * @generated
+   * @ordered
+   */
+  CURRENT(5, "CURRENT", "current");
+  /**
+   * The '<em><b>NEG</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #NEG
+   * @model literal="!"
+   * @generated
+   * @ordered
+   */
+  public static final int NEG_VALUE = 0;
+  /**
+   * The '<em><b>PLUS</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #PLUS
+   * @model literal="+"
+   * @generated
+   * @ordered
+   */
+  public static final int PLUS_VALUE = 1;
+  /**
+   * The '<em><b>MINUS</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #MINUS
+   * @model literal="-"
+   * @generated
+   * @ordered
+   */
+  public static final int MINUS_VALUE = 2;
+  /**
+   * The '<em><b>MAY</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #MAY
+   * @model literal="may"
+   * @generated
+   * @ordered
+   */
+  public static final int MAY_VALUE = 3;
+  /**
+   * The '<em><b>MUST</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #MUST
+   * @model literal="must"
+   * @generated
+   * @ordered
+   */
+  public static final int MUST_VALUE = 4;
+  /**
+   * The '<em><b>CURRENT</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #CURRENT
+   * @model literal="current"
+   * @generated
+   * @ordered
+   */
+  public static final int CURRENT_VALUE = 5;
+  /**
+   * An array of all the '<em><b>Unary Op</b></em>' enumerators.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private static final UnaryOp[] VALUES_ARRAY =
+    new UnaryOp[]
+    {
+      NEG,
+      PLUS,
+      MINUS,
+      MAY,
+      MUST,
+      CURRENT,
+    };
+  /**
+   * A public read-only list of all the '<em><b>Unary Op</b></em>' enumerators.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static final List<UnaryOp> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+  /**
+   * Returns the '<em><b>Unary Op</b></em>' literal with the specified literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static UnaryOp get(String literal)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      UnaryOp result = VALUES_ARRAY[i];
+      if (result.toString().equals(literal))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+  /**
+   * Returns the '<em><b>Unary Op</b></em>' literal with the specified name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static UnaryOp getByName(String name)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      UnaryOp result = VALUES_ARRAY[i];
+      if (result.getName().equals(name))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+  /**
+   * Returns the '<em><b>Unary Op</b></em>' literal with the specified integer value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static UnaryOp get(int value)
+  {
+    switch (value)
+    {
+      case NEG_VALUE: return NEG;
+      case PLUS_VALUE: return PLUS;
+      case MINUS_VALUE: return MINUS;
+      case MAY_VALUE: return MAY;
+      case MUST_VALUE: return MUST;
+      case CURRENT_VALUE: return CURRENT;
+    }
+    return null;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final int value;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final String name;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final String literal;
+  /**
+   * Only this class can construct instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private UnaryOp(int value, String name, String literal)
+  {
+    this.value = value;
+    this.name = name;
+    this.literal = literal;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public int getValue()
+  {
+    return value;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getName()
+  {
+    return name;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getLiteral()
+  {
+    return literal;
+  }
+  /**
+   * Returns the literal value of the enumerator, which is its string representation.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    return literal;
+  }
+  
+} //UnaryOp
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Unknown.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Unknown.java
deleted file mode 100644
index 496f433a..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Unknown.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Unknown</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getUnknown()
- * @model
- * @generated
- */
-public interface Unknown extends TruthValue
-{
-} // Unknown
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/UnnamedErrorPrediateDefinition.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/UnnamedErrorPrediateDefinition.java
new file mode 100644
index 00000000..54621550
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/UnnamedErrorPrediateDefinition.java
@@ -0,0 +1,70 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage;
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Unnamed Error Prediate Definition</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.UnnamedErrorPrediateDefinition#getArgumentList <em>Argument List</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.UnnamedErrorPrediateDefinition#getBody <em>Body</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getUnnamedErrorPrediateDefinition()
+ * @model
+ * @generated
+ */
+public interface UnnamedErrorPrediateDefinition extends Statement
+{
+  /**
+   * Returns the value of the '<em><b>Argument List</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Argument List</em>' containment reference.
+   * @see #setArgumentList(ArgumentList)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getUnnamedErrorPrediateDefinition_ArgumentList()
+   * @model containment="true"
+   * @generated
+   */
+  ArgumentList getArgumentList();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.UnnamedErrorPrediateDefinition#getArgumentList <em>Argument List</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Argument List</em>' containment reference.
+   * @see #getArgumentList()
+   * @generated
+   */
+  void setArgumentList(ArgumentList value);
+  /**
+   * Returns the value of the '<em><b>Body</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Body</em>' containment reference.
+   * @see #setBody(Expression)
+   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getUnnamedErrorPrediateDefinition_Body()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getBody();
+  /**
+   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.UnnamedErrorPrediateDefinition#getBody <em>Body</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Body</em>' containment reference.
+   * @see #getBody()
+   * @generated
+   */
+  void setBody(Expression value);
+} // UnnamedErrorPrediateDefinition
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/UnnamedObject.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/UnnamedObject.java
deleted file mode 100644
index 152ee782..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/UnnamedObject.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Unnamed Object</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.UnnamedObject#getName <em>Name</em>}</li>
- * </ul>
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getUnnamedObject()
- * @model
- * @generated
- */
-public interface UnnamedObject extends org.eclipse.viatra.solver.language.solverLanguage.Object
-{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getUnnamedObject_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.UnnamedObject#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-  void setName(String value);
-} // UnnamedObject
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Variable.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Variable.java
deleted file mode 100644
index 2f915fa7..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/Variable.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage;
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Variable</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.Variable#getName <em>Name</em>}</li>
- * </ul>
- *
- * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getVariable()
- * @model
- * @generated
- */
-public interface Variable extends Literal
-{
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#getVariable_Name()
-   * @model
-   * @generated
-   */
-  String getName();
-  /**
-   * Sets the value of the '{@link org.eclipse.viatra.solver.language.solverLanguage.Variable#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
-   * @generated
-   */
-  void setName(String value);
-} // Variable
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AggregationImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AggregationImpl.java
new file mode 100644
index 00000000..542f3c40
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AggregationImpl.java
@@ -0,0 +1,343 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.Aggregation;
+import org.eclipse.viatra.solver.language.solverLanguage.AggregationOp;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Aggregation</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AggregationImpl#getOp <em>Op</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AggregationImpl#getBody <em>Body</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AggregationImpl#getCondition <em>Condition</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class AggregationImpl extends ExpressionImpl implements Aggregation
+{
+  /**
+   * The default value of the '{@link #getOp() <em>Op</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getOp()
+   * @generated
+   * @ordered
+   */
+  protected static final AggregationOp OP_EDEFAULT = AggregationOp.ONLY;
+  /**
+   * The cached value of the '{@link #getOp() <em>Op</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getOp()
+   * @generated
+   * @ordered
+   */
+  protected AggregationOp op = OP_EDEFAULT;
+  /**
+   * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getBody()
+   * @generated
+   * @ordered
+   */
+  protected Expression body;
+  /**
+   * The cached value of the '{@link #getCondition() <em>Condition</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getCondition()
+   * @generated
+   * @ordered
+   */
+  protected Expression condition;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected AggregationImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.AGGREGATION;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public AggregationOp getOp()
+  {
+    return op;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setOp(AggregationOp newOp)
+  {
+    AggregationOp oldOp = op;
+    op = newOp == null ? OP_EDEFAULT : newOp;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.AGGREGATION__OP, oldOp, op));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getBody()
+  {
+    return body;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetBody(Expression newBody, NotificationChain msgs)
+  {
+    Expression oldBody = body;
+    body = newBody;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.AGGREGATION__BODY, oldBody, newBody);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setBody(Expression newBody)
+  {
+    if (newBody != body)
+    {
+      NotificationChain msgs = null;
+      if (body != null)
+        msgs = ((InternalEObject)body).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.AGGREGATION__BODY, null, msgs);
+      if (newBody != null)
+        msgs = ((InternalEObject)newBody).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.AGGREGATION__BODY, null, msgs);
+      msgs = basicSetBody(newBody, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.AGGREGATION__BODY, newBody, newBody));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getCondition()
+  {
+    return condition;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetCondition(Expression newCondition, NotificationChain msgs)
+  {
+    Expression oldCondition = condition;
+    condition = newCondition;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.AGGREGATION__CONDITION, oldCondition, newCondition);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setCondition(Expression newCondition)
+  {
+    if (newCondition != condition)
+    {
+      NotificationChain msgs = null;
+      if (condition != null)
+        msgs = ((InternalEObject)condition).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.AGGREGATION__CONDITION, null, msgs);
+      if (newCondition != null)
+        msgs = ((InternalEObject)newCondition).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.AGGREGATION__CONDITION, null, msgs);
+      msgs = basicSetCondition(newCondition, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.AGGREGATION__CONDITION, newCondition, newCondition));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.AGGREGATION__BODY:
+        return basicSetBody(null, msgs);
+      case SolverLanguagePackage.AGGREGATION__CONDITION:
+        return basicSetCondition(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.AGGREGATION__OP:
+        return getOp();
+      case SolverLanguagePackage.AGGREGATION__BODY:
+        return getBody();
+      case SolverLanguagePackage.AGGREGATION__CONDITION:
+        return getCondition();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.AGGREGATION__OP:
+        setOp((AggregationOp)newValue);
+        return;
+      case SolverLanguagePackage.AGGREGATION__BODY:
+        setBody((Expression)newValue);
+        return;
+      case SolverLanguagePackage.AGGREGATION__CONDITION:
+        setCondition((Expression)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.AGGREGATION__OP:
+        setOp(OP_EDEFAULT);
+        return;
+      case SolverLanguagePackage.AGGREGATION__BODY:
+        setBody((Expression)null);
+        return;
+      case SolverLanguagePackage.AGGREGATION__CONDITION:
+        setCondition((Expression)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.AGGREGATION__OP:
+        return op != OP_EDEFAULT;
+      case SolverLanguagePackage.AGGREGATION__BODY:
+        return body != null;
+      case SolverLanguagePackage.AGGREGATION__CONDITION:
+        return condition != null;
+    }
+    return super.eIsSet(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+    StringBuilder result = new StringBuilder(super.toString());
+    result.append(" (op: ");
+    result.append(op);
+    result.append(')');
+    return result.toString();
+  }
+} //AggregationImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PolarityImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ArgumentImpl.java
index 7c2ae07d..d8bf8d91 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PolarityImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ArgumentImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
@@ -7,24 +7,24 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.Polarity;
+import org.eclipse.viatra.solver.language.solverLanguage.Argument;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
 /**
 * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Polarity</b></em>'.
+ * An implementation of the model object '<em><b>Argument</b></em>'.
 * <!-- end-user-doc -->
 *
 * @generated
 */
-public class PolarityImpl extends MinimalEObjectImpl.Container implements Polarity
+public class ArgumentImpl extends MinimalEObjectImpl.Container implements Argument
 {
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  protected PolarityImpl()
+  protected ArgumentImpl()
  {
    super();
  }
@@ -37,7 +37,7 @@ public class PolarityImpl extends MinimalEObjectImpl.Container implements Polari
  @Override
  protected EClass eStaticClass()
  {
-    return SolverLanguagePackage.Literals.POLARITY;
+    return SolverLanguagePackage.Literals.ARGUMENT;
  }
-} //PolarityImpl
+} //ArgumentImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PatternBodyImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ArgumentListImpl.java
index 5cd03fbf..8c16fb4f 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PatternBodyImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ArgumentListImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
@@ -17,41 +17,41 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.viatra.solver.language.solverLanguage.Constraint;
+import org.eclipse.viatra.solver.language.solverLanguage.Argument;
-import org.eclipse.viatra.solver.language.solverLanguage.PatternBody;
+import org.eclipse.viatra.solver.language.solverLanguage.ArgumentList;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
 /**
 * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Pattern Body</b></em>'.
+ * An implementation of the model object '<em><b>Argument List</b></em>'.
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
 * </p>
 * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PatternBodyImpl#getConstraints <em>Constraints</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ArgumentListImpl#getArguments <em>Arguments</em>}</li>
 * </ul>
 *
 * @generated
 */
-public class PatternBodyImpl extends MinimalEObjectImpl.Container implements PatternBody
+public class ArgumentListImpl extends MinimalEObjectImpl.Container implements ArgumentList
 {
  /**
-   * The cached value of the '{@link #getConstraints() <em>Constraints</em>}' containment reference list.
+   * The cached value of the '{@link #getArguments() <em>Arguments</em>}' containment reference list.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see #getConstraints()
+   * @see #getArguments()
   * @generated
   * @ordered
   */
-  protected EList<Constraint> constraints;
+  protected EList<Argument> arguments;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  protected PatternBodyImpl()
+  protected ArgumentListImpl()
  {
    super();
  }
@@ -64,7 +64,7 @@ public class PatternBodyImpl extends MinimalEObjectImpl.Container implements Pat
  @Override
  protected EClass eStaticClass()
  {
-    return SolverLanguagePackage.Literals.PATTERN_BODY;
+    return SolverLanguagePackage.Literals.ARGUMENT_LIST;
  }
  /**
@@ -73,13 +73,13 @@ public class PatternBodyImpl extends MinimalEObjectImpl.Container implements Pat
   * @generated
   */
  @Override
-  public EList<Constraint> getConstraints()
+  public EList<Argument> getArguments()
  {
-    if (constraints == null)
+    if (arguments == null)
    {
-      constraints = new EObjectContainmentEList<Constraint>(Constraint.class, this, SolverLanguagePackage.PATTERN_BODY__CONSTRAINTS);
+      arguments = new EObjectContainmentEList<Argument>(Argument.class, this, SolverLanguagePackage.ARGUMENT_LIST__ARGUMENTS);
    }
-    return constraints;
+    return arguments;
  }
  /**
@@ -92,8 +92,8 @@ public class PatternBodyImpl extends MinimalEObjectImpl.Container implements Pat
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.PATTERN_BODY__CONSTRAINTS:
+      case SolverLanguagePackage.ARGUMENT_LIST__ARGUMENTS:
-        return ((InternalEList<?>)getConstraints()).basicRemove(otherEnd, msgs);
+        return ((InternalEList<?>)getArguments()).basicRemove(otherEnd, msgs);
    }
    return super.eInverseRemove(otherEnd, featureID, msgs);
  }
@@ -108,8 +108,8 @@ public class PatternBodyImpl extends MinimalEObjectImpl.Container implements Pat
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.PATTERN_BODY__CONSTRAINTS:
+      case SolverLanguagePackage.ARGUMENT_LIST__ARGUMENTS:
-        return getConstraints();
+        return getArguments();
    }
    return super.eGet(featureID, resolve, coreType);
  }
@@ -125,9 +125,9 @@ public class PatternBodyImpl extends MinimalEObjectImpl.Container implements Pat
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.PATTERN_BODY__CONSTRAINTS:
+      case SolverLanguagePackage.ARGUMENT_LIST__ARGUMENTS:
-        getConstraints().clear();
+        getArguments().clear();
-        getConstraints().addAll((Collection<? extends Constraint>)newValue);
+        getArguments().addAll((Collection<? extends Argument>)newValue);
        return;
    }
    super.eSet(featureID, newValue);
@@ -143,8 +143,8 @@ public class PatternBodyImpl extends MinimalEObjectImpl.Container implements Pat
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.PATTERN_BODY__CONSTRAINTS:
+      case SolverLanguagePackage.ARGUMENT_LIST__ARGUMENTS:
-        getConstraints().clear();
+        getArguments().clear();
        return;
    }
    super.eUnset(featureID);
@@ -160,10 +160,10 @@ public class PatternBodyImpl extends MinimalEObjectImpl.Container implements Pat
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.PATTERN_BODY__CONSTRAINTS:
+      case SolverLanguagePackage.ARGUMENT_LIST__ARGUMENTS:
-        return constraints != null && !constraints.isEmpty();
+        return arguments != null && !arguments.isEmpty();
    }
    return super.eIsSet(featureID);
  }
-} //PatternBodyImpl
+} //ArgumentListImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ParameterImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AssertionImpl.java
index 6281c4bc..8165b62e 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ParameterImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AssertionImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
@@ -10,55 +10,53 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.Parameter;
+import org.eclipse.viatra.solver.language.solverLanguage.Assertion;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-import org.eclipse.viatra.solver.language.solverLanguage.Symbol;
-import org.eclipse.viatra.solver.language.solverLanguage.Variable;
 /**
 * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Parameter</b></em>'.
+ * An implementation of the model object '<em><b>Assertion</b></em>'.
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
 * </p>
 * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ParameterImpl#getVariable <em>Variable</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AssertionImpl#getBody <em>Body</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ParameterImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AssertionImpl#getRange <em>Range</em>}</li>
 * </ul>
 *
 * @generated
 */
-public class ParameterImpl extends MinimalEObjectImpl.Container implements Parameter
+public class AssertionImpl extends StatementImpl implements Assertion
 {
  /**
-   * The cached value of the '{@link #getVariable() <em>Variable</em>}' containment reference.
+   * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see #getVariable()
+   * @see #getBody()
   * @generated
   * @ordered
   */
-  protected Variable variable;
+  protected Expression body;
  /**
-   * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.
+   * The cached value of the '{@link #getRange() <em>Range</em>}' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see #getType()
+   * @see #getRange()
   * @generated
   * @ordered
   */
-  protected Symbol type;
+  protected Expression range;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  protected ParameterImpl()
+  protected AssertionImpl()
  {
    super();
  }
@@ -71,7 +69,7 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
  @Override
  protected EClass eStaticClass()
  {
-    return SolverLanguagePackage.Literals.PARAMETER;
+    return SolverLanguagePackage.Literals.ASSERTION;
  }
  /**
@@ -80,9 +78,9 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
   * @generated
   */
  @Override
-  public Variable getVariable()
+  public Expression getBody()
  {
-    return variable;
+    return body;
  }
  /**
@@ -90,13 +88,13 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
   * <!-- end-user-doc -->
   * @generated
   */
-  public NotificationChain basicSetVariable(Variable newVariable, NotificationChain msgs)
+  public NotificationChain basicSetBody(Expression newBody, NotificationChain msgs)
  {
-    Variable oldVariable = variable;
+    Expression oldBody = body;
-    variable = newVariable;
+    body = newBody;
    if (eNotificationRequired())
    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PARAMETER__VARIABLE, oldVariable, newVariable);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.ASSERTION__BODY, oldBody, newBody);
      if (msgs == null) msgs = notification; else msgs.add(notification);
    }
    return msgs;
@@ -108,20 +106,20 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
   * @generated
   */
  @Override
-  public void setVariable(Variable newVariable)
+  public void setBody(Expression newBody)
  {
-    if (newVariable != variable)
+    if (newBody != body)
    {
      NotificationChain msgs = null;
-      if (variable != null)
+      if (body != null)
-        msgs = ((InternalEObject)variable).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.PARAMETER__VARIABLE, null, msgs);
+        msgs = ((InternalEObject)body).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.ASSERTION__BODY, null, msgs);
-      if (newVariable != null)
+      if (newBody != null)
-        msgs = ((InternalEObject)newVariable).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.PARAMETER__VARIABLE, null, msgs);
+        msgs = ((InternalEObject)newBody).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.ASSERTION__BODY, null, msgs);
-      msgs = basicSetVariable(newVariable, msgs);
+      msgs = basicSetBody(newBody, msgs);
      if (msgs != null) msgs.dispatch();
    }
    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PARAMETER__VARIABLE, newVariable, newVariable));
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.ASSERTION__BODY, newBody, newBody));
  }
  /**
@@ -130,9 +128,9 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
   * @generated
   */
  @Override
-  public Symbol getType()
+  public Expression getRange()
  {
-    return type;
+    return range;
  }
  /**
@@ -140,13 +138,13 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
   * <!-- end-user-doc -->
   * @generated
   */
-  public NotificationChain basicSetType(Symbol newType, NotificationChain msgs)
+  public NotificationChain basicSetRange(Expression newRange, NotificationChain msgs)
  {
-    Symbol oldType = type;
+    Expression oldRange = range;
-    type = newType;
+    range = newRange;
    if (eNotificationRequired())
    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PARAMETER__TYPE, oldType, newType);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.ASSERTION__RANGE, oldRange, newRange);
      if (msgs == null) msgs = notification; else msgs.add(notification);
    }
    return msgs;
@@ -158,20 +156,20 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
   * @generated
   */
  @Override
-  public void setType(Symbol newType)
+  public void setRange(Expression newRange)
  {
-    if (newType != type)
+    if (newRange != range)
    {
      NotificationChain msgs = null;
-      if (type != null)
+      if (range != null)
-        msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.PARAMETER__TYPE, null, msgs);
+        msgs = ((InternalEObject)range).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.ASSERTION__RANGE, null, msgs);
-      if (newType != null)
+      if (newRange != null)
-        msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.PARAMETER__TYPE, null, msgs);
+        msgs = ((InternalEObject)newRange).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.ASSERTION__RANGE, null, msgs);
-      msgs = basicSetType(newType, msgs);
+      msgs = basicSetRange(newRange, msgs);
      if (msgs != null) msgs.dispatch();
    }
    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PARAMETER__TYPE, newType, newType));
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.ASSERTION__RANGE, newRange, newRange));
  }
  /**
@@ -184,10 +182,10 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.PARAMETER__VARIABLE:
+      case SolverLanguagePackage.ASSERTION__BODY:
-        return basicSetVariable(null, msgs);
+        return basicSetBody(null, msgs);
-      case SolverLanguagePackage.PARAMETER__TYPE:
+      case SolverLanguagePackage.ASSERTION__RANGE:
-        return basicSetType(null, msgs);
+        return basicSetRange(null, msgs);
    }
    return super.eInverseRemove(otherEnd, featureID, msgs);
  }
@@ -202,10 +200,10 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.PARAMETER__VARIABLE:
+      case SolverLanguagePackage.ASSERTION__BODY:
-        return getVariable();
+        return getBody();
-      case SolverLanguagePackage.PARAMETER__TYPE:
+      case SolverLanguagePackage.ASSERTION__RANGE:
-        return getType();
+        return getRange();
    }
    return super.eGet(featureID, resolve, coreType);
  }
@@ -220,11 +218,11 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.PARAMETER__VARIABLE:
+      case SolverLanguagePackage.ASSERTION__BODY:
-        setVariable((Variable)newValue);
+        setBody((Expression)newValue);
        return;
-      case SolverLanguagePackage.PARAMETER__TYPE:
+      case SolverLanguagePackage.ASSERTION__RANGE:
-        setType((Symbol)newValue);
+        setRange((Expression)newValue);
        return;
    }
    super.eSet(featureID, newValue);
@@ -240,11 +238,11 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.PARAMETER__VARIABLE:
+      case SolverLanguagePackage.ASSERTION__BODY:
-        setVariable((Variable)null);
+        setBody((Expression)null);
        return;
-      case SolverLanguagePackage.PARAMETER__TYPE:
+      case SolverLanguagePackage.ASSERTION__RANGE:
-        setType((Symbol)null);
+        setRange((Expression)null);
        return;
    }
    super.eUnset(featureID);
@@ -260,12 +258,12 @@ public class ParameterImpl extends MinimalEObjectImpl.Container implements Param
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.PARAMETER__VARIABLE:
+      case SolverLanguagePackage.ASSERTION__BODY:
-        return variable != null;
+        return body != null;
-      case SolverLanguagePackage.PARAMETER__TYPE:
+      case SolverLanguagePackage.ASSERTION__RANGE:
-        return type != null;
+        return range != null;
    }
    return super.eIsSet(featureID);
  }
-} //ParameterImpl
+} //AssertionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BasicInterpretationImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BasicInterpretationImpl.java
deleted file mode 100644
index aef515f6..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BasicInterpretationImpl.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.ComplexObject;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-import org.eclipse.viatra.solver.language.solverLanguage.Symbol;
-import org.eclipse.viatra.solver.language.solverLanguage.TruthValue;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Basic Interpretation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BasicInterpretationImpl#getSymbol <em>Symbol</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BasicInterpretationImpl#getObjects <em>Objects</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BasicInterpretationImpl#getValue <em>Value</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class BasicInterpretationImpl extends InterpretationImpl implements BasicInterpretation
-{
-  /**
-   * The cached value of the '{@link #getSymbol() <em>Symbol</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSymbol()
-   * @generated
-   * @ordered
-   */
-  protected Symbol symbol;
-  /**
-   * The cached value of the '{@link #getObjects() <em>Objects</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getObjects()
-   * @generated
-   * @ordered
-   */
-  protected EList<ComplexObject> objects;
-  /**
-   * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getValue()
-   * @generated
-   * @ordered
-   */
-  protected TruthValue value;
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected BasicInterpretationImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.BASIC_INTERPRETATION;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Symbol getSymbol()
-  {
-    return symbol;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetSymbol(Symbol newSymbol, NotificationChain msgs)
-  {
-    Symbol oldSymbol = symbol;
-    symbol = newSymbol;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.BASIC_INTERPRETATION__SYMBOL, oldSymbol, newSymbol);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setSymbol(Symbol newSymbol)
-  {
-    if (newSymbol != symbol)
-    {
-      NotificationChain msgs = null;
-      if (symbol != null)
-        msgs = ((InternalEObject)symbol).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.BASIC_INTERPRETATION__SYMBOL, null, msgs);
-      if (newSymbol != null)
-        msgs = ((InternalEObject)newSymbol).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.BASIC_INTERPRETATION__SYMBOL, null, msgs);
-      msgs = basicSetSymbol(newSymbol, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.BASIC_INTERPRETATION__SYMBOL, newSymbol, newSymbol));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EList<ComplexObject> getObjects()
-  {
-    if (objects == null)
-    {
-      objects = new EObjectContainmentEList<ComplexObject>(ComplexObject.class, this, SolverLanguagePackage.BASIC_INTERPRETATION__OBJECTS);
-    }
-    return objects;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public TruthValue getValue()
-  {
-    return value;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetValue(TruthValue newValue, NotificationChain msgs)
-  {
-    TruthValue oldValue = value;
-    value = newValue;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.BASIC_INTERPRETATION__VALUE, oldValue, newValue);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setValue(TruthValue newValue)
-  {
-    if (newValue != value)
-    {
-      NotificationChain msgs = null;
-      if (value != null)
-        msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.BASIC_INTERPRETATION__VALUE, null, msgs);
-      if (newValue != null)
-        msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.BASIC_INTERPRETATION__VALUE, null, msgs);
-      msgs = basicSetValue(newValue, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.BASIC_INTERPRETATION__VALUE, newValue, newValue));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.BASIC_INTERPRETATION__SYMBOL:
-        return basicSetSymbol(null, msgs);
-      case SolverLanguagePackage.BASIC_INTERPRETATION__OBJECTS:
-        return ((InternalEList<?>)getObjects()).basicRemove(otherEnd, msgs);
-      case SolverLanguagePackage.BASIC_INTERPRETATION__VALUE:
-        return basicSetValue(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.BASIC_INTERPRETATION__SYMBOL:
-        return getSymbol();
-      case SolverLanguagePackage.BASIC_INTERPRETATION__OBJECTS:
-        return getObjects();
-      case SolverLanguagePackage.BASIC_INTERPRETATION__VALUE:
-        return getValue();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.BASIC_INTERPRETATION__SYMBOL:
-        setSymbol((Symbol)newValue);
-        return;
-      case SolverLanguagePackage.BASIC_INTERPRETATION__OBJECTS:
-        getObjects().clear();
-        getObjects().addAll((Collection<? extends ComplexObject>)newValue);
-        return;
-      case SolverLanguagePackage.BASIC_INTERPRETATION__VALUE:
-        setValue((TruthValue)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.BASIC_INTERPRETATION__SYMBOL:
-        setSymbol((Symbol)null);
-        return;
-      case SolverLanguagePackage.BASIC_INTERPRETATION__OBJECTS:
-        getObjects().clear();
-        return;
-      case SolverLanguagePackage.BASIC_INTERPRETATION__VALUE:
-        setValue((TruthValue)null);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.BASIC_INTERPRETATION__SYMBOL:
-        return symbol != null;
-      case SolverLanguagePackage.BASIC_INTERPRETATION__OBJECTS:
-        return objects != null && !objects.isEmpty();
-      case SolverLanguagePackage.BASIC_INTERPRETATION__VALUE:
-        return value != null;
-    }
-    return super.eIsSet(featureID);
-  }
-} //BasicInterpretationImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BinaryExpressionImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BinaryExpressionImpl.java
new file mode 100644
index 00000000..adc94c4a
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BinaryExpressionImpl.java
@@ -0,0 +1,343 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression;
+import org.eclipse.viatra.solver.language.solverLanguage.BinaryOperator;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Binary Expression</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BinaryExpressionImpl#getLeft <em>Left</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BinaryExpressionImpl#getOp <em>Op</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BinaryExpressionImpl#getRight <em>Right</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class BinaryExpressionImpl extends ExpressionImpl implements BinaryExpression
+{
+  /**
+   * The cached value of the '{@link #getLeft() <em>Left</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getLeft()
+   * @generated
+   * @ordered
+   */
+  protected Expression left;
+  /**
+   * The default value of the '{@link #getOp() <em>Op</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getOp()
+   * @generated
+   * @ordered
+   */
+  protected static final BinaryOperator OP_EDEFAULT = BinaryOperator.EQ;
+  /**
+   * The cached value of the '{@link #getOp() <em>Op</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getOp()
+   * @generated
+   * @ordered
+   */
+  protected BinaryOperator op = OP_EDEFAULT;
+  /**
+   * The cached value of the '{@link #getRight() <em>Right</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getRight()
+   * @generated
+   * @ordered
+   */
+  protected Expression right;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected BinaryExpressionImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.BINARY_EXPRESSION;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getLeft()
+  {
+    return left;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetLeft(Expression newLeft, NotificationChain msgs)
+  {
+    Expression oldLeft = left;
+    left = newLeft;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.BINARY_EXPRESSION__LEFT, oldLeft, newLeft);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setLeft(Expression newLeft)
+  {
+    if (newLeft != left)
+    {
+      NotificationChain msgs = null;
+      if (left != null)
+        msgs = ((InternalEObject)left).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.BINARY_EXPRESSION__LEFT, null, msgs);
+      if (newLeft != null)
+        msgs = ((InternalEObject)newLeft).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.BINARY_EXPRESSION__LEFT, null, msgs);
+      msgs = basicSetLeft(newLeft, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.BINARY_EXPRESSION__LEFT, newLeft, newLeft));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public BinaryOperator getOp()
+  {
+    return op;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setOp(BinaryOperator newOp)
+  {
+    BinaryOperator oldOp = op;
+    op = newOp == null ? OP_EDEFAULT : newOp;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.BINARY_EXPRESSION__OP, oldOp, op));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getRight()
+  {
+    return right;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetRight(Expression newRight, NotificationChain msgs)
+  {
+    Expression oldRight = right;
+    right = newRight;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.BINARY_EXPRESSION__RIGHT, oldRight, newRight);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setRight(Expression newRight)
+  {
+    if (newRight != right)
+    {
+      NotificationChain msgs = null;
+      if (right != null)
+        msgs = ((InternalEObject)right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.BINARY_EXPRESSION__RIGHT, null, msgs);
+      if (newRight != null)
+        msgs = ((InternalEObject)newRight).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.BINARY_EXPRESSION__RIGHT, null, msgs);
+      msgs = basicSetRight(newRight, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.BINARY_EXPRESSION__RIGHT, newRight, newRight));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.BINARY_EXPRESSION__LEFT:
+        return basicSetLeft(null, msgs);
+      case SolverLanguagePackage.BINARY_EXPRESSION__RIGHT:
+        return basicSetRight(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.BINARY_EXPRESSION__LEFT:
+        return getLeft();
+      case SolverLanguagePackage.BINARY_EXPRESSION__OP:
+        return getOp();
+      case SolverLanguagePackage.BINARY_EXPRESSION__RIGHT:
+        return getRight();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.BINARY_EXPRESSION__LEFT:
+        setLeft((Expression)newValue);
+        return;
+      case SolverLanguagePackage.BINARY_EXPRESSION__OP:
+        setOp((BinaryOperator)newValue);
+        return;
+      case SolverLanguagePackage.BINARY_EXPRESSION__RIGHT:
+        setRight((Expression)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.BINARY_EXPRESSION__LEFT:
+        setLeft((Expression)null);
+        return;
+      case SolverLanguagePackage.BINARY_EXPRESSION__OP:
+        setOp(OP_EDEFAULT);
+        return;
+      case SolverLanguagePackage.BINARY_EXPRESSION__RIGHT:
+        setRight((Expression)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.BINARY_EXPRESSION__LEFT:
+        return left != null;
+      case SolverLanguagePackage.BINARY_EXPRESSION__OP:
+        return op != OP_EDEFAULT;
+      case SolverLanguagePackage.BINARY_EXPRESSION__RIGHT:
+        return right != null;
+    }
+    return super.eIsSet(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+    StringBuilder result = new StringBuilder(super.toString());
+    result.append(" (op: ");
+    result.append(op);
+    result.append(')');
+    return result.toString();
+  }
+} //BinaryExpressionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BooleanFalseImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BooleanFalseImpl.java
deleted file mode 100644
index ae78f540..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BooleanFalseImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanFalse;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Boolean False</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class BooleanFalseImpl extends BooleanValueImpl implements BooleanFalse
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected BooleanFalseImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.BOOLEAN_FALSE;
-  }
-} //BooleanFalseImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BooleanSymbolImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BooleanSymbolImpl.java
deleted file mode 100644
index 49258091..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BooleanSymbolImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Boolean Symbol</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class BooleanSymbolImpl extends DataSymbolImpl implements BooleanSymbol
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected BooleanSymbolImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.BOOLEAN_SYMBOL;
-  }
-} //BooleanSymbolImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BooleanValueImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BooleanValueImpl.java
deleted file mode 100644
index b27ab959..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BooleanValueImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanValue;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Boolean Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class BooleanValueImpl extends MinimalEObjectImpl.Container implements BooleanValue
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected BooleanValueImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.BOOLEAN_VALUE;
-  }
-} //BooleanValueImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BoundedMultiplicityImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BoundedMultiplicityImpl.java
new file mode 100644
index 00000000..45a105e0
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BoundedMultiplicityImpl.java
@@ -0,0 +1,237 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.BoundedMultiplicity;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Bounded Multiplicity</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BoundedMultiplicityImpl#getLowerBound <em>Lower Bound</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BoundedMultiplicityImpl#getUpperBound <em>Upper Bound</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class BoundedMultiplicityImpl extends MultiplicityImpl implements BoundedMultiplicity
+{
+  /**
+   * The default value of the '{@link #getLowerBound() <em>Lower Bound</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getLowerBound()
+   * @generated
+   * @ordered
+   */
+  protected static final int LOWER_BOUND_EDEFAULT = 0;
+  /**
+   * The cached value of the '{@link #getLowerBound() <em>Lower Bound</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getLowerBound()
+   * @generated
+   * @ordered
+   */
+  protected int lowerBound = LOWER_BOUND_EDEFAULT;
+  /**
+   * The default value of the '{@link #getUpperBound() <em>Upper Bound</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getUpperBound()
+   * @generated
+   * @ordered
+   */
+  protected static final int UPPER_BOUND_EDEFAULT = 0;
+  /**
+   * The cached value of the '{@link #getUpperBound() <em>Upper Bound</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getUpperBound()
+   * @generated
+   * @ordered
+   */
+  protected int upperBound = UPPER_BOUND_EDEFAULT;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected BoundedMultiplicityImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.BOUNDED_MULTIPLICITY;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public int getLowerBound()
+  {
+    return lowerBound;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setLowerBound(int newLowerBound)
+  {
+    int oldLowerBound = lowerBound;
+    lowerBound = newLowerBound;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.BOUNDED_MULTIPLICITY__LOWER_BOUND, oldLowerBound, lowerBound));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public int getUpperBound()
+  {
+    return upperBound;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setUpperBound(int newUpperBound)
+  {
+    int oldUpperBound = upperBound;
+    upperBound = newUpperBound;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.BOUNDED_MULTIPLICITY__UPPER_BOUND, oldUpperBound, upperBound));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.BOUNDED_MULTIPLICITY__LOWER_BOUND:
+        return getLowerBound();
+      case SolverLanguagePackage.BOUNDED_MULTIPLICITY__UPPER_BOUND:
+        return getUpperBound();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.BOUNDED_MULTIPLICITY__LOWER_BOUND:
+        setLowerBound((Integer)newValue);
+        return;
+      case SolverLanguagePackage.BOUNDED_MULTIPLICITY__UPPER_BOUND:
+        setUpperBound((Integer)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.BOUNDED_MULTIPLICITY__LOWER_BOUND:
+        setLowerBound(LOWER_BOUND_EDEFAULT);
+        return;
+      case SolverLanguagePackage.BOUNDED_MULTIPLICITY__UPPER_BOUND:
+        setUpperBound(UPPER_BOUND_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.BOUNDED_MULTIPLICITY__LOWER_BOUND:
+        return lowerBound != LOWER_BOUND_EDEFAULT;
+      case SolverLanguagePackage.BOUNDED_MULTIPLICITY__UPPER_BOUND:
+        return upperBound != UPPER_BOUND_EDEFAULT;
+    }
+    return super.eIsSet(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+    StringBuilder result = new StringBuilder(super.toString());
+    result.append(" (lowerBound: ");
+    result.append(lowerBound);
+    result.append(", upperBound: ");
+    result.append(upperBound);
+    result.append(')');
+    return result.toString();
+  }
+} //BoundedMultiplicityImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BoundedScopeDefinitionImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BoundedScopeDefinitionImpl.java
new file mode 100644
index 00000000..36bf4f96
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BoundedScopeDefinitionImpl.java
@@ -0,0 +1,237 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.BoundedScopeDefinition;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Bounded Scope Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BoundedScopeDefinitionImpl#getLowerBound <em>Lower Bound</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BoundedScopeDefinitionImpl#getUpperBound <em>Upper Bound</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class BoundedScopeDefinitionImpl extends ScopeDefinitionImpl implements BoundedScopeDefinition
+{
+  /**
+   * The default value of the '{@link #getLowerBound() <em>Lower Bound</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getLowerBound()
+   * @generated
+   * @ordered
+   */
+  protected static final int LOWER_BOUND_EDEFAULT = 0;
+  /**
+   * The cached value of the '{@link #getLowerBound() <em>Lower Bound</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getLowerBound()
+   * @generated
+   * @ordered
+   */
+  protected int lowerBound = LOWER_BOUND_EDEFAULT;
+  /**
+   * The default value of the '{@link #getUpperBound() <em>Upper Bound</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getUpperBound()
+   * @generated
+   * @ordered
+   */
+  protected static final int UPPER_BOUND_EDEFAULT = 0;
+  /**
+   * The cached value of the '{@link #getUpperBound() <em>Upper Bound</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getUpperBound()
+   * @generated
+   * @ordered
+   */
+  protected int upperBound = UPPER_BOUND_EDEFAULT;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected BoundedScopeDefinitionImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.BOUNDED_SCOPE_DEFINITION;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public int getLowerBound()
+  {
+    return lowerBound;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setLowerBound(int newLowerBound)
+  {
+    int oldLowerBound = lowerBound;
+    lowerBound = newLowerBound;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.BOUNDED_SCOPE_DEFINITION__LOWER_BOUND, oldLowerBound, lowerBound));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public int getUpperBound()
+  {
+    return upperBound;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setUpperBound(int newUpperBound)
+  {
+    int oldUpperBound = upperBound;
+    upperBound = newUpperBound;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.BOUNDED_SCOPE_DEFINITION__UPPER_BOUND, oldUpperBound, upperBound));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.BOUNDED_SCOPE_DEFINITION__LOWER_BOUND:
+        return getLowerBound();
+      case SolverLanguagePackage.BOUNDED_SCOPE_DEFINITION__UPPER_BOUND:
+        return getUpperBound();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.BOUNDED_SCOPE_DEFINITION__LOWER_BOUND:
+        setLowerBound((Integer)newValue);
+        return;
+      case SolverLanguagePackage.BOUNDED_SCOPE_DEFINITION__UPPER_BOUND:
+        setUpperBound((Integer)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.BOUNDED_SCOPE_DEFINITION__LOWER_BOUND:
+        setLowerBound(LOWER_BOUND_EDEFAULT);
+        return;
+      case SolverLanguagePackage.BOUNDED_SCOPE_DEFINITION__UPPER_BOUND:
+        setUpperBound(UPPER_BOUND_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.BOUNDED_SCOPE_DEFINITION__LOWER_BOUND:
+        return lowerBound != LOWER_BOUND_EDEFAULT;
+      case SolverLanguagePackage.BOUNDED_SCOPE_DEFINITION__UPPER_BOUND:
+        return upperBound != UPPER_BOUND_EDEFAULT;
+    }
+    return super.eIsSet(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+    StringBuilder result = new StringBuilder(super.toString());
+    result.append(" (lowerBound: ");
+    result.append(lowerBound);
+    result.append(", upperBound: ");
+    result.append(upperBound);
+    result.append(')');
+    return result.toString();
+  }
+} //BoundedScopeDefinitionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CDInterpretationImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CDInterpretationImpl.java
deleted file mode 100644
index b23bbba5..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CDInterpretationImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.CDInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>CD Interpretation</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class CDInterpretationImpl extends InterpretationImpl implements CDInterpretation
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected CDInterpretationImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.CD_INTERPRETATION;
-  }
-} //CDInterpretationImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CallImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CallImpl.java
new file mode 100644
index 00000000..fde31be5
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CallImpl.java
@@ -0,0 +1,401 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.ArgumentList;
+import org.eclipse.viatra.solver.language.solverLanguage.Call;
+import org.eclipse.viatra.solver.language.solverLanguage.Reference;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Call</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CallImpl#getFunctor <em>Functor</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CallImpl#getArgumentList <em>Argument List</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CallImpl#isTransitiveClosure <em>Transitive Closure</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CallImpl#isReflexiveTransitiveClosure <em>Reflexive Transitive Closure</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CallImpl extends ExpressionImpl implements Call
+{
+  /**
+   * The cached value of the '{@link #getFunctor() <em>Functor</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getFunctor()
+   * @generated
+   * @ordered
+   */
+  protected Reference functor;
+  /**
+   * The cached value of the '{@link #getArgumentList() <em>Argument List</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getArgumentList()
+   * @generated
+   * @ordered
+   */
+  protected ArgumentList argumentList;
+  /**
+   * The default value of the '{@link #isTransitiveClosure() <em>Transitive Closure</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #isTransitiveClosure()
+   * @generated
+   * @ordered
+   */
+  protected static final boolean TRANSITIVE_CLOSURE_EDEFAULT = false;
+  /**
+   * The cached value of the '{@link #isTransitiveClosure() <em>Transitive Closure</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #isTransitiveClosure()
+   * @generated
+   * @ordered
+   */
+  protected boolean transitiveClosure = TRANSITIVE_CLOSURE_EDEFAULT;
+  /**
+   * The default value of the '{@link #isReflexiveTransitiveClosure() <em>Reflexive Transitive Closure</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #isReflexiveTransitiveClosure()
+   * @generated
+   * @ordered
+   */
+  protected static final boolean REFLEXIVE_TRANSITIVE_CLOSURE_EDEFAULT = false;
+  /**
+   * The cached value of the '{@link #isReflexiveTransitiveClosure() <em>Reflexive Transitive Closure</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #isReflexiveTransitiveClosure()
+   * @generated
+   * @ordered
+   */
+  protected boolean reflexiveTransitiveClosure = REFLEXIVE_TRANSITIVE_CLOSURE_EDEFAULT;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected CallImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.CALL;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Reference getFunctor()
+  {
+    return functor;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetFunctor(Reference newFunctor, NotificationChain msgs)
+  {
+    Reference oldFunctor = functor;
+    functor = newFunctor;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CALL__FUNCTOR, oldFunctor, newFunctor);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setFunctor(Reference newFunctor)
+  {
+    if (newFunctor != functor)
+    {
+      NotificationChain msgs = null;
+      if (functor != null)
+        msgs = ((InternalEObject)functor).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CALL__FUNCTOR, null, msgs);
+      if (newFunctor != null)
+        msgs = ((InternalEObject)newFunctor).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CALL__FUNCTOR, null, msgs);
+      msgs = basicSetFunctor(newFunctor, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CALL__FUNCTOR, newFunctor, newFunctor));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public ArgumentList getArgumentList()
+  {
+    return argumentList;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetArgumentList(ArgumentList newArgumentList, NotificationChain msgs)
+  {
+    ArgumentList oldArgumentList = argumentList;
+    argumentList = newArgumentList;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CALL__ARGUMENT_LIST, oldArgumentList, newArgumentList);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setArgumentList(ArgumentList newArgumentList)
+  {
+    if (newArgumentList != argumentList)
+    {
+      NotificationChain msgs = null;
+      if (argumentList != null)
+        msgs = ((InternalEObject)argumentList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CALL__ARGUMENT_LIST, null, msgs);
+      if (newArgumentList != null)
+        msgs = ((InternalEObject)newArgumentList).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CALL__ARGUMENT_LIST, null, msgs);
+      msgs = basicSetArgumentList(newArgumentList, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CALL__ARGUMENT_LIST, newArgumentList, newArgumentList));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean isTransitiveClosure()
+  {
+    return transitiveClosure;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setTransitiveClosure(boolean newTransitiveClosure)
+  {
+    boolean oldTransitiveClosure = transitiveClosure;
+    transitiveClosure = newTransitiveClosure;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CALL__TRANSITIVE_CLOSURE, oldTransitiveClosure, transitiveClosure));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean isReflexiveTransitiveClosure()
+  {
+    return reflexiveTransitiveClosure;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setReflexiveTransitiveClosure(boolean newReflexiveTransitiveClosure)
+  {
+    boolean oldReflexiveTransitiveClosure = reflexiveTransitiveClosure;
+    reflexiveTransitiveClosure = newReflexiveTransitiveClosure;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CALL__REFLEXIVE_TRANSITIVE_CLOSURE, oldReflexiveTransitiveClosure, reflexiveTransitiveClosure));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.CALL__FUNCTOR:
+        return basicSetFunctor(null, msgs);
+      case SolverLanguagePackage.CALL__ARGUMENT_LIST:
+        return basicSetArgumentList(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.CALL__FUNCTOR:
+        return getFunctor();
+      case SolverLanguagePackage.CALL__ARGUMENT_LIST:
+        return getArgumentList();
+      case SolverLanguagePackage.CALL__TRANSITIVE_CLOSURE:
+        return isTransitiveClosure();
+      case SolverLanguagePackage.CALL__REFLEXIVE_TRANSITIVE_CLOSURE:
+        return isReflexiveTransitiveClosure();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.CALL__FUNCTOR:
+        setFunctor((Reference)newValue);
+        return;
+      case SolverLanguagePackage.CALL__ARGUMENT_LIST:
+        setArgumentList((ArgumentList)newValue);
+        return;
+      case SolverLanguagePackage.CALL__TRANSITIVE_CLOSURE:
+        setTransitiveClosure((Boolean)newValue);
+        return;
+      case SolverLanguagePackage.CALL__REFLEXIVE_TRANSITIVE_CLOSURE:
+        setReflexiveTransitiveClosure((Boolean)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.CALL__FUNCTOR:
+        setFunctor((Reference)null);
+        return;
+      case SolverLanguagePackage.CALL__ARGUMENT_LIST:
+        setArgumentList((ArgumentList)null);
+        return;
+      case SolverLanguagePackage.CALL__TRANSITIVE_CLOSURE:
+        setTransitiveClosure(TRANSITIVE_CLOSURE_EDEFAULT);
+        return;
+      case SolverLanguagePackage.CALL__REFLEXIVE_TRANSITIVE_CLOSURE:
+        setReflexiveTransitiveClosure(REFLEXIVE_TRANSITIVE_CLOSURE_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.CALL__FUNCTOR:
+        return functor != null;
+      case SolverLanguagePackage.CALL__ARGUMENT_LIST:
+        return argumentList != null;
+      case SolverLanguagePackage.CALL__TRANSITIVE_CLOSURE:
+        return transitiveClosure != TRANSITIVE_CLOSURE_EDEFAULT;
+      case SolverLanguagePackage.CALL__REFLEXIVE_TRANSITIVE_CLOSURE:
+        return reflexiveTransitiveClosure != REFLEXIVE_TRANSITIVE_CLOSURE_EDEFAULT;
+    }
+    return super.eIsSet(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+    StringBuilder result = new StringBuilder(super.toString());
+    result.append(" (transitiveClosure: ");
+    result.append(transitiveClosure);
+    result.append(", reflexiveTransitiveClosure: ");
+    result.append(reflexiveTransitiveClosure);
+    result.append(')');
+    return result.toString();
+  }
+} //CallImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CaseImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CaseImpl.java
new file mode 100644
index 00000000..47245831
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CaseImpl.java
@@ -0,0 +1,269 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.Case;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Case</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CaseImpl#getCondition <em>Condition</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CaseImpl#getBody <em>Body</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CaseImpl extends ExpressionImpl implements Case
+{
+  /**
+   * The cached value of the '{@link #getCondition() <em>Condition</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getCondition()
+   * @generated
+   * @ordered
+   */
+  protected Expression condition;
+  /**
+   * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getBody()
+   * @generated
+   * @ordered
+   */
+  protected Expression body;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected CaseImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.CASE;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getCondition()
+  {
+    return condition;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetCondition(Expression newCondition, NotificationChain msgs)
+  {
+    Expression oldCondition = condition;
+    condition = newCondition;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CASE__CONDITION, oldCondition, newCondition);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setCondition(Expression newCondition)
+  {
+    if (newCondition != condition)
+    {
+      NotificationChain msgs = null;
+      if (condition != null)
+        msgs = ((InternalEObject)condition).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CASE__CONDITION, null, msgs);
+      if (newCondition != null)
+        msgs = ((InternalEObject)newCondition).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CASE__CONDITION, null, msgs);
+      msgs = basicSetCondition(newCondition, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CASE__CONDITION, newCondition, newCondition));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getBody()
+  {
+    return body;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetBody(Expression newBody, NotificationChain msgs)
+  {
+    Expression oldBody = body;
+    body = newBody;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CASE__BODY, oldBody, newBody);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setBody(Expression newBody)
+  {
+    if (newBody != body)
+    {
+      NotificationChain msgs = null;
+      if (body != null)
+        msgs = ((InternalEObject)body).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CASE__BODY, null, msgs);
+      if (newBody != null)
+        msgs = ((InternalEObject)newBody).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CASE__BODY, null, msgs);
+      msgs = basicSetBody(newBody, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CASE__BODY, newBody, newBody));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.CASE__CONDITION:
+        return basicSetCondition(null, msgs);
+      case SolverLanguagePackage.CASE__BODY:
+        return basicSetBody(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.CASE__CONDITION:
+        return getCondition();
+      case SolverLanguagePackage.CASE__BODY:
+        return getBody();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.CASE__CONDITION:
+        setCondition((Expression)newValue);
+        return;
+      case SolverLanguagePackage.CASE__BODY:
+        setBody((Expression)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.CASE__CONDITION:
+        setCondition((Expression)null);
+        return;
+      case SolverLanguagePackage.CASE__BODY:
+        setBody((Expression)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.CASE__CONDITION:
+        return condition != null;
+      case SolverLanguagePackage.CASE__BODY:
+        return body != null;
+    }
+    return super.eIsSet(featureID);
+  }
+} //CaseImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ClassInterpretationImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ClassInterpretationImpl.java
deleted file mode 100644
index effc5970..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ClassInterpretationImpl.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Class Interpretation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ClassInterpretationImpl#isAbstract <em>Abstract</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ClassInterpretationImpl#getSymbol <em>Symbol</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ClassInterpretationImpl#getSupertypes <em>Supertypes</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ClassInterpretationImpl#getFielt <em>Fielt</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class ClassInterpretationImpl extends CDInterpretationImpl implements ClassInterpretation
-{
-  /**
-   * The default value of the '{@link #isAbstract() <em>Abstract</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isAbstract()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean ABSTRACT_EDEFAULT = false;
-  /**
-   * The cached value of the '{@link #isAbstract() <em>Abstract</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isAbstract()
-   * @generated
-   * @ordered
-   */
-  protected boolean abstract_ = ABSTRACT_EDEFAULT;
-  /**
-   * The cached value of the '{@link #getSymbol() <em>Symbol</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSymbol()
-   * @generated
-   * @ordered
-   */
-  protected ModelSymbol symbol;
-  /**
-   * The cached value of the '{@link #getSupertypes() <em>Supertypes</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSupertypes()
-   * @generated
-   * @ordered
-   */
-  protected EList<ModelSymbol> supertypes;
-  /**
-   * The cached value of the '{@link #getFielt() <em>Fielt</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFielt()
-   * @generated
-   * @ordered
-   */
-  protected EList<FieldRelationInterpretation> fielt;
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ClassInterpretationImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.CLASS_INTERPRETATION;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean isAbstract()
-  {
-    return abstract_;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setAbstract(boolean newAbstract)
-  {
-    boolean oldAbstract = abstract_;
-    abstract_ = newAbstract;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CLASS_INTERPRETATION__ABSTRACT, oldAbstract, abstract_));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public ModelSymbol getSymbol()
-  {
-    return symbol;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetSymbol(ModelSymbol newSymbol, NotificationChain msgs)
-  {
-    ModelSymbol oldSymbol = symbol;
-    symbol = newSymbol;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CLASS_INTERPRETATION__SYMBOL, oldSymbol, newSymbol);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setSymbol(ModelSymbol newSymbol)
-  {
-    if (newSymbol != symbol)
-    {
-      NotificationChain msgs = null;
-      if (symbol != null)
-        msgs = ((InternalEObject)symbol).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CLASS_INTERPRETATION__SYMBOL, null, msgs);
-      if (newSymbol != null)
-        msgs = ((InternalEObject)newSymbol).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CLASS_INTERPRETATION__SYMBOL, null, msgs);
-      msgs = basicSetSymbol(newSymbol, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CLASS_INTERPRETATION__SYMBOL, newSymbol, newSymbol));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EList<ModelSymbol> getSupertypes()
-  {
-    if (supertypes == null)
-    {
-      supertypes = new EObjectContainmentEList<ModelSymbol>(ModelSymbol.class, this, SolverLanguagePackage.CLASS_INTERPRETATION__SUPERTYPES);
-    }
-    return supertypes;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EList<FieldRelationInterpretation> getFielt()
-  {
-    if (fielt == null)
-    {
-      fielt = new EObjectContainmentEList<FieldRelationInterpretation>(FieldRelationInterpretation.class, this, SolverLanguagePackage.CLASS_INTERPRETATION__FIELT);
-    }
-    return fielt;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.CLASS_INTERPRETATION__SYMBOL:
-        return basicSetSymbol(null, msgs);
-      case SolverLanguagePackage.CLASS_INTERPRETATION__SUPERTYPES:
-        return ((InternalEList<?>)getSupertypes()).basicRemove(otherEnd, msgs);
-      case SolverLanguagePackage.CLASS_INTERPRETATION__FIELT:
-        return ((InternalEList<?>)getFielt()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.CLASS_INTERPRETATION__ABSTRACT:
-        return isAbstract();
-      case SolverLanguagePackage.CLASS_INTERPRETATION__SYMBOL:
-        return getSymbol();
-      case SolverLanguagePackage.CLASS_INTERPRETATION__SUPERTYPES:
-        return getSupertypes();
-      case SolverLanguagePackage.CLASS_INTERPRETATION__FIELT:
-        return getFielt();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.CLASS_INTERPRETATION__ABSTRACT:
-        setAbstract((Boolean)newValue);
-        return;
-      case SolverLanguagePackage.CLASS_INTERPRETATION__SYMBOL:
-        setSymbol((ModelSymbol)newValue);
-        return;
-      case SolverLanguagePackage.CLASS_INTERPRETATION__SUPERTYPES:
-        getSupertypes().clear();
-        getSupertypes().addAll((Collection<? extends ModelSymbol>)newValue);
-        return;
-      case SolverLanguagePackage.CLASS_INTERPRETATION__FIELT:
-        getFielt().clear();
-        getFielt().addAll((Collection<? extends FieldRelationInterpretation>)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.CLASS_INTERPRETATION__ABSTRACT:
-        setAbstract(ABSTRACT_EDEFAULT);
-        return;
-      case SolverLanguagePackage.CLASS_INTERPRETATION__SYMBOL:
-        setSymbol((ModelSymbol)null);
-        return;
-      case SolverLanguagePackage.CLASS_INTERPRETATION__SUPERTYPES:
-        getSupertypes().clear();
-        return;
-      case SolverLanguagePackage.CLASS_INTERPRETATION__FIELT:
-        getFielt().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.CLASS_INTERPRETATION__ABSTRACT:
-        return abstract_ != ABSTRACT_EDEFAULT;
-      case SolverLanguagePackage.CLASS_INTERPRETATION__SYMBOL:
-        return symbol != null;
-      case SolverLanguagePackage.CLASS_INTERPRETATION__SUPERTYPES:
-        return supertypes != null && !supertypes.isEmpty();
-      case SolverLanguagePackage.CLASS_INTERPRETATION__FIELT:
-        return fielt != null && !fielt.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-    StringBuilder result = new StringBuilder(super.toString());
-    result.append(" (abstract: ");
-    result.append(abstract_);
-    result.append(')');
-    return result.toString();
-  }
-} //ClassInterpretationImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ComparisonImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ComparisonImpl.java
new file mode 100644
index 00000000..9e62d7ef
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ComparisonImpl.java
@@ -0,0 +1,343 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.BinaryOperator;
+import org.eclipse.viatra.solver.language.solverLanguage.Comparison;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Comparison</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ComparisonImpl#getLeft <em>Left</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ComparisonImpl#getOp <em>Op</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ComparisonImpl#getRight <em>Right</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ComparisonImpl extends ExpressionImpl implements Comparison
+{
+  /**
+   * The cached value of the '{@link #getLeft() <em>Left</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getLeft()
+   * @generated
+   * @ordered
+   */
+  protected Expression left;
+  /**
+   * The default value of the '{@link #getOp() <em>Op</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getOp()
+   * @generated
+   * @ordered
+   */
+  protected static final BinaryOperator OP_EDEFAULT = BinaryOperator.EQ;
+  /**
+   * The cached value of the '{@link #getOp() <em>Op</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getOp()
+   * @generated
+   * @ordered
+   */
+  protected BinaryOperator op = OP_EDEFAULT;
+  /**
+   * The cached value of the '{@link #getRight() <em>Right</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getRight()
+   * @generated
+   * @ordered
+   */
+  protected Expression right;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ComparisonImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.COMPARISON;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getLeft()
+  {
+    return left;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetLeft(Expression newLeft, NotificationChain msgs)
+  {
+    Expression oldLeft = left;
+    left = newLeft;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.COMPARISON__LEFT, oldLeft, newLeft);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setLeft(Expression newLeft)
+  {
+    if (newLeft != left)
+    {
+      NotificationChain msgs = null;
+      if (left != null)
+        msgs = ((InternalEObject)left).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.COMPARISON__LEFT, null, msgs);
+      if (newLeft != null)
+        msgs = ((InternalEObject)newLeft).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.COMPARISON__LEFT, null, msgs);
+      msgs = basicSetLeft(newLeft, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.COMPARISON__LEFT, newLeft, newLeft));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public BinaryOperator getOp()
+  {
+    return op;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setOp(BinaryOperator newOp)
+  {
+    BinaryOperator oldOp = op;
+    op = newOp == null ? OP_EDEFAULT : newOp;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.COMPARISON__OP, oldOp, op));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getRight()
+  {
+    return right;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetRight(Expression newRight, NotificationChain msgs)
+  {
+    Expression oldRight = right;
+    right = newRight;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.COMPARISON__RIGHT, oldRight, newRight);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setRight(Expression newRight)
+  {
+    if (newRight != right)
+    {
+      NotificationChain msgs = null;
+      if (right != null)
+        msgs = ((InternalEObject)right).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.COMPARISON__RIGHT, null, msgs);
+      if (newRight != null)
+        msgs = ((InternalEObject)newRight).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.COMPARISON__RIGHT, null, msgs);
+      msgs = basicSetRight(newRight, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.COMPARISON__RIGHT, newRight, newRight));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.COMPARISON__LEFT:
+        return basicSetLeft(null, msgs);
+      case SolverLanguagePackage.COMPARISON__RIGHT:
+        return basicSetRight(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.COMPARISON__LEFT:
+        return getLeft();
+      case SolverLanguagePackage.COMPARISON__OP:
+        return getOp();
+      case SolverLanguagePackage.COMPARISON__RIGHT:
+        return getRight();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.COMPARISON__LEFT:
+        setLeft((Expression)newValue);
+        return;
+      case SolverLanguagePackage.COMPARISON__OP:
+        setOp((BinaryOperator)newValue);
+        return;
+      case SolverLanguagePackage.COMPARISON__RIGHT:
+        setRight((Expression)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.COMPARISON__LEFT:
+        setLeft((Expression)null);
+        return;
+      case SolverLanguagePackage.COMPARISON__OP:
+        setOp(OP_EDEFAULT);
+        return;
+      case SolverLanguagePackage.COMPARISON__RIGHT:
+        setRight((Expression)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.COMPARISON__LEFT:
+        return left != null;
+      case SolverLanguagePackage.COMPARISON__OP:
+        return op != OP_EDEFAULT;
+      case SolverLanguagePackage.COMPARISON__RIGHT:
+        return right != null;
+    }
+    return super.eIsSet(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+    StringBuilder result = new StringBuilder(super.toString());
+    result.append(" (op: ");
+    result.append(op);
+    result.append(')');
+    return result.toString();
+  }
+} //ComparisonImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ComplexObjectImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ComplexObjectImpl.java
deleted file mode 100644
index 09ad8a6d..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ComplexObjectImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.ComplexObject;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Complex Object</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ComplexObjectImpl extends MinimalEObjectImpl.Container implements ComplexObject
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ComplexObjectImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.COMPLEX_OBJECT;
-  }
-} //ComplexObjectImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ConjunctionImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ConjunctionImpl.java
new file mode 100644
index 00000000..6a1e995a
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ConjunctionImpl.java
@@ -0,0 +1,167 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.viatra.solver.language.solverLanguage.Conjunction;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Conjunction</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ConjunctionImpl#getChildren <em>Children</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ConjunctionImpl extends ExpressionImpl implements Conjunction
+{
+  /**
+   * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getChildren()
+   * @generated
+   * @ordered
+   */
+  protected EList<Expression> children;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ConjunctionImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.CONJUNCTION;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EList<Expression> getChildren()
+  {
+    if (children == null)
+    {
+      children = new EObjectContainmentEList<Expression>(Expression.class, this, SolverLanguagePackage.CONJUNCTION__CHILDREN);
+    }
+    return children;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.CONJUNCTION__CHILDREN:
+        return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.CONJUNCTION__CHILDREN:
+        return getChildren();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.CONJUNCTION__CHILDREN:
+        getChildren().clear();
+        getChildren().addAll((Collection<? extends Expression>)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.CONJUNCTION__CHILDREN:
+        getChildren().clear();
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.CONJUNCTION__CHILDREN:
+        return children != null && !children.isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
+} //ConjunctionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ConstraintImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ConstraintImpl.java
deleted file mode 100644
index 2f990fee..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ConstraintImpl.java
+++ /dev/null
@@ -1,393 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.viatra.solver.language.solverLanguage.ClosureType;
-import org.eclipse.viatra.solver.language.solverLanguage.Constraint;
-import org.eclipse.viatra.solver.language.solverLanguage.Literal;
-import org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.Polarity;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Constraint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ConstraintImpl#getPolarity <em>Polarity</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ConstraintImpl#getSymbol <em>Symbol</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ConstraintImpl#getParams <em>Params</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ConstraintImpl#getClosureType <em>Closure Type</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class ConstraintImpl extends MinimalEObjectImpl.Container implements Constraint
-{
-  /**
-   * The cached value of the '{@link #getPolarity() <em>Polarity</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPolarity()
-   * @generated
-   * @ordered
-   */
-  protected Polarity polarity;
-  /**
-   * The cached value of the '{@link #getSymbol() <em>Symbol</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSymbol()
-   * @generated
-   * @ordered
-   */
-  protected ModelSymbol symbol;
-  /**
-   * The cached value of the '{@link #getParams() <em>Params</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getParams()
-   * @generated
-   * @ordered
-   */
-  protected EList<Literal> params;
-  /**
-   * The cached value of the '{@link #getClosureType() <em>Closure Type</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getClosureType()
-   * @generated
-   * @ordered
-   */
-  protected ClosureType closureType;
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ConstraintImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.CONSTRAINT;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Polarity getPolarity()
-  {
-    return polarity;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetPolarity(Polarity newPolarity, NotificationChain msgs)
-  {
-    Polarity oldPolarity = polarity;
-    polarity = newPolarity;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CONSTRAINT__POLARITY, oldPolarity, newPolarity);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setPolarity(Polarity newPolarity)
-  {
-    if (newPolarity != polarity)
-    {
-      NotificationChain msgs = null;
-      if (polarity != null)
-        msgs = ((InternalEObject)polarity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CONSTRAINT__POLARITY, null, msgs);
-      if (newPolarity != null)
-        msgs = ((InternalEObject)newPolarity).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CONSTRAINT__POLARITY, null, msgs);
-      msgs = basicSetPolarity(newPolarity, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CONSTRAINT__POLARITY, newPolarity, newPolarity));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public ModelSymbol getSymbol()
-  {
-    return symbol;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetSymbol(ModelSymbol newSymbol, NotificationChain msgs)
-  {
-    ModelSymbol oldSymbol = symbol;
-    symbol = newSymbol;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CONSTRAINT__SYMBOL, oldSymbol, newSymbol);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setSymbol(ModelSymbol newSymbol)
-  {
-    if (newSymbol != symbol)
-    {
-      NotificationChain msgs = null;
-      if (symbol != null)
-        msgs = ((InternalEObject)symbol).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CONSTRAINT__SYMBOL, null, msgs);
-      if (newSymbol != null)
-        msgs = ((InternalEObject)newSymbol).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CONSTRAINT__SYMBOL, null, msgs);
-      msgs = basicSetSymbol(newSymbol, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CONSTRAINT__SYMBOL, newSymbol, newSymbol));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EList<Literal> getParams()
-  {
-    if (params == null)
-    {
-      params = new EObjectContainmentEList<Literal>(Literal.class, this, SolverLanguagePackage.CONSTRAINT__PARAMS);
-    }
-    return params;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public ClosureType getClosureType()
-  {
-    return closureType;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetClosureType(ClosureType newClosureType, NotificationChain msgs)
-  {
-    ClosureType oldClosureType = closureType;
-    closureType = newClosureType;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CONSTRAINT__CLOSURE_TYPE, oldClosureType, newClosureType);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setClosureType(ClosureType newClosureType)
-  {
-    if (newClosureType != closureType)
-    {
-      NotificationChain msgs = null;
-      if (closureType != null)
-        msgs = ((InternalEObject)closureType).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CONSTRAINT__CLOSURE_TYPE, null, msgs);
-      if (newClosureType != null)
-        msgs = ((InternalEObject)newClosureType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CONSTRAINT__CLOSURE_TYPE, null, msgs);
-      msgs = basicSetClosureType(newClosureType, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CONSTRAINT__CLOSURE_TYPE, newClosureType, newClosureType));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.CONSTRAINT__POLARITY:
-        return basicSetPolarity(null, msgs);
-      case SolverLanguagePackage.CONSTRAINT__SYMBOL:
-        return basicSetSymbol(null, msgs);
-      case SolverLanguagePackage.CONSTRAINT__PARAMS:
-        return ((InternalEList<?>)getParams()).basicRemove(otherEnd, msgs);
-      case SolverLanguagePackage.CONSTRAINT__CLOSURE_TYPE:
-        return basicSetClosureType(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.CONSTRAINT__POLARITY:
-        return getPolarity();
-      case SolverLanguagePackage.CONSTRAINT__SYMBOL:
-        return getSymbol();
-      case SolverLanguagePackage.CONSTRAINT__PARAMS:
-        return getParams();
-      case SolverLanguagePackage.CONSTRAINT__CLOSURE_TYPE:
-        return getClosureType();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.CONSTRAINT__POLARITY:
-        setPolarity((Polarity)newValue);
-        return;
-      case SolverLanguagePackage.CONSTRAINT__SYMBOL:
-        setSymbol((ModelSymbol)newValue);
-        return;
-      case SolverLanguagePackage.CONSTRAINT__PARAMS:
-        getParams().clear();
-        getParams().addAll((Collection<? extends Literal>)newValue);
-        return;
-      case SolverLanguagePackage.CONSTRAINT__CLOSURE_TYPE:
-        setClosureType((ClosureType)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.CONSTRAINT__POLARITY:
-        setPolarity((Polarity)null);
-        return;
-      case SolverLanguagePackage.CONSTRAINT__SYMBOL:
-        setSymbol((ModelSymbol)null);
-        return;
-      case SolverLanguagePackage.CONSTRAINT__PARAMS:
-        getParams().clear();
-        return;
-      case SolverLanguagePackage.CONSTRAINT__CLOSURE_TYPE:
-        setClosureType((ClosureType)null);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.CONSTRAINT__POLARITY:
-        return polarity != null;
-      case SolverLanguagePackage.CONSTRAINT__SYMBOL:
-        return symbol != null;
-      case SolverLanguagePackage.CONSTRAINT__PARAMS:
-        return params != null && !params.isEmpty();
-      case SolverLanguagePackage.CONSTRAINT__CLOSURE_TYPE:
-        return closureType != null;
-    }
-    return super.eIsSet(featureID);
-  }
-} //ConstraintImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AllInstancesImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CountImpl.java
index 5da3bf30..1609245f 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AllInstancesImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CountImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
@@ -11,41 +11,41 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.AllInstances;
+import org.eclipse.viatra.solver.language.solverLanguage.Count;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-import org.eclipse.viatra.solver.language.solverLanguage.Symbol;
 /**
 * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>All Instances</b></em>'.
+ * An implementation of the model object '<em><b>Count</b></em>'.
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
 * </p>
 * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AllInstancesImpl#getSymbol <em>Symbol</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CountImpl#getBody <em>Body</em>}</li>
 * </ul>
 *
 * @generated
 */
-public class AllInstancesImpl extends ComplexObjectImpl implements AllInstances
+public class CountImpl extends ExpressionImpl implements Count
 {
  /**
-   * The cached value of the '{@link #getSymbol() <em>Symbol</em>}' containment reference.
+   * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see #getSymbol()
+   * @see #getBody()
   * @generated
   * @ordered
   */
-  protected Symbol symbol;
+  protected Expression body;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  protected AllInstancesImpl()
+  protected CountImpl()
  {
    super();
  }
@@ -58,7 +58,7 @@ public class AllInstancesImpl extends ComplexObjectImpl implements AllInstances
  @Override
  protected EClass eStaticClass()
  {
-    return SolverLanguagePackage.Literals.ALL_INSTANCES;
+    return SolverLanguagePackage.Literals.COUNT;
  }
  /**
@@ -67,9 +67,9 @@ public class AllInstancesImpl extends ComplexObjectImpl implements AllInstances
   * @generated
   */
  @Override
-  public Symbol getSymbol()
+  public Expression getBody()
  {
-    return symbol;
+    return body;
  }
  /**
@@ -77,13 +77,13 @@ public class AllInstancesImpl extends ComplexObjectImpl implements AllInstances
   * <!-- end-user-doc -->
   * @generated
   */
-  public NotificationChain basicSetSymbol(Symbol newSymbol, NotificationChain msgs)
+  public NotificationChain basicSetBody(Expression newBody, NotificationChain msgs)
  {
-    Symbol oldSymbol = symbol;
+    Expression oldBody = body;
-    symbol = newSymbol;
+    body = newBody;
    if (eNotificationRequired())
    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.ALL_INSTANCES__SYMBOL, oldSymbol, newSymbol);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.COUNT__BODY, oldBody, newBody);
      if (msgs == null) msgs = notification; else msgs.add(notification);
    }
    return msgs;
@@ -95,20 +95,20 @@ public class AllInstancesImpl extends ComplexObjectImpl implements AllInstances
   * @generated
   */
  @Override
-  public void setSymbol(Symbol newSymbol)
+  public void setBody(Expression newBody)
  {
-    if (newSymbol != symbol)
+    if (newBody != body)
    {
      NotificationChain msgs = null;
-      if (symbol != null)
+      if (body != null)
-        msgs = ((InternalEObject)symbol).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.ALL_INSTANCES__SYMBOL, null, msgs);
+        msgs = ((InternalEObject)body).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.COUNT__BODY, null, msgs);
-      if (newSymbol != null)
+      if (newBody != null)
-        msgs = ((InternalEObject)newSymbol).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.ALL_INSTANCES__SYMBOL, null, msgs);
+        msgs = ((InternalEObject)newBody).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.COUNT__BODY, null, msgs);
-      msgs = basicSetSymbol(newSymbol, msgs);
+      msgs = basicSetBody(newBody, msgs);
      if (msgs != null) msgs.dispatch();
    }
    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.ALL_INSTANCES__SYMBOL, newSymbol, newSymbol));
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.COUNT__BODY, newBody, newBody));
  }
  /**
@@ -121,8 +121,8 @@ public class AllInstancesImpl extends ComplexObjectImpl implements AllInstances
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.ALL_INSTANCES__SYMBOL:
+      case SolverLanguagePackage.COUNT__BODY:
-        return basicSetSymbol(null, msgs);
+        return basicSetBody(null, msgs);
    }
    return super.eInverseRemove(otherEnd, featureID, msgs);
  }
@@ -137,8 +137,8 @@ public class AllInstancesImpl extends ComplexObjectImpl implements AllInstances
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.ALL_INSTANCES__SYMBOL:
+      case SolverLanguagePackage.COUNT__BODY:
-        return getSymbol();
+        return getBody();
    }
    return super.eGet(featureID, resolve, coreType);
  }
@@ -153,8 +153,8 @@ public class AllInstancesImpl extends ComplexObjectImpl implements AllInstances
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.ALL_INSTANCES__SYMBOL:
+      case SolverLanguagePackage.COUNT__BODY:
-        setSymbol((Symbol)newValue);
+        setBody((Expression)newValue);
        return;
    }
    super.eSet(featureID, newValue);
@@ -170,8 +170,8 @@ public class AllInstancesImpl extends ComplexObjectImpl implements AllInstances
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.ALL_INSTANCES__SYMBOL:
+      case SolverLanguagePackage.COUNT__BODY:
-        setSymbol((Symbol)null);
+        setBody((Expression)null);
        return;
    }
    super.eUnset(featureID);
@@ -187,10 +187,10 @@ public class AllInstancesImpl extends ComplexObjectImpl implements AllInstances
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.ALL_INSTANCES__SYMBOL:
+      case SolverLanguagePackage.COUNT__BODY:
-        return symbol != null;
+        return body != null;
    }
    return super.eIsSet(featureID);
  }
-} //AllInstancesImpl
+} //CountImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DataObjectImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DataObjectImpl.java
deleted file mode 100644
index 33bee29f..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DataObjectImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.DataObject;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Data Object</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class DataObjectImpl extends ObjectImpl implements DataObject
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected DataObjectImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.DATA_OBJECT;
-  }
-} //DataObjectImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DataSymbolImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DataSymbolImpl.java
deleted file mode 100644
index 221b4783..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DataSymbolImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.DataSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Data Symbol</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class DataSymbolImpl extends SymbolImpl implements DataSymbol
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected DataSymbolImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.DATA_SYMBOL;
-  }
-} //DataSymbolImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DefaultDefinitionImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DefaultDefinitionImpl.java
new file mode 100644
index 00000000..c1eaa71a
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DefaultDefinitionImpl.java
@@ -0,0 +1,270 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.Call;
+import org.eclipse.viatra.solver.language.solverLanguage.DefaultDefinition;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Default Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.DefaultDefinitionImpl#getHead <em>Head</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.DefaultDefinitionImpl#getRange <em>Range</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class DefaultDefinitionImpl extends StatementImpl implements DefaultDefinition
+{
+  /**
+   * The cached value of the '{@link #getHead() <em>Head</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getHead()
+   * @generated
+   * @ordered
+   */
+  protected Call head;
+  /**
+   * The cached value of the '{@link #getRange() <em>Range</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getRange()
+   * @generated
+   * @ordered
+   */
+  protected Expression range;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected DefaultDefinitionImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.DEFAULT_DEFINITION;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Call getHead()
+  {
+    return head;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetHead(Call newHead, NotificationChain msgs)
+  {
+    Call oldHead = head;
+    head = newHead;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.DEFAULT_DEFINITION__HEAD, oldHead, newHead);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setHead(Call newHead)
+  {
+    if (newHead != head)
+    {
+      NotificationChain msgs = null;
+      if (head != null)
+        msgs = ((InternalEObject)head).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.DEFAULT_DEFINITION__HEAD, null, msgs);
+      if (newHead != null)
+        msgs = ((InternalEObject)newHead).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.DEFAULT_DEFINITION__HEAD, null, msgs);
+      msgs = basicSetHead(newHead, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.DEFAULT_DEFINITION__HEAD, newHead, newHead));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getRange()
+  {
+    return range;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetRange(Expression newRange, NotificationChain msgs)
+  {
+    Expression oldRange = range;
+    range = newRange;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.DEFAULT_DEFINITION__RANGE, oldRange, newRange);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setRange(Expression newRange)
+  {
+    if (newRange != range)
+    {
+      NotificationChain msgs = null;
+      if (range != null)
+        msgs = ((InternalEObject)range).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.DEFAULT_DEFINITION__RANGE, null, msgs);
+      if (newRange != null)
+        msgs = ((InternalEObject)newRange).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.DEFAULT_DEFINITION__RANGE, null, msgs);
+      msgs = basicSetRange(newRange, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.DEFAULT_DEFINITION__RANGE, newRange, newRange));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.DEFAULT_DEFINITION__HEAD:
+        return basicSetHead(null, msgs);
+      case SolverLanguagePackage.DEFAULT_DEFINITION__RANGE:
+        return basicSetRange(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.DEFAULT_DEFINITION__HEAD:
+        return getHead();
+      case SolverLanguagePackage.DEFAULT_DEFINITION__RANGE:
+        return getRange();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.DEFAULT_DEFINITION__HEAD:
+        setHead((Call)newValue);
+        return;
+      case SolverLanguagePackage.DEFAULT_DEFINITION__RANGE:
+        setRange((Expression)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.DEFAULT_DEFINITION__HEAD:
+        setHead((Call)null);
+        return;
+      case SolverLanguagePackage.DEFAULT_DEFINITION__RANGE:
+        setRange((Expression)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.DEFAULT_DEFINITION__HEAD:
+        return head != null;
+      case SolverLanguagePackage.DEFAULT_DEFINITION__RANGE:
+        return range != null;
+    }
+    return super.eIsSet(featureID);
+  }
+} //DefaultDefinitionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DisjunctionImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DisjunctionImpl.java
new file mode 100644
index 00000000..ecdb14d8
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DisjunctionImpl.java
@@ -0,0 +1,167 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.viatra.solver.language.solverLanguage.Disjunction;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Disjunction</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.DisjunctionImpl#getChildren <em>Children</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class DisjunctionImpl extends ExpressionImpl implements Disjunction
+{
+  /**
+   * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getChildren()
+   * @generated
+   * @ordered
+   */
+  protected EList<Expression> children;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected DisjunctionImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.DISJUNCTION;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EList<Expression> getChildren()
+  {
+    if (children == null)
+    {
+      children = new EObjectContainmentEList<Expression>(Expression.class, this, SolverLanguagePackage.DISJUNCTION__CHILDREN);
+    }
+    return children;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.DISJUNCTION__CHILDREN:
+        return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.DISJUNCTION__CHILDREN:
+        return getChildren();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.DISJUNCTION__CHILDREN:
+        getChildren().clear();
+        getChildren().addAll((Collection<? extends Expression>)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.DISJUNCTION__CHILDREN:
+        getChildren().clear();
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.DISJUNCTION__CHILDREN:
+        return children != null && !children.isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
+} //DisjunctionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnknownImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/EmptyIntervalLiteralImpl.java
index 44195feb..1ebf38ad 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnknownImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/EmptyIntervalLiteralImpl.java
@@ -1,28 +1,28 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.solver.language.solverLanguage.EmptyIntervalLiteral;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-import org.eclipse.viatra.solver.language.solverLanguage.Unknown;
 /**
 * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Unknown</b></em>'.
+ * An implementation of the model object '<em><b>Empty Interval Literal</b></em>'.
 * <!-- end-user-doc -->
 *
 * @generated
 */
-public class UnknownImpl extends TruthValueImpl implements Unknown
+public class EmptyIntervalLiteralImpl extends LiteralImpl implements EmptyIntervalLiteral
 {
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  protected UnknownImpl()
+  protected EmptyIntervalLiteralImpl()
  {
    super();
  }
@@ -35,7 +35,7 @@ public class UnknownImpl extends TruthValueImpl implements Unknown
  @Override
  protected EClass eStaticClass()
  {
-    return SolverLanguagePackage.Literals.UNKNOWN;
+    return SolverLanguagePackage.Literals.EMPTY_INTERVAL_LITERAL;
  }
-} //UnknownImpl
+} //EmptyIntervalLiteralImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/EnumInterpretationImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/EnumInterpretationImpl.java
deleted file mode 100644
index efa12ea6..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/EnumInterpretationImpl.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.NamedObject;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Enum Interpretation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.EnumInterpretationImpl#getSymbol <em>Symbol</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.EnumInterpretationImpl#getObjects <em>Objects</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class EnumInterpretationImpl extends CDInterpretationImpl implements EnumInterpretation
-{
-  /**
-   * The cached value of the '{@link #getSymbol() <em>Symbol</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSymbol()
-   * @generated
-   * @ordered
-   */
-  protected ModelSymbol symbol;
-  /**
-   * The cached value of the '{@link #getObjects() <em>Objects</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getObjects()
-   * @generated
-   * @ordered
-   */
-  protected EList<NamedObject> objects;
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EnumInterpretationImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.ENUM_INTERPRETATION;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public ModelSymbol getSymbol()
-  {
-    return symbol;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetSymbol(ModelSymbol newSymbol, NotificationChain msgs)
-  {
-    ModelSymbol oldSymbol = symbol;
-    symbol = newSymbol;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.ENUM_INTERPRETATION__SYMBOL, oldSymbol, newSymbol);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setSymbol(ModelSymbol newSymbol)
-  {
-    if (newSymbol != symbol)
-    {
-      NotificationChain msgs = null;
-      if (symbol != null)
-        msgs = ((InternalEObject)symbol).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.ENUM_INTERPRETATION__SYMBOL, null, msgs);
-      if (newSymbol != null)
-        msgs = ((InternalEObject)newSymbol).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.ENUM_INTERPRETATION__SYMBOL, null, msgs);
-      msgs = basicSetSymbol(newSymbol, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.ENUM_INTERPRETATION__SYMBOL, newSymbol, newSymbol));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EList<NamedObject> getObjects()
-  {
-    if (objects == null)
-    {
-      objects = new EObjectContainmentEList<NamedObject>(NamedObject.class, this, SolverLanguagePackage.ENUM_INTERPRETATION__OBJECTS);
-    }
-    return objects;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.ENUM_INTERPRETATION__SYMBOL:
-        return basicSetSymbol(null, msgs);
-      case SolverLanguagePackage.ENUM_INTERPRETATION__OBJECTS:
-        return ((InternalEList<?>)getObjects()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.ENUM_INTERPRETATION__SYMBOL:
-        return getSymbol();
-      case SolverLanguagePackage.ENUM_INTERPRETATION__OBJECTS:
-        return getObjects();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.ENUM_INTERPRETATION__SYMBOL:
-        setSymbol((ModelSymbol)newValue);
-        return;
-      case SolverLanguagePackage.ENUM_INTERPRETATION__OBJECTS:
-        getObjects().clear();
-        getObjects().addAll((Collection<? extends NamedObject>)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.ENUM_INTERPRETATION__SYMBOL:
-        setSymbol((ModelSymbol)null);
-        return;
-      case SolverLanguagePackage.ENUM_INTERPRETATION__OBJECTS:
-        getObjects().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.ENUM_INTERPRETATION__SYMBOL:
-        return symbol != null;
-      case SolverLanguagePackage.ENUM_INTERPRETATION__OBJECTS:
-        return objects != null && !objects.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-} //EnumInterpretationImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/EqualsSymbolImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/EqualsSymbolImpl.java
deleted file mode 100644
index 33929f42..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/EqualsSymbolImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.EqualsSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Equals Symbol</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class EqualsSymbolImpl extends PartialitySymbolImpl implements EqualsSymbol
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EqualsSymbolImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.EQUALS_SYMBOL;
-  }
-} //EqualsSymbolImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ErrorImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ErrorImpl.java
deleted file mode 100644
index e58094a7..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ErrorImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Error</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ErrorImpl extends TruthValueImpl implements org.eclipse.viatra.solver.language.solverLanguage.Error
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ErrorImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.ERROR;
-  }
-} //ErrorImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ModelSymbolImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExactMultiplicityImpl.java
index bd195572..3751de39 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ModelSymbolImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExactMultiplicityImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
@@ -9,50 +9,50 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol;
+import org.eclipse.viatra.solver.language.solverLanguage.ExactMultiplicity;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
 /**
 * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Model Symbol</b></em>'.
+ * An implementation of the model object '<em><b>Exact Multiplicity</b></em>'.
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
 * </p>
 * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ModelSymbolImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExactMultiplicityImpl#getMultiplicity <em>Multiplicity</em>}</li>
 * </ul>
 *
 * @generated
 */
-public class ModelSymbolImpl extends SymbolImpl implements ModelSymbol
+public class ExactMultiplicityImpl extends MultiplicityImpl implements ExactMultiplicity
 {
  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+   * The default value of the '{@link #getMultiplicity() <em>Multiplicity</em>}' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see #getName()
+   * @see #getMultiplicity()
   * @generated
   * @ordered
   */
-  protected static final String NAME_EDEFAULT = null;
+  protected static final int MULTIPLICITY_EDEFAULT = 0;
  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+   * The cached value of the '{@link #getMultiplicity() <em>Multiplicity</em>}' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see #getName()
+   * @see #getMultiplicity()
   * @generated
   * @ordered
   */
-  protected String name = NAME_EDEFAULT;
+  protected int multiplicity = MULTIPLICITY_EDEFAULT;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  protected ModelSymbolImpl()
+  protected ExactMultiplicityImpl()
  {
    super();
  }
@@ -65,7 +65,7 @@ public class ModelSymbolImpl extends SymbolImpl implements ModelSymbol
  @Override
  protected EClass eStaticClass()
  {
-    return SolverLanguagePackage.Literals.MODEL_SYMBOL;
+    return SolverLanguagePackage.Literals.EXACT_MULTIPLICITY;
  }
  /**
@@ -74,9 +74,9 @@ public class ModelSymbolImpl extends SymbolImpl implements ModelSymbol
   * @generated
   */
  @Override
-  public String getName()
+  public int getMultiplicity()
  {
-    return name;
+    return multiplicity;
  }
  /**
@@ -85,12 +85,12 @@ public class ModelSymbolImpl extends SymbolImpl implements ModelSymbol
   * @generated
   */
  @Override
-  public void setName(String newName)
+  public void setMultiplicity(int newMultiplicity)
  {
-    String oldName = name;
+    int oldMultiplicity = multiplicity;
-    name = newName;
+    multiplicity = newMultiplicity;
    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.MODEL_SYMBOL__NAME, oldName, name));
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.EXACT_MULTIPLICITY__MULTIPLICITY, oldMultiplicity, multiplicity));
  }
  /**
@@ -103,8 +103,8 @@ public class ModelSymbolImpl extends SymbolImpl implements ModelSymbol
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.MODEL_SYMBOL__NAME:
+      case SolverLanguagePackage.EXACT_MULTIPLICITY__MULTIPLICITY:
-        return getName();
+        return getMultiplicity();
    }
    return super.eGet(featureID, resolve, coreType);
  }
@@ -119,8 +119,8 @@ public class ModelSymbolImpl extends SymbolImpl implements ModelSymbol
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.MODEL_SYMBOL__NAME:
+      case SolverLanguagePackage.EXACT_MULTIPLICITY__MULTIPLICITY:
-        setName((String)newValue);
+        setMultiplicity((Integer)newValue);
        return;
    }
    super.eSet(featureID, newValue);
@@ -136,8 +136,8 @@ public class ModelSymbolImpl extends SymbolImpl implements ModelSymbol
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.MODEL_SYMBOL__NAME:
+      case SolverLanguagePackage.EXACT_MULTIPLICITY__MULTIPLICITY:
-        setName(NAME_EDEFAULT);
+        setMultiplicity(MULTIPLICITY_EDEFAULT);
        return;
    }
    super.eUnset(featureID);
@@ -153,8 +153,8 @@ public class ModelSymbolImpl extends SymbolImpl implements ModelSymbol
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.MODEL_SYMBOL__NAME:
+      case SolverLanguagePackage.EXACT_MULTIPLICITY__MULTIPLICITY:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+        return multiplicity != MULTIPLICITY_EDEFAULT;
    }
    return super.eIsSet(featureID);
  }
@@ -170,10 +170,10 @@ public class ModelSymbolImpl extends SymbolImpl implements ModelSymbol
    if (eIsProxy()) return super.toString();
    StringBuilder result = new StringBuilder(super.toString());
-    result.append(" (name: ");
+    result.append(" (multiplicity: ");
-    result.append(name);
+    result.append(multiplicity);
    result.append(')');
    return result.toString();
  }
-} //ModelSymbolImpl
+} //ExactMultiplicityImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/NamedObjectImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExactScopeDefinitionImpl.java
index 9d907661..faf51904 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/NamedObjectImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExactScopeDefinitionImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
@@ -9,50 +9,50 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.NamedObject;
+import org.eclipse.viatra.solver.language.solverLanguage.ExactScopeDefinition;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
 /**
 * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Named Object</b></em>'.
+ * An implementation of the model object '<em><b>Exact Scope Definition</b></em>'.
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
 * </p>
 * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.NamedObjectImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExactScopeDefinitionImpl#getExactScope <em>Exact Scope</em>}</li>
 * </ul>
 *
 * @generated
 */
-public class NamedObjectImpl extends ObjectImpl implements NamedObject
+public class ExactScopeDefinitionImpl extends ScopeDefinitionImpl implements ExactScopeDefinition
 {
  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+   * The default value of the '{@link #getExactScope() <em>Exact Scope</em>}' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see #getName()
+   * @see #getExactScope()
   * @generated
   * @ordered
   */
-  protected static final String NAME_EDEFAULT = null;
+  protected static final int EXACT_SCOPE_EDEFAULT = 0;
  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+   * The cached value of the '{@link #getExactScope() <em>Exact Scope</em>}' attribute.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see #getName()
+   * @see #getExactScope()
   * @generated
   * @ordered
   */
-  protected String name = NAME_EDEFAULT;
+  protected int exactScope = EXACT_SCOPE_EDEFAULT;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  protected NamedObjectImpl()
+  protected ExactScopeDefinitionImpl()
  {
    super();
  }
@@ -65,7 +65,7 @@ public class NamedObjectImpl extends ObjectImpl implements NamedObject
  @Override
  protected EClass eStaticClass()
  {
-    return SolverLanguagePackage.Literals.NAMED_OBJECT;
+    return SolverLanguagePackage.Literals.EXACT_SCOPE_DEFINITION;
  }
  /**
@@ -74,9 +74,9 @@ public class NamedObjectImpl extends ObjectImpl implements NamedObject
   * @generated
   */
  @Override
-  public String getName()
+  public int getExactScope()
  {
-    return name;
+    return exactScope;
  }
  /**
@@ -85,12 +85,12 @@ public class NamedObjectImpl extends ObjectImpl implements NamedObject
   * @generated
   */
  @Override
-  public void setName(String newName)
+  public void setExactScope(int newExactScope)
  {
-    String oldName = name;
+    int oldExactScope = exactScope;
-    name = newName;
+    exactScope = newExactScope;
    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.NAMED_OBJECT__NAME, oldName, name));
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.EXACT_SCOPE_DEFINITION__EXACT_SCOPE, oldExactScope, exactScope));
  }
  /**
@@ -103,8 +103,8 @@ public class NamedObjectImpl extends ObjectImpl implements NamedObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.NAMED_OBJECT__NAME:
+      case SolverLanguagePackage.EXACT_SCOPE_DEFINITION__EXACT_SCOPE:
-        return getName();
+        return getExactScope();
    }
    return super.eGet(featureID, resolve, coreType);
  }
@@ -119,8 +119,8 @@ public class NamedObjectImpl extends ObjectImpl implements NamedObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.NAMED_OBJECT__NAME:
+      case SolverLanguagePackage.EXACT_SCOPE_DEFINITION__EXACT_SCOPE:
-        setName((String)newValue);
+        setExactScope((Integer)newValue);
        return;
    }
    super.eSet(featureID, newValue);
@@ -136,8 +136,8 @@ public class NamedObjectImpl extends ObjectImpl implements NamedObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.NAMED_OBJECT__NAME:
+      case SolverLanguagePackage.EXACT_SCOPE_DEFINITION__EXACT_SCOPE:
-        setName(NAME_EDEFAULT);
+        setExactScope(EXACT_SCOPE_EDEFAULT);
        return;
    }
    super.eUnset(featureID);
@@ -153,8 +153,8 @@ public class NamedObjectImpl extends ObjectImpl implements NamedObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.NAMED_OBJECT__NAME:
+      case SolverLanguagePackage.EXACT_SCOPE_DEFINITION__EXACT_SCOPE:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+        return exactScope != EXACT_SCOPE_EDEFAULT;
    }
    return super.eIsSet(featureID);
  }
@@ -170,10 +170,10 @@ public class NamedObjectImpl extends ObjectImpl implements NamedObject
    if (eIsProxy()) return super.toString();
    StringBuilder result = new StringBuilder(super.toString());
-    result.append(" (name: ");
+    result.append(" (exactScope: ");
-    result.append(name);
+    result.append(exactScope);
    result.append(')');
    return result.toString();
  }
-} //NamedObjectImpl
+} //ExactScopeDefinitionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExistSymbolImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExistSymbolImpl.java
deleted file mode 100644
index 2fd59e41..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExistSymbolImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.ExistSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Exist Symbol</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ExistSymbolImpl extends PartialitySymbolImpl implements ExistSymbol
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ExistSymbolImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.EXIST_SYMBOL;
-  }
-} //ExistSymbolImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BooleanObjectImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExpressionArgumentImpl.java
index cb1a3ff4..f83c1cb3 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BooleanObjectImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExpressionArgumentImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
@@ -11,41 +11,41 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanObject;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanValue;
+import org.eclipse.viatra.solver.language.solverLanguage.ExpressionArgument;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
 /**
 * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Boolean Object</b></em>'.
+ * An implementation of the model object '<em><b>Expression Argument</b></em>'.
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
 * </p>
 * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BooleanObjectImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExpressionArgumentImpl#getBody <em>Body</em>}</li>
 * </ul>
 *
 * @generated
 */
-public class BooleanObjectImpl extends DataObjectImpl implements BooleanObject
+public class ExpressionArgumentImpl extends ArgumentImpl implements ExpressionArgument
 {
  /**
-   * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
+   * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see #getValue()
+   * @see #getBody()
   * @generated
   * @ordered
   */
-  protected BooleanValue value;
+  protected Expression body;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  protected BooleanObjectImpl()
+  protected ExpressionArgumentImpl()
  {
    super();
  }
@@ -58,7 +58,7 @@ public class BooleanObjectImpl extends DataObjectImpl implements BooleanObject
  @Override
  protected EClass eStaticClass()
  {
-    return SolverLanguagePackage.Literals.BOOLEAN_OBJECT;
+    return SolverLanguagePackage.Literals.EXPRESSION_ARGUMENT;
  }
  /**
@@ -67,9 +67,9 @@ public class BooleanObjectImpl extends DataObjectImpl implements BooleanObject
   * @generated
   */
  @Override
-  public BooleanValue getValue()
+  public Expression getBody()
  {
-    return value;
+    return body;
  }
  /**
@@ -77,13 +77,13 @@ public class BooleanObjectImpl extends DataObjectImpl implements BooleanObject
   * <!-- end-user-doc -->
   * @generated
   */
-  public NotificationChain basicSetValue(BooleanValue newValue, NotificationChain msgs)
+  public NotificationChain basicSetBody(Expression newBody, NotificationChain msgs)
  {
-    BooleanValue oldValue = value;
+    Expression oldBody = body;
-    value = newValue;
+    body = newBody;
    if (eNotificationRequired())
    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.BOOLEAN_OBJECT__VALUE, oldValue, newValue);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.EXPRESSION_ARGUMENT__BODY, oldBody, newBody);
      if (msgs == null) msgs = notification; else msgs.add(notification);
    }
    return msgs;
@@ -95,20 +95,20 @@ public class BooleanObjectImpl extends DataObjectImpl implements BooleanObject
   * @generated
   */
  @Override
-  public void setValue(BooleanValue newValue)
+  public void setBody(Expression newBody)
  {
-    if (newValue != value)
+    if (newBody != body)
    {
      NotificationChain msgs = null;
-      if (value != null)
+      if (body != null)
-        msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.BOOLEAN_OBJECT__VALUE, null, msgs);
+        msgs = ((InternalEObject)body).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.EXPRESSION_ARGUMENT__BODY, null, msgs);
-      if (newValue != null)
+      if (newBody != null)
-        msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.BOOLEAN_OBJECT__VALUE, null, msgs);
+        msgs = ((InternalEObject)newBody).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.EXPRESSION_ARGUMENT__BODY, null, msgs);
-      msgs = basicSetValue(newValue, msgs);
+      msgs = basicSetBody(newBody, msgs);
      if (msgs != null) msgs.dispatch();
    }
    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.BOOLEAN_OBJECT__VALUE, newValue, newValue));
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.EXPRESSION_ARGUMENT__BODY, newBody, newBody));
  }
  /**
@@ -121,8 +121,8 @@ public class BooleanObjectImpl extends DataObjectImpl implements BooleanObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.BOOLEAN_OBJECT__VALUE:
+      case SolverLanguagePackage.EXPRESSION_ARGUMENT__BODY:
-        return basicSetValue(null, msgs);
+        return basicSetBody(null, msgs);
    }
    return super.eInverseRemove(otherEnd, featureID, msgs);
  }
@@ -137,8 +137,8 @@ public class BooleanObjectImpl extends DataObjectImpl implements BooleanObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.BOOLEAN_OBJECT__VALUE:
+      case SolverLanguagePackage.EXPRESSION_ARGUMENT__BODY:
-        return getValue();
+        return getBody();
    }
    return super.eGet(featureID, resolve, coreType);
  }
@@ -153,8 +153,8 @@ public class BooleanObjectImpl extends DataObjectImpl implements BooleanObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.BOOLEAN_OBJECT__VALUE:
+      case SolverLanguagePackage.EXPRESSION_ARGUMENT__BODY:
-        setValue((BooleanValue)newValue);
+        setBody((Expression)newValue);
        return;
    }
    super.eSet(featureID, newValue);
@@ -170,8 +170,8 @@ public class BooleanObjectImpl extends DataObjectImpl implements BooleanObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.BOOLEAN_OBJECT__VALUE:
+      case SolverLanguagePackage.EXPRESSION_ARGUMENT__BODY:
-        setValue((BooleanValue)null);
+        setBody((Expression)null);
        return;
    }
    super.eUnset(featureID);
@@ -187,10 +187,10 @@ public class BooleanObjectImpl extends DataObjectImpl implements BooleanObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.BOOLEAN_OBJECT__VALUE:
+      case SolverLanguagePackage.EXPRESSION_ARGUMENT__BODY:
-        return value != null;
+        return body != null;
    }
    return super.eIsSet(featureID);
  }
-} //BooleanObjectImpl
+} //ExpressionArgumentImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FalseImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExpressionImpl.java
index 332f9af3..585e3c41 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FalseImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExpressionImpl.java
@@ -1,28 +1,28 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.False;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
 /**
 * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>False</b></em>'.
+ * An implementation of the model object '<em><b>Expression</b></em>'.
 * <!-- end-user-doc -->
 *
 * @generated
 */
-public class FalseImpl extends TruthValueImpl implements False
+public class ExpressionImpl extends StatementImpl implements Expression
 {
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  protected FalseImpl()
+  protected ExpressionImpl()
  {
    super();
  }
@@ -35,7 +35,7 @@ public class FalseImpl extends TruthValueImpl implements False
  @Override
  protected EClass eStaticClass()
  {
-    return SolverLanguagePackage.Literals.FALSE;
+    return SolverLanguagePackage.Literals.EXPRESSION;
  }
-} //FalseImpl
+} //ExpressionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternMetricDefinitionImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternMetricDefinitionImpl.java
new file mode 100644
index 00000000..e324c38a
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternMetricDefinitionImpl.java
@@ -0,0 +1,270 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.Call;
+import org.eclipse.viatra.solver.language.solverLanguage.ExternMetricDefinition;
+import org.eclipse.viatra.solver.language.solverLanguage.MetricType;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Extern Metric Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExternMetricDefinitionImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExternMetricDefinitionImpl#getHead <em>Head</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ExternMetricDefinitionImpl extends StatementImpl implements ExternMetricDefinition
+{
+  /**
+   * The default value of the '{@link #getType() <em>Type</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getType()
+   * @generated
+   * @ordered
+   */
+  protected static final MetricType TYPE_EDEFAULT = MetricType.INT;
+  /**
+   * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getType()
+   * @generated
+   * @ordered
+   */
+  protected MetricType type = TYPE_EDEFAULT;
+  /**
+   * The cached value of the '{@link #getHead() <em>Head</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getHead()
+   * @generated
+   * @ordered
+   */
+  protected Call head;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ExternMetricDefinitionImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.EXTERN_METRIC_DEFINITION;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public MetricType getType()
+  {
+    return type;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setType(MetricType newType)
+  {
+    MetricType oldType = type;
+    type = newType == null ? TYPE_EDEFAULT : newType;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.EXTERN_METRIC_DEFINITION__TYPE, oldType, type));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Call getHead()
+  {
+    return head;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetHead(Call newHead, NotificationChain msgs)
+  {
+    Call oldHead = head;
+    head = newHead;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.EXTERN_METRIC_DEFINITION__HEAD, oldHead, newHead);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setHead(Call newHead)
+  {
+    if (newHead != head)
+    {
+      NotificationChain msgs = null;
+      if (head != null)
+        msgs = ((InternalEObject)head).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.EXTERN_METRIC_DEFINITION__HEAD, null, msgs);
+      if (newHead != null)
+        msgs = ((InternalEObject)newHead).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.EXTERN_METRIC_DEFINITION__HEAD, null, msgs);
+      msgs = basicSetHead(newHead, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.EXTERN_METRIC_DEFINITION__HEAD, newHead, newHead));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.EXTERN_METRIC_DEFINITION__HEAD:
+        return basicSetHead(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.EXTERN_METRIC_DEFINITION__TYPE:
+        return getType();
+      case SolverLanguagePackage.EXTERN_METRIC_DEFINITION__HEAD:
+        return getHead();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.EXTERN_METRIC_DEFINITION__TYPE:
+        setType((MetricType)newValue);
+        return;
+      case SolverLanguagePackage.EXTERN_METRIC_DEFINITION__HEAD:
+        setHead((Call)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.EXTERN_METRIC_DEFINITION__TYPE:
+        setType(TYPE_EDEFAULT);
+        return;
+      case SolverLanguagePackage.EXTERN_METRIC_DEFINITION__HEAD:
+        setHead((Call)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.EXTERN_METRIC_DEFINITION__TYPE:
+        return type != TYPE_EDEFAULT;
+      case SolverLanguagePackage.EXTERN_METRIC_DEFINITION__HEAD:
+        return head != null;
+    }
+    return super.eIsSet(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+    StringBuilder result = new StringBuilder(super.toString());
+    result.append(" (type: ");
+    result.append(type);
+    result.append(')');
+    return result.toString();
+  }
+} //ExternMetricDefinitionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DefaultInterpretationImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternPredicateDefinitionImpl.java
index eb2835a0..0605cb0f 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DefaultInterpretationImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternPredicateDefinitionImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
@@ -11,41 +11,41 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation;
+import org.eclipse.viatra.solver.language.solverLanguage.Call;
-import org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation;
+import org.eclipse.viatra.solver.language.solverLanguage.ExternPredicateDefinition;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
 /**
 * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Default Interpretation</b></em>'.
+ * An implementation of the model object '<em><b>Extern Predicate Definition</b></em>'.
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
 * </p>
 * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.DefaultInterpretationImpl#getInterpretation <em>Interpretation</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExternPredicateDefinitionImpl#getHead <em>Head</em>}</li>
 * </ul>
 *
 * @generated
 */
-public class DefaultInterpretationImpl extends InterpretationImpl implements DefaultInterpretation
+public class ExternPredicateDefinitionImpl extends StatementImpl implements ExternPredicateDefinition
 {
  /**
-   * The cached value of the '{@link #getInterpretation() <em>Interpretation</em>}' containment reference.
+   * The cached value of the '{@link #getHead() <em>Head</em>}' containment reference.
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
-   * @see #getInterpretation()
+   * @see #getHead()
   * @generated
   * @ordered
   */
-  protected BasicInterpretation interpretation;
+  protected Call head;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  protected DefaultInterpretationImpl()
+  protected ExternPredicateDefinitionImpl()
  {
    super();
  }
@@ -58,7 +58,7 @@ public class DefaultInterpretationImpl extends InterpretationImpl implements Def
  @Override
  protected EClass eStaticClass()
  {
-    return SolverLanguagePackage.Literals.DEFAULT_INTERPRETATION;
+    return SolverLanguagePackage.Literals.EXTERN_PREDICATE_DEFINITION;
  }
  /**
@@ -67,9 +67,9 @@ public class DefaultInterpretationImpl extends InterpretationImpl implements Def
   * @generated
   */
  @Override
-  public BasicInterpretation getInterpretation()
+  public Call getHead()
  {
-    return interpretation;
+    return head;
  }
  /**
@@ -77,13 +77,13 @@ public class DefaultInterpretationImpl extends InterpretationImpl implements Def
   * <!-- end-user-doc -->
   * @generated
   */
-  public NotificationChain basicSetInterpretation(BasicInterpretation newInterpretation, NotificationChain msgs)
+  public NotificationChain basicSetHead(Call newHead, NotificationChain msgs)
  {
-    BasicInterpretation oldInterpretation = interpretation;
+    Call oldHead = head;
-    interpretation = newInterpretation;
+    head = newHead;
    if (eNotificationRequired())
    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.DEFAULT_INTERPRETATION__INTERPRETATION, oldInterpretation, newInterpretation);
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.EXTERN_PREDICATE_DEFINITION__HEAD, oldHead, newHead);
      if (msgs == null) msgs = notification; else msgs.add(notification);
    }
    return msgs;
@@ -95,20 +95,20 @@ public class DefaultInterpretationImpl extends InterpretationImpl implements Def
   * @generated
   */
  @Override
-  public void setInterpretation(BasicInterpretation newInterpretation)
+  public void setHead(Call newHead)
  {
-    if (newInterpretation != interpretation)
+    if (newHead != head)
    {
      NotificationChain msgs = null;
-      if (interpretation != null)
+      if (head != null)
-        msgs = ((InternalEObject)interpretation).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.DEFAULT_INTERPRETATION__INTERPRETATION, null, msgs);
+        msgs = ((InternalEObject)head).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.EXTERN_PREDICATE_DEFINITION__HEAD, null, msgs);
-      if (newInterpretation != null)
+      if (newHead != null)
-        msgs = ((InternalEObject)newInterpretation).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.DEFAULT_INTERPRETATION__INTERPRETATION, null, msgs);
+        msgs = ((InternalEObject)newHead).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.EXTERN_PREDICATE_DEFINITION__HEAD, null, msgs);
-      msgs = basicSetInterpretation(newInterpretation, msgs);
+      msgs = basicSetHead(newHead, msgs);
      if (msgs != null) msgs.dispatch();
    }
    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.DEFAULT_INTERPRETATION__INTERPRETATION, newInterpretation, newInterpretation));
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.EXTERN_PREDICATE_DEFINITION__HEAD, newHead, newHead));
  }
  /**
@@ -121,8 +121,8 @@ public class DefaultInterpretationImpl extends InterpretationImpl implements Def
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.DEFAULT_INTERPRETATION__INTERPRETATION:
+      case SolverLanguagePackage.EXTERN_PREDICATE_DEFINITION__HEAD:
-        return basicSetInterpretation(null, msgs);
+        return basicSetHead(null, msgs);
    }
    return super.eInverseRemove(otherEnd, featureID, msgs);
  }
@@ -137,8 +137,8 @@ public class DefaultInterpretationImpl extends InterpretationImpl implements Def
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.DEFAULT_INTERPRETATION__INTERPRETATION:
+      case SolverLanguagePackage.EXTERN_PREDICATE_DEFINITION__HEAD:
-        return getInterpretation();
+        return getHead();
    }
    return super.eGet(featureID, resolve, coreType);
  }
@@ -153,8 +153,8 @@ public class DefaultInterpretationImpl extends InterpretationImpl implements Def
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.DEFAULT_INTERPRETATION__INTERPRETATION:
+      case SolverLanguagePackage.EXTERN_PREDICATE_DEFINITION__HEAD:
-        setInterpretation((BasicInterpretation)newValue);
+        setHead((Call)newValue);
        return;
    }
    super.eSet(featureID, newValue);
@@ -170,8 +170,8 @@ public class DefaultInterpretationImpl extends InterpretationImpl implements Def
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.DEFAULT_INTERPRETATION__INTERPRETATION:
+      case SolverLanguagePackage.EXTERN_PREDICATE_DEFINITION__HEAD:
-        setInterpretation((BasicInterpretation)null);
+        setHead((Call)null);
        return;
    }
    super.eUnset(featureID);
@@ -187,10 +187,10 @@ public class DefaultInterpretationImpl extends InterpretationImpl implements Def
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.DEFAULT_INTERPRETATION__INTERPRETATION:
+      case SolverLanguagePackage.EXTERN_PREDICATE_DEFINITION__HEAD:
-        return interpretation != null;
+        return head != null;
    }
    return super.eIsSet(featureID);
  }
-} //DefaultInterpretationImpl
+} //ExternPredicateDefinitionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FieldRelationInterpretationImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FieldRelationInterpretationImpl.java
deleted file mode 100644
index ea9b80b2..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FieldRelationInterpretationImpl.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-import org.eclipse.viatra.solver.language.solverLanguage.Symbol;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Field Relation Interpretation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FieldRelationInterpretationImpl#isContainment <em>Containment</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FieldRelationInterpretationImpl#getSymbol <em>Symbol</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FieldRelationInterpretationImpl#getMultiplicity <em>Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FieldRelationInterpretationImpl#getTarget <em>Target</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class FieldRelationInterpretationImpl extends MinimalEObjectImpl.Container implements FieldRelationInterpretation
-{
-  /**
-   * The default value of the '{@link #isContainment() <em>Containment</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isContainment()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean CONTAINMENT_EDEFAULT = false;
-  /**
-   * The cached value of the '{@link #isContainment() <em>Containment</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isContainment()
-   * @generated
-   * @ordered
-   */
-  protected boolean containment = CONTAINMENT_EDEFAULT;
-  /**
-   * The cached value of the '{@link #getSymbol() <em>Symbol</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSymbol()
-   * @generated
-   * @ordered
-   */
-  protected ModelSymbol symbol;
-  /**
-   * The cached value of the '{@link #getMultiplicity() <em>Multiplicity</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getMultiplicity()
-   * @generated
-   * @ordered
-   */
-  protected MultiplicityDefinition multiplicity;
-  /**
-   * The cached value of the '{@link #getTarget() <em>Target</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTarget()
-   * @generated
-   * @ordered
-   */
-  protected Symbol target;
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected FieldRelationInterpretationImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.FIELD_RELATION_INTERPRETATION;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean isContainment()
-  {
-    return containment;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setContainment(boolean newContainment)
-  {
-    boolean oldContainment = containment;
-    containment = newContainment;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__CONTAINMENT, oldContainment, containment));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public ModelSymbol getSymbol()
-  {
-    return symbol;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetSymbol(ModelSymbol newSymbol, NotificationChain msgs)
-  {
-    ModelSymbol oldSymbol = symbol;
-    symbol = newSymbol;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__SYMBOL, oldSymbol, newSymbol);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setSymbol(ModelSymbol newSymbol)
-  {
-    if (newSymbol != symbol)
-    {
-      NotificationChain msgs = null;
-      if (symbol != null)
-        msgs = ((InternalEObject)symbol).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__SYMBOL, null, msgs);
-      if (newSymbol != null)
-        msgs = ((InternalEObject)newSymbol).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__SYMBOL, null, msgs);
-      msgs = basicSetSymbol(newSymbol, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__SYMBOL, newSymbol, newSymbol));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public MultiplicityDefinition getMultiplicity()
-  {
-    return multiplicity;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetMultiplicity(MultiplicityDefinition newMultiplicity, NotificationChain msgs)
-  {
-    MultiplicityDefinition oldMultiplicity = multiplicity;
-    multiplicity = newMultiplicity;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__MULTIPLICITY, oldMultiplicity, newMultiplicity);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setMultiplicity(MultiplicityDefinition newMultiplicity)
-  {
-    if (newMultiplicity != multiplicity)
-    {
-      NotificationChain msgs = null;
-      if (multiplicity != null)
-        msgs = ((InternalEObject)multiplicity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__MULTIPLICITY, null, msgs);
-      if (newMultiplicity != null)
-        msgs = ((InternalEObject)newMultiplicity).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__MULTIPLICITY, null, msgs);
-      msgs = basicSetMultiplicity(newMultiplicity, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__MULTIPLICITY, newMultiplicity, newMultiplicity));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Symbol getTarget()
-  {
-    return target;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetTarget(Symbol newTarget, NotificationChain msgs)
-  {
-    Symbol oldTarget = target;
-    target = newTarget;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__TARGET, oldTarget, newTarget);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setTarget(Symbol newTarget)
-  {
-    if (newTarget != target)
-    {
-      NotificationChain msgs = null;
-      if (target != null)
-        msgs = ((InternalEObject)target).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__TARGET, null, msgs);
-      if (newTarget != null)
-        msgs = ((InternalEObject)newTarget).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__TARGET, null, msgs);
-      msgs = basicSetTarget(newTarget, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__TARGET, newTarget, newTarget));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__SYMBOL:
-        return basicSetSymbol(null, msgs);
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__MULTIPLICITY:
-        return basicSetMultiplicity(null, msgs);
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__TARGET:
-        return basicSetTarget(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__CONTAINMENT:
-        return isContainment();
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__SYMBOL:
-        return getSymbol();
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__MULTIPLICITY:
-        return getMultiplicity();
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__TARGET:
-        return getTarget();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__CONTAINMENT:
-        setContainment((Boolean)newValue);
-        return;
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__SYMBOL:
-        setSymbol((ModelSymbol)newValue);
-        return;
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__MULTIPLICITY:
-        setMultiplicity((MultiplicityDefinition)newValue);
-        return;
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__TARGET:
-        setTarget((Symbol)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__CONTAINMENT:
-        setContainment(CONTAINMENT_EDEFAULT);
-        return;
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__SYMBOL:
-        setSymbol((ModelSymbol)null);
-        return;
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__MULTIPLICITY:
-        setMultiplicity((MultiplicityDefinition)null);
-        return;
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__TARGET:
-        setTarget((Symbol)null);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__CONTAINMENT:
-        return containment != CONTAINMENT_EDEFAULT;
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__SYMBOL:
-        return symbol != null;
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__MULTIPLICITY:
-        return multiplicity != null;
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION__TARGET:
-        return target != null;
-    }
-    return super.eIsSet(featureID);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-    StringBuilder result = new StringBuilder(super.toString());
-    result.append(" (containment: ");
-    result.append(containment);
-    result.append(')');
-    return result.toString();
-  }
-} //FieldRelationInterpretationImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/GlobalRelationInterpretationImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/GlobalRelationInterpretationImpl.java
deleted file mode 100644
index 52f7a67d..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/GlobalRelationInterpretationImpl.java
+++ /dev/null
@@ -1,563 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-import org.eclipse.viatra.solver.language.solverLanguage.Symbol;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Global Relation Interpretation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.GlobalRelationInterpretationImpl#isContainment <em>Containment</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.GlobalRelationInterpretationImpl#getSymbol <em>Symbol</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.GlobalRelationInterpretationImpl#getSourceMultiplicity <em>Source Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.GlobalRelationInterpretationImpl#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.GlobalRelationInterpretationImpl#getTargetMultiplicity <em>Target Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.GlobalRelationInterpretationImpl#getTarget <em>Target</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class GlobalRelationInterpretationImpl extends CDInterpretationImpl implements GlobalRelationInterpretation
-{
-  /**
-   * The default value of the '{@link #isContainment() <em>Containment</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isContainment()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean CONTAINMENT_EDEFAULT = false;
-  /**
-   * The cached value of the '{@link #isContainment() <em>Containment</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isContainment()
-   * @generated
-   * @ordered
-   */
-  protected boolean containment = CONTAINMENT_EDEFAULT;
-  /**
-   * The cached value of the '{@link #getSymbol() <em>Symbol</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSymbol()
-   * @generated
-   * @ordered
-   */
-  protected ModelSymbol symbol;
-  /**
-   * The cached value of the '{@link #getSourceMultiplicity() <em>Source Multiplicity</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSourceMultiplicity()
-   * @generated
-   * @ordered
-   */
-  protected MultiplicityDefinition sourceMultiplicity;
-  /**
-   * The cached value of the '{@link #getSource() <em>Source</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSource()
-   * @generated
-   * @ordered
-   */
-  protected Symbol source;
-  /**
-   * The cached value of the '{@link #getTargetMultiplicity() <em>Target Multiplicity</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTargetMultiplicity()
-   * @generated
-   * @ordered
-   */
-  protected MultiplicityDefinition targetMultiplicity;
-  /**
-   * The cached value of the '{@link #getTarget() <em>Target</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTarget()
-   * @generated
-   * @ordered
-   */
-  protected Symbol target;
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected GlobalRelationInterpretationImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.GLOBAL_RELATION_INTERPRETATION;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean isContainment()
-  {
-    return containment;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setContainment(boolean newContainment)
-  {
-    boolean oldContainment = containment;
-    containment = newContainment;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__CONTAINMENT, oldContainment, containment));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public ModelSymbol getSymbol()
-  {
-    return symbol;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetSymbol(ModelSymbol newSymbol, NotificationChain msgs)
-  {
-    ModelSymbol oldSymbol = symbol;
-    symbol = newSymbol;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SYMBOL, oldSymbol, newSymbol);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setSymbol(ModelSymbol newSymbol)
-  {
-    if (newSymbol != symbol)
-    {
-      NotificationChain msgs = null;
-      if (symbol != null)
-        msgs = ((InternalEObject)symbol).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SYMBOL, null, msgs);
-      if (newSymbol != null)
-        msgs = ((InternalEObject)newSymbol).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SYMBOL, null, msgs);
-      msgs = basicSetSymbol(newSymbol, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SYMBOL, newSymbol, newSymbol));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public MultiplicityDefinition getSourceMultiplicity()
-  {
-    return sourceMultiplicity;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetSourceMultiplicity(MultiplicityDefinition newSourceMultiplicity, NotificationChain msgs)
-  {
-    MultiplicityDefinition oldSourceMultiplicity = sourceMultiplicity;
-    sourceMultiplicity = newSourceMultiplicity;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SOURCE_MULTIPLICITY, oldSourceMultiplicity, newSourceMultiplicity);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setSourceMultiplicity(MultiplicityDefinition newSourceMultiplicity)
-  {
-    if (newSourceMultiplicity != sourceMultiplicity)
-    {
-      NotificationChain msgs = null;
-      if (sourceMultiplicity != null)
-        msgs = ((InternalEObject)sourceMultiplicity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SOURCE_MULTIPLICITY, null, msgs);
-      if (newSourceMultiplicity != null)
-        msgs = ((InternalEObject)newSourceMultiplicity).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SOURCE_MULTIPLICITY, null, msgs);
-      msgs = basicSetSourceMultiplicity(newSourceMultiplicity, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SOURCE_MULTIPLICITY, newSourceMultiplicity, newSourceMultiplicity));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Symbol getSource()
-  {
-    return source;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetSource(Symbol newSource, NotificationChain msgs)
-  {
-    Symbol oldSource = source;
-    source = newSource;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SOURCE, oldSource, newSource);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setSource(Symbol newSource)
-  {
-    if (newSource != source)
-    {
-      NotificationChain msgs = null;
-      if (source != null)
-        msgs = ((InternalEObject)source).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SOURCE, null, msgs);
-      if (newSource != null)
-        msgs = ((InternalEObject)newSource).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SOURCE, null, msgs);
-      msgs = basicSetSource(newSource, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SOURCE, newSource, newSource));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public MultiplicityDefinition getTargetMultiplicity()
-  {
-    return targetMultiplicity;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetTargetMultiplicity(MultiplicityDefinition newTargetMultiplicity, NotificationChain msgs)
-  {
-    MultiplicityDefinition oldTargetMultiplicity = targetMultiplicity;
-    targetMultiplicity = newTargetMultiplicity;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__TARGET_MULTIPLICITY, oldTargetMultiplicity, newTargetMultiplicity);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setTargetMultiplicity(MultiplicityDefinition newTargetMultiplicity)
-  {
-    if (newTargetMultiplicity != targetMultiplicity)
-    {
-      NotificationChain msgs = null;
-      if (targetMultiplicity != null)
-        msgs = ((InternalEObject)targetMultiplicity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__TARGET_MULTIPLICITY, null, msgs);
-      if (newTargetMultiplicity != null)
-        msgs = ((InternalEObject)newTargetMultiplicity).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__TARGET_MULTIPLICITY, null, msgs);
-      msgs = basicSetTargetMultiplicity(newTargetMultiplicity, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__TARGET_MULTIPLICITY, newTargetMultiplicity, newTargetMultiplicity));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Symbol getTarget()
-  {
-    return target;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetTarget(Symbol newTarget, NotificationChain msgs)
-  {
-    Symbol oldTarget = target;
-    target = newTarget;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__TARGET, oldTarget, newTarget);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setTarget(Symbol newTarget)
-  {
-    if (newTarget != target)
-    {
-      NotificationChain msgs = null;
-      if (target != null)
-        msgs = ((InternalEObject)target).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__TARGET, null, msgs);
-      if (newTarget != null)
-        msgs = ((InternalEObject)newTarget).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__TARGET, null, msgs);
-      msgs = basicSetTarget(newTarget, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__TARGET, newTarget, newTarget));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SYMBOL:
-        return basicSetSymbol(null, msgs);
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SOURCE_MULTIPLICITY:
-        return basicSetSourceMultiplicity(null, msgs);
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SOURCE:
-        return basicSetSource(null, msgs);
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__TARGET_MULTIPLICITY:
-        return basicSetTargetMultiplicity(null, msgs);
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__TARGET:
-        return basicSetTarget(null, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__CONTAINMENT:
-        return isContainment();
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SYMBOL:
-        return getSymbol();
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SOURCE_MULTIPLICITY:
-        return getSourceMultiplicity();
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SOURCE:
-        return getSource();
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__TARGET_MULTIPLICITY:
-        return getTargetMultiplicity();
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__TARGET:
-        return getTarget();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__CONTAINMENT:
-        setContainment((Boolean)newValue);
-        return;
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SYMBOL:
-        setSymbol((ModelSymbol)newValue);
-        return;
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SOURCE_MULTIPLICITY:
-        setSourceMultiplicity((MultiplicityDefinition)newValue);
-        return;
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SOURCE:
-        setSource((Symbol)newValue);
-        return;
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__TARGET_MULTIPLICITY:
-        setTargetMultiplicity((MultiplicityDefinition)newValue);
-        return;
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__TARGET:
-        setTarget((Symbol)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__CONTAINMENT:
-        setContainment(CONTAINMENT_EDEFAULT);
-        return;
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SYMBOL:
-        setSymbol((ModelSymbol)null);
-        return;
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SOURCE_MULTIPLICITY:
-        setSourceMultiplicity((MultiplicityDefinition)null);
-        return;
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SOURCE:
-        setSource((Symbol)null);
-        return;
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__TARGET_MULTIPLICITY:
-        setTargetMultiplicity((MultiplicityDefinition)null);
-        return;
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__TARGET:
-        setTarget((Symbol)null);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__CONTAINMENT:
-        return containment != CONTAINMENT_EDEFAULT;
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SYMBOL:
-        return symbol != null;
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SOURCE_MULTIPLICITY:
-        return sourceMultiplicity != null;
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__SOURCE:
-        return source != null;
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__TARGET_MULTIPLICITY:
-        return targetMultiplicity != null;
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION__TARGET:
-        return target != null;
-    }
-    return super.eIsSet(featureID);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-    StringBuilder result = new StringBuilder(super.toString());
-    result.append(" (containment: ");
-    result.append(containment);
-    result.append(')');
-    return result.toString();
-  }
-} //GlobalRelationInterpretationImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IfElseImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IfElseImpl.java
new file mode 100644
index 00000000..1b873568
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IfElseImpl.java
@@ -0,0 +1,342 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
+import org.eclipse.viatra.solver.language.solverLanguage.IfElse;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>If Else</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.IfElseImpl#getCondition <em>Condition</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.IfElseImpl#getThen <em>Then</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.IfElseImpl#getElse <em>Else</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class IfElseImpl extends ExpressionImpl implements IfElse
+{
+  /**
+   * The cached value of the '{@link #getCondition() <em>Condition</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getCondition()
+   * @generated
+   * @ordered
+   */
+  protected Expression condition;
+  /**
+   * The cached value of the '{@link #getThen() <em>Then</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getThen()
+   * @generated
+   * @ordered
+   */
+  protected Expression then;
+  /**
+   * The cached value of the '{@link #getElse() <em>Else</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getElse()
+   * @generated
+   * @ordered
+   */
+  protected Expression else_;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected IfElseImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.IF_ELSE;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getCondition()
+  {
+    return condition;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetCondition(Expression newCondition, NotificationChain msgs)
+  {
+    Expression oldCondition = condition;
+    condition = newCondition;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.IF_ELSE__CONDITION, oldCondition, newCondition);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setCondition(Expression newCondition)
+  {
+    if (newCondition != condition)
+    {
+      NotificationChain msgs = null;
+      if (condition != null)
+        msgs = ((InternalEObject)condition).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.IF_ELSE__CONDITION, null, msgs);
+      if (newCondition != null)
+        msgs = ((InternalEObject)newCondition).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.IF_ELSE__CONDITION, null, msgs);
+      msgs = basicSetCondition(newCondition, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.IF_ELSE__CONDITION, newCondition, newCondition));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getThen()
+  {
+    return then;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetThen(Expression newThen, NotificationChain msgs)
+  {
+    Expression oldThen = then;
+    then = newThen;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.IF_ELSE__THEN, oldThen, newThen);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setThen(Expression newThen)
+  {
+    if (newThen != then)
+    {
+      NotificationChain msgs = null;
+      if (then != null)
+        msgs = ((InternalEObject)then).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.IF_ELSE__THEN, null, msgs);
+      if (newThen != null)
+        msgs = ((InternalEObject)newThen).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.IF_ELSE__THEN, null, msgs);
+      msgs = basicSetThen(newThen, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.IF_ELSE__THEN, newThen, newThen));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getElse()
+  {
+    return else_;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetElse(Expression newElse, NotificationChain msgs)
+  {
+    Expression oldElse = else_;
+    else_ = newElse;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.IF_ELSE__ELSE, oldElse, newElse);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setElse(Expression newElse)
+  {
+    if (newElse != else_)
+    {
+      NotificationChain msgs = null;
+      if (else_ != null)
+        msgs = ((InternalEObject)else_).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.IF_ELSE__ELSE, null, msgs);
+      if (newElse != null)
+        msgs = ((InternalEObject)newElse).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.IF_ELSE__ELSE, null, msgs);
+      msgs = basicSetElse(newElse, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.IF_ELSE__ELSE, newElse, newElse));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.IF_ELSE__CONDITION:
+        return basicSetCondition(null, msgs);
+      case SolverLanguagePackage.IF_ELSE__THEN:
+        return basicSetThen(null, msgs);
+      case SolverLanguagePackage.IF_ELSE__ELSE:
+        return basicSetElse(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.IF_ELSE__CONDITION:
+        return getCondition();
+      case SolverLanguagePackage.IF_ELSE__THEN:
+        return getThen();
+      case SolverLanguagePackage.IF_ELSE__ELSE:
+        return getElse();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.IF_ELSE__CONDITION:
+        setCondition((Expression)newValue);
+        return;
+      case SolverLanguagePackage.IF_ELSE__THEN:
+        setThen((Expression)newValue);
+        return;
+      case SolverLanguagePackage.IF_ELSE__ELSE:
+        setElse((Expression)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.IF_ELSE__CONDITION:
+        setCondition((Expression)null);
+        return;
+      case SolverLanguagePackage.IF_ELSE__THEN:
+        setThen((Expression)null);
+        return;
+      case SolverLanguagePackage.IF_ELSE__ELSE:
+        setElse((Expression)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.IF_ELSE__CONDITION:
+        return condition != null;
+      case SolverLanguagePackage.IF_ELSE__THEN:
+        return then != null;
+      case SolverLanguagePackage.IF_ELSE__ELSE:
+        return else_ != null;
+    }
+    return super.eIsSet(featureID);
+  }
+} //IfElseImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BooleanTrueImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/InfinityLiteralImpl.java
index 4d110ee9..e796f5a0 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BooleanTrueImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/InfinityLiteralImpl.java
@@ -1,28 +1,28 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanTrue;
+import org.eclipse.viatra.solver.language.solverLanguage.InfinityLiteral;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
 /**
 * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Boolean True</b></em>'.
+ * An implementation of the model object '<em><b>Infinity Literal</b></em>'.
 * <!-- end-user-doc -->
 *
 * @generated
 */
-public class BooleanTrueImpl extends BooleanValueImpl implements BooleanTrue
+public class InfinityLiteralImpl extends LiteralImpl implements InfinityLiteral
 {
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  protected BooleanTrueImpl()
+  protected InfinityLiteralImpl()
  {
    super();
  }
@@ -35,7 +35,7 @@ public class BooleanTrueImpl extends BooleanValueImpl implements BooleanTrue
  @Override
  protected EClass eStaticClass()
  {
-    return SolverLanguagePackage.Literals.BOOLEAN_TRUE;
+    return SolverLanguagePackage.Literals.INFINITY_LITERAL;
  }
-} //BooleanTrueImpl
+} //InfinityLiteralImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IntegerSymbolImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IntegerSymbolImpl.java
deleted file mode 100644
index bcd978fa..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IntegerSymbolImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.IntegerSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Integer Symbol</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class IntegerSymbolImpl extends DataSymbolImpl implements IntegerSymbol
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected IntegerSymbolImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.INTEGER_SYMBOL;
-  }
-} //IntegerSymbolImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/InterpretationImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/InterpretationImpl.java
deleted file mode 100644
index fb41d77d..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/InterpretationImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.Interpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Interpretation</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class InterpretationImpl extends StatementImpl implements Interpretation
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected InterpretationImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.INTERPRETATION;
-  }
-} //InterpretationImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IntervalImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IntervalImpl.java
new file mode 100644
index 00000000..e6107ef8
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IntervalImpl.java
@@ -0,0 +1,269 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
+import org.eclipse.viatra.solver.language.solverLanguage.Interval;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Interval</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.IntervalImpl#getLowerBound <em>Lower Bound</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.IntervalImpl#getUpperBound <em>Upper Bound</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class IntervalImpl extends ExpressionImpl implements Interval
+{
+  /**
+   * The cached value of the '{@link #getLowerBound() <em>Lower Bound</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getLowerBound()
+   * @generated
+   * @ordered
+   */
+  protected Expression lowerBound;
+  /**
+   * The cached value of the '{@link #getUpperBound() <em>Upper Bound</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getUpperBound()
+   * @generated
+   * @ordered
+   */
+  protected Expression upperBound;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected IntervalImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.INTERVAL;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getLowerBound()
+  {
+    return lowerBound;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetLowerBound(Expression newLowerBound, NotificationChain msgs)
+  {
+    Expression oldLowerBound = lowerBound;
+    lowerBound = newLowerBound;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.INTERVAL__LOWER_BOUND, oldLowerBound, newLowerBound);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setLowerBound(Expression newLowerBound)
+  {
+    if (newLowerBound != lowerBound)
+    {
+      NotificationChain msgs = null;
+      if (lowerBound != null)
+        msgs = ((InternalEObject)lowerBound).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.INTERVAL__LOWER_BOUND, null, msgs);
+      if (newLowerBound != null)
+        msgs = ((InternalEObject)newLowerBound).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.INTERVAL__LOWER_BOUND, null, msgs);
+      msgs = basicSetLowerBound(newLowerBound, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.INTERVAL__LOWER_BOUND, newLowerBound, newLowerBound));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getUpperBound()
+  {
+    return upperBound;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetUpperBound(Expression newUpperBound, NotificationChain msgs)
+  {
+    Expression oldUpperBound = upperBound;
+    upperBound = newUpperBound;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.INTERVAL__UPPER_BOUND, oldUpperBound, newUpperBound);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setUpperBound(Expression newUpperBound)
+  {
+    if (newUpperBound != upperBound)
+    {
+      NotificationChain msgs = null;
+      if (upperBound != null)
+        msgs = ((InternalEObject)upperBound).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.INTERVAL__UPPER_BOUND, null, msgs);
+      if (newUpperBound != null)
+        msgs = ((InternalEObject)newUpperBound).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.INTERVAL__UPPER_BOUND, null, msgs);
+      msgs = basicSetUpperBound(newUpperBound, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.INTERVAL__UPPER_BOUND, newUpperBound, newUpperBound));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.INTERVAL__LOWER_BOUND:
+        return basicSetLowerBound(null, msgs);
+      case SolverLanguagePackage.INTERVAL__UPPER_BOUND:
+        return basicSetUpperBound(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.INTERVAL__LOWER_BOUND:
+        return getLowerBound();
+      case SolverLanguagePackage.INTERVAL__UPPER_BOUND:
+        return getUpperBound();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.INTERVAL__LOWER_BOUND:
+        setLowerBound((Expression)newValue);
+        return;
+      case SolverLanguagePackage.INTERVAL__UPPER_BOUND:
+        setUpperBound((Expression)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.INTERVAL__LOWER_BOUND:
+        setLowerBound((Expression)null);
+        return;
+      case SolverLanguagePackage.INTERVAL__UPPER_BOUND:
+        setUpperBound((Expression)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.INTERVAL__LOWER_BOUND:
+        return lowerBound != null;
+      case SolverLanguagePackage.INTERVAL__UPPER_BOUND:
+        return upperBound != null;
+    }
+    return super.eIsSet(featureID);
+  }
+} //IntervalImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IrreflexiveClosureImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IrreflexiveClosureImpl.java
deleted file mode 100644
index 07ad66f9..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IrreflexiveClosureImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.IrreflexiveClosure;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Irreflexive Closure</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class IrreflexiveClosureImpl extends ClosureTypeImpl implements IrreflexiveClosure
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected IrreflexiveClosureImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.IRREFLEXIVE_CLOSURE;
-  }
-} //IrreflexiveClosureImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LiteralImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LiteralImpl.java
index 518aa2b7..2983566c 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LiteralImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LiteralImpl.java
@@ -1,12 +1,10 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.viatra.solver.language.solverLanguage.Literal;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
@@ -17,7 +15,7 @@ import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
 *
 * @generated
 */
-public class LiteralImpl extends MinimalEObjectImpl.Container implements Literal
+public class LiteralImpl extends ExpressionImpl implements Literal
 {
  /**
   * <!-- begin-user-doc -->
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IntObjectImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LogicLiteralImpl.java
index fa844b68..2bc27a20 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IntObjectImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LogicLiteralImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
@@ -9,23 +9,24 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.IntObject;
+import org.eclipse.viatra.solver.language.solverLanguage.LogicLiteral;
+import org.eclipse.viatra.solver.language.solverLanguage.LogicValue;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
 /**
 * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Int Object</b></em>'.
+ * An implementation of the model object '<em><b>Logic Literal</b></em>'.
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
 * </p>
 * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.IntObjectImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.LogicLiteralImpl#getValue <em>Value</em>}</li>
 * </ul>
 *
 * @generated
 */
-public class IntObjectImpl extends DataObjectImpl implements IntObject
+public class LogicLiteralImpl extends LiteralImpl implements LogicLiteral
 {
  /**
   * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
@@ -35,7 +36,7 @@ public class IntObjectImpl extends DataObjectImpl implements IntObject
   * @generated
   * @ordered
   */
-  protected static final int VALUE_EDEFAULT = 0;
+  protected static final LogicValue VALUE_EDEFAULT = LogicValue.TRUE;
  /**
   * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
@@ -45,14 +46,14 @@ public class IntObjectImpl extends DataObjectImpl implements IntObject
   * @generated
   * @ordered
   */
-  protected int value = VALUE_EDEFAULT;
+  protected LogicValue value = VALUE_EDEFAULT;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  protected IntObjectImpl()
+  protected LogicLiteralImpl()
  {
    super();
  }
@@ -65,7 +66,7 @@ public class IntObjectImpl extends DataObjectImpl implements IntObject
  @Override
  protected EClass eStaticClass()
  {
-    return SolverLanguagePackage.Literals.INT_OBJECT;
+    return SolverLanguagePackage.Literals.LOGIC_LITERAL;
  }
  /**
@@ -74,7 +75,7 @@ public class IntObjectImpl extends DataObjectImpl implements IntObject
   * @generated
   */
  @Override
-  public int getValue()
+  public LogicValue getValue()
  {
    return value;
  }
@@ -85,12 +86,12 @@ public class IntObjectImpl extends DataObjectImpl implements IntObject
   * @generated
   */
  @Override
-  public void setValue(int newValue)
+  public void setValue(LogicValue newValue)
  {
-    int oldValue = value;
+    LogicValue oldValue = value;
-    value = newValue;
+    value = newValue == null ? VALUE_EDEFAULT : newValue;
    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.INT_OBJECT__VALUE, oldValue, value));
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.LOGIC_LITERAL__VALUE, oldValue, value));
  }
  /**
@@ -103,7 +104,7 @@ public class IntObjectImpl extends DataObjectImpl implements IntObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.INT_OBJECT__VALUE:
+      case SolverLanguagePackage.LOGIC_LITERAL__VALUE:
        return getValue();
    }
    return super.eGet(featureID, resolve, coreType);
@@ -119,8 +120,8 @@ public class IntObjectImpl extends DataObjectImpl implements IntObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.INT_OBJECT__VALUE:
+      case SolverLanguagePackage.LOGIC_LITERAL__VALUE:
-        setValue((Integer)newValue);
+        setValue((LogicValue)newValue);
        return;
    }
    super.eSet(featureID, newValue);
@@ -136,7 +137,7 @@ public class IntObjectImpl extends DataObjectImpl implements IntObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.INT_OBJECT__VALUE:
+      case SolverLanguagePackage.LOGIC_LITERAL__VALUE:
        setValue(VALUE_EDEFAULT);
        return;
    }
@@ -153,7 +154,7 @@ public class IntObjectImpl extends DataObjectImpl implements IntObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.INT_OBJECT__VALUE:
+      case SolverLanguagePackage.LOGIC_LITERAL__VALUE:
        return value != VALUE_EDEFAULT;
    }
    return super.eIsSet(featureID);
@@ -176,4 +177,4 @@ public class IntObjectImpl extends DataObjectImpl implements IntObject
    return result.toString();
  }
-} //IntObjectImpl
+} //LogicLiteralImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LowerBoundedScopeDefinitionImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LowerBoundedScopeDefinitionImpl.java
new file mode 100644
index 00000000..5eb671f3
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LowerBoundedScopeDefinitionImpl.java
@@ -0,0 +1,179 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.LowerBoundedScopeDefinition;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Lower Bounded Scope Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.LowerBoundedScopeDefinitionImpl#getLowerBound <em>Lower Bound</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class LowerBoundedScopeDefinitionImpl extends ScopeDefinitionImpl implements LowerBoundedScopeDefinition
+{
+  /**
+   * The default value of the '{@link #getLowerBound() <em>Lower Bound</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getLowerBound()
+   * @generated
+   * @ordered
+   */
+  protected static final int LOWER_BOUND_EDEFAULT = 0;
+  /**
+   * The cached value of the '{@link #getLowerBound() <em>Lower Bound</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getLowerBound()
+   * @generated
+   * @ordered
+   */
+  protected int lowerBound = LOWER_BOUND_EDEFAULT;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected LowerBoundedScopeDefinitionImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.LOWER_BOUNDED_SCOPE_DEFINITION;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public int getLowerBound()
+  {
+    return lowerBound;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setLowerBound(int newLowerBound)
+  {
+    int oldLowerBound = lowerBound;
+    lowerBound = newLowerBound;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.LOWER_BOUNDED_SCOPE_DEFINITION__LOWER_BOUND, oldLowerBound, lowerBound));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.LOWER_BOUNDED_SCOPE_DEFINITION__LOWER_BOUND:
+        return getLowerBound();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.LOWER_BOUNDED_SCOPE_DEFINITION__LOWER_BOUND:
+        setLowerBound((Integer)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.LOWER_BOUNDED_SCOPE_DEFINITION__LOWER_BOUND:
+        setLowerBound(LOWER_BOUND_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.LOWER_BOUNDED_SCOPE_DEFINITION__LOWER_BOUND:
+        return lowerBound != LOWER_BOUND_EDEFAULT;
+    }
+    return super.eIsSet(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+    StringBuilder result = new StringBuilder(super.toString());
+    result.append(" (lowerBound: ");
+    result.append(lowerBound);
+    result.append(')');
+    return result.toString();
+  }
+} //LowerBoundedScopeDefinitionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AllObjectsImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ManyMultiplicityImpl.java
index b1e9c3d0..c248b4ea 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AllObjectsImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ManyMultiplicityImpl.java
@@ -1,28 +1,28 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.AllObjects;
+import org.eclipse.viatra.solver.language.solverLanguage.ManyMultiplicity;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
 /**
 * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>All Objects</b></em>'.
+ * An implementation of the model object '<em><b>Many Multiplicity</b></em>'.
 * <!-- end-user-doc -->
 *
 * @generated
 */
-public class AllObjectsImpl extends ComplexObjectImpl implements AllObjects
+public class ManyMultiplicityImpl extends MultiplicityImpl implements ManyMultiplicity
 {
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  protected AllObjectsImpl()
+  protected ManyMultiplicityImpl()
  {
    super();
  }
@@ -35,7 +35,7 @@ public class AllObjectsImpl extends ComplexObjectImpl implements AllObjects
  @Override
  protected EClass eStaticClass()
  {
-    return SolverLanguagePackage.Literals.ALL_OBJECTS;
+    return SolverLanguagePackage.Literals.MANY_MULTIPLICITY;
  }
-} //AllObjectsImpl
+} //ManyMultiplicityImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MemberDefinitionImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MemberDefinitionImpl.java
new file mode 100644
index 00000000..69021347
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MemberDefinitionImpl.java
@@ -0,0 +1,463 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition;
+import org.eclipse.viatra.solver.language.solverLanguage.Multiplicity;
+import org.eclipse.viatra.solver.language.solverLanguage.NamedElement;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Member Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MemberDefinitionImpl#isContainment <em>Containment</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MemberDefinitionImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MemberDefinitionImpl#getMultiplicity <em>Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MemberDefinitionImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MemberDefinitionImpl#getOpposite <em>Opposite</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class MemberDefinitionImpl extends MinimalEObjectImpl.Container implements MemberDefinition
+{
+  /**
+   * The default value of the '{@link #isContainment() <em>Containment</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #isContainment()
+   * @generated
+   * @ordered
+   */
+  protected static final boolean CONTAINMENT_EDEFAULT = false;
+  /**
+   * The cached value of the '{@link #isContainment() <em>Containment</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #isContainment()
+   * @generated
+   * @ordered
+   */
+  protected boolean containment = CONTAINMENT_EDEFAULT;
+  /**
+   * The cached value of the '{@link #getType() <em>Type</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getType()
+   * @generated
+   * @ordered
+   */
+  protected NamedElement type;
+  /**
+   * The cached value of the '{@link #getMultiplicity() <em>Multiplicity</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getMultiplicity()
+   * @generated
+   * @ordered
+   */
+  protected Multiplicity multiplicity;
+  /**
+   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected static final String NAME_EDEFAULT = null;
+  /**
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected String name = NAME_EDEFAULT;
+  /**
+   * The cached value of the '{@link #getOpposite() <em>Opposite</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getOpposite()
+   * @generated
+   * @ordered
+   */
+  protected NamedElement opposite;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected MemberDefinitionImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.MEMBER_DEFINITION;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean isContainment()
+  {
+    return containment;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setContainment(boolean newContainment)
+  {
+    boolean oldContainment = containment;
+    containment = newContainment;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.MEMBER_DEFINITION__CONTAINMENT, oldContainment, containment));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NamedElement getType()
+  {
+    if (type != null && type.eIsProxy())
+    {
+      InternalEObject oldType = (InternalEObject)type;
+      type = (NamedElement)eResolveProxy(oldType);
+      if (type != oldType)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, SolverLanguagePackage.MEMBER_DEFINITION__TYPE, oldType, type));
+      }
+    }
+    return type;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NamedElement basicGetType()
+  {
+    return type;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setType(NamedElement newType)
+  {
+    NamedElement oldType = type;
+    type = newType;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.MEMBER_DEFINITION__TYPE, oldType, type));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Multiplicity getMultiplicity()
+  {
+    return multiplicity;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetMultiplicity(Multiplicity newMultiplicity, NotificationChain msgs)
+  {
+    Multiplicity oldMultiplicity = multiplicity;
+    multiplicity = newMultiplicity;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.MEMBER_DEFINITION__MULTIPLICITY, oldMultiplicity, newMultiplicity);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setMultiplicity(Multiplicity newMultiplicity)
+  {
+    if (newMultiplicity != multiplicity)
+    {
+      NotificationChain msgs = null;
+      if (multiplicity != null)
+        msgs = ((InternalEObject)multiplicity).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.MEMBER_DEFINITION__MULTIPLICITY, null, msgs);
+      if (newMultiplicity != null)
+        msgs = ((InternalEObject)newMultiplicity).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.MEMBER_DEFINITION__MULTIPLICITY, null, msgs);
+      msgs = basicSetMultiplicity(newMultiplicity, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.MEMBER_DEFINITION__MULTIPLICITY, newMultiplicity, newMultiplicity));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getName()
+  {
+    return name;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setName(String newName)
+  {
+    String oldName = name;
+    name = newName;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.MEMBER_DEFINITION__NAME, oldName, name));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NamedElement getOpposite()
+  {
+    if (opposite != null && opposite.eIsProxy())
+    {
+      InternalEObject oldOpposite = (InternalEObject)opposite;
+      opposite = (NamedElement)eResolveProxy(oldOpposite);
+      if (opposite != oldOpposite)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, SolverLanguagePackage.MEMBER_DEFINITION__OPPOSITE, oldOpposite, opposite));
+      }
+    }
+    return opposite;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NamedElement basicGetOpposite()
+  {
+    return opposite;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setOpposite(NamedElement newOpposite)
+  {
+    NamedElement oldOpposite = opposite;
+    opposite = newOpposite;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.MEMBER_DEFINITION__OPPOSITE, oldOpposite, opposite));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.MEMBER_DEFINITION__MULTIPLICITY:
+        return basicSetMultiplicity(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.MEMBER_DEFINITION__CONTAINMENT:
+        return isContainment();
+      case SolverLanguagePackage.MEMBER_DEFINITION__TYPE:
+        if (resolve) return getType();
+        return basicGetType();
+      case SolverLanguagePackage.MEMBER_DEFINITION__MULTIPLICITY:
+        return getMultiplicity();
+      case SolverLanguagePackage.MEMBER_DEFINITION__NAME:
+        return getName();
+      case SolverLanguagePackage.MEMBER_DEFINITION__OPPOSITE:
+        if (resolve) return getOpposite();
+        return basicGetOpposite();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.MEMBER_DEFINITION__CONTAINMENT:
+        setContainment((Boolean)newValue);
+        return;
+      case SolverLanguagePackage.MEMBER_DEFINITION__TYPE:
+        setType((NamedElement)newValue);
+        return;
+      case SolverLanguagePackage.MEMBER_DEFINITION__MULTIPLICITY:
+        setMultiplicity((Multiplicity)newValue);
+        return;
+      case SolverLanguagePackage.MEMBER_DEFINITION__NAME:
+        setName((String)newValue);
+        return;
+      case SolverLanguagePackage.MEMBER_DEFINITION__OPPOSITE:
+        setOpposite((NamedElement)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.MEMBER_DEFINITION__CONTAINMENT:
+        setContainment(CONTAINMENT_EDEFAULT);
+        return;
+      case SolverLanguagePackage.MEMBER_DEFINITION__TYPE:
+        setType((NamedElement)null);
+        return;
+      case SolverLanguagePackage.MEMBER_DEFINITION__MULTIPLICITY:
+        setMultiplicity((Multiplicity)null);
+        return;
+      case SolverLanguagePackage.MEMBER_DEFINITION__NAME:
+        setName(NAME_EDEFAULT);
+        return;
+      case SolverLanguagePackage.MEMBER_DEFINITION__OPPOSITE:
+        setOpposite((NamedElement)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.MEMBER_DEFINITION__CONTAINMENT:
+        return containment != CONTAINMENT_EDEFAULT;
+      case SolverLanguagePackage.MEMBER_DEFINITION__TYPE:
+        return type != null;
+      case SolverLanguagePackage.MEMBER_DEFINITION__MULTIPLICITY:
+        return multiplicity != null;
+      case SolverLanguagePackage.MEMBER_DEFINITION__NAME:
+        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+      case SolverLanguagePackage.MEMBER_DEFINITION__OPPOSITE:
+        return opposite != null;
+    }
+    return super.eIsSet(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+    StringBuilder result = new StringBuilder(super.toString());
+    result.append(" (containment: ");
+    result.append(containment);
+    result.append(", name: ");
+    result.append(name);
+    result.append(')');
+    return result.toString();
+  }
+} //MemberDefinitionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MetricDefinitionImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MetricDefinitionImpl.java
new file mode 100644
index 00000000..8f84d2f1
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MetricDefinitionImpl.java
@@ -0,0 +1,343 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
+import org.eclipse.viatra.solver.language.solverLanguage.MetricDefinition;
+import org.eclipse.viatra.solver.language.solverLanguage.MetricType;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Metric Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MetricDefinitionImpl#getHead <em>Head</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MetricDefinitionImpl#getBody <em>Body</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MetricDefinitionImpl#getType <em>Type</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class MetricDefinitionImpl extends StatementImpl implements MetricDefinition
+{
+  /**
+   * The cached value of the '{@link #getHead() <em>Head</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getHead()
+   * @generated
+   * @ordered
+   */
+  protected Expression head;
+  /**
+   * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getBody()
+   * @generated
+   * @ordered
+   */
+  protected Expression body;
+  /**
+   * The default value of the '{@link #getType() <em>Type</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getType()
+   * @generated
+   * @ordered
+   */
+  protected static final MetricType TYPE_EDEFAULT = MetricType.INT;
+  /**
+   * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getType()
+   * @generated
+   * @ordered
+   */
+  protected MetricType type = TYPE_EDEFAULT;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected MetricDefinitionImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.METRIC_DEFINITION;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getHead()
+  {
+    return head;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetHead(Expression newHead, NotificationChain msgs)
+  {
+    Expression oldHead = head;
+    head = newHead;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.METRIC_DEFINITION__HEAD, oldHead, newHead);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setHead(Expression newHead)
+  {
+    if (newHead != head)
+    {
+      NotificationChain msgs = null;
+      if (head != null)
+        msgs = ((InternalEObject)head).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.METRIC_DEFINITION__HEAD, null, msgs);
+      if (newHead != null)
+        msgs = ((InternalEObject)newHead).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.METRIC_DEFINITION__HEAD, null, msgs);
+      msgs = basicSetHead(newHead, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.METRIC_DEFINITION__HEAD, newHead, newHead));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getBody()
+  {
+    return body;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetBody(Expression newBody, NotificationChain msgs)
+  {
+    Expression oldBody = body;
+    body = newBody;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.METRIC_DEFINITION__BODY, oldBody, newBody);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setBody(Expression newBody)
+  {
+    if (newBody != body)
+    {
+      NotificationChain msgs = null;
+      if (body != null)
+        msgs = ((InternalEObject)body).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.METRIC_DEFINITION__BODY, null, msgs);
+      if (newBody != null)
+        msgs = ((InternalEObject)newBody).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.METRIC_DEFINITION__BODY, null, msgs);
+      msgs = basicSetBody(newBody, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.METRIC_DEFINITION__BODY, newBody, newBody));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public MetricType getType()
+  {
+    return type;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setType(MetricType newType)
+  {
+    MetricType oldType = type;
+    type = newType == null ? TYPE_EDEFAULT : newType;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.METRIC_DEFINITION__TYPE, oldType, type));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.METRIC_DEFINITION__HEAD:
+        return basicSetHead(null, msgs);
+      case SolverLanguagePackage.METRIC_DEFINITION__BODY:
+        return basicSetBody(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.METRIC_DEFINITION__HEAD:
+        return getHead();
+      case SolverLanguagePackage.METRIC_DEFINITION__BODY:
+        return getBody();
+      case SolverLanguagePackage.METRIC_DEFINITION__TYPE:
+        return getType();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.METRIC_DEFINITION__HEAD:
+        setHead((Expression)newValue);
+        return;
+      case SolverLanguagePackage.METRIC_DEFINITION__BODY:
+        setBody((Expression)newValue);
+        return;
+      case SolverLanguagePackage.METRIC_DEFINITION__TYPE:
+        setType((MetricType)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.METRIC_DEFINITION__HEAD:
+        setHead((Expression)null);
+        return;
+      case SolverLanguagePackage.METRIC_DEFINITION__BODY:
+        setBody((Expression)null);
+        return;
+      case SolverLanguagePackage.METRIC_DEFINITION__TYPE:
+        setType(TYPE_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.METRIC_DEFINITION__HEAD:
+        return head != null;
+      case SolverLanguagePackage.METRIC_DEFINITION__BODY:
+        return body != null;
+      case SolverLanguagePackage.METRIC_DEFINITION__TYPE:
+        return type != TYPE_EDEFAULT;
+    }
+    return super.eIsSet(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+    StringBuilder result = new StringBuilder(super.toString());
+    result.append(" (type: ");
+    result.append(type);
+    result.append(')');
+    return result.toString();
+  }
+} //MetricDefinitionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MultiplicityDefinitionImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MultiplicityDefinitionImpl.java
deleted file mode 100644
index a346568c..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MultiplicityDefinitionImpl.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Multiplicity Definition</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MultiplicityDefinitionImpl#getLower <em>Lower</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MultiplicityDefinitionImpl#getUpper <em>Upper</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MultiplicityDefinitionImpl#isUnlimitedUpper <em>Unlimited Upper</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class MultiplicityDefinitionImpl extends MinimalEObjectImpl.Container implements MultiplicityDefinition
-{
-  /**
-   * The default value of the '{@link #getLower() <em>Lower</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLower()
-   * @generated
-   * @ordered
-   */
-  protected static final int LOWER_EDEFAULT = 0;
-  /**
-   * The cached value of the '{@link #getLower() <em>Lower</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLower()
-   * @generated
-   * @ordered
-   */
-  protected int lower = LOWER_EDEFAULT;
-  /**
-   * The default value of the '{@link #getUpper() <em>Upper</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getUpper()
-   * @generated
-   * @ordered
-   */
-  protected static final int UPPER_EDEFAULT = 0;
-  /**
-   * The cached value of the '{@link #getUpper() <em>Upper</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getUpper()
-   * @generated
-   * @ordered
-   */
-  protected int upper = UPPER_EDEFAULT;
-  /**
-   * The default value of the '{@link #isUnlimitedUpper() <em>Unlimited Upper</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUnlimitedUpper()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean UNLIMITED_UPPER_EDEFAULT = false;
-  /**
-   * The cached value of the '{@link #isUnlimitedUpper() <em>Unlimited Upper</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isUnlimitedUpper()
-   * @generated
-   * @ordered
-   */
-  protected boolean unlimitedUpper = UNLIMITED_UPPER_EDEFAULT;
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected MultiplicityDefinitionImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.MULTIPLICITY_DEFINITION;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public int getLower()
-  {
-    return lower;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setLower(int newLower)
-  {
-    int oldLower = lower;
-    lower = newLower;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.MULTIPLICITY_DEFINITION__LOWER, oldLower, lower));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public int getUpper()
-  {
-    return upper;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setUpper(int newUpper)
-  {
-    int oldUpper = upper;
-    upper = newUpper;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.MULTIPLICITY_DEFINITION__UPPER, oldUpper, upper));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean isUnlimitedUpper()
-  {
-    return unlimitedUpper;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setUnlimitedUpper(boolean newUnlimitedUpper)
-  {
-    boolean oldUnlimitedUpper = unlimitedUpper;
-    unlimitedUpper = newUnlimitedUpper;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.MULTIPLICITY_DEFINITION__UNLIMITED_UPPER, oldUnlimitedUpper, unlimitedUpper));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.MULTIPLICITY_DEFINITION__LOWER:
-        return getLower();
-      case SolverLanguagePackage.MULTIPLICITY_DEFINITION__UPPER:
-        return getUpper();
-      case SolverLanguagePackage.MULTIPLICITY_DEFINITION__UNLIMITED_UPPER:
-        return isUnlimitedUpper();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.MULTIPLICITY_DEFINITION__LOWER:
-        setLower((Integer)newValue);
-        return;
-      case SolverLanguagePackage.MULTIPLICITY_DEFINITION__UPPER:
-        setUpper((Integer)newValue);
-        return;
-      case SolverLanguagePackage.MULTIPLICITY_DEFINITION__UNLIMITED_UPPER:
-        setUnlimitedUpper((Boolean)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.MULTIPLICITY_DEFINITION__LOWER:
-        setLower(LOWER_EDEFAULT);
-        return;
-      case SolverLanguagePackage.MULTIPLICITY_DEFINITION__UPPER:
-        setUpper(UPPER_EDEFAULT);
-        return;
-      case SolverLanguagePackage.MULTIPLICITY_DEFINITION__UNLIMITED_UPPER:
-        setUnlimitedUpper(UNLIMITED_UPPER_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.MULTIPLICITY_DEFINITION__LOWER:
-        return lower != LOWER_EDEFAULT;
-      case SolverLanguagePackage.MULTIPLICITY_DEFINITION__UPPER:
-        return upper != UPPER_EDEFAULT;
-      case SolverLanguagePackage.MULTIPLICITY_DEFINITION__UNLIMITED_UPPER:
-        return unlimitedUpper != UNLIMITED_UPPER_EDEFAULT;
-    }
-    return super.eIsSet(featureID);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-    StringBuilder result = new StringBuilder(super.toString());
-    result.append(" (lower: ");
-    result.append(lower);
-    result.append(", upper: ");
-    result.append(upper);
-    result.append(", unlimitedUpper: ");
-    result.append(unlimitedUpper);
-    result.append(')');
-    return result.toString();
-  }
-} //MultiplicityDefinitionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ClosureTypeImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MultiplicityImpl.java
index 98136f79..935cf5be 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ClosureTypeImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MultiplicityImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
@@ -7,24 +7,24 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.ClosureType;
+import org.eclipse.viatra.solver.language.solverLanguage.Multiplicity;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
 /**
 * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Closure Type</b></em>'.
+ * An implementation of the model object '<em><b>Multiplicity</b></em>'.
 * <!-- end-user-doc -->
 *
 * @generated
 */
-public class ClosureTypeImpl extends MinimalEObjectImpl.Container implements ClosureType
+public class MultiplicityImpl extends MinimalEObjectImpl.Container implements Multiplicity
 {
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  protected ClosureTypeImpl()
+  protected MultiplicityImpl()
  {
    super();
  }
@@ -37,7 +37,7 @@ public class ClosureTypeImpl extends MinimalEObjectImpl.Container implements Clo
  @Override
  protected EClass eStaticClass()
  {
-    return SolverLanguagePackage.Literals.CLOSURE_TYPE;
+    return SolverLanguagePackage.Literals.MULTIPLICITY;
  }
-} //ClosureTypeImpl
+} //MultiplicityImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/VariableImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/NamedElementImpl.java
index 9a254023..a94f9894 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/VariableImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/NamedElementImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
@@ -8,24 +8,25 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.NamedElement;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-import org.eclipse.viatra.solver.language.solverLanguage.Variable;
 /**
 * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Variable</b></em>'.
+ * An implementation of the model object '<em><b>Named Element</b></em>'.
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
 * </p>
 * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.VariableImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.NamedElementImpl#getName <em>Name</em>}</li>
 * </ul>
 *
 * @generated
 */
-public class VariableImpl extends LiteralImpl implements Variable
+public class NamedElementImpl extends MinimalEObjectImpl.Container implements NamedElement
 {
  /**
   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
@@ -52,7 +53,7 @@ public class VariableImpl extends LiteralImpl implements Variable
   * <!-- end-user-doc -->
   * @generated
   */
-  protected VariableImpl()
+  protected NamedElementImpl()
  {
    super();
  }
@@ -65,7 +66,7 @@ public class VariableImpl extends LiteralImpl implements Variable
  @Override
  protected EClass eStaticClass()
  {
-    return SolverLanguagePackage.Literals.VARIABLE;
+    return SolverLanguagePackage.Literals.NAMED_ELEMENT;
  }
  /**
@@ -90,7 +91,7 @@ public class VariableImpl extends LiteralImpl implements Variable
    String oldName = name;
    name = newName;
    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.VARIABLE__NAME, oldName, name));
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.NAMED_ELEMENT__NAME, oldName, name));
  }
  /**
@@ -103,7 +104,7 @@ public class VariableImpl extends LiteralImpl implements Variable
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.VARIABLE__NAME:
+      case SolverLanguagePackage.NAMED_ELEMENT__NAME:
        return getName();
    }
    return super.eGet(featureID, resolve, coreType);
@@ -119,7 +120,7 @@ public class VariableImpl extends LiteralImpl implements Variable
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.VARIABLE__NAME:
+      case SolverLanguagePackage.NAMED_ELEMENT__NAME:
        setName((String)newValue);
        return;
    }
@@ -136,7 +137,7 @@ public class VariableImpl extends LiteralImpl implements Variable
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.VARIABLE__NAME:
+      case SolverLanguagePackage.NAMED_ELEMENT__NAME:
        setName(NAME_EDEFAULT);
        return;
    }
@@ -153,7 +154,7 @@ public class VariableImpl extends LiteralImpl implements Variable
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.VARIABLE__NAME:
+      case SolverLanguagePackage.NAMED_ELEMENT__NAME:
        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
    }
    return super.eIsSet(featureID);
@@ -176,4 +177,4 @@ public class VariableImpl extends LiteralImpl implements Variable
    return result.toString();
  }
-} //VariableImpl
+} //NamedElementImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/NegativeImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/NegativeImpl.java
deleted file mode 100644
index a30b228f..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/NegativeImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.Negative;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Negative</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class NegativeImpl extends PolarityImpl implements Negative
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected NegativeImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.NEGATIVE;
-  }
-} //NegativeImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/RealObjectImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/NumericLiteralImpl.java
index bc32a9a6..04622dfb 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/RealObjectImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/NumericLiteralImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
@@ -11,23 +11,23 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.RealObject;
+import org.eclipse.viatra.solver.language.solverLanguage.NumericLiteral;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
 /**
 * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Real Object</b></em>'.
+ * An implementation of the model object '<em><b>Numeric Literal</b></em>'.
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
 * </p>
 * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.RealObjectImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.NumericLiteralImpl#getValue <em>Value</em>}</li>
 * </ul>
 *
 * @generated
 */
-public class RealObjectImpl extends DataObjectImpl implements RealObject
+public class NumericLiteralImpl extends LiteralImpl implements NumericLiteral
 {
  /**
   * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
@@ -54,7 +54,7 @@ public class RealObjectImpl extends DataObjectImpl implements RealObject
   * <!-- end-user-doc -->
   * @generated
   */
-  protected RealObjectImpl()
+  protected NumericLiteralImpl()
  {
    super();
  }
@@ -67,7 +67,7 @@ public class RealObjectImpl extends DataObjectImpl implements RealObject
  @Override
  protected EClass eStaticClass()
  {
-    return SolverLanguagePackage.Literals.REAL_OBJECT;
+    return SolverLanguagePackage.Literals.NUMERIC_LITERAL;
  }
  /**
@@ -92,7 +92,7 @@ public class RealObjectImpl extends DataObjectImpl implements RealObject
    BigDecimal oldValue = value;
    value = newValue;
    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.REAL_OBJECT__VALUE, oldValue, value));
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.NUMERIC_LITERAL__VALUE, oldValue, value));
  }
  /**
@@ -105,7 +105,7 @@ public class RealObjectImpl extends DataObjectImpl implements RealObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.REAL_OBJECT__VALUE:
+      case SolverLanguagePackage.NUMERIC_LITERAL__VALUE:
        return getValue();
    }
    return super.eGet(featureID, resolve, coreType);
@@ -121,7 +121,7 @@ public class RealObjectImpl extends DataObjectImpl implements RealObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.REAL_OBJECT__VALUE:
+      case SolverLanguagePackage.NUMERIC_LITERAL__VALUE:
        setValue((BigDecimal)newValue);
        return;
    }
@@ -138,7 +138,7 @@ public class RealObjectImpl extends DataObjectImpl implements RealObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.REAL_OBJECT__VALUE:
+      case SolverLanguagePackage.NUMERIC_LITERAL__VALUE:
        setValue(VALUE_EDEFAULT);
        return;
    }
@@ -155,7 +155,7 @@ public class RealObjectImpl extends DataObjectImpl implements RealObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.REAL_OBJECT__VALUE:
+      case SolverLanguagePackage.NUMERIC_LITERAL__VALUE:
        return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
    }
    return super.eIsSet(featureID);
@@ -178,4 +178,4 @@ public class RealObjectImpl extends DataObjectImpl implements RealObject
    return result.toString();
  }
-} //RealObjectImpl
+} //NumericLiteralImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ObjectImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ObjectImpl.java
deleted file mode 100644
index d2f9b8d9..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ObjectImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Object</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ObjectImpl extends ComplexObjectImpl implements org.eclipse.viatra.solver.language.solverLanguage.Object
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ObjectImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.OBJECT;
-  }
-} //ObjectImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ObjectiveDefinitionImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ObjectiveDefinitionImpl.java
new file mode 100644
index 00000000..43b16e31
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ObjectiveDefinitionImpl.java
@@ -0,0 +1,270 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
+import org.eclipse.viatra.solver.language.solverLanguage.ObjectiveDefinition;
+import org.eclipse.viatra.solver.language.solverLanguage.ObjectiveKind;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Objective Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ObjectiveDefinitionImpl#getKind <em>Kind</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ObjectiveDefinitionImpl#getObjective <em>Objective</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ObjectiveDefinitionImpl extends StatementImpl implements ObjectiveDefinition
+{
+  /**
+   * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getKind()
+   * @generated
+   * @ordered
+   */
+  protected static final ObjectiveKind KIND_EDEFAULT = ObjectiveKind.MINIMIZE;
+  /**
+   * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getKind()
+   * @generated
+   * @ordered
+   */
+  protected ObjectiveKind kind = KIND_EDEFAULT;
+  /**
+   * The cached value of the '{@link #getObjective() <em>Objective</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getObjective()
+   * @generated
+   * @ordered
+   */
+  protected Expression objective;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ObjectiveDefinitionImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.OBJECTIVE_DEFINITION;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public ObjectiveKind getKind()
+  {
+    return kind;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setKind(ObjectiveKind newKind)
+  {
+    ObjectiveKind oldKind = kind;
+    kind = newKind == null ? KIND_EDEFAULT : newKind;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.OBJECTIVE_DEFINITION__KIND, oldKind, kind));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getObjective()
+  {
+    return objective;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetObjective(Expression newObjective, NotificationChain msgs)
+  {
+    Expression oldObjective = objective;
+    objective = newObjective;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.OBJECTIVE_DEFINITION__OBJECTIVE, oldObjective, newObjective);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setObjective(Expression newObjective)
+  {
+    if (newObjective != objective)
+    {
+      NotificationChain msgs = null;
+      if (objective != null)
+        msgs = ((InternalEObject)objective).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.OBJECTIVE_DEFINITION__OBJECTIVE, null, msgs);
+      if (newObjective != null)
+        msgs = ((InternalEObject)newObjective).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.OBJECTIVE_DEFINITION__OBJECTIVE, null, msgs);
+      msgs = basicSetObjective(newObjective, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.OBJECTIVE_DEFINITION__OBJECTIVE, newObjective, newObjective));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.OBJECTIVE_DEFINITION__OBJECTIVE:
+        return basicSetObjective(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.OBJECTIVE_DEFINITION__KIND:
+        return getKind();
+      case SolverLanguagePackage.OBJECTIVE_DEFINITION__OBJECTIVE:
+        return getObjective();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.OBJECTIVE_DEFINITION__KIND:
+        setKind((ObjectiveKind)newValue);
+        return;
+      case SolverLanguagePackage.OBJECTIVE_DEFINITION__OBJECTIVE:
+        setObjective((Expression)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.OBJECTIVE_DEFINITION__KIND:
+        setKind(KIND_EDEFAULT);
+        return;
+      case SolverLanguagePackage.OBJECTIVE_DEFINITION__OBJECTIVE:
+        setObjective((Expression)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.OBJECTIVE_DEFINITION__KIND:
+        return kind != KIND_EDEFAULT;
+      case SolverLanguagePackage.OBJECTIVE_DEFINITION__OBJECTIVE:
+        return objective != null;
+    }
+    return super.eIsSet(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+    StringBuilder result = new StringBuilder(super.toString());
+    result.append(" (kind: ");
+    result.append(kind);
+    result.append(')');
+    return result.toString();
+  }
+} //ObjectiveDefinitionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PartialitySymbolImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PartialitySymbolImpl.java
deleted file mode 100644
index efc2c5f5..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PartialitySymbolImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.PartialitySymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Partiality Symbol</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class PartialitySymbolImpl extends SymbolImpl implements PartialitySymbol
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected PartialitySymbolImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.PARTIALITY_SYMBOL;
-  }
-} //PartialitySymbolImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PositiveImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PositiveImpl.java
deleted file mode 100644
index 130cfe7a..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PositiveImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.Positive;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Positive</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class PositiveImpl extends PolarityImpl implements Positive
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected PositiveImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.POSITIVE;
-  }
-} //PositiveImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateDefinitionImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateDefinitionImpl.java
new file mode 100644
index 00000000..50130f01
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateDefinitionImpl.java
@@ -0,0 +1,400 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
+import org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Predicate Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateDefinitionImpl#getHead <em>Head</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateDefinitionImpl#getBody <em>Body</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateDefinitionImpl#isFunctional <em>Functional</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateDefinitionImpl#isError <em>Error</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class PredicateDefinitionImpl extends StatementImpl implements PredicateDefinition
+{
+  /**
+   * The cached value of the '{@link #getHead() <em>Head</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getHead()
+   * @generated
+   * @ordered
+   */
+  protected Expression head;
+  /**
+   * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getBody()
+   * @generated
+   * @ordered
+   */
+  protected Expression body;
+  /**
+   * The default value of the '{@link #isFunctional() <em>Functional</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #isFunctional()
+   * @generated
+   * @ordered
+   */
+  protected static final boolean FUNCTIONAL_EDEFAULT = false;
+  /**
+   * The cached value of the '{@link #isFunctional() <em>Functional</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #isFunctional()
+   * @generated
+   * @ordered
+   */
+  protected boolean functional = FUNCTIONAL_EDEFAULT;
+  /**
+   * The default value of the '{@link #isError() <em>Error</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #isError()
+   * @generated
+   * @ordered
+   */
+  protected static final boolean ERROR_EDEFAULT = false;
+  /**
+   * The cached value of the '{@link #isError() <em>Error</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #isError()
+   * @generated
+   * @ordered
+   */
+  protected boolean error = ERROR_EDEFAULT;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected PredicateDefinitionImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.PREDICATE_DEFINITION;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getHead()
+  {
+    return head;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetHead(Expression newHead, NotificationChain msgs)
+  {
+    Expression oldHead = head;
+    head = newHead;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PREDICATE_DEFINITION__HEAD, oldHead, newHead);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setHead(Expression newHead)
+  {
+    if (newHead != head)
+    {
+      NotificationChain msgs = null;
+      if (head != null)
+        msgs = ((InternalEObject)head).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.PREDICATE_DEFINITION__HEAD, null, msgs);
+      if (newHead != null)
+        msgs = ((InternalEObject)newHead).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.PREDICATE_DEFINITION__HEAD, null, msgs);
+      msgs = basicSetHead(newHead, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PREDICATE_DEFINITION__HEAD, newHead, newHead));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getBody()
+  {
+    return body;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetBody(Expression newBody, NotificationChain msgs)
+  {
+    Expression oldBody = body;
+    body = newBody;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PREDICATE_DEFINITION__BODY, oldBody, newBody);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setBody(Expression newBody)
+  {
+    if (newBody != body)
+    {
+      NotificationChain msgs = null;
+      if (body != null)
+        msgs = ((InternalEObject)body).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.PREDICATE_DEFINITION__BODY, null, msgs);
+      if (newBody != null)
+        msgs = ((InternalEObject)newBody).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.PREDICATE_DEFINITION__BODY, null, msgs);
+      msgs = basicSetBody(newBody, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PREDICATE_DEFINITION__BODY, newBody, newBody));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean isFunctional()
+  {
+    return functional;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setFunctional(boolean newFunctional)
+  {
+    boolean oldFunctional = functional;
+    functional = newFunctional;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PREDICATE_DEFINITION__FUNCTIONAL, oldFunctional, functional));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean isError()
+  {
+    return error;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setError(boolean newError)
+  {
+    boolean oldError = error;
+    error = newError;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PREDICATE_DEFINITION__ERROR, oldError, error));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.PREDICATE_DEFINITION__HEAD:
+        return basicSetHead(null, msgs);
+      case SolverLanguagePackage.PREDICATE_DEFINITION__BODY:
+        return basicSetBody(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.PREDICATE_DEFINITION__HEAD:
+        return getHead();
+      case SolverLanguagePackage.PREDICATE_DEFINITION__BODY:
+        return getBody();
+      case SolverLanguagePackage.PREDICATE_DEFINITION__FUNCTIONAL:
+        return isFunctional();
+      case SolverLanguagePackage.PREDICATE_DEFINITION__ERROR:
+        return isError();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.PREDICATE_DEFINITION__HEAD:
+        setHead((Expression)newValue);
+        return;
+      case SolverLanguagePackage.PREDICATE_DEFINITION__BODY:
+        setBody((Expression)newValue);
+        return;
+      case SolverLanguagePackage.PREDICATE_DEFINITION__FUNCTIONAL:
+        setFunctional((Boolean)newValue);
+        return;
+      case SolverLanguagePackage.PREDICATE_DEFINITION__ERROR:
+        setError((Boolean)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.PREDICATE_DEFINITION__HEAD:
+        setHead((Expression)null);
+        return;
+      case SolverLanguagePackage.PREDICATE_DEFINITION__BODY:
+        setBody((Expression)null);
+        return;
+      case SolverLanguagePackage.PREDICATE_DEFINITION__FUNCTIONAL:
+        setFunctional(FUNCTIONAL_EDEFAULT);
+        return;
+      case SolverLanguagePackage.PREDICATE_DEFINITION__ERROR:
+        setError(ERROR_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.PREDICATE_DEFINITION__HEAD:
+        return head != null;
+      case SolverLanguagePackage.PREDICATE_DEFINITION__BODY:
+        return body != null;
+      case SolverLanguagePackage.PREDICATE_DEFINITION__FUNCTIONAL:
+        return functional != FUNCTIONAL_EDEFAULT;
+      case SolverLanguagePackage.PREDICATE_DEFINITION__ERROR:
+        return error != ERROR_EDEFAULT;
+    }
+    return super.eIsSet(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+    StringBuilder result = new StringBuilder(super.toString());
+    result.append(" (functional: ");
+    result.append(functional);
+    result.append(", error: ");
+    result.append(error);
+    result.append(')');
+    return result.toString();
+  }
+} //PredicateDefinitionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateImpl.java
deleted file mode 100644
index d3c7366d..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateImpl.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.Parameter;
-import org.eclipse.viatra.solver.language.solverLanguage.PatternBody;
-import org.eclipse.viatra.solver.language.solverLanguage.Predicate;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Predicate</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateImpl#isIsError <em>Is Error</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateImpl#getSymbol <em>Symbol</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateImpl#getParameters <em>Parameters</em>}</li>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateImpl#getBodies <em>Bodies</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class PredicateImpl extends StatementImpl implements Predicate
-{
-  /**
-   * The default value of the '{@link #isIsError() <em>Is Error</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isIsError()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean IS_ERROR_EDEFAULT = false;
-  /**
-   * The cached value of the '{@link #isIsError() <em>Is Error</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isIsError()
-   * @generated
-   * @ordered
-   */
-  protected boolean isError = IS_ERROR_EDEFAULT;
-  /**
-   * The cached value of the '{@link #getSymbol() <em>Symbol</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSymbol()
-   * @generated
-   * @ordered
-   */
-  protected ModelSymbol symbol;
-  /**
-   * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getParameters()
-   * @generated
-   * @ordered
-   */
-  protected EList<Parameter> parameters;
-  /**
-   * The cached value of the '{@link #getBodies() <em>Bodies</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getBodies()
-   * @generated
-   * @ordered
-   */
-  protected EList<PatternBody> bodies;
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected PredicateImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.PREDICATE;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean isIsError()
-  {
-    return isError;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setIsError(boolean newIsError)
-  {
-    boolean oldIsError = isError;
-    isError = newIsError;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PREDICATE__IS_ERROR, oldIsError, isError));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public ModelSymbol getSymbol()
-  {
-    return symbol;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetSymbol(ModelSymbol newSymbol, NotificationChain msgs)
-  {
-    ModelSymbol oldSymbol = symbol;
-    symbol = newSymbol;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PREDICATE__SYMBOL, oldSymbol, newSymbol);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setSymbol(ModelSymbol newSymbol)
-  {
-    if (newSymbol != symbol)
-    {
-      NotificationChain msgs = null;
-      if (symbol != null)
-        msgs = ((InternalEObject)symbol).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.PREDICATE__SYMBOL, null, msgs);
-      if (newSymbol != null)
-        msgs = ((InternalEObject)newSymbol).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.PREDICATE__SYMBOL, null, msgs);
-      msgs = basicSetSymbol(newSymbol, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PREDICATE__SYMBOL, newSymbol, newSymbol));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EList<Parameter> getParameters()
-  {
-    if (parameters == null)
-    {
-      parameters = new EObjectContainmentEList<Parameter>(Parameter.class, this, SolverLanguagePackage.PREDICATE__PARAMETERS);
-    }
-    return parameters;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public EList<PatternBody> getBodies()
-  {
-    if (bodies == null)
-    {
-      bodies = new EObjectContainmentEList<PatternBody>(PatternBody.class, this, SolverLanguagePackage.PREDICATE__BODIES);
-    }
-    return bodies;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.PREDICATE__SYMBOL:
-        return basicSetSymbol(null, msgs);
-      case SolverLanguagePackage.PREDICATE__PARAMETERS:
-        return ((InternalEList<?>)getParameters()).basicRemove(otherEnd, msgs);
-      case SolverLanguagePackage.PREDICATE__BODIES:
-        return ((InternalEList<?>)getBodies()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.PREDICATE__IS_ERROR:
-        return isIsError();
-      case SolverLanguagePackage.PREDICATE__SYMBOL:
-        return getSymbol();
-      case SolverLanguagePackage.PREDICATE__PARAMETERS:
-        return getParameters();
-      case SolverLanguagePackage.PREDICATE__BODIES:
-        return getBodies();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @SuppressWarnings("unchecked")
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.PREDICATE__IS_ERROR:
-        setIsError((Boolean)newValue);
-        return;
-      case SolverLanguagePackage.PREDICATE__SYMBOL:
-        setSymbol((ModelSymbol)newValue);
-        return;
-      case SolverLanguagePackage.PREDICATE__PARAMETERS:
-        getParameters().clear();
-        getParameters().addAll((Collection<? extends Parameter>)newValue);
-        return;
-      case SolverLanguagePackage.PREDICATE__BODIES:
-        getBodies().clear();
-        getBodies().addAll((Collection<? extends PatternBody>)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.PREDICATE__IS_ERROR:
-        setIsError(IS_ERROR_EDEFAULT);
-        return;
-      case SolverLanguagePackage.PREDICATE__SYMBOL:
-        setSymbol((ModelSymbol)null);
-        return;
-      case SolverLanguagePackage.PREDICATE__PARAMETERS:
-        getParameters().clear();
-        return;
-      case SolverLanguagePackage.PREDICATE__BODIES:
-        getBodies().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.PREDICATE__IS_ERROR:
-        return isError != IS_ERROR_EDEFAULT;
-      case SolverLanguagePackage.PREDICATE__SYMBOL:
-        return symbol != null;
-      case SolverLanguagePackage.PREDICATE__PARAMETERS:
-        return parameters != null && !parameters.isEmpty();
-      case SolverLanguagePackage.PREDICATE__BODIES:
-        return bodies != null && !bodies.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-    StringBuilder result = new StringBuilder(super.toString());
-    result.append(" (isError: ");
-    result.append(isError);
-    result.append(')');
-    return result.toString();
-  }
-} //PredicateImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ProblemImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ProblemImpl.java
index e5cc3585..744e604d 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ProblemImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ProblemImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/RealSymbolImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/RealSymbolImpl.java
deleted file mode 100644
index 8cfd0980..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/RealSymbolImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.RealSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Real Symbol</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class RealSymbolImpl extends DataSymbolImpl implements RealSymbol
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected RealSymbolImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.REAL_SYMBOL;
-  }
-} //RealSymbolImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ReferenceImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ReferenceImpl.java
new file mode 100644
index 00000000..be44c0e9
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ReferenceImpl.java
@@ -0,0 +1,175 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.NamedElement;
+import org.eclipse.viatra.solver.language.solverLanguage.Reference;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Reference</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ReferenceImpl#getReferred <em>Referred</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ReferenceImpl extends ExpressionImpl implements Reference
+{
+  /**
+   * The cached value of the '{@link #getReferred() <em>Referred</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getReferred()
+   * @generated
+   * @ordered
+   */
+  protected NamedElement referred;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ReferenceImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.REFERENCE;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NamedElement getReferred()
+  {
+    if (referred != null && referred.eIsProxy())
+    {
+      InternalEObject oldReferred = (InternalEObject)referred;
+      referred = (NamedElement)eResolveProxy(oldReferred);
+      if (referred != oldReferred)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, SolverLanguagePackage.REFERENCE__REFERRED, oldReferred, referred));
+      }
+    }
+    return referred;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NamedElement basicGetReferred()
+  {
+    return referred;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setReferred(NamedElement newReferred)
+  {
+    NamedElement oldReferred = referred;
+    referred = newReferred;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.REFERENCE__REFERRED, oldReferred, referred));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.REFERENCE__REFERRED:
+        if (resolve) return getReferred();
+        return basicGetReferred();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.REFERENCE__REFERRED:
+        setReferred((NamedElement)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.REFERENCE__REFERRED:
+        setReferred((NamedElement)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.REFERENCE__REFERRED:
+        return referred != null;
+    }
+    return super.eIsSet(featureID);
+  }
+} //ReferenceImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ReflexiveClosureImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ReflexiveClosureImpl.java
deleted file mode 100644
index 111b48cb..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ReflexiveClosureImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.ReflexiveClosure;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Reflexive Closure</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class ReflexiveClosureImpl extends ClosureTypeImpl implements ReflexiveClosure
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ReflexiveClosureImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.REFLEXIVE_CLOSURE;
-  }
-} //ReflexiveClosureImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ScopeDefinitionImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ScopeDefinitionImpl.java
new file mode 100644
index 00000000..be109307
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ScopeDefinitionImpl.java
@@ -0,0 +1,175 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.NamedElement;
+import org.eclipse.viatra.solver.language.solverLanguage.ScopeDefinition;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Scope Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ScopeDefinitionImpl#getType <em>Type</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ScopeDefinitionImpl extends StatementImpl implements ScopeDefinition
+{
+  /**
+   * The cached value of the '{@link #getType() <em>Type</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getType()
+   * @generated
+   * @ordered
+   */
+  protected NamedElement type;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected ScopeDefinitionImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.SCOPE_DEFINITION;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NamedElement getType()
+  {
+    if (type != null && type.eIsProxy())
+    {
+      InternalEObject oldType = (InternalEObject)type;
+      type = (NamedElement)eResolveProxy(oldType);
+      if (type != oldType)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, SolverLanguagePackage.SCOPE_DEFINITION__TYPE, oldType, type));
+      }
+    }
+    return type;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NamedElement basicGetType()
+  {
+    return type;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setType(NamedElement newType)
+  {
+    NamedElement oldType = type;
+    type = newType;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.SCOPE_DEFINITION__TYPE, oldType, type));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.SCOPE_DEFINITION__TYPE:
+        if (resolve) return getType();
+        return basicGetType();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.SCOPE_DEFINITION__TYPE:
+        setType((NamedElement)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.SCOPE_DEFINITION__TYPE:
+        setType((NamedElement)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.SCOPE_DEFINITION__TYPE:
+        return type != null;
+    }
+    return super.eIsSet(featureID);
+  }
+} //ScopeDefinitionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguageFactoryImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguageFactoryImpl.java
index 5cb1dcdc..8a5976c2 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguageFactoryImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguageFactoryImpl.java
@@ -1,9 +1,10 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
@@ -11,58 +12,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.viatra.solver.language.solverLanguage.AllInstances;
+import org.eclipse.viatra.solver.language.solverLanguage.*;
-import org.eclipse.viatra.solver.language.solverLanguage.AllObjects;
-import org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanFalse;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanObject;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanTrue;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanValue;
-import org.eclipse.viatra.solver.language.solverLanguage.CDInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.ClosureType;
-import org.eclipse.viatra.solver.language.solverLanguage.ComplexObject;
-import org.eclipse.viatra.solver.language.solverLanguage.Constraint;
-import org.eclipse.viatra.solver.language.solverLanguage.DataObject;
-import org.eclipse.viatra.solver.language.solverLanguage.DataSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.EqualsSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.ExistSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.False;
-import org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.IntObject;
-import org.eclipse.viatra.solver.language.solverLanguage.IntegerSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.Interpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.IrreflexiveClosure;
-import org.eclipse.viatra.solver.language.solverLanguage.Literal;
-import org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition;
-import org.eclipse.viatra.solver.language.solverLanguage.NamedObject;
-import org.eclipse.viatra.solver.language.solverLanguage.Negative;
-import org.eclipse.viatra.solver.language.solverLanguage.Parameter;
-import org.eclipse.viatra.solver.language.solverLanguage.PartialitySymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.PatternBody;
-import org.eclipse.viatra.solver.language.solverLanguage.Polarity;
-import org.eclipse.viatra.solver.language.solverLanguage.Positive;
-import org.eclipse.viatra.solver.language.solverLanguage.Predicate;
-import org.eclipse.viatra.solver.language.solverLanguage.Problem;
-import org.eclipse.viatra.solver.language.solverLanguage.RealObject;
-import org.eclipse.viatra.solver.language.solverLanguage.RealSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.ReflexiveClosure;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguageFactory;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-import org.eclipse.viatra.solver.language.solverLanguage.Statement;
-import org.eclipse.viatra.solver.language.solverLanguage.StringObject;
-import org.eclipse.viatra.solver.language.solverLanguage.StringSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.Symbol;
-import org.eclipse.viatra.solver.language.solverLanguage.True;
-import org.eclipse.viatra.solver.language.solverLanguage.TruthValue;
-import org.eclipse.viatra.solver.language.solverLanguage.Unknown;
-import org.eclipse.viatra.solver.language.solverLanguage.UnnamedObject;
-import org.eclipse.viatra.solver.language.solverLanguage.Variable;
 /**
 * <!-- begin-user-doc -->
@@ -118,56 +68,50 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
    {
      case SolverLanguagePackage.PROBLEM: return createProblem();
      case SolverLanguagePackage.STATEMENT: return createStatement();
-      case SolverLanguagePackage.BOOLEAN_VALUE: return createBooleanValue();
+      case SolverLanguagePackage.PREDICATE_DEFINITION: return createPredicateDefinition();
-      case SolverLanguagePackage.TRUTH_VALUE: return createTruthValue();
+      case SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION: return createUnnamedErrorPrediateDefinition();
-      case SolverLanguagePackage.INTERPRETATION: return createInterpretation();
+      case SolverLanguagePackage.DEFAULT_DEFINITION: return createDefaultDefinition();
-      case SolverLanguagePackage.BASIC_INTERPRETATION: return createBasicInterpretation();
+      case SolverLanguagePackage.EXTERN_PREDICATE_DEFINITION: return createExternPredicateDefinition();
-      case SolverLanguagePackage.SYMBOL: return createSymbol();
+      case SolverLanguagePackage.METRIC_DEFINITION: return createMetricDefinition();
-      case SolverLanguagePackage.MODEL_SYMBOL: return createModelSymbol();
+      case SolverLanguagePackage.EXTERN_METRIC_DEFINITION: return createExternMetricDefinition();
-      case SolverLanguagePackage.PARTIALITY_SYMBOL: return createPartialitySymbol();
+      case SolverLanguagePackage.EXPRESSION: return createExpression();
-      case SolverLanguagePackage.EXIST_SYMBOL: return createExistSymbol();
+      case SolverLanguagePackage.IF_ELSE: return createIfElse();
-      case SolverLanguagePackage.EQUALS_SYMBOL: return createEqualsSymbol();
+      case SolverLanguagePackage.CASE: return createCase();
-      case SolverLanguagePackage.DATA_SYMBOL: return createDataSymbol();
+      case SolverLanguagePackage.COUNT: return createCount();
-      case SolverLanguagePackage.BOOLEAN_SYMBOL: return createBooleanSymbol();
+      case SolverLanguagePackage.AGGREGATION: return createAggregation();
-      case SolverLanguagePackage.INTEGER_SYMBOL: return createIntegerSymbol();
+      case SolverLanguagePackage.CALL: return createCall();
-      case SolverLanguagePackage.REAL_SYMBOL: return createRealSymbol();
+      case SolverLanguagePackage.ARGUMENT_LIST: return createArgumentList();
-      case SolverLanguagePackage.STRING_SYMBOL: return createStringSymbol();
+      case SolverLanguagePackage.ARGUMENT: return createArgument();
-      case SolverLanguagePackage.COMPLEX_OBJECT: return createComplexObject();
+      case SolverLanguagePackage.EXPRESSION_ARGUMENT: return createExpressionArgument();
-      case SolverLanguagePackage.OBJECT: return createObject();
+      case SolverLanguagePackage.STAR_ARGUMENT: return createStarArgument();
-      case SolverLanguagePackage.NAMED_OBJECT: return createNamedObject();
+      case SolverLanguagePackage.TYPED_ARGUMENT: return createTypedArgument();
-      case SolverLanguagePackage.UNNAMED_OBJECT: return createUnnamedObject();
+      case SolverLanguagePackage.TYPED_STAR_ARGUMENT: return createTypedStarArgument();
-      case SolverLanguagePackage.DATA_OBJECT: return createDataObject();
+      case SolverLanguagePackage.REFERENCE: return createReference();
-      case SolverLanguagePackage.BOOLEAN_OBJECT: return createBooleanObject();
+      case SolverLanguagePackage.INTERVAL: return createInterval();
-      case SolverLanguagePackage.INT_OBJECT: return createIntObject();
-      case SolverLanguagePackage.REAL_OBJECT: return createRealObject();
-      case SolverLanguagePackage.STRING_OBJECT: return createStringObject();
-      case SolverLanguagePackage.PREDICATE: return createPredicate();
-      case SolverLanguagePackage.PARAMETER: return createParameter();
-      case SolverLanguagePackage.PATTERN_BODY: return createPatternBody();
-      case SolverLanguagePackage.POLARITY: return createPolarity();
-      case SolverLanguagePackage.CONSTRAINT: return createConstraint();
-      case SolverLanguagePackage.CLOSURE_TYPE: return createClosureType();
      case SolverLanguagePackage.LITERAL: return createLiteral();
-      case SolverLanguagePackage.VARIABLE: return createVariable();
+      case SolverLanguagePackage.LOGIC_LITERAL: return createLogicLiteral();
-      case SolverLanguagePackage.ALL_INSTANCES: return createAllInstances();
+      case SolverLanguagePackage.NUMERIC_LITERAL: return createNumericLiteral();
-      case SolverLanguagePackage.ALL_OBJECTS: return createAllObjects();
+      case SolverLanguagePackage.INFINITY_LITERAL: return createInfinityLiteral();
-      case SolverLanguagePackage.DEFAULT_INTERPRETATION: return createDefaultInterpretation();
+      case SolverLanguagePackage.EMPTY_INTERVAL_LITERAL: return createEmptyIntervalLiteral();
-      case SolverLanguagePackage.CD_INTERPRETATION: return createCDInterpretation();
+      case SolverLanguagePackage.STRING_LITERAL: return createStringLiteral();
-      case SolverLanguagePackage.CLASS_INTERPRETATION: return createClassInterpretation();
+      case SolverLanguagePackage.MEMBER_DEFINITION: return createMemberDefinition();
-      case SolverLanguagePackage.ENUM_INTERPRETATION: return createEnumInterpretation();
+      case SolverLanguagePackage.MULTIPLICITY: return createMultiplicity();
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION: return createFieldRelationInterpretation();
+      case SolverLanguagePackage.MANY_MULTIPLICITY: return createManyMultiplicity();
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION: return createGlobalRelationInterpretation();
+      case SolverLanguagePackage.EXACT_MULTIPLICITY: return createExactMultiplicity();
-      case SolverLanguagePackage.MULTIPLICITY_DEFINITION: return createMultiplicityDefinition();
+      case SolverLanguagePackage.BOUNDED_MULTIPLICITY: return createBoundedMultiplicity();
-      case SolverLanguagePackage.BOOLEAN_TRUE: return createBooleanTrue();
+      case SolverLanguagePackage.SCOPE_DEFINITION: return createScopeDefinition();
-      case SolverLanguagePackage.BOOLEAN_FALSE: return createBooleanFalse();
+      case SolverLanguagePackage.EXACT_SCOPE_DEFINITION: return createExactScopeDefinition();
-      case SolverLanguagePackage.TRUE: return createTrue();
+      case SolverLanguagePackage.BOUNDED_SCOPE_DEFINITION: return createBoundedScopeDefinition();
-      case SolverLanguagePackage.FALSE: return createFalse();
+      case SolverLanguagePackage.LOWER_BOUNDED_SCOPE_DEFINITION: return createLowerBoundedScopeDefinition();
-      case SolverLanguagePackage.UNKNOWN: return createUnknown();
+      case SolverLanguagePackage.OBJECTIVE_DEFINITION: return createObjectiveDefinition();
-      case SolverLanguagePackage.ERROR: return createError();
+      case SolverLanguagePackage.NAMED_ELEMENT: return createNamedElement();
-      case SolverLanguagePackage.POSITIVE: return createPositive();
+      case SolverLanguagePackage.ASSERTION: return createAssertion();
-      case SolverLanguagePackage.NEGATIVE: return createNegative();
+      case SolverLanguagePackage.DISJUNCTION: return createDisjunction();
-      case SolverLanguagePackage.REFLEXIVE_CLOSURE: return createReflexiveClosure();
+      case SolverLanguagePackage.SWITCH: return createSwitch();
-      case SolverLanguagePackage.IRREFLEXIVE_CLOSURE: return createIrreflexiveClosure();
+      case SolverLanguagePackage.CONJUNCTION: return createConjunction();
+      case SolverLanguagePackage.COMPARISON: return createComparison();
+      case SolverLanguagePackage.BINARY_EXPRESSION: return createBinaryExpression();
+      case SolverLanguagePackage.UNARY_EXPRESSION: return createUnaryExpression();
      default:
        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
    }
@@ -179,6 +123,60 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
+  public Object createFromString(EDataType eDataType, String initialValue)
+  {
+    switch (eDataType.getClassifierID())
+    {
+      case SolverLanguagePackage.METRIC_TYPE:
+        return createMetricTypeFromString(eDataType, initialValue);
+      case SolverLanguagePackage.BINARY_OPERATOR:
+        return createBinaryOperatorFromString(eDataType, initialValue);
+      case SolverLanguagePackage.UNARY_OP:
+        return createUnaryOpFromString(eDataType, initialValue);
+      case SolverLanguagePackage.AGGREGATION_OP:
+        return createAggregationOpFromString(eDataType, initialValue);
+      case SolverLanguagePackage.LOGIC_VALUE:
+        return createLogicValueFromString(eDataType, initialValue);
+      case SolverLanguagePackage.OBJECTIVE_KIND:
+        return createObjectiveKindFromString(eDataType, initialValue);
+      default:
+        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+    }
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String convertToString(EDataType eDataType, Object instanceValue)
+  {
+    switch (eDataType.getClassifierID())
+    {
+      case SolverLanguagePackage.METRIC_TYPE:
+        return convertMetricTypeToString(eDataType, instanceValue);
+      case SolverLanguagePackage.BINARY_OPERATOR:
+        return convertBinaryOperatorToString(eDataType, instanceValue);
+      case SolverLanguagePackage.UNARY_OP:
+        return convertUnaryOpToString(eDataType, instanceValue);
+      case SolverLanguagePackage.AGGREGATION_OP:
+        return convertAggregationOpToString(eDataType, instanceValue);
+      case SolverLanguagePackage.LOGIC_VALUE:
+        return convertLogicValueToString(eDataType, instanceValue);
+      case SolverLanguagePackage.OBJECTIVE_KIND:
+        return convertObjectiveKindToString(eDataType, instanceValue);
+      default:
+        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+    }
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
  public Problem createProblem()
  {
    ProblemImpl problem = new ProblemImpl();
@@ -203,10 +201,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public BooleanValue createBooleanValue()
+  public PredicateDefinition createPredicateDefinition()
  {
-    BooleanValueImpl booleanValue = new BooleanValueImpl();
+    PredicateDefinitionImpl predicateDefinition = new PredicateDefinitionImpl();
-    return booleanValue;
+    return predicateDefinition;
  }
  /**
@@ -215,10 +213,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public TruthValue createTruthValue()
+  public UnnamedErrorPrediateDefinition createUnnamedErrorPrediateDefinition()
  {
-    TruthValueImpl truthValue = new TruthValueImpl();
+    UnnamedErrorPrediateDefinitionImpl unnamedErrorPrediateDefinition = new UnnamedErrorPrediateDefinitionImpl();
-    return truthValue;
+    return unnamedErrorPrediateDefinition;
  }
  /**
@@ -227,10 +225,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public Interpretation createInterpretation()
+  public DefaultDefinition createDefaultDefinition()
  {
-    InterpretationImpl interpretation = new InterpretationImpl();
+    DefaultDefinitionImpl defaultDefinition = new DefaultDefinitionImpl();
-    return interpretation;
+    return defaultDefinition;
  }
  /**
@@ -239,10 +237,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public BasicInterpretation createBasicInterpretation()
+  public ExternPredicateDefinition createExternPredicateDefinition()
  {
-    BasicInterpretationImpl basicInterpretation = new BasicInterpretationImpl();
+    ExternPredicateDefinitionImpl externPredicateDefinition = new ExternPredicateDefinitionImpl();
-    return basicInterpretation;
+    return externPredicateDefinition;
  }
  /**
@@ -251,10 +249,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public Symbol createSymbol()
+  public MetricDefinition createMetricDefinition()
  {
-    SymbolImpl symbol = new SymbolImpl();
+    MetricDefinitionImpl metricDefinition = new MetricDefinitionImpl();
-    return symbol;
+    return metricDefinition;
  }
  /**
@@ -263,10 +261,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public ModelSymbol createModelSymbol()
+  public ExternMetricDefinition createExternMetricDefinition()
  {
-    ModelSymbolImpl modelSymbol = new ModelSymbolImpl();
+    ExternMetricDefinitionImpl externMetricDefinition = new ExternMetricDefinitionImpl();
-    return modelSymbol;
+    return externMetricDefinition;
  }
  /**
@@ -275,10 +273,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public PartialitySymbol createPartialitySymbol()
+  public Expression createExpression()
  {
-    PartialitySymbolImpl partialitySymbol = new PartialitySymbolImpl();
+    ExpressionImpl expression = new ExpressionImpl();
-    return partialitySymbol;
+    return expression;
  }
  /**
@@ -287,10 +285,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public ExistSymbol createExistSymbol()
+  public IfElse createIfElse()
  {
-    ExistSymbolImpl existSymbol = new ExistSymbolImpl();
+    IfElseImpl ifElse = new IfElseImpl();
-    return existSymbol;
+    return ifElse;
  }
  /**
@@ -299,10 +297,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public EqualsSymbol createEqualsSymbol()
+  public Case createCase()
  {
-    EqualsSymbolImpl equalsSymbol = new EqualsSymbolImpl();
+    CaseImpl case_ = new CaseImpl();
-    return equalsSymbol;
+    return case_;
  }
  /**
@@ -311,10 +309,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public DataSymbol createDataSymbol()
+  public Count createCount()
  {
-    DataSymbolImpl dataSymbol = new DataSymbolImpl();
+    CountImpl count = new CountImpl();
-    return dataSymbol;
+    return count;
  }
  /**
@@ -323,10 +321,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public BooleanSymbol createBooleanSymbol()
+  public Aggregation createAggregation()
  {
-    BooleanSymbolImpl booleanSymbol = new BooleanSymbolImpl();
+    AggregationImpl aggregation = new AggregationImpl();
-    return booleanSymbol;
+    return aggregation;
  }
  /**
@@ -335,10 +333,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public IntegerSymbol createIntegerSymbol()
+  public Call createCall()
  {
-    IntegerSymbolImpl integerSymbol = new IntegerSymbolImpl();
+    CallImpl call = new CallImpl();
-    return integerSymbol;
+    return call;
  }
  /**
@@ -347,10 +345,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public RealSymbol createRealSymbol()
+  public ArgumentList createArgumentList()
  {
-    RealSymbolImpl realSymbol = new RealSymbolImpl();
+    ArgumentListImpl argumentList = new ArgumentListImpl();
-    return realSymbol;
+    return argumentList;
  }
  /**
@@ -359,10 +357,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public StringSymbol createStringSymbol()
+  public Argument createArgument()
  {
-    StringSymbolImpl stringSymbol = new StringSymbolImpl();
+    ArgumentImpl argument = new ArgumentImpl();
-    return stringSymbol;
+    return argument;
  }
  /**
@@ -371,10 +369,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public ComplexObject createComplexObject()
+  public ExpressionArgument createExpressionArgument()
  {
-    ComplexObjectImpl complexObject = new ComplexObjectImpl();
+    ExpressionArgumentImpl expressionArgument = new ExpressionArgumentImpl();
-    return complexObject;
+    return expressionArgument;
  }
  /**
@@ -383,10 +381,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public org.eclipse.viatra.solver.language.solverLanguage.Object createObject()
+  public StarArgument createStarArgument()
  {
-    ObjectImpl object = new ObjectImpl();
+    StarArgumentImpl starArgument = new StarArgumentImpl();
-    return object;
+    return starArgument;
  }
  /**
@@ -395,10 +393,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public NamedObject createNamedObject()
+  public TypedArgument createTypedArgument()
  {
-    NamedObjectImpl namedObject = new NamedObjectImpl();
+    TypedArgumentImpl typedArgument = new TypedArgumentImpl();
-    return namedObject;
+    return typedArgument;
  }
  /**
@@ -407,10 +405,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public UnnamedObject createUnnamedObject()
+  public TypedStarArgument createTypedStarArgument()
  {
-    UnnamedObjectImpl unnamedObject = new UnnamedObjectImpl();
+    TypedStarArgumentImpl typedStarArgument = new TypedStarArgumentImpl();
-    return unnamedObject;
+    return typedStarArgument;
  }
  /**
@@ -419,10 +417,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public DataObject createDataObject()
+  public Reference createReference()
  {
-    DataObjectImpl dataObject = new DataObjectImpl();
+    ReferenceImpl reference = new ReferenceImpl();
-    return dataObject;
+    return reference;
  }
  /**
@@ -431,10 +429,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public BooleanObject createBooleanObject()
+  public Interval createInterval()
  {
-    BooleanObjectImpl booleanObject = new BooleanObjectImpl();
+    IntervalImpl interval = new IntervalImpl();
-    return booleanObject;
+    return interval;
  }
  /**
@@ -443,10 +441,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public IntObject createIntObject()
+  public Literal createLiteral()
  {
-    IntObjectImpl intObject = new IntObjectImpl();
+    LiteralImpl literal = new LiteralImpl();
-    return intObject;
+    return literal;
  }
  /**
@@ -455,10 +453,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public RealObject createRealObject()
+  public LogicLiteral createLogicLiteral()
  {
-    RealObjectImpl realObject = new RealObjectImpl();
+    LogicLiteralImpl logicLiteral = new LogicLiteralImpl();
-    return realObject;
+    return logicLiteral;
  }
  /**
@@ -467,10 +465,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public StringObject createStringObject()
+  public NumericLiteral createNumericLiteral()
  {
-    StringObjectImpl stringObject = new StringObjectImpl();
+    NumericLiteralImpl numericLiteral = new NumericLiteralImpl();
-    return stringObject;
+    return numericLiteral;
  }
  /**
@@ -479,10 +477,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public Predicate createPredicate()
+  public InfinityLiteral createInfinityLiteral()
  {
-    PredicateImpl predicate = new PredicateImpl();
+    InfinityLiteralImpl infinityLiteral = new InfinityLiteralImpl();
-    return predicate;
+    return infinityLiteral;
  }
  /**
@@ -491,10 +489,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public Parameter createParameter()
+  public EmptyIntervalLiteral createEmptyIntervalLiteral()
  {
-    ParameterImpl parameter = new ParameterImpl();
+    EmptyIntervalLiteralImpl emptyIntervalLiteral = new EmptyIntervalLiteralImpl();
-    return parameter;
+    return emptyIntervalLiteral;
  }
  /**
@@ -503,10 +501,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public PatternBody createPatternBody()
+  public StringLiteral createStringLiteral()
  {
-    PatternBodyImpl patternBody = new PatternBodyImpl();
+    StringLiteralImpl stringLiteral = new StringLiteralImpl();
-    return patternBody;
+    return stringLiteral;
  }
  /**
@@ -515,10 +513,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public Polarity createPolarity()
+  public MemberDefinition createMemberDefinition()
  {
-    PolarityImpl polarity = new PolarityImpl();
+    MemberDefinitionImpl memberDefinition = new MemberDefinitionImpl();
-    return polarity;
+    return memberDefinition;
  }
  /**
@@ -527,10 +525,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public Constraint createConstraint()
+  public Multiplicity createMultiplicity()
  {
-    ConstraintImpl constraint = new ConstraintImpl();
+    MultiplicityImpl multiplicity = new MultiplicityImpl();
-    return constraint;
+    return multiplicity;
  }
  /**
@@ -539,10 +537,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public ClosureType createClosureType()
+  public ManyMultiplicity createManyMultiplicity()
  {
-    ClosureTypeImpl closureType = new ClosureTypeImpl();
+    ManyMultiplicityImpl manyMultiplicity = new ManyMultiplicityImpl();
-    return closureType;
+    return manyMultiplicity;
  }
  /**
@@ -551,10 +549,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public Literal createLiteral()
+  public ExactMultiplicity createExactMultiplicity()
  {
-    LiteralImpl literal = new LiteralImpl();
+    ExactMultiplicityImpl exactMultiplicity = new ExactMultiplicityImpl();
-    return literal;
+    return exactMultiplicity;
  }
  /**
@@ -563,10 +561,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public Variable createVariable()
+  public BoundedMultiplicity createBoundedMultiplicity()
  {
-    VariableImpl variable = new VariableImpl();
+    BoundedMultiplicityImpl boundedMultiplicity = new BoundedMultiplicityImpl();
-    return variable;
+    return boundedMultiplicity;
  }
  /**
@@ -575,10 +573,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public AllInstances createAllInstances()
+  public ScopeDefinition createScopeDefinition()
  {
-    AllInstancesImpl allInstances = new AllInstancesImpl();
+    ScopeDefinitionImpl scopeDefinition = new ScopeDefinitionImpl();
-    return allInstances;
+    return scopeDefinition;
  }
  /**
@@ -587,10 +585,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public AllObjects createAllObjects()
+  public ExactScopeDefinition createExactScopeDefinition()
  {
-    AllObjectsImpl allObjects = new AllObjectsImpl();
+    ExactScopeDefinitionImpl exactScopeDefinition = new ExactScopeDefinitionImpl();
-    return allObjects;
+    return exactScopeDefinition;
  }
  /**
@@ -599,10 +597,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public DefaultInterpretation createDefaultInterpretation()
+  public BoundedScopeDefinition createBoundedScopeDefinition()
  {
-    DefaultInterpretationImpl defaultInterpretation = new DefaultInterpretationImpl();
+    BoundedScopeDefinitionImpl boundedScopeDefinition = new BoundedScopeDefinitionImpl();
-    return defaultInterpretation;
+    return boundedScopeDefinition;
  }
  /**
@@ -611,10 +609,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public CDInterpretation createCDInterpretation()
+  public LowerBoundedScopeDefinition createLowerBoundedScopeDefinition()
  {
-    CDInterpretationImpl cdInterpretation = new CDInterpretationImpl();
+    LowerBoundedScopeDefinitionImpl lowerBoundedScopeDefinition = new LowerBoundedScopeDefinitionImpl();
-    return cdInterpretation;
+    return lowerBoundedScopeDefinition;
  }
  /**
@@ -623,10 +621,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public ClassInterpretation createClassInterpretation()
+  public ObjectiveDefinition createObjectiveDefinition()
  {
-    ClassInterpretationImpl classInterpretation = new ClassInterpretationImpl();
+    ObjectiveDefinitionImpl objectiveDefinition = new ObjectiveDefinitionImpl();
-    return classInterpretation;
+    return objectiveDefinition;
  }
  /**
@@ -635,10 +633,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public EnumInterpretation createEnumInterpretation()
+  public NamedElement createNamedElement()
  {
-    EnumInterpretationImpl enumInterpretation = new EnumInterpretationImpl();
+    NamedElementImpl namedElement = new NamedElementImpl();
-    return enumInterpretation;
+    return namedElement;
  }
  /**
@@ -647,10 +645,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public FieldRelationInterpretation createFieldRelationInterpretation()
+  public Assertion createAssertion()
  {
-    FieldRelationInterpretationImpl fieldRelationInterpretation = new FieldRelationInterpretationImpl();
+    AssertionImpl assertion = new AssertionImpl();
-    return fieldRelationInterpretation;
+    return assertion;
  }
  /**
@@ -659,10 +657,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public GlobalRelationInterpretation createGlobalRelationInterpretation()
+  public Disjunction createDisjunction()
  {
-    GlobalRelationInterpretationImpl globalRelationInterpretation = new GlobalRelationInterpretationImpl();
+    DisjunctionImpl disjunction = new DisjunctionImpl();
-    return globalRelationInterpretation;
+    return disjunction;
  }
  /**
@@ -671,10 +669,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public MultiplicityDefinition createMultiplicityDefinition()
+  public Switch createSwitch()
  {
-    MultiplicityDefinitionImpl multiplicityDefinition = new MultiplicityDefinitionImpl();
+    SwitchImpl switch_ = new SwitchImpl();
-    return multiplicityDefinition;
+    return switch_;
  }
  /**
@@ -683,10 +681,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public BooleanTrue createBooleanTrue()
+  public Conjunction createConjunction()
  {
-    BooleanTrueImpl booleanTrue = new BooleanTrueImpl();
+    ConjunctionImpl conjunction = new ConjunctionImpl();
-    return booleanTrue;
+    return conjunction;
  }
  /**
@@ -695,10 +693,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public BooleanFalse createBooleanFalse()
+  public Comparison createComparison()
  {
-    BooleanFalseImpl booleanFalse = new BooleanFalseImpl();
+    ComparisonImpl comparison = new ComparisonImpl();
-    return booleanFalse;
+    return comparison;
  }
  /**
@@ -707,10 +705,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public True createTrue()
+  public BinaryExpression createBinaryExpression()
  {
-    TrueImpl true_ = new TrueImpl();
+    BinaryExpressionImpl binaryExpression = new BinaryExpressionImpl();
-    return true_;
+    return binaryExpression;
  }
  /**
@@ -719,10 +717,10 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * @generated
   */
  @Override
-  public False createFalse()
+  public UnaryExpression createUnaryExpression()
  {
-    FalseImpl false_ = new FalseImpl();
+    UnaryExpressionImpl unaryExpression = new UnaryExpressionImpl();
-    return false_;
+    return unaryExpression;
  }
  /**
@@ -730,11 +728,11 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * <!-- end-user-doc -->
   * @generated
   */
-  @Override
+  public MetricType createMetricTypeFromString(EDataType eDataType, String initialValue)
-  public Unknown createUnknown()
  {
-    UnknownImpl unknown = new UnknownImpl();
+    MetricType result = MetricType.get(initialValue);
-    return unknown;
+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    return result;
  }
  /**
@@ -742,11 +740,9 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * <!-- end-user-doc -->
   * @generated
   */
-  @Override
+  public String convertMetricTypeToString(EDataType eDataType, Object instanceValue)
-  public org.eclipse.viatra.solver.language.solverLanguage.Error createError()
  {
-    ErrorImpl error = new ErrorImpl();
+    return instanceValue == null ? null : instanceValue.toString();
-    return error;
  }
  /**
@@ -754,11 +750,11 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * <!-- end-user-doc -->
   * @generated
   */
-  @Override
+  public BinaryOperator createBinaryOperatorFromString(EDataType eDataType, String initialValue)
-  public Positive createPositive()
  {
-    PositiveImpl positive = new PositiveImpl();
+    BinaryOperator result = BinaryOperator.get(initialValue);
-    return positive;
+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    return result;
  }
  /**
@@ -766,11 +762,9 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * <!-- end-user-doc -->
   * @generated
   */
-  @Override
+  public String convertBinaryOperatorToString(EDataType eDataType, Object instanceValue)
-  public Negative createNegative()
  {
-    NegativeImpl negative = new NegativeImpl();
+    return instanceValue == null ? null : instanceValue.toString();
-    return negative;
  }
  /**
@@ -778,11 +772,11 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * <!-- end-user-doc -->
   * @generated
   */
-  @Override
+  public UnaryOp createUnaryOpFromString(EDataType eDataType, String initialValue)
-  public ReflexiveClosure createReflexiveClosure()
  {
-    ReflexiveClosureImpl reflexiveClosure = new ReflexiveClosureImpl();
+    UnaryOp result = UnaryOp.get(initialValue);
-    return reflexiveClosure;
+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    return result;
  }
  /**
@@ -790,11 +784,75 @@ public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLan
   * <!-- end-user-doc -->
   * @generated
   */
-  @Override
+  public String convertUnaryOpToString(EDataType eDataType, Object instanceValue)
-  public IrreflexiveClosure createIrreflexiveClosure()
+  {
+    return instanceValue == null ? null : instanceValue.toString();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public AggregationOp createAggregationOpFromString(EDataType eDataType, String initialValue)
+  {
+    AggregationOp result = AggregationOp.get(initialValue);
+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    return result;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String convertAggregationOpToString(EDataType eDataType, Object instanceValue)
+  {
+    return instanceValue == null ? null : instanceValue.toString();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public LogicValue createLogicValueFromString(EDataType eDataType, String initialValue)
+  {
+    LogicValue result = LogicValue.get(initialValue);
+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    return result;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String convertLogicValueToString(EDataType eDataType, Object instanceValue)
+  {
+    return instanceValue == null ? null : instanceValue.toString();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public ObjectiveKind createObjectiveKindFromString(EDataType eDataType, String initialValue)
+  {
+    ObjectiveKind result = ObjectiveKind.get(initialValue);
+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    return result;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public String convertObjectiveKindToString(EDataType eDataType, Object instanceValue)
  {
-    IrreflexiveClosureImpl irreflexiveClosure = new IrreflexiveClosureImpl();
+    return instanceValue == null ? null : instanceValue.toString();
-    return irreflexiveClosure;
  }
  /**
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguagePackageImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguagePackageImpl.java
index f617be3f..393a2545 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguagePackageImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguagePackageImpl.java
@@ -1,67 +1,70 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.AllInstances;
+import org.eclipse.viatra.solver.language.solverLanguage.Aggregation;
-import org.eclipse.viatra.solver.language.solverLanguage.AllObjects;
+import org.eclipse.viatra.solver.language.solverLanguage.AggregationOp;
-import org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation;
+import org.eclipse.viatra.solver.language.solverLanguage.Argument;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanFalse;
+import org.eclipse.viatra.solver.language.solverLanguage.ArgumentList;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanObject;
+import org.eclipse.viatra.solver.language.solverLanguage.Assertion;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanSymbol;
+import org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanTrue;
+import org.eclipse.viatra.solver.language.solverLanguage.BinaryOperator;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanValue;
+import org.eclipse.viatra.solver.language.solverLanguage.BoundedMultiplicity;
-import org.eclipse.viatra.solver.language.solverLanguage.CDInterpretation;
+import org.eclipse.viatra.solver.language.solverLanguage.BoundedScopeDefinition;
-import org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation;
+import org.eclipse.viatra.solver.language.solverLanguage.Call;
-import org.eclipse.viatra.solver.language.solverLanguage.ClosureType;
+import org.eclipse.viatra.solver.language.solverLanguage.Case;
-import org.eclipse.viatra.solver.language.solverLanguage.ComplexObject;
+import org.eclipse.viatra.solver.language.solverLanguage.Comparison;
-import org.eclipse.viatra.solver.language.solverLanguage.Constraint;
+import org.eclipse.viatra.solver.language.solverLanguage.Conjunction;
-import org.eclipse.viatra.solver.language.solverLanguage.DataObject;
+import org.eclipse.viatra.solver.language.solverLanguage.Count;
-import org.eclipse.viatra.solver.language.solverLanguage.DataSymbol;
+import org.eclipse.viatra.solver.language.solverLanguage.DefaultDefinition;
-import org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation;
+import org.eclipse.viatra.solver.language.solverLanguage.Disjunction;
-import org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation;
+import org.eclipse.viatra.solver.language.solverLanguage.EmptyIntervalLiteral;
-import org.eclipse.viatra.solver.language.solverLanguage.EqualsSymbol;
+import org.eclipse.viatra.solver.language.solverLanguage.ExactMultiplicity;
-import org.eclipse.viatra.solver.language.solverLanguage.ExistSymbol;
+import org.eclipse.viatra.solver.language.solverLanguage.ExactScopeDefinition;
-import org.eclipse.viatra.solver.language.solverLanguage.False;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
-import org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation;
+import org.eclipse.viatra.solver.language.solverLanguage.ExpressionArgument;
-import org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation;
+import org.eclipse.viatra.solver.language.solverLanguage.ExternMetricDefinition;
-import org.eclipse.viatra.solver.language.solverLanguage.IntObject;
+import org.eclipse.viatra.solver.language.solverLanguage.ExternPredicateDefinition;
-import org.eclipse.viatra.solver.language.solverLanguage.IntegerSymbol;
+import org.eclipse.viatra.solver.language.solverLanguage.IfElse;
-import org.eclipse.viatra.solver.language.solverLanguage.Interpretation;
+import org.eclipse.viatra.solver.language.solverLanguage.InfinityLiteral;
-import org.eclipse.viatra.solver.language.solverLanguage.IrreflexiveClosure;
+import org.eclipse.viatra.solver.language.solverLanguage.Interval;
 import org.eclipse.viatra.solver.language.solverLanguage.Literal;
-import org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol;
+import org.eclipse.viatra.solver.language.solverLanguage.LogicLiteral;
-import org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition;
+import org.eclipse.viatra.solver.language.solverLanguage.LogicValue;
-import org.eclipse.viatra.solver.language.solverLanguage.NamedObject;
+import org.eclipse.viatra.solver.language.solverLanguage.LowerBoundedScopeDefinition;
-import org.eclipse.viatra.solver.language.solverLanguage.Negative;
+import org.eclipse.viatra.solver.language.solverLanguage.ManyMultiplicity;
-import org.eclipse.viatra.solver.language.solverLanguage.Parameter;
+import org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition;
-import org.eclipse.viatra.solver.language.solverLanguage.PartialitySymbol;
+import org.eclipse.viatra.solver.language.solverLanguage.MetricDefinition;
-import org.eclipse.viatra.solver.language.solverLanguage.PatternBody;
+import org.eclipse.viatra.solver.language.solverLanguage.MetricType;
-import org.eclipse.viatra.solver.language.solverLanguage.Polarity;
+import org.eclipse.viatra.solver.language.solverLanguage.Multiplicity;
-import org.eclipse.viatra.solver.language.solverLanguage.Positive;
+import org.eclipse.viatra.solver.language.solverLanguage.NamedElement;
-import org.eclipse.viatra.solver.language.solverLanguage.Predicate;
+import org.eclipse.viatra.solver.language.solverLanguage.NumericLiteral;
+import org.eclipse.viatra.solver.language.solverLanguage.ObjectiveDefinition;
+import org.eclipse.viatra.solver.language.solverLanguage.ObjectiveKind;
+import org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition;
 import org.eclipse.viatra.solver.language.solverLanguage.Problem;
-import org.eclipse.viatra.solver.language.solverLanguage.RealObject;
+import org.eclipse.viatra.solver.language.solverLanguage.Reference;
-import org.eclipse.viatra.solver.language.solverLanguage.RealSymbol;
+import org.eclipse.viatra.solver.language.solverLanguage.ScopeDefinition;
-import org.eclipse.viatra.solver.language.solverLanguage.ReflexiveClosure;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguageFactory;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+import org.eclipse.viatra.solver.language.solverLanguage.StarArgument;
 import org.eclipse.viatra.solver.language.solverLanguage.Statement;
-import org.eclipse.viatra.solver.language.solverLanguage.StringObject;
+import org.eclipse.viatra.solver.language.solverLanguage.StringLiteral;
-import org.eclipse.viatra.solver.language.solverLanguage.StringSymbol;
+import org.eclipse.viatra.solver.language.solverLanguage.Switch;
-import org.eclipse.viatra.solver.language.solverLanguage.Symbol;
+import org.eclipse.viatra.solver.language.solverLanguage.TypedArgument;
-import org.eclipse.viatra.solver.language.solverLanguage.True;
+import org.eclipse.viatra.solver.language.solverLanguage.TypedStarArgument;
-import org.eclipse.viatra.solver.language.solverLanguage.TruthValue;
+import org.eclipse.viatra.solver.language.solverLanguage.UnaryExpression;
-import org.eclipse.viatra.solver.language.solverLanguage.Unknown;
+import org.eclipse.viatra.solver.language.solverLanguage.UnaryOp;
-import org.eclipse.viatra.solver.language.solverLanguage.UnnamedObject;
+import org.eclipse.viatra.solver.language.solverLanguage.UnnamedErrorPrediateDefinition;
-import org.eclipse.viatra.solver.language.solverLanguage.Variable;
 /**
 * <!-- begin-user-doc -->
@@ -90,350 +93,350 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass booleanValueEClass = null;
+  private EClass predicateDefinitionEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass truthValueEClass = null;
+  private EClass unnamedErrorPrediateDefinitionEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass interpretationEClass = null;
+  private EClass defaultDefinitionEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass basicInterpretationEClass = null;
+  private EClass externPredicateDefinitionEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass symbolEClass = null;
+  private EClass metricDefinitionEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass modelSymbolEClass = null;
+  private EClass externMetricDefinitionEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass partialitySymbolEClass = null;
+  private EClass expressionEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass existSymbolEClass = null;
+  private EClass ifElseEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass equalsSymbolEClass = null;
+  private EClass caseEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass dataSymbolEClass = null;
+  private EClass countEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass booleanSymbolEClass = null;
+  private EClass aggregationEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass integerSymbolEClass = null;
+  private EClass callEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass realSymbolEClass = null;
+  private EClass argumentListEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass stringSymbolEClass = null;
+  private EClass argumentEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass complexObjectEClass = null;
+  private EClass expressionArgumentEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass objectEClass = null;
+  private EClass starArgumentEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass namedObjectEClass = null;
+  private EClass typedArgumentEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass unnamedObjectEClass = null;
+  private EClass typedStarArgumentEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass dataObjectEClass = null;
+  private EClass referenceEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass booleanObjectEClass = null;
+  private EClass intervalEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass intObjectEClass = null;
+  private EClass literalEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass realObjectEClass = null;
+  private EClass logicLiteralEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass stringObjectEClass = null;
+  private EClass numericLiteralEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass predicateEClass = null;
+  private EClass infinityLiteralEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass parameterEClass = null;
+  private EClass emptyIntervalLiteralEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass patternBodyEClass = null;
+  private EClass stringLiteralEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass polarityEClass = null;
+  private EClass memberDefinitionEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass constraintEClass = null;
+  private EClass multiplicityEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass closureTypeEClass = null;
+  private EClass manyMultiplicityEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass literalEClass = null;
+  private EClass exactMultiplicityEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass variableEClass = null;
+  private EClass boundedMultiplicityEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass allInstancesEClass = null;
+  private EClass scopeDefinitionEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass allObjectsEClass = null;
+  private EClass exactScopeDefinitionEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass defaultInterpretationEClass = null;
+  private EClass boundedScopeDefinitionEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass cdInterpretationEClass = null;
+  private EClass lowerBoundedScopeDefinitionEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass classInterpretationEClass = null;
+  private EClass objectiveDefinitionEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass enumInterpretationEClass = null;
+  private EClass namedElementEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass fieldRelationInterpretationEClass = null;
+  private EClass assertionEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass globalRelationInterpretationEClass = null;
+  private EClass disjunctionEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass multiplicityDefinitionEClass = null;
+  private EClass switchEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass booleanTrueEClass = null;
+  private EClass conjunctionEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass booleanFalseEClass = null;
+  private EClass comparisonEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass trueEClass = null;
+  private EClass binaryExpressionEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass falseEClass = null;
+  private EClass unaryExpressionEClass = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass unknownEClass = null;
+  private EEnum metricTypeEEnum = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass errorEClass = null;
+  private EEnum binaryOperatorEEnum = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass positiveEClass = null;
+  private EEnum unaryOpEEnum = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass negativeEClass = null;
+  private EEnum aggregationOpEEnum = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass reflexiveClosureEClass = null;
+  private EEnum logicValueEEnum = null;
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  private EClass irreflexiveClosureEClass = null;
+  private EEnum objectiveKindEEnum = null;
  /**
   * Creates an instance of the model <b>Package</b>, registered with
@@ -537,9 +540,108 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getBooleanValue()
+  public EAttribute getStatement_Abstract()
+  {
+    return (EAttribute)statementEClass.getEStructuralFeatures().get(0);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EAttribute getStatement_Name()
+  {
+    return (EAttribute)statementEClass.getEStructuralFeatures().get(1);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EReference getStatement_Superclasses()
+  {
+    return (EReference)statementEClass.getEStructuralFeatures().get(2);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EReference getStatement_Members()
+  {
+    return (EReference)statementEClass.getEStructuralFeatures().get(3);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EClass getPredicateDefinition()
+  {
+    return predicateDefinitionEClass;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EReference getPredicateDefinition_Head()
+  {
+    return (EReference)predicateDefinitionEClass.getEStructuralFeatures().get(0);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EReference getPredicateDefinition_Body()
+  {
+    return (EReference)predicateDefinitionEClass.getEStructuralFeatures().get(1);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EAttribute getPredicateDefinition_Functional()
+  {
+    return (EAttribute)predicateDefinitionEClass.getEStructuralFeatures().get(2);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EAttribute getPredicateDefinition_Error()
+  {
+    return (EAttribute)predicateDefinitionEClass.getEStructuralFeatures().get(3);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EClass getUnnamedErrorPrediateDefinition()
  {
-    return booleanValueEClass;
+    return unnamedErrorPrediateDefinitionEClass;
  }
  /**
@@ -548,9 +650,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getTruthValue()
+  public EReference getUnnamedErrorPrediateDefinition_ArgumentList()
  {
-    return truthValueEClass;
+    return (EReference)unnamedErrorPrediateDefinitionEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -559,9 +661,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getInterpretation()
+  public EReference getUnnamedErrorPrediateDefinition_Body()
  {
-    return interpretationEClass;
+    return (EReference)unnamedErrorPrediateDefinitionEClass.getEStructuralFeatures().get(1);
  }
  /**
@@ -570,9 +672,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getBasicInterpretation()
+  public EClass getDefaultDefinition()
  {
-    return basicInterpretationEClass;
+    return defaultDefinitionEClass;
  }
  /**
@@ -581,9 +683,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getBasicInterpretation_Symbol()
+  public EReference getDefaultDefinition_Head()
  {
-    return (EReference)basicInterpretationEClass.getEStructuralFeatures().get(0);
+    return (EReference)defaultDefinitionEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -592,9 +694,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getBasicInterpretation_Objects()
+  public EReference getDefaultDefinition_Range()
  {
-    return (EReference)basicInterpretationEClass.getEStructuralFeatures().get(1);
+    return (EReference)defaultDefinitionEClass.getEStructuralFeatures().get(1);
  }
  /**
@@ -603,9 +705,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getBasicInterpretation_Value()
+  public EClass getExternPredicateDefinition()
  {
-    return (EReference)basicInterpretationEClass.getEStructuralFeatures().get(2);
+    return externPredicateDefinitionEClass;
  }
  /**
@@ -614,9 +716,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getSymbol()
+  public EReference getExternPredicateDefinition_Head()
  {
-    return symbolEClass;
+    return (EReference)externPredicateDefinitionEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -625,9 +727,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getModelSymbol()
+  public EClass getMetricDefinition()
  {
-    return modelSymbolEClass;
+    return metricDefinitionEClass;
  }
  /**
@@ -636,9 +738,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EAttribute getModelSymbol_Name()
+  public EReference getMetricDefinition_Head()
  {
-    return (EAttribute)modelSymbolEClass.getEStructuralFeatures().get(0);
+    return (EReference)metricDefinitionEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -647,9 +749,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getPartialitySymbol()
+  public EReference getMetricDefinition_Body()
  {
-    return partialitySymbolEClass;
+    return (EReference)metricDefinitionEClass.getEStructuralFeatures().get(1);
  }
  /**
@@ -658,9 +760,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getExistSymbol()
+  public EAttribute getMetricDefinition_Type()
  {
-    return existSymbolEClass;
+    return (EAttribute)metricDefinitionEClass.getEStructuralFeatures().get(2);
  }
  /**
@@ -669,9 +771,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getEqualsSymbol()
+  public EClass getExternMetricDefinition()
  {
-    return equalsSymbolEClass;
+    return externMetricDefinitionEClass;
  }
  /**
@@ -680,9 +782,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getDataSymbol()
+  public EAttribute getExternMetricDefinition_Type()
  {
-    return dataSymbolEClass;
+    return (EAttribute)externMetricDefinitionEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -691,9 +793,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getBooleanSymbol()
+  public EReference getExternMetricDefinition_Head()
  {
-    return booleanSymbolEClass;
+    return (EReference)externMetricDefinitionEClass.getEStructuralFeatures().get(1);
  }
  /**
@@ -702,9 +804,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getIntegerSymbol()
+  public EClass getExpression()
  {
-    return integerSymbolEClass;
+    return expressionEClass;
  }
  /**
@@ -713,9 +815,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getRealSymbol()
+  public EClass getIfElse()
  {
-    return realSymbolEClass;
+    return ifElseEClass;
  }
  /**
@@ -724,9 +826,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getStringSymbol()
+  public EReference getIfElse_Condition()
  {
-    return stringSymbolEClass;
+    return (EReference)ifElseEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -735,9 +837,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getComplexObject()
+  public EReference getIfElse_Then()
  {
-    return complexObjectEClass;
+    return (EReference)ifElseEClass.getEStructuralFeatures().get(1);
  }
  /**
@@ -746,9 +848,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getObject()
+  public EReference getIfElse_Else()
  {
-    return objectEClass;
+    return (EReference)ifElseEClass.getEStructuralFeatures().get(2);
  }
  /**
@@ -757,9 +859,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getNamedObject()
+  public EClass getCase()
  {
-    return namedObjectEClass;
+    return caseEClass;
  }
  /**
@@ -768,9 +870,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EAttribute getNamedObject_Name()
+  public EReference getCase_Condition()
  {
-    return (EAttribute)namedObjectEClass.getEStructuralFeatures().get(0);
+    return (EReference)caseEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -779,9 +881,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getUnnamedObject()
+  public EReference getCase_Body()
  {
-    return unnamedObjectEClass;
+    return (EReference)caseEClass.getEStructuralFeatures().get(1);
  }
  /**
@@ -790,9 +892,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EAttribute getUnnamedObject_Name()
+  public EClass getCount()
  {
-    return (EAttribute)unnamedObjectEClass.getEStructuralFeatures().get(0);
+    return countEClass;
  }
  /**
@@ -801,9 +903,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getDataObject()
+  public EReference getCount_Body()
  {
-    return dataObjectEClass;
+    return (EReference)countEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -812,9 +914,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getBooleanObject()
+  public EClass getAggregation()
  {
-    return booleanObjectEClass;
+    return aggregationEClass;
  }
  /**
@@ -823,9 +925,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getBooleanObject_Value()
+  public EAttribute getAggregation_Op()
  {
-    return (EReference)booleanObjectEClass.getEStructuralFeatures().get(0);
+    return (EAttribute)aggregationEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -834,9 +936,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getIntObject()
+  public EReference getAggregation_Body()
  {
-    return intObjectEClass;
+    return (EReference)aggregationEClass.getEStructuralFeatures().get(1);
  }
  /**
@@ -845,9 +947,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EAttribute getIntObject_Value()
+  public EReference getAggregation_Condition()
  {
-    return (EAttribute)intObjectEClass.getEStructuralFeatures().get(0);
+    return (EReference)aggregationEClass.getEStructuralFeatures().get(2);
  }
  /**
@@ -856,9 +958,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getRealObject()
+  public EClass getCall()
  {
-    return realObjectEClass;
+    return callEClass;
  }
  /**
@@ -867,9 +969,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EAttribute getRealObject_Value()
+  public EReference getCall_Functor()
  {
-    return (EAttribute)realObjectEClass.getEStructuralFeatures().get(0);
+    return (EReference)callEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -878,9 +980,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getStringObject()
+  public EReference getCall_ArgumentList()
  {
-    return stringObjectEClass;
+    return (EReference)callEClass.getEStructuralFeatures().get(1);
  }
  /**
@@ -889,9 +991,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EAttribute getStringObject_Value()
+  public EAttribute getCall_TransitiveClosure()
  {
-    return (EAttribute)stringObjectEClass.getEStructuralFeatures().get(0);
+    return (EAttribute)callEClass.getEStructuralFeatures().get(2);
  }
  /**
@@ -900,9 +1002,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getPredicate()
+  public EAttribute getCall_ReflexiveTransitiveClosure()
  {
-    return predicateEClass;
+    return (EAttribute)callEClass.getEStructuralFeatures().get(3);
  }
  /**
@@ -911,9 +1013,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EAttribute getPredicate_IsError()
+  public EClass getArgumentList()
  {
-    return (EAttribute)predicateEClass.getEStructuralFeatures().get(0);
+    return argumentListEClass;
  }
  /**
@@ -922,9 +1024,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getPredicate_Symbol()
+  public EReference getArgumentList_Arguments()
  {
-    return (EReference)predicateEClass.getEStructuralFeatures().get(1);
+    return (EReference)argumentListEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -933,9 +1035,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getPredicate_Parameters()
+  public EClass getArgument()
  {
-    return (EReference)predicateEClass.getEStructuralFeatures().get(2);
+    return argumentEClass;
  }
  /**
@@ -944,9 +1046,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getPredicate_Bodies()
+  public EClass getExpressionArgument()
  {
-    return (EReference)predicateEClass.getEStructuralFeatures().get(3);
+    return expressionArgumentEClass;
  }
  /**
@@ -955,9 +1057,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getParameter()
+  public EReference getExpressionArgument_Body()
  {
-    return parameterEClass;
+    return (EReference)expressionArgumentEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -966,9 +1068,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getParameter_Variable()
+  public EClass getStarArgument()
  {
-    return (EReference)parameterEClass.getEStructuralFeatures().get(0);
+    return starArgumentEClass;
  }
  /**
@@ -977,9 +1079,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getParameter_Type()
+  public EClass getTypedArgument()
  {
-    return (EReference)parameterEClass.getEStructuralFeatures().get(1);
+    return typedArgumentEClass;
  }
  /**
@@ -988,9 +1090,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getPatternBody()
+  public EReference getTypedArgument_Type()
  {
-    return patternBodyEClass;
+    return (EReference)typedArgumentEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -999,9 +1101,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getPatternBody_Constraints()
+  public EReference getTypedArgument_Variable()
  {
-    return (EReference)patternBodyEClass.getEStructuralFeatures().get(0);
+    return (EReference)typedArgumentEClass.getEStructuralFeatures().get(1);
  }
  /**
@@ -1010,9 +1112,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getPolarity()
+  public EClass getTypedStarArgument()
  {
-    return polarityEClass;
+    return typedStarArgumentEClass;
  }
  /**
@@ -1021,9 +1123,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getConstraint()
+  public EReference getTypedStarArgument_Type()
  {
-    return constraintEClass;
+    return (EReference)typedStarArgumentEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -1032,9 +1134,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getConstraint_Polarity()
+  public EClass getReference()
  {
-    return (EReference)constraintEClass.getEStructuralFeatures().get(0);
+    return referenceEClass;
  }
  /**
@@ -1043,9 +1145,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getConstraint_Symbol()
+  public EReference getReference_Referred()
  {
-    return (EReference)constraintEClass.getEStructuralFeatures().get(1);
+    return (EReference)referenceEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -1054,9 +1156,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getConstraint_Params()
+  public EClass getInterval()
  {
-    return (EReference)constraintEClass.getEStructuralFeatures().get(2);
+    return intervalEClass;
  }
  /**
@@ -1065,9 +1167,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getConstraint_ClosureType()
+  public EReference getInterval_LowerBound()
  {
-    return (EReference)constraintEClass.getEStructuralFeatures().get(3);
+    return (EReference)intervalEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -1076,9 +1178,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getClosureType()
+  public EReference getInterval_UpperBound()
  {
-    return closureTypeEClass;
+    return (EReference)intervalEClass.getEStructuralFeatures().get(1);
  }
  /**
@@ -1098,9 +1200,207 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getVariable()
+  public EClass getLogicLiteral()
+  {
+    return logicLiteralEClass;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EAttribute getLogicLiteral_Value()
+  {
+    return (EAttribute)logicLiteralEClass.getEStructuralFeatures().get(0);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EClass getNumericLiteral()
+  {
+    return numericLiteralEClass;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EAttribute getNumericLiteral_Value()
+  {
+    return (EAttribute)numericLiteralEClass.getEStructuralFeatures().get(0);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EClass getInfinityLiteral()
+  {
+    return infinityLiteralEClass;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EClass getEmptyIntervalLiteral()
+  {
+    return emptyIntervalLiteralEClass;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EClass getStringLiteral()
+  {
+    return stringLiteralEClass;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EAttribute getStringLiteral_Value()
+  {
+    return (EAttribute)stringLiteralEClass.getEStructuralFeatures().get(0);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EClass getMemberDefinition()
+  {
+    return memberDefinitionEClass;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EAttribute getMemberDefinition_Containment()
+  {
+    return (EAttribute)memberDefinitionEClass.getEStructuralFeatures().get(0);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EReference getMemberDefinition_Type()
+  {
+    return (EReference)memberDefinitionEClass.getEStructuralFeatures().get(1);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EReference getMemberDefinition_Multiplicity()
+  {
+    return (EReference)memberDefinitionEClass.getEStructuralFeatures().get(2);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EAttribute getMemberDefinition_Name()
+  {
+    return (EAttribute)memberDefinitionEClass.getEStructuralFeatures().get(3);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EReference getMemberDefinition_Opposite()
+  {
+    return (EReference)memberDefinitionEClass.getEStructuralFeatures().get(4);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EClass getMultiplicity()
+  {
+    return multiplicityEClass;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EClass getManyMultiplicity()
+  {
+    return manyMultiplicityEClass;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EClass getExactMultiplicity()
+  {
+    return exactMultiplicityEClass;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EAttribute getExactMultiplicity_Multiplicity()
+  {
+    return (EAttribute)exactMultiplicityEClass.getEStructuralFeatures().get(0);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EClass getBoundedMultiplicity()
  {
-    return variableEClass;
+    return boundedMultiplicityEClass;
  }
  /**
@@ -1109,9 +1409,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EAttribute getVariable_Name()
+  public EAttribute getBoundedMultiplicity_LowerBound()
  {
-    return (EAttribute)variableEClass.getEStructuralFeatures().get(0);
+    return (EAttribute)boundedMultiplicityEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -1120,9 +1420,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getAllInstances()
+  public EAttribute getBoundedMultiplicity_UpperBound()
  {
-    return allInstancesEClass;
+    return (EAttribute)boundedMultiplicityEClass.getEStructuralFeatures().get(1);
  }
  /**
@@ -1131,9 +1431,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getAllInstances_Symbol()
+  public EClass getScopeDefinition()
  {
-    return (EReference)allInstancesEClass.getEStructuralFeatures().get(0);
+    return scopeDefinitionEClass;
  }
  /**
@@ -1142,9 +1442,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getAllObjects()
+  public EReference getScopeDefinition_Type()
  {
-    return allObjectsEClass;
+    return (EReference)scopeDefinitionEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -1153,9 +1453,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getDefaultInterpretation()
+  public EClass getExactScopeDefinition()
  {
-    return defaultInterpretationEClass;
+    return exactScopeDefinitionEClass;
  }
  /**
@@ -1164,9 +1464,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getDefaultInterpretation_Interpretation()
+  public EAttribute getExactScopeDefinition_ExactScope()
  {
-    return (EReference)defaultInterpretationEClass.getEStructuralFeatures().get(0);
+    return (EAttribute)exactScopeDefinitionEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -1175,9 +1475,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getCDInterpretation()
+  public EClass getBoundedScopeDefinition()
  {
-    return cdInterpretationEClass;
+    return boundedScopeDefinitionEClass;
  }
  /**
@@ -1186,9 +1486,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getClassInterpretation()
+  public EAttribute getBoundedScopeDefinition_LowerBound()
  {
-    return classInterpretationEClass;
+    return (EAttribute)boundedScopeDefinitionEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -1197,9 +1497,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EAttribute getClassInterpretation_Abstract()
+  public EAttribute getBoundedScopeDefinition_UpperBound()
  {
-    return (EAttribute)classInterpretationEClass.getEStructuralFeatures().get(0);
+    return (EAttribute)boundedScopeDefinitionEClass.getEStructuralFeatures().get(1);
  }
  /**
@@ -1208,9 +1508,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getClassInterpretation_Symbol()
+  public EClass getLowerBoundedScopeDefinition()
  {
-    return (EReference)classInterpretationEClass.getEStructuralFeatures().get(1);
+    return lowerBoundedScopeDefinitionEClass;
  }
  /**
@@ -1219,9 +1519,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getClassInterpretation_Supertypes()
+  public EAttribute getLowerBoundedScopeDefinition_LowerBound()
  {
-    return (EReference)classInterpretationEClass.getEStructuralFeatures().get(2);
+    return (EAttribute)lowerBoundedScopeDefinitionEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -1230,9 +1530,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getClassInterpretation_Fielt()
+  public EClass getObjectiveDefinition()
  {
-    return (EReference)classInterpretationEClass.getEStructuralFeatures().get(3);
+    return objectiveDefinitionEClass;
  }
  /**
@@ -1241,9 +1541,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getEnumInterpretation()
+  public EAttribute getObjectiveDefinition_Kind()
  {
-    return enumInterpretationEClass;
+    return (EAttribute)objectiveDefinitionEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -1252,9 +1552,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getEnumInterpretation_Symbol()
+  public EReference getObjectiveDefinition_Objective()
  {
-    return (EReference)enumInterpretationEClass.getEStructuralFeatures().get(0);
+    return (EReference)objectiveDefinitionEClass.getEStructuralFeatures().get(1);
  }
  /**
@@ -1263,9 +1563,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getEnumInterpretation_Objects()
+  public EClass getNamedElement()
  {
-    return (EReference)enumInterpretationEClass.getEStructuralFeatures().get(1);
+    return namedElementEClass;
  }
  /**
@@ -1274,9 +1574,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getFieldRelationInterpretation()
+  public EAttribute getNamedElement_Name()
  {
-    return fieldRelationInterpretationEClass;
+    return (EAttribute)namedElementEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -1285,9 +1585,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EAttribute getFieldRelationInterpretation_Containment()
+  public EClass getAssertion()
  {
-    return (EAttribute)fieldRelationInterpretationEClass.getEStructuralFeatures().get(0);
+    return assertionEClass;
  }
  /**
@@ -1296,9 +1596,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getFieldRelationInterpretation_Symbol()
+  public EReference getAssertion_Body()
  {
-    return (EReference)fieldRelationInterpretationEClass.getEStructuralFeatures().get(1);
+    return (EReference)assertionEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -1307,9 +1607,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getFieldRelationInterpretation_Multiplicity()
+  public EReference getAssertion_Range()
  {
-    return (EReference)fieldRelationInterpretationEClass.getEStructuralFeatures().get(2);
+    return (EReference)assertionEClass.getEStructuralFeatures().get(1);
  }
  /**
@@ -1318,9 +1618,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getFieldRelationInterpretation_Target()
+  public EClass getDisjunction()
  {
-    return (EReference)fieldRelationInterpretationEClass.getEStructuralFeatures().get(3);
+    return disjunctionEClass;
  }
  /**
@@ -1329,9 +1629,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getGlobalRelationInterpretation()
+  public EReference getDisjunction_Children()
  {
-    return globalRelationInterpretationEClass;
+    return (EReference)disjunctionEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -1340,9 +1640,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EAttribute getGlobalRelationInterpretation_Containment()
+  public EClass getSwitch()
  {
-    return (EAttribute)globalRelationInterpretationEClass.getEStructuralFeatures().get(0);
+    return switchEClass;
  }
  /**
@@ -1351,9 +1651,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getGlobalRelationInterpretation_Symbol()
+  public EReference getSwitch_Cases()
  {
-    return (EReference)globalRelationInterpretationEClass.getEStructuralFeatures().get(1);
+    return (EReference)switchEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -1362,9 +1662,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getGlobalRelationInterpretation_SourceMultiplicity()
+  public EClass getConjunction()
  {
-    return (EReference)globalRelationInterpretationEClass.getEStructuralFeatures().get(2);
+    return conjunctionEClass;
  }
  /**
@@ -1373,9 +1673,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getGlobalRelationInterpretation_Source()
+  public EReference getConjunction_Children()
  {
-    return (EReference)globalRelationInterpretationEClass.getEStructuralFeatures().get(3);
+    return (EReference)conjunctionEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -1384,9 +1684,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getGlobalRelationInterpretation_TargetMultiplicity()
+  public EClass getComparison()
  {
-    return (EReference)globalRelationInterpretationEClass.getEStructuralFeatures().get(4);
+    return comparisonEClass;
  }
  /**
@@ -1395,9 +1695,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EReference getGlobalRelationInterpretation_Target()
+  public EReference getComparison_Left()
  {
-    return (EReference)globalRelationInterpretationEClass.getEStructuralFeatures().get(5);
+    return (EReference)comparisonEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -1406,9 +1706,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getMultiplicityDefinition()
+  public EAttribute getComparison_Op()
  {
-    return multiplicityDefinitionEClass;
+    return (EAttribute)comparisonEClass.getEStructuralFeatures().get(1);
  }
  /**
@@ -1417,9 +1717,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EAttribute getMultiplicityDefinition_Lower()
+  public EReference getComparison_Right()
  {
-    return (EAttribute)multiplicityDefinitionEClass.getEStructuralFeatures().get(0);
+    return (EReference)comparisonEClass.getEStructuralFeatures().get(2);
  }
  /**
@@ -1428,9 +1728,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EAttribute getMultiplicityDefinition_Upper()
+  public EClass getBinaryExpression()
  {
-    return (EAttribute)multiplicityDefinitionEClass.getEStructuralFeatures().get(1);
+    return binaryExpressionEClass;
  }
  /**
@@ -1439,9 +1739,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EAttribute getMultiplicityDefinition_UnlimitedUpper()
+  public EReference getBinaryExpression_Left()
  {
-    return (EAttribute)multiplicityDefinitionEClass.getEStructuralFeatures().get(2);
+    return (EReference)binaryExpressionEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -1450,9 +1750,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getBooleanTrue()
+  public EAttribute getBinaryExpression_Op()
  {
-    return booleanTrueEClass;
+    return (EAttribute)binaryExpressionEClass.getEStructuralFeatures().get(1);
  }
  /**
@@ -1461,9 +1761,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getBooleanFalse()
+  public EReference getBinaryExpression_Right()
  {
-    return booleanFalseEClass;
+    return (EReference)binaryExpressionEClass.getEStructuralFeatures().get(2);
  }
  /**
@@ -1472,9 +1772,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getTrue()
+  public EClass getUnaryExpression()
  {
-    return trueEClass;
+    return unaryExpressionEClass;
  }
  /**
@@ -1483,9 +1783,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getFalse()
+  public EAttribute getUnaryExpression_Op()
  {
-    return falseEClass;
+    return (EAttribute)unaryExpressionEClass.getEStructuralFeatures().get(0);
  }
  /**
@@ -1494,9 +1794,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getUnknown()
+  public EReference getUnaryExpression_Body()
  {
-    return unknownEClass;
+    return (EReference)unaryExpressionEClass.getEStructuralFeatures().get(1);
  }
  /**
@@ -1505,9 +1805,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getError()
+  public EEnum getMetricType()
  {
-    return errorEClass;
+    return metricTypeEEnum;
  }
  /**
@@ -1516,9 +1816,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getPositive()
+  public EEnum getBinaryOperator()
  {
-    return positiveEClass;
+    return binaryOperatorEEnum;
  }
  /**
@@ -1527,9 +1827,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getNegative()
+  public EEnum getUnaryOp()
  {
-    return negativeEClass;
+    return unaryOpEEnum;
  }
  /**
@@ -1538,9 +1838,9 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getReflexiveClosure()
+  public EEnum getAggregationOp()
  {
-    return reflexiveClosureEClass;
+    return aggregationOpEEnum;
  }
  /**
@@ -1549,9 +1849,20 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
   * @generated
   */
  @Override
-  public EClass getIrreflexiveClosure()
+  public EEnum getLogicValue()
  {
-    return irreflexiveClosureEClass;
+    return logicValueEEnum;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EEnum getObjectiveKind()
+  {
+    return objectiveKindEEnum;
  }
  /**
@@ -1589,149 +1900,173 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
    createEReference(problemEClass, PROBLEM__STATEMENTS);
    statementEClass = createEClass(STATEMENT);
+    createEAttribute(statementEClass, STATEMENT__ABSTRACT);
+    createEAttribute(statementEClass, STATEMENT__NAME);
+    createEReference(statementEClass, STATEMENT__SUPERCLASSES);
+    createEReference(statementEClass, STATEMENT__MEMBERS);
-    booleanValueEClass = createEClass(BOOLEAN_VALUE);
+    predicateDefinitionEClass = createEClass(PREDICATE_DEFINITION);
+    createEReference(predicateDefinitionEClass, PREDICATE_DEFINITION__HEAD);
-    truthValueEClass = createEClass(TRUTH_VALUE);
+    createEReference(predicateDefinitionEClass, PREDICATE_DEFINITION__BODY);
+    createEAttribute(predicateDefinitionEClass, PREDICATE_DEFINITION__FUNCTIONAL);
-    interpretationEClass = createEClass(INTERPRETATION);
+    createEAttribute(predicateDefinitionEClass, PREDICATE_DEFINITION__ERROR);
-    basicInterpretationEClass = createEClass(BASIC_INTERPRETATION);
-    createEReference(basicInterpretationEClass, BASIC_INTERPRETATION__SYMBOL);
-    createEReference(basicInterpretationEClass, BASIC_INTERPRETATION__OBJECTS);
-    createEReference(basicInterpretationEClass, BASIC_INTERPRETATION__VALUE);
-    symbolEClass = createEClass(SYMBOL);
-    modelSymbolEClass = createEClass(MODEL_SYMBOL);
+    unnamedErrorPrediateDefinitionEClass = createEClass(UNNAMED_ERROR_PREDIATE_DEFINITION);
-    createEAttribute(modelSymbolEClass, MODEL_SYMBOL__NAME);
+    createEReference(unnamedErrorPrediateDefinitionEClass, UNNAMED_ERROR_PREDIATE_DEFINITION__ARGUMENT_LIST);
+    createEReference(unnamedErrorPrediateDefinitionEClass, UNNAMED_ERROR_PREDIATE_DEFINITION__BODY);
-    partialitySymbolEClass = createEClass(PARTIALITY_SYMBOL);
+    defaultDefinitionEClass = createEClass(DEFAULT_DEFINITION);
+    createEReference(defaultDefinitionEClass, DEFAULT_DEFINITION__HEAD);
+    createEReference(defaultDefinitionEClass, DEFAULT_DEFINITION__RANGE);
-    existSymbolEClass = createEClass(EXIST_SYMBOL);
+    externPredicateDefinitionEClass = createEClass(EXTERN_PREDICATE_DEFINITION);
+    createEReference(externPredicateDefinitionEClass, EXTERN_PREDICATE_DEFINITION__HEAD);
-    equalsSymbolEClass = createEClass(EQUALS_SYMBOL);
+    metricDefinitionEClass = createEClass(METRIC_DEFINITION);
+    createEReference(metricDefinitionEClass, METRIC_DEFINITION__HEAD);
+    createEReference(metricDefinitionEClass, METRIC_DEFINITION__BODY);
+    createEAttribute(metricDefinitionEClass, METRIC_DEFINITION__TYPE);
-    dataSymbolEClass = createEClass(DATA_SYMBOL);
+    externMetricDefinitionEClass = createEClass(EXTERN_METRIC_DEFINITION);
+    createEAttribute(externMetricDefinitionEClass, EXTERN_METRIC_DEFINITION__TYPE);
+    createEReference(externMetricDefinitionEClass, EXTERN_METRIC_DEFINITION__HEAD);
-    booleanSymbolEClass = createEClass(BOOLEAN_SYMBOL);
+    expressionEClass = createEClass(EXPRESSION);
-    integerSymbolEClass = createEClass(INTEGER_SYMBOL);
+    ifElseEClass = createEClass(IF_ELSE);
+    createEReference(ifElseEClass, IF_ELSE__CONDITION);
+    createEReference(ifElseEClass, IF_ELSE__THEN);
+    createEReference(ifElseEClass, IF_ELSE__ELSE);
-    realSymbolEClass = createEClass(REAL_SYMBOL);
+    caseEClass = createEClass(CASE);
+    createEReference(caseEClass, CASE__CONDITION);
+    createEReference(caseEClass, CASE__BODY);
-    stringSymbolEClass = createEClass(STRING_SYMBOL);
+    countEClass = createEClass(COUNT);
+    createEReference(countEClass, COUNT__BODY);
-    complexObjectEClass = createEClass(COMPLEX_OBJECT);
+    aggregationEClass = createEClass(AGGREGATION);
+    createEAttribute(aggregationEClass, AGGREGATION__OP);
+    createEReference(aggregationEClass, AGGREGATION__BODY);
+    createEReference(aggregationEClass, AGGREGATION__CONDITION);
-    objectEClass = createEClass(OBJECT);
+    callEClass = createEClass(CALL);
+    createEReference(callEClass, CALL__FUNCTOR);
+    createEReference(callEClass, CALL__ARGUMENT_LIST);
+    createEAttribute(callEClass, CALL__TRANSITIVE_CLOSURE);
+    createEAttribute(callEClass, CALL__REFLEXIVE_TRANSITIVE_CLOSURE);
-    namedObjectEClass = createEClass(NAMED_OBJECT);
+    argumentListEClass = createEClass(ARGUMENT_LIST);
-    createEAttribute(namedObjectEClass, NAMED_OBJECT__NAME);
+    createEReference(argumentListEClass, ARGUMENT_LIST__ARGUMENTS);
-    unnamedObjectEClass = createEClass(UNNAMED_OBJECT);
+    argumentEClass = createEClass(ARGUMENT);
-    createEAttribute(unnamedObjectEClass, UNNAMED_OBJECT__NAME);
-    dataObjectEClass = createEClass(DATA_OBJECT);
+    expressionArgumentEClass = createEClass(EXPRESSION_ARGUMENT);
+    createEReference(expressionArgumentEClass, EXPRESSION_ARGUMENT__BODY);
-    booleanObjectEClass = createEClass(BOOLEAN_OBJECT);
+    starArgumentEClass = createEClass(STAR_ARGUMENT);
-    createEReference(booleanObjectEClass, BOOLEAN_OBJECT__VALUE);
-    intObjectEClass = createEClass(INT_OBJECT);
+    typedArgumentEClass = createEClass(TYPED_ARGUMENT);
-    createEAttribute(intObjectEClass, INT_OBJECT__VALUE);
+    createEReference(typedArgumentEClass, TYPED_ARGUMENT__TYPE);
+    createEReference(typedArgumentEClass, TYPED_ARGUMENT__VARIABLE);
-    realObjectEClass = createEClass(REAL_OBJECT);
+    typedStarArgumentEClass = createEClass(TYPED_STAR_ARGUMENT);
-    createEAttribute(realObjectEClass, REAL_OBJECT__VALUE);
+    createEReference(typedStarArgumentEClass, TYPED_STAR_ARGUMENT__TYPE);
-    stringObjectEClass = createEClass(STRING_OBJECT);
+    referenceEClass = createEClass(REFERENCE);
-    createEAttribute(stringObjectEClass, STRING_OBJECT__VALUE);
+    createEReference(referenceEClass, REFERENCE__REFERRED);
-    predicateEClass = createEClass(PREDICATE);
+    intervalEClass = createEClass(INTERVAL);
-    createEAttribute(predicateEClass, PREDICATE__IS_ERROR);
+    createEReference(intervalEClass, INTERVAL__LOWER_BOUND);
-    createEReference(predicateEClass, PREDICATE__SYMBOL);
+    createEReference(intervalEClass, INTERVAL__UPPER_BOUND);
-    createEReference(predicateEClass, PREDICATE__PARAMETERS);
-    createEReference(predicateEClass, PREDICATE__BODIES);
-    parameterEClass = createEClass(PARAMETER);
+    literalEClass = createEClass(LITERAL);
-    createEReference(parameterEClass, PARAMETER__VARIABLE);
-    createEReference(parameterEClass, PARAMETER__TYPE);
-    patternBodyEClass = createEClass(PATTERN_BODY);
-    createEReference(patternBodyEClass, PATTERN_BODY__CONSTRAINTS);
-    polarityEClass = createEClass(POLARITY);
+    logicLiteralEClass = createEClass(LOGIC_LITERAL);
+    createEAttribute(logicLiteralEClass, LOGIC_LITERAL__VALUE);
-    constraintEClass = createEClass(CONSTRAINT);
+    numericLiteralEClass = createEClass(NUMERIC_LITERAL);
-    createEReference(constraintEClass, CONSTRAINT__POLARITY);
+    createEAttribute(numericLiteralEClass, NUMERIC_LITERAL__VALUE);
-    createEReference(constraintEClass, CONSTRAINT__SYMBOL);
-    createEReference(constraintEClass, CONSTRAINT__PARAMS);
-    createEReference(constraintEClass, CONSTRAINT__CLOSURE_TYPE);
-    closureTypeEClass = createEClass(CLOSURE_TYPE);
+    infinityLiteralEClass = createEClass(INFINITY_LITERAL);
-    literalEClass = createEClass(LITERAL);
+    emptyIntervalLiteralEClass = createEClass(EMPTY_INTERVAL_LITERAL);
-    variableEClass = createEClass(VARIABLE);
+    stringLiteralEClass = createEClass(STRING_LITERAL);
-    createEAttribute(variableEClass, VARIABLE__NAME);
+    createEAttribute(stringLiteralEClass, STRING_LITERAL__VALUE);
-    allInstancesEClass = createEClass(ALL_INSTANCES);
+    memberDefinitionEClass = createEClass(MEMBER_DEFINITION);
-    createEReference(allInstancesEClass, ALL_INSTANCES__SYMBOL);
+    createEAttribute(memberDefinitionEClass, MEMBER_DEFINITION__CONTAINMENT);
+    createEReference(memberDefinitionEClass, MEMBER_DEFINITION__TYPE);
+    createEReference(memberDefinitionEClass, MEMBER_DEFINITION__MULTIPLICITY);
+    createEAttribute(memberDefinitionEClass, MEMBER_DEFINITION__NAME);
+    createEReference(memberDefinitionEClass, MEMBER_DEFINITION__OPPOSITE);
-    allObjectsEClass = createEClass(ALL_OBJECTS);
+    multiplicityEClass = createEClass(MULTIPLICITY);
-    defaultInterpretationEClass = createEClass(DEFAULT_INTERPRETATION);
+    manyMultiplicityEClass = createEClass(MANY_MULTIPLICITY);
-    createEReference(defaultInterpretationEClass, DEFAULT_INTERPRETATION__INTERPRETATION);
-    cdInterpretationEClass = createEClass(CD_INTERPRETATION);
+    exactMultiplicityEClass = createEClass(EXACT_MULTIPLICITY);
+    createEAttribute(exactMultiplicityEClass, EXACT_MULTIPLICITY__MULTIPLICITY);
-    classInterpretationEClass = createEClass(CLASS_INTERPRETATION);
+    boundedMultiplicityEClass = createEClass(BOUNDED_MULTIPLICITY);
-    createEAttribute(classInterpretationEClass, CLASS_INTERPRETATION__ABSTRACT);
+    createEAttribute(boundedMultiplicityEClass, BOUNDED_MULTIPLICITY__LOWER_BOUND);
-    createEReference(classInterpretationEClass, CLASS_INTERPRETATION__SYMBOL);
+    createEAttribute(boundedMultiplicityEClass, BOUNDED_MULTIPLICITY__UPPER_BOUND);
-    createEReference(classInterpretationEClass, CLASS_INTERPRETATION__SUPERTYPES);
-    createEReference(classInterpretationEClass, CLASS_INTERPRETATION__FIELT);
-    enumInterpretationEClass = createEClass(ENUM_INTERPRETATION);
+    scopeDefinitionEClass = createEClass(SCOPE_DEFINITION);
-    createEReference(enumInterpretationEClass, ENUM_INTERPRETATION__SYMBOL);
+    createEReference(scopeDefinitionEClass, SCOPE_DEFINITION__TYPE);
-    createEReference(enumInterpretationEClass, ENUM_INTERPRETATION__OBJECTS);
-    fieldRelationInterpretationEClass = createEClass(FIELD_RELATION_INTERPRETATION);
+    exactScopeDefinitionEClass = createEClass(EXACT_SCOPE_DEFINITION);
-    createEAttribute(fieldRelationInterpretationEClass, FIELD_RELATION_INTERPRETATION__CONTAINMENT);
+    createEAttribute(exactScopeDefinitionEClass, EXACT_SCOPE_DEFINITION__EXACT_SCOPE);
-    createEReference(fieldRelationInterpretationEClass, FIELD_RELATION_INTERPRETATION__SYMBOL);
-    createEReference(fieldRelationInterpretationEClass, FIELD_RELATION_INTERPRETATION__MULTIPLICITY);
-    createEReference(fieldRelationInterpretationEClass, FIELD_RELATION_INTERPRETATION__TARGET);
-    globalRelationInterpretationEClass = createEClass(GLOBAL_RELATION_INTERPRETATION);
+    boundedScopeDefinitionEClass = createEClass(BOUNDED_SCOPE_DEFINITION);
-    createEAttribute(globalRelationInterpretationEClass, GLOBAL_RELATION_INTERPRETATION__CONTAINMENT);
+    createEAttribute(boundedScopeDefinitionEClass, BOUNDED_SCOPE_DEFINITION__LOWER_BOUND);
-    createEReference(globalRelationInterpretationEClass, GLOBAL_RELATION_INTERPRETATION__SYMBOL);
+    createEAttribute(boundedScopeDefinitionEClass, BOUNDED_SCOPE_DEFINITION__UPPER_BOUND);
-    createEReference(globalRelationInterpretationEClass, GLOBAL_RELATION_INTERPRETATION__SOURCE_MULTIPLICITY);
-    createEReference(globalRelationInterpretationEClass, GLOBAL_RELATION_INTERPRETATION__SOURCE);
-    createEReference(globalRelationInterpretationEClass, GLOBAL_RELATION_INTERPRETATION__TARGET_MULTIPLICITY);
-    createEReference(globalRelationInterpretationEClass, GLOBAL_RELATION_INTERPRETATION__TARGET);
-    multiplicityDefinitionEClass = createEClass(MULTIPLICITY_DEFINITION);
+    lowerBoundedScopeDefinitionEClass = createEClass(LOWER_BOUNDED_SCOPE_DEFINITION);
-    createEAttribute(multiplicityDefinitionEClass, MULTIPLICITY_DEFINITION__LOWER);
+    createEAttribute(lowerBoundedScopeDefinitionEClass, LOWER_BOUNDED_SCOPE_DEFINITION__LOWER_BOUND);
-    createEAttribute(multiplicityDefinitionEClass, MULTIPLICITY_DEFINITION__UPPER);
-    createEAttribute(multiplicityDefinitionEClass, MULTIPLICITY_DEFINITION__UNLIMITED_UPPER);
-    booleanTrueEClass = createEClass(BOOLEAN_TRUE);
+    objectiveDefinitionEClass = createEClass(OBJECTIVE_DEFINITION);
+    createEAttribute(objectiveDefinitionEClass, OBJECTIVE_DEFINITION__KIND);
+    createEReference(objectiveDefinitionEClass, OBJECTIVE_DEFINITION__OBJECTIVE);
-    booleanFalseEClass = createEClass(BOOLEAN_FALSE);
+    namedElementEClass = createEClass(NAMED_ELEMENT);
+    createEAttribute(namedElementEClass, NAMED_ELEMENT__NAME);
-    trueEClass = createEClass(TRUE);
+    assertionEClass = createEClass(ASSERTION);
+    createEReference(assertionEClass, ASSERTION__BODY);
+    createEReference(assertionEClass, ASSERTION__RANGE);
-    falseEClass = createEClass(FALSE);
+    disjunctionEClass = createEClass(DISJUNCTION);
+    createEReference(disjunctionEClass, DISJUNCTION__CHILDREN);
-    unknownEClass = createEClass(UNKNOWN);
+    switchEClass = createEClass(SWITCH);
+    createEReference(switchEClass, SWITCH__CASES);
-    errorEClass = createEClass(ERROR);
+    conjunctionEClass = createEClass(CONJUNCTION);
+    createEReference(conjunctionEClass, CONJUNCTION__CHILDREN);
-    positiveEClass = createEClass(POSITIVE);
+    comparisonEClass = createEClass(COMPARISON);
+    createEReference(comparisonEClass, COMPARISON__LEFT);
+    createEAttribute(comparisonEClass, COMPARISON__OP);
+    createEReference(comparisonEClass, COMPARISON__RIGHT);
-    negativeEClass = createEClass(NEGATIVE);
+    binaryExpressionEClass = createEClass(BINARY_EXPRESSION);
+    createEReference(binaryExpressionEClass, BINARY_EXPRESSION__LEFT);
+    createEAttribute(binaryExpressionEClass, BINARY_EXPRESSION__OP);
+    createEReference(binaryExpressionEClass, BINARY_EXPRESSION__RIGHT);
-    reflexiveClosureEClass = createEClass(REFLEXIVE_CLOSURE);
+    unaryExpressionEClass = createEClass(UNARY_EXPRESSION);
+    createEAttribute(unaryExpressionEClass, UNARY_EXPRESSION__OP);
+    createEReference(unaryExpressionEClass, UNARY_EXPRESSION__BODY);
-    irreflexiveClosureEClass = createEClass(IRREFLEXIVE_CLOSURE);
+    // Create enums
+    metricTypeEEnum = createEEnum(METRIC_TYPE);
+    binaryOperatorEEnum = createEEnum(BINARY_OPERATOR);
+    unaryOpEEnum = createEEnum(UNARY_OP);
+    aggregationOpEEnum = createEEnum(AGGREGATION_OP);
+    logicValueEEnum = createEEnum(LOGIC_VALUE);
+    objectiveKindEEnum = createEEnum(OBJECTIVE_KIND);
  }
  /**
@@ -1763,195 +2098,255 @@ public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLan
    // Set bounds for type parameters
    // Add supertypes to classes
-    interpretationEClass.getESuperTypes().add(this.getStatement());
+    predicateDefinitionEClass.getESuperTypes().add(this.getStatement());
-    basicInterpretationEClass.getESuperTypes().add(this.getInterpretation());
+    unnamedErrorPrediateDefinitionEClass.getESuperTypes().add(this.getStatement());
-    modelSymbolEClass.getESuperTypes().add(this.getSymbol());
+    defaultDefinitionEClass.getESuperTypes().add(this.getStatement());
-    partialitySymbolEClass.getESuperTypes().add(this.getSymbol());
+    externPredicateDefinitionEClass.getESuperTypes().add(this.getStatement());
-    existSymbolEClass.getESuperTypes().add(this.getPartialitySymbol());
+    metricDefinitionEClass.getESuperTypes().add(this.getStatement());
-    equalsSymbolEClass.getESuperTypes().add(this.getPartialitySymbol());
+    externMetricDefinitionEClass.getESuperTypes().add(this.getStatement());
-    dataSymbolEClass.getESuperTypes().add(this.getSymbol());
+    expressionEClass.getESuperTypes().add(this.getStatement());
-    booleanSymbolEClass.getESuperTypes().add(this.getDataSymbol());
+    ifElseEClass.getESuperTypes().add(this.getExpression());
-    integerSymbolEClass.getESuperTypes().add(this.getDataSymbol());
+    caseEClass.getESuperTypes().add(this.getExpression());
-    realSymbolEClass.getESuperTypes().add(this.getDataSymbol());
+    countEClass.getESuperTypes().add(this.getExpression());
-    stringSymbolEClass.getESuperTypes().add(this.getDataSymbol());
+    aggregationEClass.getESuperTypes().add(this.getExpression());
-    objectEClass.getESuperTypes().add(this.getComplexObject());
+    callEClass.getESuperTypes().add(this.getExpression());
-    namedObjectEClass.getESuperTypes().add(this.getObject());
+    expressionArgumentEClass.getESuperTypes().add(this.getArgument());
-    namedObjectEClass.getESuperTypes().add(this.getLiteral());
+    starArgumentEClass.getESuperTypes().add(this.getArgument());
-    unnamedObjectEClass.getESuperTypes().add(this.getObject());
+    typedArgumentEClass.getESuperTypes().add(this.getArgument());
-    dataObjectEClass.getESuperTypes().add(this.getObject());
+    typedStarArgumentEClass.getESuperTypes().add(this.getArgument());
-    dataObjectEClass.getESuperTypes().add(this.getLiteral());
+    referenceEClass.getESuperTypes().add(this.getExpression());
-    booleanObjectEClass.getESuperTypes().add(this.getDataObject());
+    intervalEClass.getESuperTypes().add(this.getExpression());
-    intObjectEClass.getESuperTypes().add(this.getDataObject());
+    literalEClass.getESuperTypes().add(this.getExpression());
-    realObjectEClass.getESuperTypes().add(this.getDataObject());
+    logicLiteralEClass.getESuperTypes().add(this.getLiteral());
-    stringObjectEClass.getESuperTypes().add(this.getDataObject());
+    numericLiteralEClass.getESuperTypes().add(this.getLiteral());
-    predicateEClass.getESuperTypes().add(this.getStatement());
+    infinityLiteralEClass.getESuperTypes().add(this.getLiteral());
-    variableEClass.getESuperTypes().add(this.getLiteral());
+    emptyIntervalLiteralEClass.getESuperTypes().add(this.getLiteral());
-    allInstancesEClass.getESuperTypes().add(this.getComplexObject());
+    stringLiteralEClass.getESuperTypes().add(this.getLiteral());
-    allObjectsEClass.getESuperTypes().add(this.getComplexObject());
+    manyMultiplicityEClass.getESuperTypes().add(this.getMultiplicity());
-    defaultInterpretationEClass.getESuperTypes().add(this.getInterpretation());
+    exactMultiplicityEClass.getESuperTypes().add(this.getMultiplicity());
-    cdInterpretationEClass.getESuperTypes().add(this.getInterpretation());
+    boundedMultiplicityEClass.getESuperTypes().add(this.getMultiplicity());
-    classInterpretationEClass.getESuperTypes().add(this.getCDInterpretation());
+    scopeDefinitionEClass.getESuperTypes().add(this.getStatement());
-    enumInterpretationEClass.getESuperTypes().add(this.getCDInterpretation());
+    exactScopeDefinitionEClass.getESuperTypes().add(this.getScopeDefinition());
-    globalRelationInterpretationEClass.getESuperTypes().add(this.getCDInterpretation());
+    boundedScopeDefinitionEClass.getESuperTypes().add(this.getScopeDefinition());
-    booleanTrueEClass.getESuperTypes().add(this.getBooleanValue());
+    lowerBoundedScopeDefinitionEClass.getESuperTypes().add(this.getScopeDefinition());
-    booleanFalseEClass.getESuperTypes().add(this.getBooleanValue());
+    objectiveDefinitionEClass.getESuperTypes().add(this.getStatement());
-    trueEClass.getESuperTypes().add(this.getTruthValue());
+    assertionEClass.getESuperTypes().add(this.getStatement());
-    falseEClass.getESuperTypes().add(this.getTruthValue());
+    disjunctionEClass.getESuperTypes().add(this.getExpression());
-    unknownEClass.getESuperTypes().add(this.getTruthValue());
+    switchEClass.getESuperTypes().add(this.getExpression());
-    errorEClass.getESuperTypes().add(this.getTruthValue());
+    conjunctionEClass.getESuperTypes().add(this.getExpression());
-    positiveEClass.getESuperTypes().add(this.getPolarity());
+    comparisonEClass.getESuperTypes().add(this.getExpression());
-    negativeEClass.getESuperTypes().add(this.getPolarity());
+    binaryExpressionEClass.getESuperTypes().add(this.getExpression());
-    reflexiveClosureEClass.getESuperTypes().add(this.getClosureType());
+    unaryExpressionEClass.getESuperTypes().add(this.getExpression());
-    irreflexiveClosureEClass.getESuperTypes().add(this.getClosureType());
    // Initialize classes and features; add operations and parameters
    initEClass(problemEClass, Problem.class, "Problem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
    initEReference(getProblem_Statements(), this.getStatement(), null, "statements", null, 0, -1, Problem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
    initEClass(statementEClass, Statement.class, "Statement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getStatement_Abstract(), ecorePackage.getEBoolean(), "abstract", null, 0, 1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getStatement_Name(), ecorePackage.getEString(), "name", null, 0, 1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getStatement_Superclasses(), this.getNamedElement(), null, "superclasses", null, 0, -1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getStatement_Members(), this.getMemberDefinition(), null, "members", null, 0, -1, Statement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(booleanValueEClass, BooleanValue.class, "BooleanValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(predicateDefinitionEClass, PredicateDefinition.class, "PredicateDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getPredicateDefinition_Head(), this.getExpression(), null, "head", null, 0, 1, PredicateDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(truthValueEClass, TruthValue.class, "TruthValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getPredicateDefinition_Body(), this.getExpression(), null, "body", null, 0, 1, PredicateDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getPredicateDefinition_Functional(), ecorePackage.getEBoolean(), "functional", null, 0, 1, PredicateDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(interpretationEClass, Interpretation.class, "Interpretation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getPredicateDefinition_Error(), ecorePackage.getEBoolean(), "error", null, 0, 1, PredicateDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(basicInterpretationEClass, BasicInterpretation.class, "BasicInterpretation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getBasicInterpretation_Symbol(), this.getSymbol(), null, "symbol", null, 0, 1, BasicInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBasicInterpretation_Objects(), this.getComplexObject(), null, "objects", null, 0, -1, BasicInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getBasicInterpretation_Value(), this.getTruthValue(), null, "value", null, 0, 1, BasicInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(symbolEClass, Symbol.class, "Symbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEClass(modelSymbolEClass, ModelSymbol.class, "ModelSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getModelSymbol_Name(), ecorePackage.getEString(), "name", null, 0, 1, ModelSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(partialitySymbolEClass, PartialitySymbol.class, "PartialitySymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEClass(existSymbolEClass, ExistSymbol.class, "ExistSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(unnamedErrorPrediateDefinitionEClass, UnnamedErrorPrediateDefinition.class, "UnnamedErrorPrediateDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getUnnamedErrorPrediateDefinition_ArgumentList(), this.getArgumentList(), null, "argumentList", null, 0, 1, UnnamedErrorPrediateDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getUnnamedErrorPrediateDefinition_Body(), this.getExpression(), null, "body", null, 0, 1, UnnamedErrorPrediateDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(equalsSymbolEClass, EqualsSymbol.class, "EqualsSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(defaultDefinitionEClass, DefaultDefinition.class, "DefaultDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getDefaultDefinition_Head(), this.getCall(), null, "head", null, 0, 1, DefaultDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getDefaultDefinition_Range(), this.getExpression(), null, "range", null, 0, 1, DefaultDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(dataSymbolEClass, DataSymbol.class, "DataSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(externPredicateDefinitionEClass, ExternPredicateDefinition.class, "ExternPredicateDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getExternPredicateDefinition_Head(), this.getCall(), null, "head", null, 0, 1, ExternPredicateDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(booleanSymbolEClass, BooleanSymbol.class, "BooleanSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(metricDefinitionEClass, MetricDefinition.class, "MetricDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getMetricDefinition_Head(), this.getExpression(), null, "head", null, 0, 1, MetricDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMetricDefinition_Body(), this.getExpression(), null, "body", null, 0, 1, MetricDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMetricDefinition_Type(), this.getMetricType(), "type", null, 0, 1, MetricDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(integerSymbolEClass, IntegerSymbol.class, "IntegerSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(externMetricDefinitionEClass, ExternMetricDefinition.class, "ExternMetricDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getExternMetricDefinition_Type(), this.getMetricType(), "type", null, 0, 1, ExternMetricDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getExternMetricDefinition_Head(), this.getCall(), null, "head", null, 0, 1, ExternMetricDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(realSymbolEClass, RealSymbol.class, "RealSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(expressionEClass, Expression.class, "Expression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEClass(stringSymbolEClass, StringSymbol.class, "StringSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(ifElseEClass, IfElse.class, "IfElse", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getIfElse_Condition(), this.getExpression(), null, "condition", null, 0, 1, IfElse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getIfElse_Then(), this.getExpression(), null, "then", null, 0, 1, IfElse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getIfElse_Else(), this.getExpression(), null, "else", null, 0, 1, IfElse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(complexObjectEClass, ComplexObject.class, "ComplexObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(caseEClass, Case.class, "Case", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getCase_Condition(), this.getExpression(), null, "condition", null, 0, 1, Case.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCase_Body(), this.getExpression(), null, "body", null, 0, 1, Case.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(objectEClass, org.eclipse.viatra.solver.language.solverLanguage.Object.class, "Object", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(countEClass, Count.class, "Count", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getCount_Body(), this.getExpression(), null, "body", null, 0, 1, Count.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(namedObjectEClass, NamedObject.class, "NamedObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(aggregationEClass, Aggregation.class, "Aggregation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getNamedObject_Name(), ecorePackage.getEString(), "name", null, 0, 1, NamedObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getAggregation_Op(), this.getAggregationOp(), "op", null, 0, 1, Aggregation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getAggregation_Body(), this.getExpression(), null, "body", null, 0, 1, Aggregation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getAggregation_Condition(), this.getExpression(), null, "condition", null, 0, 1, Aggregation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(unnamedObjectEClass, UnnamedObject.class, "UnnamedObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(callEClass, Call.class, "Call", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getUnnamedObject_Name(), ecorePackage.getEString(), "name", null, 0, 1, UnnamedObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCall_Functor(), this.getReference(), null, "functor", null, 0, 1, Call.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCall_ArgumentList(), this.getArgumentList(), null, "argumentList", null, 0, 1, Call.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCall_TransitiveClosure(), ecorePackage.getEBoolean(), "transitiveClosure", null, 0, 1, Call.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCall_ReflexiveTransitiveClosure(), ecorePackage.getEBoolean(), "reflexiveTransitiveClosure", null, 0, 1, Call.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(dataObjectEClass, DataObject.class, "DataObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(argumentListEClass, ArgumentList.class, "ArgumentList", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getArgumentList_Arguments(), this.getArgument(), null, "arguments", null, 0, -1, ArgumentList.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(booleanObjectEClass, BooleanObject.class, "BooleanObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(argumentEClass, Argument.class, "Argument", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getBooleanObject_Value(), this.getBooleanValue(), null, "value", null, 0, 1, BooleanObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(intObjectEClass, IntObject.class, "IntObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(expressionArgumentEClass, ExpressionArgument.class, "ExpressionArgument", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getIntObject_Value(), ecorePackage.getEInt(), "value", null, 0, 1, IntObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getExpressionArgument_Body(), this.getExpression(), null, "body", null, 0, 1, ExpressionArgument.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(realObjectEClass, RealObject.class, "RealObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(starArgumentEClass, StarArgument.class, "StarArgument", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getRealObject_Value(), ecorePackage.getEBigDecimal(), "value", null, 0, 1, RealObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(stringObjectEClass, StringObject.class, "StringObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(typedArgumentEClass, TypedArgument.class, "TypedArgument", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getStringObject_Value(), ecorePackage.getEString(), "value", null, 0, 1, StringObject.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getTypedArgument_Type(), this.getNamedElement(), null, "type", null, 0, 1, TypedArgument.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getTypedArgument_Variable(), this.getNamedElement(), null, "variable", null, 0, 1, TypedArgument.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(predicateEClass, Predicate.class, "Predicate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(typedStarArgumentEClass, TypedStarArgument.class, "TypedStarArgument", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getPredicate_IsError(), ecorePackage.getEBoolean(), "isError", null, 0, 1, Predicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getTypedStarArgument_Type(), this.getNamedElement(), null, "type", null, 0, 1, TypedStarArgument.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPredicate_Symbol(), this.getModelSymbol(), null, "symbol", null, 0, 1, Predicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPredicate_Parameters(), this.getParameter(), null, "parameters", null, 0, -1, Predicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getPredicate_Bodies(), this.getPatternBody(), null, "bodies", null, 0, -1, Predicate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(referenceEClass, Reference.class, "Reference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getParameter_Variable(), this.getVariable(), null, "variable", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getReference_Referred(), this.getNamedElement(), null, "referred", null, 0, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getParameter_Type(), this.getSymbol(), null, "type", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(patternBodyEClass, PatternBody.class, "PatternBody", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(intervalEClass, Interval.class, "Interval", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getPatternBody_Constraints(), this.getConstraint(), null, "constraints", null, 0, -1, PatternBody.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getInterval_LowerBound(), this.getExpression(), null, "lowerBound", null, 0, 1, Interval.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getInterval_UpperBound(), this.getExpression(), null, "upperBound", null, 0, 1, Interval.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(polarityEClass, Polarity.class, "Polarity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEClass(constraintEClass, Constraint.class, "Constraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getConstraint_Polarity(), this.getPolarity(), null, "polarity", null, 0, 1, Constraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getConstraint_Symbol(), this.getModelSymbol(), null, "symbol", null, 0, 1, Constraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getConstraint_Params(), this.getLiteral(), null, "params", null, 0, -1, Constraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getConstraint_ClosureType(), this.getClosureType(), null, "closureType", null, 0, 1, Constraint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(closureTypeEClass, ClosureType.class, "ClosureType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
    initEClass(literalEClass, Literal.class, "Literal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEClass(variableEClass, Variable.class, "Variable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(logicLiteralEClass, LogicLiteral.class, "LogicLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getVariable_Name(), ecorePackage.getEString(), "name", null, 0, 1, Variable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getLogicLiteral_Value(), this.getLogicValue(), "value", null, 0, 1, LogicLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(allInstancesEClass, AllInstances.class, "AllInstances", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getAllInstances_Symbol(), this.getSymbol(), null, "symbol", null, 0, 1, AllInstances.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(allObjectsEClass, AllObjects.class, "AllObjects", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEClass(defaultInterpretationEClass, DefaultInterpretation.class, "DefaultInterpretation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getDefaultInterpretation_Interpretation(), this.getBasicInterpretation(), null, "interpretation", null, 0, 1, DefaultInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(cdInterpretationEClass, CDInterpretation.class, "CDInterpretation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEClass(classInterpretationEClass, ClassInterpretation.class, "ClassInterpretation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getClassInterpretation_Abstract(), ecorePackage.getEBoolean(), "abstract", null, 0, 1, ClassInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getClassInterpretation_Symbol(), this.getModelSymbol(), null, "symbol", null, 0, 1, ClassInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getClassInterpretation_Supertypes(), this.getModelSymbol(), null, "supertypes", null, 0, -1, ClassInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getClassInterpretation_Fielt(), this.getFieldRelationInterpretation(), null, "fielt", null, 0, -1, ClassInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(enumInterpretationEClass, EnumInterpretation.class, "EnumInterpretation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getEnumInterpretation_Symbol(), this.getModelSymbol(), null, "Symbol", null, 0, 1, EnumInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getEnumInterpretation_Objects(), this.getNamedObject(), null, "objects", null, 0, -1, EnumInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(fieldRelationInterpretationEClass, FieldRelationInterpretation.class, "FieldRelationInterpretation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getFieldRelationInterpretation_Containment(), ecorePackage.getEBoolean(), "containment", null, 0, 1, FieldRelationInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getFieldRelationInterpretation_Symbol(), this.getModelSymbol(), null, "symbol", null, 0, 1, FieldRelationInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getFieldRelationInterpretation_Multiplicity(), this.getMultiplicityDefinition(), null, "multiplicity", null, 0, 1, FieldRelationInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getFieldRelationInterpretation_Target(), this.getSymbol(), null, "target", null, 0, 1, FieldRelationInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(globalRelationInterpretationEClass, GlobalRelationInterpretation.class, "GlobalRelationInterpretation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getGlobalRelationInterpretation_Containment(), ecorePackage.getEBoolean(), "containment", null, 0, 1, GlobalRelationInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getGlobalRelationInterpretation_Symbol(), this.getModelSymbol(), null, "symbol", null, 0, 1, GlobalRelationInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getGlobalRelationInterpretation_SourceMultiplicity(), this.getMultiplicityDefinition(), null, "sourceMultiplicity", null, 0, 1, GlobalRelationInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getGlobalRelationInterpretation_Source(), this.getSymbol(), null, "source", null, 0, 1, GlobalRelationInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getGlobalRelationInterpretation_TargetMultiplicity(), this.getMultiplicityDefinition(), null, "targetMultiplicity", null, 0, 1, GlobalRelationInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getGlobalRelationInterpretation_Target(), this.getSymbol(), null, "target", null, 0, 1, GlobalRelationInterpretation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(multiplicityDefinitionEClass, MultiplicityDefinition.class, "MultiplicityDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getMultiplicityDefinition_Lower(), ecorePackage.getEInt(), "lower", null, 0, 1, MultiplicityDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getMultiplicityDefinition_Upper(), ecorePackage.getEInt(), "upper", null, 0, 1, MultiplicityDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getMultiplicityDefinition_UnlimitedUpper(), ecorePackage.getEBoolean(), "unlimitedUpper", null, 0, 1, MultiplicityDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(booleanTrueEClass, BooleanTrue.class, "BooleanTrue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEClass(booleanFalseEClass, BooleanFalse.class, "BooleanFalse", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEClass(trueEClass, True.class, "True", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEClass(falseEClass, False.class, "False", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEClass(unknownEClass, Unknown.class, "Unknown", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEClass(errorEClass, org.eclipse.viatra.solver.language.solverLanguage.Error.class, "Error", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(numericLiteralEClass, NumericLiteral.class, "NumericLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getNumericLiteral_Value(), ecorePackage.getEBigDecimal(), "value", null, 0, 1, NumericLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(positiveEClass, Positive.class, "Positive", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(infinityLiteralEClass, InfinityLiteral.class, "InfinityLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEClass(negativeEClass, Negative.class, "Negative", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(emptyIntervalLiteralEClass, EmptyIntervalLiteral.class, "EmptyIntervalLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEClass(reflexiveClosureEClass, ReflexiveClosure.class, "ReflexiveClosure", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(stringLiteralEClass, StringLiteral.class, "StringLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getStringLiteral_Value(), ecorePackage.getEString(), "value", null, 0, 1, StringLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEClass(irreflexiveClosureEClass, IrreflexiveClosure.class, "IrreflexiveClosure", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(memberDefinitionEClass, MemberDefinition.class, "MemberDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getMemberDefinition_Containment(), ecorePackage.getEBoolean(), "containment", null, 0, 1, MemberDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMemberDefinition_Type(), this.getNamedElement(), null, "type", null, 0, 1, MemberDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMemberDefinition_Multiplicity(), this.getMultiplicity(), null, "multiplicity", null, 0, 1, MemberDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMemberDefinition_Name(), ecorePackage.getEString(), "name", null, 0, 1, MemberDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getMemberDefinition_Opposite(), this.getNamedElement(), null, "opposite", null, 0, 1, MemberDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(multiplicityEClass, Multiplicity.class, "Multiplicity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(manyMultiplicityEClass, ManyMultiplicity.class, "ManyMultiplicity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEClass(exactMultiplicityEClass, ExactMultiplicity.class, "ExactMultiplicity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getExactMultiplicity_Multiplicity(), ecorePackage.getEInt(), "multiplicity", null, 0, 1, ExactMultiplicity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(boundedMultiplicityEClass, BoundedMultiplicity.class, "BoundedMultiplicity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBoundedMultiplicity_LowerBound(), ecorePackage.getEInt(), "lowerBound", null, 0, 1, BoundedMultiplicity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBoundedMultiplicity_UpperBound(), ecorePackage.getEInt(), "upperBound", null, 0, 1, BoundedMultiplicity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(scopeDefinitionEClass, ScopeDefinition.class, "ScopeDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getScopeDefinition_Type(), this.getNamedElement(), null, "type", null, 0, 1, ScopeDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(exactScopeDefinitionEClass, ExactScopeDefinition.class, "ExactScopeDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getExactScopeDefinition_ExactScope(), ecorePackage.getEInt(), "exactScope", null, 0, 1, ExactScopeDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(boundedScopeDefinitionEClass, BoundedScopeDefinition.class, "BoundedScopeDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBoundedScopeDefinition_LowerBound(), ecorePackage.getEInt(), "lowerBound", null, 0, 1, BoundedScopeDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBoundedScopeDefinition_UpperBound(), ecorePackage.getEInt(), "upperBound", null, 0, 1, BoundedScopeDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(lowerBoundedScopeDefinitionEClass, LowerBoundedScopeDefinition.class, "LowerBoundedScopeDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getLowerBoundedScopeDefinition_LowerBound(), ecorePackage.getEInt(), "lowerBound", null, 0, 1, LowerBoundedScopeDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(objectiveDefinitionEClass, ObjectiveDefinition.class, "ObjectiveDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getObjectiveDefinition_Kind(), this.getObjectiveKind(), "kind", null, 0, 1, ObjectiveDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getObjectiveDefinition_Objective(), this.getExpression(), null, "objective", null, 0, 1, ObjectiveDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(namedElementEClass, NamedElement.class, "NamedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getNamedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, NamedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(assertionEClass, Assertion.class, "Assertion", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getAssertion_Body(), this.getExpression(), null, "body", null, 0, 1, Assertion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getAssertion_Range(), this.getExpression(), null, "range", null, 0, 1, Assertion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(disjunctionEClass, Disjunction.class, "Disjunction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getDisjunction_Children(), this.getExpression(), null, "children", null, 0, -1, Disjunction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(switchEClass, Switch.class, "Switch", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getSwitch_Cases(), this.getCase(), null, "cases", null, 0, -1, Switch.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(conjunctionEClass, Conjunction.class, "Conjunction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getConjunction_Children(), this.getExpression(), null, "children", null, 0, -1, Conjunction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(comparisonEClass, Comparison.class, "Comparison", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getComparison_Left(), this.getExpression(), null, "left", null, 0, 1, Comparison.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getComparison_Op(), this.getBinaryOperator(), "op", null, 0, 1, Comparison.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getComparison_Right(), this.getExpression(), null, "right", null, 0, 1, Comparison.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(binaryExpressionEClass, BinaryExpression.class, "BinaryExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getBinaryExpression_Left(), this.getExpression(), null, "left", null, 0, 1, BinaryExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBinaryExpression_Op(), this.getBinaryOperator(), "op", null, 0, 1, BinaryExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBinaryExpression_Right(), this.getExpression(), null, "right", null, 0, 1, BinaryExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEClass(unaryExpressionEClass, UnaryExpression.class, "UnaryExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getUnaryExpression_Op(), this.getUnaryOp(), "op", null, 0, 1, UnaryExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getUnaryExpression_Body(), this.getExpression(), null, "body", null, 0, 1, UnaryExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    // Initialize enums and add enum literals
+    initEEnum(metricTypeEEnum, MetricType.class, "MetricType");
+    addEEnumLiteral(metricTypeEEnum, MetricType.INT);
+    addEEnumLiteral(metricTypeEEnum, MetricType.REAL);
+    initEEnum(binaryOperatorEEnum, BinaryOperator.class, "BinaryOperator");
+    addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.EQ);
+    addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.NOT_EQ);
+    addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.LESS);
+    addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.LESS_EQ);
+    addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.GREATER);
+    addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.GREATER_EQ);
+    addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.IN);
+    addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.ADD);
+    addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.SUB);
+    addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.MUL);
+    addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.DIV);
+    addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.POW);
+    initEEnum(unaryOpEEnum, UnaryOp.class, "UnaryOp");
+    addEEnumLiteral(unaryOpEEnum, UnaryOp.NEG);
+    addEEnumLiteral(unaryOpEEnum, UnaryOp.PLUS);
+    addEEnumLiteral(unaryOpEEnum, UnaryOp.MINUS);
+    addEEnumLiteral(unaryOpEEnum, UnaryOp.MAY);
+    addEEnumLiteral(unaryOpEEnum, UnaryOp.MUST);
+    addEEnumLiteral(unaryOpEEnum, UnaryOp.CURRENT);
+    initEEnum(aggregationOpEEnum, AggregationOp.class, "AggregationOp");
+    addEEnumLiteral(aggregationOpEEnum, AggregationOp.ONLY);
+    addEEnumLiteral(aggregationOpEEnum, AggregationOp.SUM);
+    addEEnumLiteral(aggregationOpEEnum, AggregationOp.PROD);
+    addEEnumLiteral(aggregationOpEEnum, AggregationOp.AVG);
+    addEEnumLiteral(aggregationOpEEnum, AggregationOp.MIN);
+    addEEnumLiteral(aggregationOpEEnum, AggregationOp.MAX);
+    initEEnum(logicValueEEnum, LogicValue.class, "LogicValue");
+    addEEnumLiteral(logicValueEEnum, LogicValue.TRUE);
+    addEEnumLiteral(logicValueEEnum, LogicValue.FALSE);
+    addEEnumLiteral(logicValueEEnum, LogicValue.UNKNOWN);
+    addEEnumLiteral(logicValueEEnum, LogicValue.ERROR);
+    initEEnum(objectiveKindEEnum, ObjectiveKind.class, "ObjectiveKind");
+    addEEnumLiteral(objectiveKindEEnum, ObjectiveKind.MINIMIZE);
+    addEEnumLiteral(objectiveKindEEnum, ObjectiveKind.MAXIMIZE);
    // Create resource
    createResource(eNS_URI);
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StringSymbolImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StarArgumentImpl.java
index faf3f06a..b0cecaab 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StringSymbolImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StarArgumentImpl.java
@@ -1,28 +1,28 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-import org.eclipse.viatra.solver.language.solverLanguage.StringSymbol;
+import org.eclipse.viatra.solver.language.solverLanguage.StarArgument;
 /**
 * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>String Symbol</b></em>'.
+ * An implementation of the model object '<em><b>Star Argument</b></em>'.
 * <!-- end-user-doc -->
 *
 * @generated
 */
-public class StringSymbolImpl extends DataSymbolImpl implements StringSymbol
+public class StarArgumentImpl extends ArgumentImpl implements StarArgument
 {
  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
   */
-  protected StringSymbolImpl()
+  protected StarArgumentImpl()
  {
    super();
  }
@@ -35,7 +35,7 @@ public class StringSymbolImpl extends DataSymbolImpl implements StringSymbol
  @Override
  protected EClass eStaticClass()
  {
-    return SolverLanguagePackage.Literals.STRING_SYMBOL;
+    return SolverLanguagePackage.Literals.STAR_ARGUMENT;
  }
-} //StringSymbolImpl
+} //StarArgumentImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StatementImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StatementImpl.java
index 6e660396..dbd697ec 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StatementImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StatementImpl.java
@@ -1,12 +1,27 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition;
+import org.eclipse.viatra.solver.language.solverLanguage.NamedElement;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
 import org.eclipse.viatra.solver.language.solverLanguage.Statement;
@@ -14,12 +29,81 @@ import org.eclipse.viatra.solver.language.solverLanguage.Statement;
 * <!-- begin-user-doc -->
 * An implementation of the model object '<em><b>Statement</b></em>'.
 * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.StatementImpl#isAbstract <em>Abstract</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.StatementImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.StatementImpl#getSuperclasses <em>Superclasses</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.StatementImpl#getMembers <em>Members</em>}</li>
+ * </ul>
 *
 * @generated
 */
 public class StatementImpl extends MinimalEObjectImpl.Container implements Statement
 {
  /**
+   * The default value of the '{@link #isAbstract() <em>Abstract</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #isAbstract()
+   * @generated
+   * @ordered
+   */
+  protected static final boolean ABSTRACT_EDEFAULT = false;
+  /**
+   * The cached value of the '{@link #isAbstract() <em>Abstract</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #isAbstract()
+   * @generated
+   * @ordered
+   */
+  protected boolean abstract_ = ABSTRACT_EDEFAULT;
+  /**
+   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected static final String NAME_EDEFAULT = null;
+  /**
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
+  protected String name = NAME_EDEFAULT;
+  /**
+   * The cached value of the '{@link #getSuperclasses() <em>Superclasses</em>}' reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getSuperclasses()
+   * @generated
+   * @ordered
+   */
+  protected EList<NamedElement> superclasses;
+  /**
+   * The cached value of the '{@link #getMembers() <em>Members</em>}' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getMembers()
+   * @generated
+   * @ordered
+   */
+  protected EList<MemberDefinition> members;
+  /**
   * <!-- begin-user-doc -->
   * <!-- end-user-doc -->
   * @generated
@@ -40,4 +124,218 @@ public class StatementImpl extends MinimalEObjectImpl.Container implements State
    return SolverLanguagePackage.Literals.STATEMENT;
  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean isAbstract()
+  {
+    return abstract_;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setAbstract(boolean newAbstract)
+  {
+    boolean oldAbstract = abstract_;
+    abstract_ = newAbstract;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.STATEMENT__ABSTRACT, oldAbstract, abstract_));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getName()
+  {
+    return name;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setName(String newName)
+  {
+    String oldName = name;
+    name = newName;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.STATEMENT__NAME, oldName, name));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EList<NamedElement> getSuperclasses()
+  {
+    if (superclasses == null)
+    {
+      superclasses = new EObjectResolvingEList<NamedElement>(NamedElement.class, this, SolverLanguagePackage.STATEMENT__SUPERCLASSES);
+    }
+    return superclasses;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EList<MemberDefinition> getMembers()
+  {
+    if (members == null)
+    {
+      members = new EObjectContainmentEList<MemberDefinition>(MemberDefinition.class, this, SolverLanguagePackage.STATEMENT__MEMBERS);
+    }
+    return members;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.STATEMENT__MEMBERS:
+        return ((InternalEList<?>)getMembers()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.STATEMENT__ABSTRACT:
+        return isAbstract();
+      case SolverLanguagePackage.STATEMENT__NAME:
+        return getName();
+      case SolverLanguagePackage.STATEMENT__SUPERCLASSES:
+        return getSuperclasses();
+      case SolverLanguagePackage.STATEMENT__MEMBERS:
+        return getMembers();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.STATEMENT__ABSTRACT:
+        setAbstract((Boolean)newValue);
+        return;
+      case SolverLanguagePackage.STATEMENT__NAME:
+        setName((String)newValue);
+        return;
+      case SolverLanguagePackage.STATEMENT__SUPERCLASSES:
+        getSuperclasses().clear();
+        getSuperclasses().addAll((Collection<? extends NamedElement>)newValue);
+        return;
+      case SolverLanguagePackage.STATEMENT__MEMBERS:
+        getMembers().clear();
+        getMembers().addAll((Collection<? extends MemberDefinition>)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.STATEMENT__ABSTRACT:
+        setAbstract(ABSTRACT_EDEFAULT);
+        return;
+      case SolverLanguagePackage.STATEMENT__NAME:
+        setName(NAME_EDEFAULT);
+        return;
+      case SolverLanguagePackage.STATEMENT__SUPERCLASSES:
+        getSuperclasses().clear();
+        return;
+      case SolverLanguagePackage.STATEMENT__MEMBERS:
+        getMembers().clear();
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.STATEMENT__ABSTRACT:
+        return abstract_ != ABSTRACT_EDEFAULT;
+      case SolverLanguagePackage.STATEMENT__NAME:
+        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+      case SolverLanguagePackage.STATEMENT__SUPERCLASSES:
+        return superclasses != null && !superclasses.isEmpty();
+      case SolverLanguagePackage.STATEMENT__MEMBERS:
+        return members != null && !members.isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+    StringBuilder result = new StringBuilder(super.toString());
+    result.append(" (abstract: ");
+    result.append(abstract_);
+    result.append(", name: ");
+    result.append(name);
+    result.append(')');
+    return result.toString();
+  }
 } //StatementImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StringObjectImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StringLiteralImpl.java
index 7a7866a7..2b0b2720 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StringObjectImpl.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StringLiteralImpl.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.impl;
@@ -10,22 +10,22 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-import org.eclipse.viatra.solver.language.solverLanguage.StringObject;
+import org.eclipse.viatra.solver.language.solverLanguage.StringLiteral;
 /**
 * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>String Object</b></em>'.
+ * An implementation of the model object '<em><b>String Literal</b></em>'.
 * <!-- end-user-doc -->
 * <p>
 * The following features are implemented:
 * </p>
 * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.StringObjectImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.StringLiteralImpl#getValue <em>Value</em>}</li>
 * </ul>
 *
 * @generated
 */
-public class StringObjectImpl extends DataObjectImpl implements StringObject
+public class StringLiteralImpl extends LiteralImpl implements StringLiteral
 {
  /**
   * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
@@ -52,7 +52,7 @@ public class StringObjectImpl extends DataObjectImpl implements StringObject
   * <!-- end-user-doc -->
   * @generated
   */
-  protected StringObjectImpl()
+  protected StringLiteralImpl()
  {
    super();
  }
@@ -65,7 +65,7 @@ public class StringObjectImpl extends DataObjectImpl implements StringObject
  @Override
  protected EClass eStaticClass()
  {
-    return SolverLanguagePackage.Literals.STRING_OBJECT;
+    return SolverLanguagePackage.Literals.STRING_LITERAL;
  }
  /**
@@ -90,7 +90,7 @@ public class StringObjectImpl extends DataObjectImpl implements StringObject
    String oldValue = value;
    value = newValue;
    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.STRING_OBJECT__VALUE, oldValue, value));
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.STRING_LITERAL__VALUE, oldValue, value));
  }
  /**
@@ -103,7 +103,7 @@ public class StringObjectImpl extends DataObjectImpl implements StringObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.STRING_OBJECT__VALUE:
+      case SolverLanguagePackage.STRING_LITERAL__VALUE:
        return getValue();
    }
    return super.eGet(featureID, resolve, coreType);
@@ -119,7 +119,7 @@ public class StringObjectImpl extends DataObjectImpl implements StringObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.STRING_OBJECT__VALUE:
+      case SolverLanguagePackage.STRING_LITERAL__VALUE:
        setValue((String)newValue);
        return;
    }
@@ -136,7 +136,7 @@ public class StringObjectImpl extends DataObjectImpl implements StringObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.STRING_OBJECT__VALUE:
+      case SolverLanguagePackage.STRING_LITERAL__VALUE:
        setValue(VALUE_EDEFAULT);
        return;
    }
@@ -153,7 +153,7 @@ public class StringObjectImpl extends DataObjectImpl implements StringObject
  {
    switch (featureID)
    {
-      case SolverLanguagePackage.STRING_OBJECT__VALUE:
+      case SolverLanguagePackage.STRING_LITERAL__VALUE:
        return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
    }
    return super.eIsSet(featureID);
@@ -176,4 +176,4 @@ public class StringObjectImpl extends DataObjectImpl implements StringObject
    return result.toString();
  }
-} //StringObjectImpl
+} //StringLiteralImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SwitchImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SwitchImpl.java
new file mode 100644
index 00000000..fefd5be6
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SwitchImpl.java
@@ -0,0 +1,167 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.viatra.solver.language.solverLanguage.Case;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+import org.eclipse.viatra.solver.language.solverLanguage.Switch;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Switch</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.SwitchImpl#getCases <em>Cases</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class SwitchImpl extends ExpressionImpl implements Switch
+{
+  /**
+   * The cached value of the '{@link #getCases() <em>Cases</em>}' containment reference list.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getCases()
+   * @generated
+   * @ordered
+   */
+  protected EList<Case> cases;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected SwitchImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.SWITCH;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public EList<Case> getCases()
+  {
+    if (cases == null)
+    {
+      cases = new EObjectContainmentEList<Case>(Case.class, this, SolverLanguagePackage.SWITCH__CASES);
+    }
+    return cases;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.SWITCH__CASES:
+        return ((InternalEList<?>)getCases()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.SWITCH__CASES:
+        return getCases();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @SuppressWarnings("unchecked")
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.SWITCH__CASES:
+        getCases().clear();
+        getCases().addAll((Collection<? extends Case>)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.SWITCH__CASES:
+        getCases().clear();
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.SWITCH__CASES:
+        return cases != null && !cases.isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
+} //SwitchImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SymbolImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SymbolImpl.java
deleted file mode 100644
index 15d1294e..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SymbolImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-import org.eclipse.viatra.solver.language.solverLanguage.Symbol;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Symbol</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class SymbolImpl extends MinimalEObjectImpl.Container implements Symbol
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected SymbolImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.SYMBOL;
-  }
-} //SymbolImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TrueImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TrueImpl.java
deleted file mode 100644
index c0e04a9a..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TrueImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-import org.eclipse.viatra.solver.language.solverLanguage.True;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>True</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class TrueImpl extends TruthValueImpl implements True
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected TrueImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.TRUE;
-  }
-} //TrueImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TruthValueImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TruthValueImpl.java
deleted file mode 100644
index f5b0fba6..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TruthValueImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-import org.eclipse.viatra.solver.language.solverLanguage.TruthValue;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Truth Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class TruthValueImpl extends MinimalEObjectImpl.Container implements TruthValue
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected TruthValueImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.TRUTH_VALUE;
-  }
-} //TruthValueImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TypedArgumentImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TypedArgumentImpl.java
new file mode 100644
index 00000000..2d93f402
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TypedArgumentImpl.java
@@ -0,0 +1,242 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.NamedElement;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+import org.eclipse.viatra.solver.language.solverLanguage.TypedArgument;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Typed Argument</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.TypedArgumentImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.TypedArgumentImpl#getVariable <em>Variable</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TypedArgumentImpl extends ArgumentImpl implements TypedArgument
+{
+  /**
+   * The cached value of the '{@link #getType() <em>Type</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getType()
+   * @generated
+   * @ordered
+   */
+  protected NamedElement type;
+  /**
+   * The cached value of the '{@link #getVariable() <em>Variable</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getVariable()
+   * @generated
+   * @ordered
+   */
+  protected NamedElement variable;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected TypedArgumentImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.TYPED_ARGUMENT;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NamedElement getType()
+  {
+    if (type != null && type.eIsProxy())
+    {
+      InternalEObject oldType = (InternalEObject)type;
+      type = (NamedElement)eResolveProxy(oldType);
+      if (type != oldType)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, SolverLanguagePackage.TYPED_ARGUMENT__TYPE, oldType, type));
+      }
+    }
+    return type;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NamedElement basicGetType()
+  {
+    return type;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setType(NamedElement newType)
+  {
+    NamedElement oldType = type;
+    type = newType;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.TYPED_ARGUMENT__TYPE, oldType, type));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NamedElement getVariable()
+  {
+    if (variable != null && variable.eIsProxy())
+    {
+      InternalEObject oldVariable = (InternalEObject)variable;
+      variable = (NamedElement)eResolveProxy(oldVariable);
+      if (variable != oldVariable)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, SolverLanguagePackage.TYPED_ARGUMENT__VARIABLE, oldVariable, variable));
+      }
+    }
+    return variable;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NamedElement basicGetVariable()
+  {
+    return variable;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setVariable(NamedElement newVariable)
+  {
+    NamedElement oldVariable = variable;
+    variable = newVariable;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.TYPED_ARGUMENT__VARIABLE, oldVariable, variable));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.TYPED_ARGUMENT__TYPE:
+        if (resolve) return getType();
+        return basicGetType();
+      case SolverLanguagePackage.TYPED_ARGUMENT__VARIABLE:
+        if (resolve) return getVariable();
+        return basicGetVariable();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.TYPED_ARGUMENT__TYPE:
+        setType((NamedElement)newValue);
+        return;
+      case SolverLanguagePackage.TYPED_ARGUMENT__VARIABLE:
+        setVariable((NamedElement)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.TYPED_ARGUMENT__TYPE:
+        setType((NamedElement)null);
+        return;
+      case SolverLanguagePackage.TYPED_ARGUMENT__VARIABLE:
+        setVariable((NamedElement)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.TYPED_ARGUMENT__TYPE:
+        return type != null;
+      case SolverLanguagePackage.TYPED_ARGUMENT__VARIABLE:
+        return variable != null;
+    }
+    return super.eIsSet(featureID);
+  }
+} //TypedArgumentImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TypedStarArgumentImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TypedStarArgumentImpl.java
new file mode 100644
index 00000000..dd2b46bc
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TypedStarArgumentImpl.java
@@ -0,0 +1,175 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.NamedElement;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+import org.eclipse.viatra.solver.language.solverLanguage.TypedStarArgument;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Typed Star Argument</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.TypedStarArgumentImpl#getType <em>Type</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TypedStarArgumentImpl extends ArgumentImpl implements TypedStarArgument
+{
+  /**
+   * The cached value of the '{@link #getType() <em>Type</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getType()
+   * @generated
+   * @ordered
+   */
+  protected NamedElement type;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected TypedStarArgumentImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.TYPED_STAR_ARGUMENT;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NamedElement getType()
+  {
+    if (type != null && type.eIsProxy())
+    {
+      InternalEObject oldType = (InternalEObject)type;
+      type = (NamedElement)eResolveProxy(oldType);
+      if (type != oldType)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, SolverLanguagePackage.TYPED_STAR_ARGUMENT__TYPE, oldType, type));
+      }
+    }
+    return type;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NamedElement basicGetType()
+  {
+    return type;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setType(NamedElement newType)
+  {
+    NamedElement oldType = type;
+    type = newType;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.TYPED_STAR_ARGUMENT__TYPE, oldType, type));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.TYPED_STAR_ARGUMENT__TYPE:
+        if (resolve) return getType();
+        return basicGetType();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.TYPED_STAR_ARGUMENT__TYPE:
+        setType((NamedElement)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.TYPED_STAR_ARGUMENT__TYPE:
+        setType((NamedElement)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.TYPED_STAR_ARGUMENT__TYPE:
+        return type != null;
+    }
+    return super.eIsSet(featureID);
+  }
+} //TypedStarArgumentImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnaryExpressionImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnaryExpressionImpl.java
new file mode 100644
index 00000000..ee5ebfbb
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnaryExpressionImpl.java
@@ -0,0 +1,270 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+import org.eclipse.viatra.solver.language.solverLanguage.UnaryExpression;
+import org.eclipse.viatra.solver.language.solverLanguage.UnaryOp;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Unary Expression</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.UnaryExpressionImpl#getOp <em>Op</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.UnaryExpressionImpl#getBody <em>Body</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class UnaryExpressionImpl extends ExpressionImpl implements UnaryExpression
+{
+  /**
+   * The default value of the '{@link #getOp() <em>Op</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getOp()
+   * @generated
+   * @ordered
+   */
+  protected static final UnaryOp OP_EDEFAULT = UnaryOp.NEG;
+  /**
+   * The cached value of the '{@link #getOp() <em>Op</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getOp()
+   * @generated
+   * @ordered
+   */
+  protected UnaryOp op = OP_EDEFAULT;
+  /**
+   * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getBody()
+   * @generated
+   * @ordered
+   */
+  protected Expression body;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected UnaryExpressionImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.UNARY_EXPRESSION;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public UnaryOp getOp()
+  {
+    return op;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setOp(UnaryOp newOp)
+  {
+    UnaryOp oldOp = op;
+    op = newOp == null ? OP_EDEFAULT : newOp;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.UNARY_EXPRESSION__OP, oldOp, op));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getBody()
+  {
+    return body;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetBody(Expression newBody, NotificationChain msgs)
+  {
+    Expression oldBody = body;
+    body = newBody;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.UNARY_EXPRESSION__BODY, oldBody, newBody);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setBody(Expression newBody)
+  {
+    if (newBody != body)
+    {
+      NotificationChain msgs = null;
+      if (body != null)
+        msgs = ((InternalEObject)body).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.UNARY_EXPRESSION__BODY, null, msgs);
+      if (newBody != null)
+        msgs = ((InternalEObject)newBody).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.UNARY_EXPRESSION__BODY, null, msgs);
+      msgs = basicSetBody(newBody, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.UNARY_EXPRESSION__BODY, newBody, newBody));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.UNARY_EXPRESSION__BODY:
+        return basicSetBody(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.UNARY_EXPRESSION__OP:
+        return getOp();
+      case SolverLanguagePackage.UNARY_EXPRESSION__BODY:
+        return getBody();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.UNARY_EXPRESSION__OP:
+        setOp((UnaryOp)newValue);
+        return;
+      case SolverLanguagePackage.UNARY_EXPRESSION__BODY:
+        setBody((Expression)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.UNARY_EXPRESSION__OP:
+        setOp(OP_EDEFAULT);
+        return;
+      case SolverLanguagePackage.UNARY_EXPRESSION__BODY:
+        setBody((Expression)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.UNARY_EXPRESSION__OP:
+        return op != OP_EDEFAULT;
+      case SolverLanguagePackage.UNARY_EXPRESSION__BODY:
+        return body != null;
+    }
+    return super.eIsSet(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    if (eIsProxy()) return super.toString();
+    StringBuilder result = new StringBuilder(super.toString());
+    result.append(" (op: ");
+    result.append(op);
+    result.append(')');
+    return result.toString();
+  }
+} //UnaryExpressionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnnamedErrorPrediateDefinitionImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnnamedErrorPrediateDefinitionImpl.java
new file mode 100644
index 00000000..cd6a3271
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnnamedErrorPrediateDefinitionImpl.java
@@ -0,0 +1,270 @@
+/**
+ * generated by Xtext 2.21.0
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.viatra.solver.language.solverLanguage.ArgumentList;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+import org.eclipse.viatra.solver.language.solverLanguage.UnnamedErrorPrediateDefinition;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Unnamed Error Prediate Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.UnnamedErrorPrediateDefinitionImpl#getArgumentList <em>Argument List</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.UnnamedErrorPrediateDefinitionImpl#getBody <em>Body</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class UnnamedErrorPrediateDefinitionImpl extends StatementImpl implements UnnamedErrorPrediateDefinition
+{
+  /**
+   * The cached value of the '{@link #getArgumentList() <em>Argument List</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getArgumentList()
+   * @generated
+   * @ordered
+   */
+  protected ArgumentList argumentList;
+  /**
+   * The cached value of the '{@link #getBody() <em>Body</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #getBody()
+   * @generated
+   * @ordered
+   */
+  protected Expression body;
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  protected UnnamedErrorPrediateDefinitionImpl()
+  {
+    super();
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EClass eStaticClass()
+  {
+    return SolverLanguagePackage.Literals.UNNAMED_ERROR_PREDIATE_DEFINITION;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public ArgumentList getArgumentList()
+  {
+    return argumentList;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetArgumentList(ArgumentList newArgumentList, NotificationChain msgs)
+  {
+    ArgumentList oldArgumentList = argumentList;
+    argumentList = newArgumentList;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION__ARGUMENT_LIST, oldArgumentList, newArgumentList);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setArgumentList(ArgumentList newArgumentList)
+  {
+    if (newArgumentList != argumentList)
+    {
+      NotificationChain msgs = null;
+      if (argumentList != null)
+        msgs = ((InternalEObject)argumentList).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION__ARGUMENT_LIST, null, msgs);
+      if (newArgumentList != null)
+        msgs = ((InternalEObject)newArgumentList).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION__ARGUMENT_LIST, null, msgs);
+      msgs = basicSetArgumentList(newArgumentList, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION__ARGUMENT_LIST, newArgumentList, newArgumentList));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Expression getBody()
+  {
+    return body;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public NotificationChain basicSetBody(Expression newBody, NotificationChain msgs)
+  {
+    Expression oldBody = body;
+    body = newBody;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION__BODY, oldBody, newBody);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void setBody(Expression newBody)
+  {
+    if (newBody != body)
+    {
+      NotificationChain msgs = null;
+      if (body != null)
+        msgs = ((InternalEObject)body).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION__BODY, null, msgs);
+      if (newBody != null)
+        msgs = ((InternalEObject)newBody).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION__BODY, null, msgs);
+      msgs = basicSetBody(newBody, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION__BODY, newBody, newBody));
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION__ARGUMENT_LIST:
+        return basicSetArgumentList(null, msgs);
+      case SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION__BODY:
+        return basicSetBody(null, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public Object eGet(int featureID, boolean resolve, boolean coreType)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION__ARGUMENT_LIST:
+        return getArgumentList();
+      case SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION__BODY:
+        return getBody();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eSet(int featureID, Object newValue)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION__ARGUMENT_LIST:
+        setArgumentList((ArgumentList)newValue);
+        return;
+      case SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION__BODY:
+        setBody((Expression)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public void eUnset(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION__ARGUMENT_LIST:
+        setArgumentList((ArgumentList)null);
+        return;
+      case SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION__BODY:
+        setBody((Expression)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public boolean eIsSet(int featureID)
+  {
+    switch (featureID)
+    {
+      case SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION__ARGUMENT_LIST:
+        return argumentList != null;
+      case SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION__BODY:
+        return body != null;
+    }
+    return super.eIsSet(featureID);
+  }
+} //UnnamedErrorPrediateDefinitionImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnnamedObjectImpl.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnnamedObjectImpl.java
deleted file mode 100644
index 39bec164..00000000
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnnamedObjectImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * generated by Xtext 2.18.0.M3
- */
-package org.eclipse.viatra.solver.language.solverLanguage.impl;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-import org.eclipse.viatra.solver.language.solverLanguage.UnnamedObject;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Unnamed Object</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.UnnamedObjectImpl#getName <em>Name</em>}</li>
- * </ul>
- *
- * @generated
- */
-public class UnnamedObjectImpl extends ObjectImpl implements UnnamedObject
-{
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_EDEFAULT = null;
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_EDEFAULT;
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected UnnamedObjectImpl()
-  {
-    super();
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  protected EClass eStaticClass()
-  {
-    return SolverLanguagePackage.Literals.UNNAMED_OBJECT;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String getName()
-  {
-    return name;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.UNNAMED_OBJECT__NAME, oldName, name));
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.UNNAMED_OBJECT__NAME:
-        return getName();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.UNNAMED_OBJECT__NAME:
-        setName((String)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.UNNAMED_OBJECT__NAME:
-        setName(NAME_EDEFAULT);
-        return;
-    }
-    super.eUnset(featureID);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case SolverLanguagePackage.UNNAMED_OBJECT__NAME:
-        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-    }
-    return super.eIsSet(featureID);
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  @Override
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-    StringBuilder result = new StringBuilder(super.toString());
-    result.append(" (name: ");
-    result.append(name);
-    result.append(')');
-    return result.toString();
-  }
-} //UnnamedObjectImpl
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageAdapterFactory.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageAdapterFactory.java
index 9931598c..e46d6779 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageAdapterFactory.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageAdapterFactory.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.util;
@@ -10,57 +10,7 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.viatra.solver.language.solverLanguage.AllInstances;
+import org.eclipse.viatra.solver.language.solverLanguage.*;
-import org.eclipse.viatra.solver.language.solverLanguage.AllObjects;
-import org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanFalse;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanObject;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanTrue;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanValue;
-import org.eclipse.viatra.solver.language.solverLanguage.CDInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.ClosureType;
-import org.eclipse.viatra.solver.language.solverLanguage.ComplexObject;
-import org.eclipse.viatra.solver.language.solverLanguage.Constraint;
-import org.eclipse.viatra.solver.language.solverLanguage.DataObject;
-import org.eclipse.viatra.solver.language.solverLanguage.DataSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.EqualsSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.ExistSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.False;
-import org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.IntObject;
-import org.eclipse.viatra.solver.language.solverLanguage.IntegerSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.Interpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.IrreflexiveClosure;
-import org.eclipse.viatra.solver.language.solverLanguage.Literal;
-import org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition;
-import org.eclipse.viatra.solver.language.solverLanguage.NamedObject;
-import org.eclipse.viatra.solver.language.solverLanguage.Negative;
-import org.eclipse.viatra.solver.language.solverLanguage.Parameter;
-import org.eclipse.viatra.solver.language.solverLanguage.PartialitySymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.PatternBody;
-import org.eclipse.viatra.solver.language.solverLanguage.Polarity;
-import org.eclipse.viatra.solver.language.solverLanguage.Positive;
-import org.eclipse.viatra.solver.language.solverLanguage.Predicate;
-import org.eclipse.viatra.solver.language.solverLanguage.Problem;
-import org.eclipse.viatra.solver.language.solverLanguage.RealObject;
-import org.eclipse.viatra.solver.language.solverLanguage.RealSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.ReflexiveClosure;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-import org.eclipse.viatra.solver.language.solverLanguage.Statement;
-import org.eclipse.viatra.solver.language.solverLanguage.StringObject;
-import org.eclipse.viatra.solver.language.solverLanguage.StringSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.Symbol;
-import org.eclipse.viatra.solver.language.solverLanguage.True;
-import org.eclipse.viatra.solver.language.solverLanguage.TruthValue;
-import org.eclipse.viatra.solver.language.solverLanguage.Unknown;
-import org.eclipse.viatra.solver.language.solverLanguage.UnnamedObject;
-import org.eclipse.viatra.solver.language.solverLanguage.Variable;
 /**
 * <!-- begin-user-doc -->
@@ -136,254 +86,224 @@ public class SolverLanguageAdapterFactory extends AdapterFactoryImpl
        return createStatementAdapter();
      }
      @Override
-      public Adapter caseBooleanValue(BooleanValue object)
+      public Adapter casePredicateDefinition(PredicateDefinition object)
      {
-        return createBooleanValueAdapter();
+        return createPredicateDefinitionAdapter();
      }
      @Override
-      public Adapter caseTruthValue(TruthValue object)
+      public Adapter caseUnnamedErrorPrediateDefinition(UnnamedErrorPrediateDefinition object)
      {
-        return createTruthValueAdapter();
+        return createUnnamedErrorPrediateDefinitionAdapter();
      }
      @Override
-      public Adapter caseInterpretation(Interpretation object)
+      public Adapter caseDefaultDefinition(DefaultDefinition object)
      {
-        return createInterpretationAdapter();
+        return createDefaultDefinitionAdapter();
      }
      @Override
-      public Adapter caseBasicInterpretation(BasicInterpretation object)
+      public Adapter caseExternPredicateDefinition(ExternPredicateDefinition object)
      {
-        return createBasicInterpretationAdapter();
+        return createExternPredicateDefinitionAdapter();
      }
      @Override
-      public Adapter caseSymbol(Symbol object)
+      public Adapter caseMetricDefinition(MetricDefinition object)
      {
-        return createSymbolAdapter();
+        return createMetricDefinitionAdapter();
      }
      @Override
-      public Adapter caseModelSymbol(ModelSymbol object)
+      public Adapter caseExternMetricDefinition(ExternMetricDefinition object)
      {
-        return createModelSymbolAdapter();
+        return createExternMetricDefinitionAdapter();
      }
      @Override
-      public Adapter casePartialitySymbol(PartialitySymbol object)
+      public Adapter caseExpression(Expression object)
      {
-        return createPartialitySymbolAdapter();
+        return createExpressionAdapter();
      }
      @Override
-      public Adapter caseExistSymbol(ExistSymbol object)
+      public Adapter caseIfElse(IfElse object)
      {
-        return createExistSymbolAdapter();
+        return createIfElseAdapter();
      }
      @Override
-      public Adapter caseEqualsSymbol(EqualsSymbol object)
+      public Adapter caseCase(Case object)
      {
-        return createEqualsSymbolAdapter();
+        return createCaseAdapter();
      }
      @Override
-      public Adapter caseDataSymbol(DataSymbol object)
+      public Adapter caseCount(Count object)
      {
-        return createDataSymbolAdapter();
+        return createCountAdapter();
      }
      @Override
-      public Adapter caseBooleanSymbol(BooleanSymbol object)
+      public Adapter caseAggregation(Aggregation object)
      {
-        return createBooleanSymbolAdapter();
+        return createAggregationAdapter();
      }
      @Override
-      public Adapter caseIntegerSymbol(IntegerSymbol object)
+      public Adapter caseCall(Call object)
      {
-        return createIntegerSymbolAdapter();
+        return createCallAdapter();
      }
      @Override
-      public Adapter caseRealSymbol(RealSymbol object)
+      public Adapter caseArgumentList(ArgumentList object)
      {
-        return createRealSymbolAdapter();
+        return createArgumentListAdapter();
      }
      @Override
-      public Adapter caseStringSymbol(StringSymbol object)
+      public Adapter caseArgument(Argument object)
      {
-        return createStringSymbolAdapter();
+        return createArgumentAdapter();
      }
      @Override
-      public Adapter caseComplexObject(ComplexObject object)
+      public Adapter caseExpressionArgument(ExpressionArgument object)
      {
-        return createComplexObjectAdapter();
+        return createExpressionArgumentAdapter();
      }
      @Override
-      public Adapter caseObject(org.eclipse.viatra.solver.language.solverLanguage.Object object)
+      public Adapter caseStarArgument(StarArgument object)
      {
-        return createObjectAdapter();
+        return createStarArgumentAdapter();
      }
      @Override
-      public Adapter caseNamedObject(NamedObject object)
+      public Adapter caseTypedArgument(TypedArgument object)
      {
-        return createNamedObjectAdapter();
+        return createTypedArgumentAdapter();
      }
      @Override
-      public Adapter caseUnnamedObject(UnnamedObject object)
+      public Adapter caseTypedStarArgument(TypedStarArgument object)
      {
-        return createUnnamedObjectAdapter();
+        return createTypedStarArgumentAdapter();
      }
      @Override
-      public Adapter caseDataObject(DataObject object)
+      public Adapter caseReference(Reference object)
      {
-        return createDataObjectAdapter();
+        return createReferenceAdapter();
      }
      @Override
-      public Adapter caseBooleanObject(BooleanObject object)
+      public Adapter caseInterval(Interval object)
      {
-        return createBooleanObjectAdapter();
+        return createIntervalAdapter();
      }
      @Override
-      public Adapter caseIntObject(IntObject object)
+      public Adapter caseLiteral(Literal object)
-      {
-        return createIntObjectAdapter();
-      }
-      @Override
-      public Adapter caseRealObject(RealObject object)
-      {
-        return createRealObjectAdapter();
-      }
-      @Override
-      public Adapter caseStringObject(StringObject object)
-      {
-        return createStringObjectAdapter();
-      }
-      @Override
-      public Adapter casePredicate(Predicate object)
-      {
-        return createPredicateAdapter();
-      }
-      @Override
-      public Adapter caseParameter(Parameter object)
-      {
-        return createParameterAdapter();
-      }
-      @Override
-      public Adapter casePatternBody(PatternBody object)
-      {
-        return createPatternBodyAdapter();
-      }
-      @Override
-      public Adapter casePolarity(Polarity object)
      {
-        return createPolarityAdapter();
+        return createLiteralAdapter();
      }
      @Override
-      public Adapter caseConstraint(Constraint object)
+      public Adapter caseLogicLiteral(LogicLiteral object)
      {
-        return createConstraintAdapter();
+        return createLogicLiteralAdapter();
      }
      @Override
-      public Adapter caseClosureType(ClosureType object)
+      public Adapter caseNumericLiteral(NumericLiteral object)
      {
-        return createClosureTypeAdapter();
+        return createNumericLiteralAdapter();
      }
      @Override
-      public Adapter caseLiteral(Literal object)
+      public Adapter caseInfinityLiteral(InfinityLiteral object)
      {
-        return createLiteralAdapter();
+        return createInfinityLiteralAdapter();
      }
      @Override
-      public Adapter caseVariable(Variable object)
+      public Adapter caseEmptyIntervalLiteral(EmptyIntervalLiteral object)
      {
-        return createVariableAdapter();
+        return createEmptyIntervalLiteralAdapter();
      }
      @Override
-      public Adapter caseAllInstances(AllInstances object)
+      public Adapter caseStringLiteral(StringLiteral object)
      {
-        return createAllInstancesAdapter();
+        return createStringLiteralAdapter();
      }
      @Override
-      public Adapter caseAllObjects(AllObjects object)
+      public Adapter caseMemberDefinition(MemberDefinition object)
      {
-        return createAllObjectsAdapter();
+        return createMemberDefinitionAdapter();
      }
      @Override
-      public Adapter caseDefaultInterpretation(DefaultInterpretation object)
+      public Adapter caseMultiplicity(Multiplicity object)
      {
-        return createDefaultInterpretationAdapter();
+        return createMultiplicityAdapter();
      }
      @Override
-      public Adapter caseCDInterpretation(CDInterpretation object)
+      public Adapter caseManyMultiplicity(ManyMultiplicity object)
      {
-        return createCDInterpretationAdapter();
+        return createManyMultiplicityAdapter();
      }
      @Override
-      public Adapter caseClassInterpretation(ClassInterpretation object)
+      public Adapter caseExactMultiplicity(ExactMultiplicity object)
      {
-        return createClassInterpretationAdapter();
+        return createExactMultiplicityAdapter();
      }
      @Override
-      public Adapter caseEnumInterpretation(EnumInterpretation object)
+      public Adapter caseBoundedMultiplicity(BoundedMultiplicity object)
      {
-        return createEnumInterpretationAdapter();
+        return createBoundedMultiplicityAdapter();
      }
      @Override
-      public Adapter caseFieldRelationInterpretation(FieldRelationInterpretation object)
+      public Adapter caseScopeDefinition(ScopeDefinition object)
      {
-        return createFieldRelationInterpretationAdapter();
+        return createScopeDefinitionAdapter();
      }
      @Override
-      public Adapter caseGlobalRelationInterpretation(GlobalRelationInterpretation object)
+      public Adapter caseExactScopeDefinition(ExactScopeDefinition object)
      {
-        return createGlobalRelationInterpretationAdapter();
+        return createExactScopeDefinitionAdapter();
      }
      @Override
-      public Adapter caseMultiplicityDefinition(MultiplicityDefinition object)
+      public Adapter caseBoundedScopeDefinition(BoundedScopeDefinition object)
      {
-        return createMultiplicityDefinitionAdapter();
+        return createBoundedScopeDefinitionAdapter();
      }
      @Override
-      public Adapter caseBooleanTrue(BooleanTrue object)
+      public Adapter caseLowerBoundedScopeDefinition(LowerBoundedScopeDefinition object)
      {
-        return createBooleanTrueAdapter();
+        return createLowerBoundedScopeDefinitionAdapter();
      }
      @Override
-      public Adapter caseBooleanFalse(BooleanFalse object)
+      public Adapter caseObjectiveDefinition(ObjectiveDefinition object)
      {
-        return createBooleanFalseAdapter();
+        return createObjectiveDefinitionAdapter();
      }
      @Override
-      public Adapter caseTrue(True object)
+      public Adapter caseNamedElement(NamedElement object)
      {
-        return createTrueAdapter();
+        return createNamedElementAdapter();
      }
      @Override
-      public Adapter caseFalse(False object)
+      public Adapter caseAssertion(Assertion object)
      {
-        return createFalseAdapter();
+        return createAssertionAdapter();
      }
      @Override
-      public Adapter caseUnknown(Unknown object)
+      public Adapter caseDisjunction(Disjunction object)
      {
-        return createUnknownAdapter();
+        return createDisjunctionAdapter();
      }
      @Override
-      public Adapter caseError(org.eclipse.viatra.solver.language.solverLanguage.Error object)
+      public Adapter caseSwitch(Switch object)
      {
-        return createErrorAdapter();
+        return createSwitchAdapter();
      }
      @Override
-      public Adapter casePositive(Positive object)
+      public Adapter caseConjunction(Conjunction object)
      {
-        return createPositiveAdapter();
+        return createConjunctionAdapter();
      }
      @Override
-      public Adapter caseNegative(Negative object)
+      public Adapter caseComparison(Comparison object)
      {
-        return createNegativeAdapter();
+        return createComparisonAdapter();
      }
      @Override
-      public Adapter caseReflexiveClosure(ReflexiveClosure object)
+      public Adapter caseBinaryExpression(BinaryExpression object)
      {
-        return createReflexiveClosureAdapter();
+        return createBinaryExpressionAdapter();
      }
      @Override
-      public Adapter caseIrreflexiveClosure(IrreflexiveClosure object)
+      public Adapter caseUnaryExpression(UnaryExpression object)
      {
-        return createIrreflexiveClosureAdapter();
+        return createUnaryExpressionAdapter();
      }
      @Override
      public Adapter defaultCase(EObject object)
@@ -438,751 +358,661 @@ public class SolverLanguageAdapterFactory extends AdapterFactoryImpl
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.BooleanValue <em>Boolean Value</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition <em>Predicate Definition</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.BooleanValue
-   * @generated
-   */
-  public Adapter createBooleanValueAdapter()
-  {
-    return null;
-  }
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.TruthValue <em>Truth Value</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.TruthValue
-   * @generated
-   */
-  public Adapter createTruthValueAdapter()
-  {
-    return null;
-  }
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Interpretation <em>Interpretation</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Interpretation
-   * @generated
-   */
-  public Adapter createInterpretationAdapter()
-  {
-    return null;
-  }
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation <em>Basic Interpretation</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation
-   * @generated
-   */
-  public Adapter createBasicInterpretationAdapter()
-  {
-    return null;
-  }
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Symbol <em>Symbol</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Symbol
-   * @generated
-   */
-  public Adapter createSymbolAdapter()
-  {
-    return null;
-  }
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol <em>Model Symbol</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition
   * @generated
   */
-  public Adapter createModelSymbolAdapter()
+  public Adapter createPredicateDefinitionAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.PartialitySymbol <em>Partiality Symbol</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.UnnamedErrorPrediateDefinition <em>Unnamed Error Prediate Definition</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.PartialitySymbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.UnnamedErrorPrediateDefinition
   * @generated
   */
-  public Adapter createPartialitySymbolAdapter()
+  public Adapter createUnnamedErrorPrediateDefinitionAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.ExistSymbol <em>Exist Symbol</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.DefaultDefinition <em>Default Definition</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.ExistSymbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.DefaultDefinition
   * @generated
   */
-  public Adapter createExistSymbolAdapter()
+  public Adapter createDefaultDefinitionAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.EqualsSymbol <em>Equals Symbol</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.ExternPredicateDefinition <em>Extern Predicate Definition</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.EqualsSymbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ExternPredicateDefinition
   * @generated
   */
-  public Adapter createEqualsSymbolAdapter()
+  public Adapter createExternPredicateDefinitionAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.DataSymbol <em>Data Symbol</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.MetricDefinition <em>Metric Definition</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.DataSymbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.MetricDefinition
   * @generated
   */
-  public Adapter createDataSymbolAdapter()
+  public Adapter createMetricDefinitionAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.BooleanSymbol <em>Boolean Symbol</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.ExternMetricDefinition <em>Extern Metric Definition</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.BooleanSymbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ExternMetricDefinition
   * @generated
   */
-  public Adapter createBooleanSymbolAdapter()
+  public Adapter createExternMetricDefinitionAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.IntegerSymbol <em>Integer Symbol</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Expression <em>Expression</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.IntegerSymbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Expression
   * @generated
   */
-  public Adapter createIntegerSymbolAdapter()
+  public Adapter createExpressionAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.RealSymbol <em>Real Symbol</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.IfElse <em>If Else</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.RealSymbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.IfElse
   * @generated
   */
-  public Adapter createRealSymbolAdapter()
+  public Adapter createIfElseAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.StringSymbol <em>String Symbol</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Case <em>Case</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.StringSymbol
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Case
   * @generated
   */
-  public Adapter createStringSymbolAdapter()
+  public Adapter createCaseAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.ComplexObject <em>Complex Object</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Count <em>Count</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.ComplexObject
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Count
   * @generated
   */
-  public Adapter createComplexObjectAdapter()
+  public Adapter createCountAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Object <em>Object</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Aggregation <em>Aggregation</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Object
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Aggregation
   * @generated
   */
-  public Adapter createObjectAdapter()
+  public Adapter createAggregationAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.NamedObject <em>Named Object</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Call <em>Call</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.NamedObject
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Call
   * @generated
   */
-  public Adapter createNamedObjectAdapter()
+  public Adapter createCallAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.UnnamedObject <em>Unnamed Object</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.ArgumentList <em>Argument List</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.UnnamedObject
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ArgumentList
   * @generated
   */
-  public Adapter createUnnamedObjectAdapter()
+  public Adapter createArgumentListAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.DataObject <em>Data Object</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Argument <em>Argument</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.DataObject
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Argument
   * @generated
   */
-  public Adapter createDataObjectAdapter()
+  public Adapter createArgumentAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.BooleanObject <em>Boolean Object</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.ExpressionArgument <em>Expression Argument</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.BooleanObject
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ExpressionArgument
   * @generated
   */
-  public Adapter createBooleanObjectAdapter()
+  public Adapter createExpressionArgumentAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.IntObject <em>Int Object</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.StarArgument <em>Star Argument</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.IntObject
+   * @see org.eclipse.viatra.solver.language.solverLanguage.StarArgument
   * @generated
   */
-  public Adapter createIntObjectAdapter()
+  public Adapter createStarArgumentAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.RealObject <em>Real Object</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.TypedArgument <em>Typed Argument</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.RealObject
+   * @see org.eclipse.viatra.solver.language.solverLanguage.TypedArgument
   * @generated
   */
-  public Adapter createRealObjectAdapter()
+  public Adapter createTypedArgumentAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.StringObject <em>String Object</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.TypedStarArgument <em>Typed Star Argument</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.StringObject
+   * @see org.eclipse.viatra.solver.language.solverLanguage.TypedStarArgument
   * @generated
   */
-  public Adapter createStringObjectAdapter()
+  public Adapter createTypedStarArgumentAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Predicate <em>Predicate</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Reference <em>Reference</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Predicate
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Reference
   * @generated
   */
-  public Adapter createPredicateAdapter()
+  public Adapter createReferenceAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Parameter <em>Parameter</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Interval <em>Interval</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Parameter
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Interval
   * @generated
   */
-  public Adapter createParameterAdapter()
+  public Adapter createIntervalAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.PatternBody <em>Pattern Body</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Literal <em>Literal</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.PatternBody
-   * @generated
-   */
-  public Adapter createPatternBodyAdapter()
-  {
-    return null;
-  }
-  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Polarity <em>Polarity</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Polarity
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Literal
   * @generated
   */
-  public Adapter createPolarityAdapter()
+  public Adapter createLiteralAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Constraint <em>Constraint</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.LogicLiteral <em>Logic Literal</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Constraint
+   * @see org.eclipse.viatra.solver.language.solverLanguage.LogicLiteral
   * @generated
   */
-  public Adapter createConstraintAdapter()
+  public Adapter createLogicLiteralAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.ClosureType <em>Closure Type</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.NumericLiteral <em>Numeric Literal</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.ClosureType
+   * @see org.eclipse.viatra.solver.language.solverLanguage.NumericLiteral
   * @generated
   */
-  public Adapter createClosureTypeAdapter()
+  public Adapter createNumericLiteralAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Literal <em>Literal</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.InfinityLiteral <em>Infinity Literal</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Literal
+   * @see org.eclipse.viatra.solver.language.solverLanguage.InfinityLiteral
   * @generated
   */
-  public Adapter createLiteralAdapter()
+  public Adapter createInfinityLiteralAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Variable <em>Variable</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.EmptyIntervalLiteral <em>Empty Interval Literal</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Variable
+   * @see org.eclipse.viatra.solver.language.solverLanguage.EmptyIntervalLiteral
   * @generated
   */
-  public Adapter createVariableAdapter()
+  public Adapter createEmptyIntervalLiteralAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.AllInstances <em>All Instances</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.StringLiteral <em>String Literal</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.AllInstances
+   * @see org.eclipse.viatra.solver.language.solverLanguage.StringLiteral
   * @generated
   */
-  public Adapter createAllInstancesAdapter()
+  public Adapter createStringLiteralAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.AllObjects <em>All Objects</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition <em>Member Definition</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.AllObjects
+   * @see org.eclipse.viatra.solver.language.solverLanguage.MemberDefinition
   * @generated
   */
-  public Adapter createAllObjectsAdapter()
+  public Adapter createMemberDefinitionAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation <em>Default Interpretation</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Multiplicity <em>Multiplicity</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Multiplicity
   * @generated
   */
-  public Adapter createDefaultInterpretationAdapter()
+  public Adapter createMultiplicityAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.CDInterpretation <em>CD Interpretation</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.ManyMultiplicity <em>Many Multiplicity</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.CDInterpretation
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ManyMultiplicity
   * @generated
   */
-  public Adapter createCDInterpretationAdapter()
+  public Adapter createManyMultiplicityAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation <em>Class Interpretation</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.ExactMultiplicity <em>Exact Multiplicity</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ExactMultiplicity
   * @generated
   */
-  public Adapter createClassInterpretationAdapter()
+  public Adapter createExactMultiplicityAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation <em>Enum Interpretation</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.BoundedMultiplicity <em>Bounded Multiplicity</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BoundedMultiplicity
   * @generated
   */
-  public Adapter createEnumInterpretationAdapter()
+  public Adapter createBoundedMultiplicityAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation <em>Field Relation Interpretation</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.ScopeDefinition <em>Scope Definition</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ScopeDefinition
   * @generated
   */
-  public Adapter createFieldRelationInterpretationAdapter()
+  public Adapter createScopeDefinitionAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation <em>Global Relation Interpretation</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.ExactScopeDefinition <em>Exact Scope Definition</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ExactScopeDefinition
   * @generated
   */
-  public Adapter createGlobalRelationInterpretationAdapter()
+  public Adapter createExactScopeDefinitionAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition <em>Multiplicity Definition</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.BoundedScopeDefinition <em>Bounded Scope Definition</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BoundedScopeDefinition
   * @generated
   */
-  public Adapter createMultiplicityDefinitionAdapter()
+  public Adapter createBoundedScopeDefinitionAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.BooleanTrue <em>Boolean True</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.LowerBoundedScopeDefinition <em>Lower Bounded Scope Definition</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.BooleanTrue
+   * @see org.eclipse.viatra.solver.language.solverLanguage.LowerBoundedScopeDefinition
   * @generated
   */
-  public Adapter createBooleanTrueAdapter()
+  public Adapter createLowerBoundedScopeDefinitionAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.BooleanFalse <em>Boolean False</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.ObjectiveDefinition <em>Objective Definition</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.BooleanFalse
+   * @see org.eclipse.viatra.solver.language.solverLanguage.ObjectiveDefinition
   * @generated
   */
-  public Adapter createBooleanFalseAdapter()
+  public Adapter createObjectiveDefinitionAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.True <em>True</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.NamedElement <em>Named Element</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.True
+   * @see org.eclipse.viatra.solver.language.solverLanguage.NamedElement
   * @generated
   */
-  public Adapter createTrueAdapter()
+  public Adapter createNamedElementAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.False <em>False</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Assertion <em>Assertion</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.False
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Assertion
   * @generated
   */
-  public Adapter createFalseAdapter()
+  public Adapter createAssertionAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Unknown <em>Unknown</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Disjunction <em>Disjunction</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Unknown
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Disjunction
   * @generated
   */
-  public Adapter createUnknownAdapter()
+  public Adapter createDisjunctionAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Error <em>Error</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Switch <em>Switch</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Error
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Switch
   * @generated
   */
-  public Adapter createErrorAdapter()
+  public Adapter createSwitchAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Positive <em>Positive</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Conjunction <em>Conjunction</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Positive
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Conjunction
   * @generated
   */
-  public Adapter createPositiveAdapter()
+  public Adapter createConjunctionAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Negative <em>Negative</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.Comparison <em>Comparison</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.Negative
+   * @see org.eclipse.viatra.solver.language.solverLanguage.Comparison
   * @generated
   */
-  public Adapter createNegativeAdapter()
+  public Adapter createComparisonAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.ReflexiveClosure <em>Reflexive Closure</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression <em>Binary Expression</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.ReflexiveClosure
+   * @see org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression
   * @generated
   */
-  public Adapter createReflexiveClosureAdapter()
+  public Adapter createBinaryExpressionAdapter()
  {
    return null;
  }
  /**
-   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.IrreflexiveClosure <em>Irreflexive Closure</em>}'.
+   * Creates a new adapter for an object of class '{@link org.eclipse.viatra.solver.language.solverLanguage.UnaryExpression <em>Unary Expression</em>}'.
   * <!-- begin-user-doc -->
   * This default implementation returns null so that we can easily ignore cases;
   * it's useful to ignore a case when inheritance will catch all the cases anyway.
   * <!-- end-user-doc -->
   * @return the new adapter.
-   * @see org.eclipse.viatra.solver.language.solverLanguage.IrreflexiveClosure
+   * @see org.eclipse.viatra.solver.language.solverLanguage.UnaryExpression
   * @generated
   */
-  public Adapter createIrreflexiveClosureAdapter()
+  public Adapter createUnaryExpressionAdapter()
  {
    return null;
  }
diff --git a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageSwitch.java b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageSwitch.java
index 6f6bcd17..f64b6bc0 100644
--- a/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageSwitch.java
+++ b/Application/org.eclipse.viatra.solver.language/src-gen/org/eclipse/viatra/solver/language/solverLanguage/util/SolverLanguageSwitch.java
@@ -1,5 +1,5 @@
 /**
- * generated by Xtext 2.18.0.M3
+ * generated by Xtext 2.21.0
 */
 package org.eclipse.viatra.solver.language.solverLanguage.util;
@@ -8,57 +8,7 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.viatra.solver.language.solverLanguage.AllInstances;
+import org.eclipse.viatra.solver.language.solverLanguage.*;
-import org.eclipse.viatra.solver.language.solverLanguage.AllObjects;
-import org.eclipse.viatra.solver.language.solverLanguage.BasicInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanFalse;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanObject;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanTrue;
-import org.eclipse.viatra.solver.language.solverLanguage.BooleanValue;
-import org.eclipse.viatra.solver.language.solverLanguage.CDInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.ClassInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.ClosureType;
-import org.eclipse.viatra.solver.language.solverLanguage.ComplexObject;
-import org.eclipse.viatra.solver.language.solverLanguage.Constraint;
-import org.eclipse.viatra.solver.language.solverLanguage.DataObject;
-import org.eclipse.viatra.solver.language.solverLanguage.DataSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.DefaultInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.EnumInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.EqualsSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.ExistSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.False;
-import org.eclipse.viatra.solver.language.solverLanguage.FieldRelationInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.GlobalRelationInterpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.IntObject;
-import org.eclipse.viatra.solver.language.solverLanguage.IntegerSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.Interpretation;
-import org.eclipse.viatra.solver.language.solverLanguage.IrreflexiveClosure;
-import org.eclipse.viatra.solver.language.solverLanguage.Literal;
-import org.eclipse.viatra.solver.language.solverLanguage.ModelSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.MultiplicityDefinition;
-import org.eclipse.viatra.solver.language.solverLanguage.NamedObject;
-import org.eclipse.viatra.solver.language.solverLanguage.Negative;
-import org.eclipse.viatra.solver.language.solverLanguage.Parameter;
-import org.eclipse.viatra.solver.language.solverLanguage.PartialitySymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.PatternBody;
-import org.eclipse.viatra.solver.language.solverLanguage.Polarity;
-import org.eclipse.viatra.solver.language.solverLanguage.Positive;
-import org.eclipse.viatra.solver.language.solverLanguage.Predicate;
-import org.eclipse.viatra.solver.language.solverLanguage.Problem;
-import org.eclipse.viatra.solver.language.solverLanguage.RealObject;
-import org.eclipse.viatra.solver.language.solverLanguage.RealSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.ReflexiveClosure;
-import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
-import org.eclipse.viatra.solver.language.solverLanguage.Statement;
-import org.eclipse.viatra.solver.language.solverLanguage.StringObject;
-import org.eclipse.viatra.solver.language.solverLanguage.StringSymbol;
-import org.eclipse.viatra.solver.language.solverLanguage.Symbol;
-import org.eclipse.viatra.solver.language.solverLanguage.True;
-import org.eclipse.viatra.solver.language.solverLanguage.TruthValue;
-import org.eclipse.viatra.solver.language.solverLanguage.Unknown;
-import org.eclipse.viatra.solver.language.solverLanguage.UnnamedObject;
-import org.eclipse.viatra.solver.language.solverLanguage.Variable;
 /**
 * <!-- begin-user-doc -->
@@ -137,423 +87,377 @@ public class SolverLanguageSwitch<T> extends Switch<T>
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.BOOLEAN_VALUE:
+      case SolverLanguagePackage.PREDICATE_DEFINITION:
      {
-        BooleanValue booleanValue = (BooleanValue)theEObject;
+        PredicateDefinition predicateDefinition = (PredicateDefinition)theEObject;
-        T result = caseBooleanValue(booleanValue);
+        T result = casePredicateDefinition(predicateDefinition);
+        if (result == null) result = caseStatement(predicateDefinition);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.TRUTH_VALUE:
+      case SolverLanguagePackage.UNNAMED_ERROR_PREDIATE_DEFINITION:
      {
-        TruthValue truthValue = (TruthValue)theEObject;
+        UnnamedErrorPrediateDefinition unnamedErrorPrediateDefinition = (UnnamedErrorPrediateDefinition)theEObject;
-        T result = caseTruthValue(truthValue);
+        T result = caseUnnamedErrorPrediateDefinition(unnamedErrorPrediateDefinition);
+        if (result == null) result = caseStatement(unnamedErrorPrediateDefinition);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.INTERPRETATION:
+      case SolverLanguagePackage.DEFAULT_DEFINITION:
      {
-        Interpretation interpretation = (Interpretation)theEObject;
+        DefaultDefinition defaultDefinition = (DefaultDefinition)theEObject;
-        T result = caseInterpretation(interpretation);
+        T result = caseDefaultDefinition(defaultDefinition);
-        if (result == null) result = caseStatement(interpretation);
+        if (result == null) result = caseStatement(defaultDefinition);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.BASIC_INTERPRETATION:
+      case SolverLanguagePackage.EXTERN_PREDICATE_DEFINITION:
      {
-        BasicInterpretation basicInterpretation = (BasicInterpretation)theEObject;
+        ExternPredicateDefinition externPredicateDefinition = (ExternPredicateDefinition)theEObject;
-        T result = caseBasicInterpretation(basicInterpretation);
+        T result = caseExternPredicateDefinition(externPredicateDefinition);
-        if (result == null) result = caseInterpretation(basicInterpretation);
+        if (result == null) result = caseStatement(externPredicateDefinition);
-        if (result == null) result = caseStatement(basicInterpretation);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.SYMBOL:
+      case SolverLanguagePackage.METRIC_DEFINITION:
      {
-        Symbol symbol = (Symbol)theEObject;
+        MetricDefinition metricDefinition = (MetricDefinition)theEObject;
-        T result = caseSymbol(symbol);
+        T result = caseMetricDefinition(metricDefinition);
+        if (result == null) result = caseStatement(metricDefinition);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.MODEL_SYMBOL:
+      case SolverLanguagePackage.EXTERN_METRIC_DEFINITION:
      {
-        ModelSymbol modelSymbol = (ModelSymbol)theEObject;
+        ExternMetricDefinition externMetricDefinition = (ExternMetricDefinition)theEObject;
-        T result = caseModelSymbol(modelSymbol);
+        T result = caseExternMetricDefinition(externMetricDefinition);
-        if (result == null) result = caseSymbol(modelSymbol);
+        if (result == null) result = caseStatement(externMetricDefinition);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.PARTIALITY_SYMBOL:
+      case SolverLanguagePackage.EXPRESSION:
      {
-        PartialitySymbol partialitySymbol = (PartialitySymbol)theEObject;
+        Expression expression = (Expression)theEObject;
-        T result = casePartialitySymbol(partialitySymbol);
+        T result = caseExpression(expression);
-        if (result == null) result = caseSymbol(partialitySymbol);
+        if (result == null) result = caseStatement(expression);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.EXIST_SYMBOL:
+      case SolverLanguagePackage.IF_ELSE:
      {
-        ExistSymbol existSymbol = (ExistSymbol)theEObject;
+        IfElse ifElse = (IfElse)theEObject;
-        T result = caseExistSymbol(existSymbol);
+        T result = caseIfElse(ifElse);
-        if (result == null) result = casePartialitySymbol(existSymbol);
+        if (result == null) result = caseExpression(ifElse);
-        if (result == null) result = caseSymbol(existSymbol);
+        if (result == null) result = caseStatement(ifElse);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.EQUALS_SYMBOL:
+      case SolverLanguagePackage.CASE:
      {
-        EqualsSymbol equalsSymbol = (EqualsSymbol)theEObject;
+        Case case_ = (Case)theEObject;
-        T result = caseEqualsSymbol(equalsSymbol);
+        T result = caseCase(case_);
-        if (result == null) result = casePartialitySymbol(equalsSymbol);
+        if (result == null) result = caseExpression(case_);
-        if (result == null) result = caseSymbol(equalsSymbol);
+        if (result == null) result = caseStatement(case_);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.DATA_SYMBOL:
+      case SolverLanguagePackage.COUNT:
      {
-        DataSymbol dataSymbol = (DataSymbol)theEObject;
+        Count count = (Count)theEObject;
-        T result = caseDataSymbol(dataSymbol);
+        T result = caseCount(count);
-        if (result == null) result = caseSymbol(dataSymbol);
+        if (result == null) result = caseExpression(count);
+        if (result == null) result = caseStatement(count);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.BOOLEAN_SYMBOL:
+      case SolverLanguagePackage.AGGREGATION:
      {
-        BooleanSymbol booleanSymbol = (BooleanSymbol)theEObject;
+        Aggregation aggregation = (Aggregation)theEObject;
-        T result = caseBooleanSymbol(booleanSymbol);
+        T result = caseAggregation(aggregation);
-        if (result == null) result = caseDataSymbol(booleanSymbol);
+        if (result == null) result = caseExpression(aggregation);
-        if (result == null) result = caseSymbol(booleanSymbol);
+        if (result == null) result = caseStatement(aggregation);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.INTEGER_SYMBOL:
+      case SolverLanguagePackage.CALL:
      {
-        IntegerSymbol integerSymbol = (IntegerSymbol)theEObject;
+        Call call = (Call)theEObject;
-        T result = caseIntegerSymbol(integerSymbol);
+        T result = caseCall(call);
-        if (result == null) result = caseDataSymbol(integerSymbol);
+        if (result == null) result = caseExpression(call);
-        if (result == null) result = caseSymbol(integerSymbol);
+        if (result == null) result = caseStatement(call);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.REAL_SYMBOL:
+      case SolverLanguagePackage.ARGUMENT_LIST:
      {
-        RealSymbol realSymbol = (RealSymbol)theEObject;
+        ArgumentList argumentList = (ArgumentList)theEObject;
-        T result = caseRealSymbol(realSymbol);
+        T result = caseArgumentList(argumentList);
-        if (result == null) result = caseDataSymbol(realSymbol);
-        if (result == null) result = caseSymbol(realSymbol);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.STRING_SYMBOL:
+      case SolverLanguagePackage.ARGUMENT:
      {
-        StringSymbol stringSymbol = (StringSymbol)theEObject;
+        Argument argument = (Argument)theEObject;
-        T result = caseStringSymbol(stringSymbol);
+        T result = caseArgument(argument);
-        if (result == null) result = caseDataSymbol(stringSymbol);
-        if (result == null) result = caseSymbol(stringSymbol);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.COMPLEX_OBJECT:
+      case SolverLanguagePackage.EXPRESSION_ARGUMENT:
      {
-        ComplexObject complexObject = (ComplexObject)theEObject;
+        ExpressionArgument expressionArgument = (ExpressionArgument)theEObject;
-        T result = caseComplexObject(complexObject);
+        T result = caseExpressionArgument(expressionArgument);
+        if (result == null) result = caseArgument(expressionArgument);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.OBJECT:
+      case SolverLanguagePackage.STAR_ARGUMENT:
      {
-        org.eclipse.viatra.solver.language.solverLanguage.Object object = (org.eclipse.viatra.solver.language.solverLanguage.Object)theEObject;
+        StarArgument starArgument = (StarArgument)theEObject;
-        T result = caseObject(object);
+        T result = caseStarArgument(starArgument);
-        if (result == null) result = caseComplexObject(object);
+        if (result == null) result = caseArgument(starArgument);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.NAMED_OBJECT:
+      case SolverLanguagePackage.TYPED_ARGUMENT:
      {
-        NamedObject namedObject = (NamedObject)theEObject;
+        TypedArgument typedArgument = (TypedArgument)theEObject;
-        T result = caseNamedObject(namedObject);
+        T result = caseTypedArgument(typedArgument);
-        if (result == null) result = caseObject(namedObject);
+        if (result == null) result = caseArgument(typedArgument);
-        if (result == null) result = caseLiteral(namedObject);
-        if (result == null) result = caseComplexObject(namedObject);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.UNNAMED_OBJECT:
+      case SolverLanguagePackage.TYPED_STAR_ARGUMENT:
      {
-        UnnamedObject unnamedObject = (UnnamedObject)theEObject;
+        TypedStarArgument typedStarArgument = (TypedStarArgument)theEObject;
-        T result = caseUnnamedObject(unnamedObject);
+        T result = caseTypedStarArgument(typedStarArgument);
-        if (result == null) result = caseObject(unnamedObject);
+        if (result == null) result = caseArgument(typedStarArgument);
-        if (result == null) result = caseComplexObject(unnamedObject);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.DATA_OBJECT:
+      case SolverLanguagePackage.REFERENCE:
      {
-        DataObject dataObject = (DataObject)theEObject;
+        Reference reference = (Reference)theEObject;
-        T result = caseDataObject(dataObject);
+        T result = caseReference(reference);
-        if (result == null) result = caseObject(dataObject);
+        if (result == null) result = caseExpression(reference);
-        if (result == null) result = caseLiteral(dataObject);
+        if (result == null) result = caseStatement(reference);
-        if (result == null) result = caseComplexObject(dataObject);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.BOOLEAN_OBJECT:
+      case SolverLanguagePackage.INTERVAL:
      {
-        BooleanObject booleanObject = (BooleanObject)theEObject;
+        Interval interval = (Interval)theEObject;
-        T result = caseBooleanObject(booleanObject);
+        T result = caseInterval(interval);
-        if (result == null) result = caseDataObject(booleanObject);
+        if (result == null) result = caseExpression(interval);
-        if (result == null) result = caseObject(booleanObject);
+        if (result == null) result = caseStatement(interval);
-        if (result == null) result = caseLiteral(booleanObject);
-        if (result == null) result = caseComplexObject(booleanObject);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.INT_OBJECT:
+      case SolverLanguagePackage.LITERAL:
-      {
-        IntObject intObject = (IntObject)theEObject;
-        T result = caseIntObject(intObject);
-        if (result == null) result = caseDataObject(intObject);
-        if (result == null) result = caseObject(intObject);
-        if (result == null) result = caseLiteral(intObject);
-        if (result == null) result = caseComplexObject(intObject);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case SolverLanguagePackage.REAL_OBJECT:
-      {
-        RealObject realObject = (RealObject)theEObject;
-        T result = caseRealObject(realObject);
-        if (result == null) result = caseDataObject(realObject);
-        if (result == null) result = caseObject(realObject);
-        if (result == null) result = caseLiteral(realObject);
-        if (result == null) result = caseComplexObject(realObject);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case SolverLanguagePackage.STRING_OBJECT:
-      {
-        StringObject stringObject = (StringObject)theEObject;
-        T result = caseStringObject(stringObject);
-        if (result == null) result = caseDataObject(stringObject);
-        if (result == null) result = caseObject(stringObject);
-        if (result == null) result = caseLiteral(stringObject);
-        if (result == null) result = caseComplexObject(stringObject);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case SolverLanguagePackage.PREDICATE:
-      {
-        Predicate predicate = (Predicate)theEObject;
-        T result = casePredicate(predicate);
-        if (result == null) result = caseStatement(predicate);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case SolverLanguagePackage.PARAMETER:
-      {
-        Parameter parameter = (Parameter)theEObject;
-        T result = caseParameter(parameter);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
-      case SolverLanguagePackage.PATTERN_BODY:
      {
-        PatternBody patternBody = (PatternBody)theEObject;
+        Literal literal = (Literal)theEObject;
-        T result = casePatternBody(patternBody);
+        T result = caseLiteral(literal);
+        if (result == null) result = caseExpression(literal);
+        if (result == null) result = caseStatement(literal);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.POLARITY:
+      case SolverLanguagePackage.LOGIC_LITERAL:
      {
-        Polarity polarity = (Polarity)theEObject;
+        LogicLiteral logicLiteral = (LogicLiteral)theEObject;
-        T result = casePolarity(polarity);
+        T result = caseLogicLiteral(logicLiteral);
+        if (result == null) result = caseLiteral(logicLiteral);
+        if (result == null) result = caseExpression(logicLiteral);
+        if (result == null) result = caseStatement(logicLiteral);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.CONSTRAINT:
+      case SolverLanguagePackage.NUMERIC_LITERAL:
      {
-        Constraint constraint = (Constraint)theEObject;
+        NumericLiteral numericLiteral = (NumericLiteral)theEObject;
-        T result = caseConstraint(constraint);
+        T result = caseNumericLiteral(numericLiteral);
+        if (result == null) result = caseLiteral(numericLiteral);
+        if (result == null) result = caseExpression(numericLiteral);
+        if (result == null) result = caseStatement(numericLiteral);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.CLOSURE_TYPE:
+      case SolverLanguagePackage.INFINITY_LITERAL:
      {
-        ClosureType closureType = (ClosureType)theEObject;
+        InfinityLiteral infinityLiteral = (InfinityLiteral)theEObject;
-        T result = caseClosureType(closureType);
+        T result = caseInfinityLiteral(infinityLiteral);
+        if (result == null) result = caseLiteral(infinityLiteral);
+        if (result == null) result = caseExpression(infinityLiteral);
+        if (result == null) result = caseStatement(infinityLiteral);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.LITERAL:
+      case SolverLanguagePackage.EMPTY_INTERVAL_LITERAL:
      {
-        Literal literal = (Literal)theEObject;
+        EmptyIntervalLiteral emptyIntervalLiteral = (EmptyIntervalLiteral)theEObject;
-        T result = caseLiteral(literal);
+        T result = caseEmptyIntervalLiteral(emptyIntervalLiteral);
+        if (result == null) result = caseLiteral(emptyIntervalLiteral);
+        if (result == null) result = caseExpression(emptyIntervalLiteral);
+        if (result == null) result = caseStatement(emptyIntervalLiteral);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.VARIABLE:
+      case SolverLanguagePackage.STRING_LITERAL:
      {
-        Variable variable = (Variable)theEObject;
+        StringLiteral stringLiteral = (StringLiteral)theEObject;
-        T result = caseVariable(variable);
+        T result = caseStringLiteral(stringLiteral);
-        if (result == null) result = caseLiteral(variable);
+        if (result == null) result = caseLiteral(stringLiteral);
+        if (result == null) result = caseExpression(stringLiteral);
+        if (result == null) result = caseStatement(stringLiteral);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.ALL_INSTANCES:
+      case SolverLanguagePackage.MEMBER_DEFINITION:
      {
-        AllInstances allInstances = (AllInstances)theEObject;
+        MemberDefinition memberDefinition = (MemberDefinition)theEObject;
-        T result = caseAllInstances(allInstances);
+        T result = caseMemberDefinition(memberDefinition);
-        if (result == null) result = caseComplexObject(allInstances);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.ALL_OBJECTS:
+      case SolverLanguagePackage.MULTIPLICITY:
      {
-        AllObjects allObjects = (AllObjects)theEObject;
+        Multiplicity multiplicity = (Multiplicity)theEObject;
-        T result = caseAllObjects(allObjects);
+        T result = caseMultiplicity(multiplicity);
-        if (result == null) result = caseComplexObject(allObjects);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.DEFAULT_INTERPRETATION:
+      case SolverLanguagePackage.MANY_MULTIPLICITY:
      {
-        DefaultInterpretation defaultInterpretation = (DefaultInterpretation)theEObject;
+        ManyMultiplicity manyMultiplicity = (ManyMultiplicity)theEObject;
-        T result = caseDefaultInterpretation(defaultInterpretation);
+        T result = caseManyMultiplicity(manyMultiplicity);
-        if (result == null) result = caseInterpretation(defaultInterpretation);
+        if (result == null) result = caseMultiplicity(manyMultiplicity);
-        if (result == null) result = caseStatement(defaultInterpretation);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.CD_INTERPRETATION:
+      case SolverLanguagePackage.EXACT_MULTIPLICITY:
      {
-        CDInterpretation cdInterpretation = (CDInterpretation)theEObject;
+        ExactMultiplicity exactMultiplicity = (ExactMultiplicity)theEObject;
-        T result = caseCDInterpretation(cdInterpretation);
+        T result = caseExactMultiplicity(exactMultiplicity);
-        if (result == null) result = caseInterpretation(cdInterpretation);
+        if (result == null) result = caseMultiplicity(exactMultiplicity);
-        if (result == null) result = caseStatement(cdInterpretation);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.CLASS_INTERPRETATION:
+      case SolverLanguagePackage.BOUNDED_MULTIPLICITY:
      {
-        ClassInterpretation classInterpretation = (ClassInterpretation)theEObject;
+        BoundedMultiplicity boundedMultiplicity = (BoundedMultiplicity)theEObject;
-        T result = caseClassInterpretation(classInterpretation);
+        T result = caseBoundedMultiplicity(boundedMultiplicity);
-        if (result == null) result = caseCDInterpretation(classInterpretation);
+        if (result == null) result = caseMultiplicity(boundedMultiplicity);
-        if (result == null) result = caseInterpretation(classInterpretation);
-        if (result == null) result = caseStatement(classInterpretation);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.ENUM_INTERPRETATION:
+      case SolverLanguagePackage.SCOPE_DEFINITION:
      {
-        EnumInterpretation enumInterpretation = (EnumInterpretation)theEObject;
+        ScopeDefinition scopeDefinition = (ScopeDefinition)theEObject;
-        T result = caseEnumInterpretation(enumInterpretation);
+        T result = caseScopeDefinition(scopeDefinition);
-        if (result == null) result = caseCDInterpretation(enumInterpretation);
+        if (result == null) result = caseStatement(scopeDefinition);
-        if (result == null) result = caseInterpretation(enumInterpretation);
-        if (result == null) result = caseStatement(enumInterpretation);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.FIELD_RELATION_INTERPRETATION:
+      case SolverLanguagePackage.EXACT_SCOPE_DEFINITION:
      {
-        FieldRelationInterpretation fieldRelationInterpretation = (FieldRelationInterpretation)theEObject;
+        ExactScopeDefinition exactScopeDefinition = (ExactScopeDefinition)theEObject;
-        T result = caseFieldRelationInterpretation(fieldRelationInterpretation);
+        T result = caseExactScopeDefinition(exactScopeDefinition);
+        if (result == null) result = caseScopeDefinition(exactScopeDefinition);
+        if (result == null) result = caseStatement(exactScopeDefinition);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.GLOBAL_RELATION_INTERPRETATION:
+      case SolverLanguagePackage.BOUNDED_SCOPE_DEFINITION:
      {
-        GlobalRelationInterpretation globalRelationInterpretation = (GlobalRelationInterpretation)theEObject;
+        BoundedScopeDefinition boundedScopeDefinition = (BoundedScopeDefinition)theEObject;
-        T result = caseGlobalRelationInterpretation(globalRelationInterpretation);
+        T result = caseBoundedScopeDefinition(boundedScopeDefinition);
-        if (result == null) result = caseCDInterpretation(globalRelationInterpretation);
+        if (result == null) result = caseScopeDefinition(boundedScopeDefinition);
-        if (result == null) result = caseInterpretation(globalRelationInterpretation);
+        if (result == null) result = caseStatement(boundedScopeDefinition);
-        if (result == null) result = caseStatement(globalRelationInterpretation);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.MULTIPLICITY_DEFINITION:
+      case SolverLanguagePackage.LOWER_BOUNDED_SCOPE_DEFINITION:
      {
-        MultiplicityDefinition multiplicityDefinition = (MultiplicityDefinition)theEObject;
+        LowerBoundedScopeDefinition lowerBoundedScopeDefinition = (LowerBoundedScopeDefinition)theEObject;
-        T result = caseMultiplicityDefinition(multiplicityDefinition);
+        T result = caseLowerBoundedScopeDefinition(lowerBoundedScopeDefinition);
+        if (result == null) result = caseScopeDefinition(lowerBoundedScopeDefinition);
+        if (result == null) result = caseStatement(lowerBoundedScopeDefinition);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.BOOLEAN_TRUE:
+      case SolverLanguagePackage.OBJECTIVE_DEFINITION:
      {
-        BooleanTrue booleanTrue = (BooleanTrue)theEObject;
+        ObjectiveDefinition objectiveDefinition = (ObjectiveDefinition)theEObject;
-        T result = caseBooleanTrue(booleanTrue);
+        T result = caseObjectiveDefinition(objectiveDefinition);
-        if (result == null) result = caseBooleanValue(booleanTrue);
+        if (result == null) result = caseStatement(objectiveDefinition);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.BOOLEAN_FALSE:
+      case SolverLanguagePackage.NAMED_ELEMENT:
      {
-        BooleanFalse booleanFalse = (BooleanFalse)theEObject;
+        NamedElement namedElement = (NamedElement)theEObject;
-        T result = caseBooleanFalse(booleanFalse);
+        T result = caseNamedElement(namedElement);
-        if (result == null) result = caseBooleanValue(booleanFalse);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.TRUE:
+      case SolverLanguagePackage.ASSERTION:
      {
-        True true_ = (True)theEObject;
+        Assertion assertion = (Assertion)theEObject;
-        T result = caseTrue(true_);
+        T result = caseAssertion(assertion);
-        if (result == null) result = caseTruthValue(true_);
+        if (result == null) result = caseStatement(assertion);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.FALSE:
+      case SolverLanguagePackage.DISJUNCTION:
      {
-        False false_ = (False)theEObject;
+        Disjunction disjunction = (Disjunction)theEObject;
-        T result = caseFalse(false_);
+        T result = caseDisjunction(disjunction);
-        if (result == null) result = caseTruthValue(false_);
+        if (result == null) result = caseExpression(disjunction);
+        if (result == null) result = caseStatement(disjunction);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.UNKNOWN:
+      case SolverLanguagePackage.SWITCH:
      {
-        Unknown unknown = (Unknown)theEObject;
+        org.eclipse.viatra.solver.language.solverLanguage.Switch switch_ = (org.eclipse.viatra.solver.language.solverLanguage.Switch)theEObject;
-        T result = caseUnknown(unknown);
+        T result = caseSwitch(switch_);
-        if (result == null) result = caseTruthValue(unknown);
+        if (result == null) result = caseExpression(switch_);
+        if (result == null) result = caseStatement(switch_);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.ERROR:
+      case SolverLanguagePackage.CONJUNCTION:
      {
-        org.eclipse.viatra.solver.language.solverLanguage.Error error = (org.eclipse.viatra.solver.language.solverLanguage.Error)theEObject;
+        Conjunction conjunction = (Conjunction)theEObject;
-        T result = caseError(error);
+        T result = caseConjunction(conjunction);
-        if (result == null) result = caseTruthValue(error);
+        if (result == null) result = caseExpression(conjunction);
+        if (result == null) result = caseStatement(conjunction);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.POSITIVE:
+      case SolverLanguagePackage.COMPARISON:
      {
-        Positive positive = (Positive)theEObject;
+        Comparison comparison = (Comparison)theEObject;
-        T result = casePositive(positive);
+        T result = caseComparison(comparison);
-        if (result == null) result = casePolarity(positive);
+        if (result == null) result = caseExpression(comparison);
+        if (result == null) result = caseStatement(comparison);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.NEGATIVE:
+      case SolverLanguagePackage.BINARY_EXPRESSION:
      {
-        Negative negative = (Negative)theEObject;
+        BinaryExpression binaryExpression = (BinaryExpression)theEObject;
-        T result = caseNegative(negative);
+        T result = caseBinaryExpression(binaryExpression);
-        if (result == null) result = casePolarity(negative);
+        if (result == null) result = caseExpression(binaryExpression);
+        if (result == null) result = caseStatement(binaryExpression);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
-      case SolverLanguagePackage.REFLEXIVE_CLOSURE:
+      case SolverLanguagePackage.UNARY_EXPRESSION:
      {
-        ReflexiveClosure reflexiveClosure = (ReflexiveClosure)theEObject;
+        UnaryExpression unaryExpression = (UnaryExpression)theEObject;
-        T result = caseReflexiveClosure(reflexiveClosure);
+        T result = caseUnaryExpression(unaryExpression);
-        if (result == null) result = caseClosureType(reflexiveClosure);
+        if (result == null) result = caseExpression(unaryExpression);
-        if (result == null) result = defaultCase(theEObject);
+        if (result == null) result = caseStatement(unaryExpression);
-        return result;
-      }
-      case SolverLanguagePackage.IRREFLEXIVE_CLOSURE:
-      {
-        IrreflexiveClosure irreflexiveClosure = (IrreflexiveClosure)theEObject;
-        T result = caseIrreflexiveClosure(irreflexiveClosure);
-        if (result == null) result = caseClosureType(irreflexiveClosure);
        if (result == null) result = defaultCase(theEObject);
        return result;
      }
@@ -594,801 +498,705 @@ public class SolverLanguageSwitch<T> extends Switch<T>
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Boolean Value</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Predicate Definition</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Boolean Value</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseBooleanValue(BooleanValue object)
-  {
-    return null;
-  }
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Truth Value</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Truth Value</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseTruthValue(TruthValue object)
-  {
-    return null;
-  }
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Interpretation</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Interpretation</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseInterpretation(Interpretation object)
-  {
-    return null;
-  }
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Basic Interpretation</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Basic Interpretation</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Predicate Definition</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseBasicInterpretation(BasicInterpretation object)
+  public T casePredicateDefinition(PredicateDefinition object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Symbol</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Unnamed Error Prediate Definition</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Symbol</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Unnamed Error Prediate Definition</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseSymbol(Symbol object)
+  public T caseUnnamedErrorPrediateDefinition(UnnamedErrorPrediateDefinition object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Model Symbol</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Default Definition</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Model Symbol</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Default Definition</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseModelSymbol(ModelSymbol object)
+  public T caseDefaultDefinition(DefaultDefinition object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Partiality Symbol</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Extern Predicate Definition</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Partiality Symbol</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Extern Predicate Definition</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T casePartialitySymbol(PartialitySymbol object)
+  public T caseExternPredicateDefinition(ExternPredicateDefinition object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Exist Symbol</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Metric Definition</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Exist Symbol</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Metric Definition</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseExistSymbol(ExistSymbol object)
+  public T caseMetricDefinition(MetricDefinition object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Equals Symbol</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Extern Metric Definition</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Equals Symbol</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Extern Metric Definition</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseEqualsSymbol(EqualsSymbol object)
+  public T caseExternMetricDefinition(ExternMetricDefinition object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Data Symbol</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Expression</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Data Symbol</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Expression</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseDataSymbol(DataSymbol object)
+  public T caseExpression(Expression object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Boolean Symbol</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>If Else</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Boolean Symbol</em>'.
+   * @return the result of interpreting the object as an instance of '<em>If Else</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseBooleanSymbol(BooleanSymbol object)
+  public T caseIfElse(IfElse object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Integer Symbol</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Case</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Integer Symbol</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Case</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseIntegerSymbol(IntegerSymbol object)
+  public T caseCase(Case object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Real Symbol</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Count</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Real Symbol</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Count</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseRealSymbol(RealSymbol object)
+  public T caseCount(Count object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>String Symbol</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Aggregation</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>String Symbol</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Aggregation</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseStringSymbol(StringSymbol object)
+  public T caseAggregation(Aggregation object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Complex Object</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Call</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Complex Object</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Call</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseComplexObject(ComplexObject object)
+  public T caseCall(Call object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Object</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Argument List</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Object</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Argument List</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseObject(org.eclipse.viatra.solver.language.solverLanguage.Object object)
+  public T caseArgumentList(ArgumentList object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Named Object</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Argument</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Named Object</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Argument</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseNamedObject(NamedObject object)
+  public T caseArgument(Argument object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Unnamed Object</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Expression Argument</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Unnamed Object</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Expression Argument</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseUnnamedObject(UnnamedObject object)
+  public T caseExpressionArgument(ExpressionArgument object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Data Object</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Star Argument</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Data Object</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Star Argument</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseDataObject(DataObject object)
+  public T caseStarArgument(StarArgument object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Boolean Object</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Typed Argument</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Boolean Object</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Typed Argument</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseBooleanObject(BooleanObject object)
+  public T caseTypedArgument(TypedArgument object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Int Object</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Typed Star Argument</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Int Object</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Typed Star Argument</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseIntObject(IntObject object)
+  public T caseTypedStarArgument(TypedStarArgument object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Real Object</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Reference</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Real Object</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Reference</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseRealObject(RealObject object)
+  public T caseReference(Reference object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>String Object</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Interval</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>String Object</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Interval</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseStringObject(StringObject object)
+  public T caseInterval(Interval object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Predicate</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Literal</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Predicate</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T casePredicate(Predicate object)
-  {
-    return null;
-  }
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Parameter</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Parameter</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseParameter(Parameter object)
-  {
-    return null;
-  }
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Pattern Body</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Pattern Body</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T casePatternBody(PatternBody object)
-  {
-    return null;
-  }
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Polarity</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Polarity</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Literal</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T casePolarity(Polarity object)
+  public T caseLiteral(Literal object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Constraint</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Logic Literal</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Constraint</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Logic Literal</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseConstraint(Constraint object)
+  public T caseLogicLiteral(LogicLiteral object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Closure Type</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Numeric Literal</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Closure Type</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Numeric Literal</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseClosureType(ClosureType object)
+  public T caseNumericLiteral(NumericLiteral object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Literal</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Infinity Literal</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Literal</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Infinity Literal</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseLiteral(Literal object)
+  public T caseInfinityLiteral(InfinityLiteral object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Variable</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Empty Interval Literal</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Variable</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Empty Interval Literal</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseVariable(Variable object)
+  public T caseEmptyIntervalLiteral(EmptyIntervalLiteral object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>All Instances</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>String Literal</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>All Instances</em>'.
+   * @return the result of interpreting the object as an instance of '<em>String Literal</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseAllInstances(AllInstances object)
+  public T caseStringLiteral(StringLiteral object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>All Objects</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Member Definition</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>All Objects</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Member Definition</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseAllObjects(AllObjects object)
+  public T caseMemberDefinition(MemberDefinition object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Default Interpretation</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Multiplicity</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Default Interpretation</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Multiplicity</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseDefaultInterpretation(DefaultInterpretation object)
+  public T caseMultiplicity(Multiplicity object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>CD Interpretation</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Many Multiplicity</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>CD Interpretation</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Many Multiplicity</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseCDInterpretation(CDInterpretation object)
+  public T caseManyMultiplicity(ManyMultiplicity object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Class Interpretation</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Exact Multiplicity</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Class Interpretation</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Exact Multiplicity</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseClassInterpretation(ClassInterpretation object)
+  public T caseExactMultiplicity(ExactMultiplicity object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Enum Interpretation</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Bounded Multiplicity</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Enum Interpretation</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Bounded Multiplicity</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseEnumInterpretation(EnumInterpretation object)
+  public T caseBoundedMultiplicity(BoundedMultiplicity object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Field Relation Interpretation</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Scope Definition</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Field Relation Interpretation</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Scope Definition</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseFieldRelationInterpretation(FieldRelationInterpretation object)
+  public T caseScopeDefinition(ScopeDefinition object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Global Relation Interpretation</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Exact Scope Definition</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Global Relation Interpretation</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Exact Scope Definition</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseGlobalRelationInterpretation(GlobalRelationInterpretation object)
+  public T caseExactScopeDefinition(ExactScopeDefinition object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Multiplicity Definition</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Bounded Scope Definition</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Multiplicity Definition</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Bounded Scope Definition</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseMultiplicityDefinition(MultiplicityDefinition object)
+  public T caseBoundedScopeDefinition(BoundedScopeDefinition object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Boolean True</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Lower Bounded Scope Definition</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Boolean True</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Lower Bounded Scope Definition</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseBooleanTrue(BooleanTrue object)
+  public T caseLowerBoundedScopeDefinition(LowerBoundedScopeDefinition object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Boolean False</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Objective Definition</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Boolean False</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Objective Definition</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseBooleanFalse(BooleanFalse object)
+  public T caseObjectiveDefinition(ObjectiveDefinition object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>True</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Named Element</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>True</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Named Element</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseTrue(True object)
+  public T caseNamedElement(NamedElement object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>False</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Assertion</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>False</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Assertion</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseFalse(False object)
+  public T caseAssertion(Assertion object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Unknown</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Disjunction</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Unknown</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Disjunction</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseUnknown(Unknown object)
+  public T caseDisjunction(Disjunction object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Error</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Switch</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Error</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Switch</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseError(org.eclipse.viatra.solver.language.solverLanguage.Error object)
+  public T caseSwitch(org.eclipse.viatra.solver.language.solverLanguage.Switch object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Positive</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Conjunction</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Positive</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Conjunction</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T casePositive(Positive object)
+  public T caseConjunction(Conjunction object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Negative</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Comparison</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Negative</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Comparison</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseNegative(Negative object)
+  public T caseComparison(Comparison object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Reflexive Closure</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Binary Expression</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Reflexive Closure</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Binary Expression</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseReflexiveClosure(ReflexiveClosure object)
+  public T caseBinaryExpression(BinaryExpression object)
  {
    return null;
  }
  /**
-   * Returns the result of interpreting the object as an instance of '<em>Irreflexive Closure</em>'.
+   * Returns the result of interpreting the object as an instance of '<em>Unary Expression</em>'.
   * <!-- begin-user-doc -->
   * This implementation returns null;
   * returning a non-null result will terminate the switch.
   * <!-- end-user-doc -->
   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Irreflexive Closure</em>'.
+   * @return the result of interpreting the object as an instance of '<em>Unary Expression</em>'.
   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
   * @generated
   */
-  public T caseIrreflexiveClosure(IrreflexiveClosure object)
+  public T caseUnaryExpression(UnaryExpression object)
  {
    return null;
  }