81 files changed, 17676 insertions, 0 deletions

diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AbstractAssertionImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AbstractAssertionImpl.java
new file mode 100644
index 00000000..ec01140f
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AbstractAssertionImpl.java
@@ -0,0 +1,255 @@
+/**
+ */
+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.AbstractAssertion;
+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>Abstract Assertion</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AbstractAssertionImpl#getExpression <em>Expression</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AbstractAssertionImpl#getRange <em>Range</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class AbstractAssertionImpl extends StatementImpl implements AbstractAssertion {
+        /**
+         * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getExpression()
+         * @generated
+         * @ordered
+         */
+        protected Expression expression;
+
+        /**
+         * 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 AbstractAssertionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.ABSTRACT_ASSERTION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Expression getExpression() {
+                return expression;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetExpression(Expression newExpression, NotificationChain msgs) {
+                Expression oldExpression = expression;
+                expression = newExpression;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.ABSTRACT_ASSERTION__EXPRESSION, oldExpression, newExpression);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setExpression(Expression newExpression) {
+                if (newExpression != expression) {
+                        NotificationChain msgs = null;
+                        if (expression != null)
+                                msgs = ((InternalEObject) expression).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.ABSTRACT_ASSERTION__EXPRESSION, null, msgs);
+                        if (newExpression != null)
+                                msgs = ((InternalEObject) newExpression).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.ABSTRACT_ASSERTION__EXPRESSION, null, msgs);
+                        msgs = basicSetExpression(newExpression, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.ABSTRACT_ASSERTION__EXPRESSION,
+                                        newExpression, newExpression));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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.ABSTRACT_ASSERTION__RANGE, oldRange, newRange);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setRange(Expression newRange) {
+                if (newRange != range) {
+                        NotificationChain msgs = null;
+                        if (range != null)
+                                msgs = ((InternalEObject) range).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.ABSTRACT_ASSERTION__RANGE, null, msgs);
+                        if (newRange != null)
+                                msgs = ((InternalEObject) newRange).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.ABSTRACT_ASSERTION__RANGE, null, msgs);
+                        msgs = basicSetRange(newRange, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.ABSTRACT_ASSERTION__RANGE,
+                                        newRange, newRange));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.ABSTRACT_ASSERTION__EXPRESSION:
+                        return basicSetExpression(null, msgs);
+                case SolverLanguagePackage.ABSTRACT_ASSERTION__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.ABSTRACT_ASSERTION__EXPRESSION:
+                        return getExpression();
+                case SolverLanguagePackage.ABSTRACT_ASSERTION__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.ABSTRACT_ASSERTION__EXPRESSION:
+                        setExpression((Expression) newValue);
+                        return;
+                case SolverLanguagePackage.ABSTRACT_ASSERTION__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.ABSTRACT_ASSERTION__EXPRESSION:
+                        setExpression((Expression) null);
+                        return;
+                case SolverLanguagePackage.ABSTRACT_ASSERTION__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.ABSTRACT_ASSERTION__EXPRESSION:
+                        return expression != null;
+                case SolverLanguagePackage.ABSTRACT_ASSERTION__RANGE:
+                        return range != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //AbstractAssertionImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AggregateExpressionImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AggregateExpressionImpl.java
new file mode 100644
index 00000000..9427a84d
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AggregateExpressionImpl.java
@@ -0,0 +1,228 @@
+/**
+ */
+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.AggregateExpression;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
+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>Aggregate Expression</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AggregateExpressionImpl#getForallVariables <em>Forall Variables</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AggregateExpressionImpl#getCondition <em>Condition</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class AggregateExpressionImpl extends ExpressionImpl implements AggregateExpression {
+        /**
+         * The cached value of the '{@link #getForallVariables() <em>Forall Variables</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getForallVariables()
+         * @generated
+         * @ordered
+         */
+        protected EList<Variable> forallVariables;
+
+        /**
+         * 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 AggregateExpressionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.AGGREGATE_EXPRESSION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Variable> getForallVariables() {
+                if (forallVariables == null) {
+                        forallVariables = new EObjectContainmentEList<Variable>(Variable.class, this,
+                                        SolverLanguagePackage.AGGREGATE_EXPRESSION__FORALL_VARIABLES);
+                }
+                return forallVariables;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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.AGGREGATE_EXPRESSION__CONDITION, oldCondition, newCondition);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setCondition(Expression newCondition) {
+                if (newCondition != condition) {
+                        NotificationChain msgs = null;
+                        if (condition != null)
+                                msgs = ((InternalEObject) condition).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.AGGREGATE_EXPRESSION__CONDITION, null, msgs);
+                        if (newCondition != null)
+                                msgs = ((InternalEObject) newCondition).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.AGGREGATE_EXPRESSION__CONDITION, null, msgs);
+                        msgs = basicSetCondition(newCondition, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.AGGREGATE_EXPRESSION__CONDITION,
+                                        newCondition, newCondition));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.AGGREGATE_EXPRESSION__FORALL_VARIABLES:
+                        return ((InternalEList<?>) getForallVariables()).basicRemove(otherEnd, msgs);
+                case SolverLanguagePackage.AGGREGATE_EXPRESSION__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.AGGREGATE_EXPRESSION__FORALL_VARIABLES:
+                        return getForallVariables();
+                case SolverLanguagePackage.AGGREGATE_EXPRESSION__CONDITION:
+                        return getCondition();
+                }
+                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.AGGREGATE_EXPRESSION__FORALL_VARIABLES:
+                        getForallVariables().clear();
+                        getForallVariables().addAll((Collection<? extends Variable>) newValue);
+                        return;
+                case SolverLanguagePackage.AGGREGATE_EXPRESSION__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.AGGREGATE_EXPRESSION__FORALL_VARIABLES:
+                        getForallVariables().clear();
+                        return;
+                case SolverLanguagePackage.AGGREGATE_EXPRESSION__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.AGGREGATE_EXPRESSION__FORALL_VARIABLES:
+                        return forallVariables != null && !forallVariables.isEmpty();
+                case SolverLanguagePackage.AGGREGATE_EXPRESSION__CONDITION:
+                        return condition != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //AggregateExpressionImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AggregationImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AggregationImpl.java
new file mode 100644
index 00000000..f67de89a
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AggregationImpl.java
@@ -0,0 +1,245 @@
+/**
+ */
+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.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>Aggregation</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AggregationImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AggregationImpl#getOp <em>Op</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class AggregationImpl extends AggregateExpressionImpl implements Aggregation {
+        /**
+         * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected Expression value;
+
+        /**
+         * The cached value of the '{@link #getOp() <em>Op</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getOp()
+         * @generated
+         * @ordered
+         */
+        protected Symbol op;
+
+        /**
+         * <!-- 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
+         */
+        public Expression getValue() {
+                return value;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetValue(Expression newValue, NotificationChain msgs) {
+                Expression oldValue = value;
+                value = newValue;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.AGGREGATION__VALUE, oldValue, newValue);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setValue(Expression newValue) {
+                if (newValue != value) {
+                        NotificationChain msgs = null;
+                        if (value != null)
+                                msgs = ((InternalEObject) value).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.AGGREGATION__VALUE, null, msgs);
+                        if (newValue != null)
+                                msgs = ((InternalEObject) newValue).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.AGGREGATION__VALUE, null, msgs);
+                        msgs = basicSetValue(newValue, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.AGGREGATION__VALUE, newValue,
+                                        newValue));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol getOp() {
+                if (op != null && op.eIsProxy()) {
+                        InternalEObject oldOp = (InternalEObject) op;
+                        op = (Symbol) eResolveProxy(oldOp);
+                        if (op != oldOp) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, SolverLanguagePackage.AGGREGATION__OP,
+                                                        oldOp, op));
+                        }
+                }
+                return op;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol basicGetOp() {
+                return op;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setOp(Symbol newOp) {
+                Symbol oldOp = op;
+                op = newOp;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.AGGREGATION__OP, oldOp, op));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.AGGREGATION__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.AGGREGATION__VALUE:
+                        return getValue();
+                case SolverLanguagePackage.AGGREGATION__OP:
+                        if (resolve)
+                                return getOp();
+                        return basicGetOp();
+                }
+                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__VALUE:
+                        setValue((Expression) newValue);
+                        return;
+                case SolverLanguagePackage.AGGREGATION__OP:
+                        setOp((Symbol) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.AGGREGATION__VALUE:
+                        setValue((Expression) null);
+                        return;
+                case SolverLanguagePackage.AGGREGATION__OP:
+                        setOp((Symbol) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.AGGREGATION__VALUE:
+                        return value != null;
+                case SolverLanguagePackage.AGGREGATION__OP:
+                        return op != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //AggregationImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AggregationOperatorImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AggregationOperatorImpl.java
new file mode 100644
index 00000000..6842754e
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AggregationOperatorImpl.java
@@ -0,0 +1,222 @@
+/**
+ */
+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.AggregationOperator;
+import org.eclipse.viatra.solver.language.solverLanguage.Datatype;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Aggregation Operator</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AggregationOperatorImpl#getArgumentType <em>Argument Type</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AggregationOperatorImpl#getResultType <em>Result Type</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class AggregationOperatorImpl extends SymbolImpl implements AggregationOperator {
+        /**
+         * The cached value of the '{@link #getArgumentType() <em>Argument Type</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getArgumentType()
+         * @generated
+         * @ordered
+         */
+        protected Datatype argumentType;
+
+        /**
+         * The cached value of the '{@link #getResultType() <em>Result Type</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getResultType()
+         * @generated
+         * @ordered
+         */
+        protected Datatype resultType;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected AggregationOperatorImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.AGGREGATION_OPERATOR;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Datatype getArgumentType() {
+                if (argumentType != null && argumentType.eIsProxy()) {
+                        InternalEObject oldArgumentType = (InternalEObject) argumentType;
+                        argumentType = (Datatype) eResolveProxy(oldArgumentType);
+                        if (argumentType != oldArgumentType) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+                                                        SolverLanguagePackage.AGGREGATION_OPERATOR__ARGUMENT_TYPE, oldArgumentType, argumentType));
+                        }
+                }
+                return argumentType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Datatype basicGetArgumentType() {
+                return argumentType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setArgumentType(Datatype newArgumentType) {
+                Datatype oldArgumentType = argumentType;
+                argumentType = newArgumentType;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.AGGREGATION_OPERATOR__ARGUMENT_TYPE, oldArgumentType, argumentType));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Datatype getResultType() {
+                if (resultType != null && resultType.eIsProxy()) {
+                        InternalEObject oldResultType = (InternalEObject) resultType;
+                        resultType = (Datatype) eResolveProxy(oldResultType);
+                        if (resultType != oldResultType) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+                                                        SolverLanguagePackage.AGGREGATION_OPERATOR__RESULT_TYPE, oldResultType, resultType));
+                        }
+                }
+                return resultType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Datatype basicGetResultType() {
+                return resultType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setResultType(Datatype newResultType) {
+                Datatype oldResultType = resultType;
+                resultType = newResultType;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.AGGREGATION_OPERATOR__RESULT_TYPE, oldResultType, resultType));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.AGGREGATION_OPERATOR__ARGUMENT_TYPE:
+                        if (resolve)
+                                return getArgumentType();
+                        return basicGetArgumentType();
+                case SolverLanguagePackage.AGGREGATION_OPERATOR__RESULT_TYPE:
+                        if (resolve)
+                                return getResultType();
+                        return basicGetResultType();
+                }
+                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_OPERATOR__ARGUMENT_TYPE:
+                        setArgumentType((Datatype) newValue);
+                        return;
+                case SolverLanguagePackage.AGGREGATION_OPERATOR__RESULT_TYPE:
+                        setResultType((Datatype) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.AGGREGATION_OPERATOR__ARGUMENT_TYPE:
+                        setArgumentType((Datatype) null);
+                        return;
+                case SolverLanguagePackage.AGGREGATION_OPERATOR__RESULT_TYPE:
+                        setResultType((Datatype) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.AGGREGATION_OPERATOR__ARGUMENT_TYPE:
+                        return argumentType != null;
+                case SolverLanguagePackage.AGGREGATION_OPERATOR__RESULT_TYPE:
+                        return resultType != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //AggregationOperatorImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ArgumentImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ArgumentImpl.java
new file mode 100644
index 00000000..c245d5aa
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ArgumentImpl.java
@@ -0,0 +1,39 @@
+/**
+ */
+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.Argument;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Argument</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class ArgumentImpl extends MinimalEObjectImpl.Container implements Argument {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ArgumentImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.ARGUMENT;
+        }
+
+} //ArgumentImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ArgumentListImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ArgumentListImpl.java
new file mode 100644
index 00000000..9d6cc468
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ArgumentListImpl.java
@@ -0,0 +1,153 @@
+/**
+ */
+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.impl.MinimalEObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.viatra.solver.language.solverLanguage.Argument;
+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>Argument List</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ArgumentListImpl#getArguments <em>Arguments</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ArgumentListImpl extends MinimalEObjectImpl.Container implements ArgumentList {
+        /**
+         * The cached value of the '{@link #getArguments() <em>Arguments</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getArguments()
+         * @generated
+         * @ordered
+         */
+        protected EList<Argument> arguments;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ArgumentListImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.ARGUMENT_LIST;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Argument> getArguments() {
+                if (arguments == null) {
+                        arguments = new EObjectContainmentEList<Argument>(Argument.class, this,
+                                        SolverLanguagePackage.ARGUMENT_LIST__ARGUMENTS);
+                }
+                return arguments;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.ARGUMENT_LIST__ARGUMENTS:
+                        return ((InternalEList<?>) getArguments()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.ARGUMENT_LIST__ARGUMENTS:
+                        return getArguments();
+                }
+                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.ARGUMENT_LIST__ARGUMENTS:
+                        getArguments().clear();
+                        getArguments().addAll((Collection<? extends Argument>) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.ARGUMENT_LIST__ARGUMENTS:
+                        getArguments().clear();
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.ARGUMENT_LIST__ARGUMENTS:
+                        return arguments != null && !arguments.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //ArgumentListImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AssertionImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AssertionImpl.java
new file mode 100644
index 00000000..8b4e2cde
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AssertionImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.viatra.solver.language.solverLanguage.Assertion;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Assertion</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class AssertionImpl extends AbstractAssertionImpl implements Assertion {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected AssertionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.ASSERTION;
+        }
+
+} //AssertionImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AttributeImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AttributeImpl.java
new file mode 100644
index 00000000..c9974907
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/AttributeImpl.java
@@ -0,0 +1,230 @@
+/**
+ */
+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.Attribute;
+import org.eclipse.viatra.solver.language.solverLanguage.AttributeKind;
+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>Attribute</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AttributeImpl#getTarget <em>Target</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.AttributeImpl#getKind <em>Kind</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class AttributeImpl extends StatementImpl implements Attribute {
+        /**
+         * The cached value of the '{@link #getTarget() <em>Target</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getTarget()
+         * @generated
+         * @ordered
+         */
+        protected Symbol target;
+
+        /**
+         * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getKind()
+         * @generated
+         * @ordered
+         */
+        protected static final AttributeKind KIND_EDEFAULT = AttributeKind.FUNCTIONAL;
+
+        /**
+         * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getKind()
+         * @generated
+         * @ordered
+         */
+        protected AttributeKind kind = KIND_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected AttributeImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.ATTRIBUTE;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol getTarget() {
+                if (target != null && target.eIsProxy()) {
+                        InternalEObject oldTarget = (InternalEObject) target;
+                        target = (Symbol) eResolveProxy(oldTarget);
+                        if (target != oldTarget) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, SolverLanguagePackage.ATTRIBUTE__TARGET,
+                                                        oldTarget, target));
+                        }
+                }
+                return target;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol basicGetTarget() {
+                return target;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setTarget(Symbol newTarget) {
+                Symbol oldTarget = target;
+                target = newTarget;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.ATTRIBUTE__TARGET, oldTarget,
+                                        target));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public AttributeKind getKind() {
+                return kind;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setKind(AttributeKind newKind) {
+                AttributeKind oldKind = kind;
+                kind = newKind == null ? KIND_EDEFAULT : newKind;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.ATTRIBUTE__KIND, oldKind,
+                                        kind));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.ATTRIBUTE__TARGET:
+                        if (resolve)
+                                return getTarget();
+                        return basicGetTarget();
+                case SolverLanguagePackage.ATTRIBUTE__KIND:
+                        return getKind();
+                }
+                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.ATTRIBUTE__TARGET:
+                        setTarget((Symbol) newValue);
+                        return;
+                case SolverLanguagePackage.ATTRIBUTE__KIND:
+                        setKind((AttributeKind) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.ATTRIBUTE__TARGET:
+                        setTarget((Symbol) null);
+                        return;
+                case SolverLanguagePackage.ATTRIBUTE__KIND:
+                        setKind(KIND_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.ATTRIBUTE__TARGET:
+                        return target != null;
+                case SolverLanguagePackage.ATTRIBUTE__KIND:
+                        return kind != KIND_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(" (kind: ");
+                result.append(kind);
+                result.append(')');
+                return result.toString();
+        }
+
+} //AttributeImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BaseRelationImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BaseRelationImpl.java
new file mode 100644
index 00000000..797b3a48
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BaseRelationImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.viatra.solver.language.solverLanguage.BaseRelation;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Base Relation</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class BaseRelationImpl extends RelationImpl implements BaseRelation {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected BaseRelationImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.BASE_RELATION;
+        }
+
+} //BaseRelationImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BinaryExpressionImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BinaryExpressionImpl.java
new file mode 100644
index 00000000..e93a12ce
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BinaryExpressionImpl.java
@@ -0,0 +1,326 @@
+/**
+ */
+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#getOp <em>Op</em>}</li>
+ *   <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#getRight <em>Right</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class BinaryExpressionImpl extends ExpressionImpl implements BinaryExpression {
+        /**
+         * 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.PLUS;
+
+        /**
+         * 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 #getLeft() <em>Left</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getLeft()
+         * @generated
+         * @ordered
+         */
+        protected Expression left;
+
+        /**
+         * 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
+         */
+        public BinaryOperator getOp() {
+                return op;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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
+         */
+        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
+         */
+        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
+         */
+        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
+         */
+        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__OP:
+                        return getOp();
+                case SolverLanguagePackage.BINARY_EXPRESSION__LEFT:
+                        return getLeft();
+                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__OP:
+                        setOp((BinaryOperator) newValue);
+                        return;
+                case SolverLanguagePackage.BINARY_EXPRESSION__LEFT:
+                        setLeft((Expression) 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__OP:
+                        setOp(OP_EDEFAULT);
+                        return;
+                case SolverLanguagePackage.BINARY_EXPRESSION__LEFT:
+                        setLeft((Expression) null);
+                        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__OP:
+                        return op != OP_EDEFAULT;
+                case SolverLanguagePackage.BINARY_EXPRESSION__LEFT:
+                        return left != null;
+                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.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BoundedMultiplicityImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BoundedMultiplicityImpl.java
new file mode 100644
index 00000000..c4aa7dfd
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BoundedMultiplicityImpl.java
@@ -0,0 +1,219 @@
+/**
+ */
+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
+         */
+        public int getLowerBound() {
+                return lowerBound;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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
+         */
+        public int getUpperBound() {
+                return upperBound;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BoundedScopeImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BoundedScopeImpl.java
new file mode 100644
index 00000000..acd63c55
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/BoundedScopeImpl.java
@@ -0,0 +1,219 @@
+/**
+ */
+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.BoundedScope;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Bounded Scope</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BoundedScopeImpl#getLowerBound <em>Lower Bound</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.BoundedScopeImpl#getUpperBound <em>Upper Bound</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class BoundedScopeImpl extends ScopeDeclarationImpl implements BoundedScope {
+        /**
+         * 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 BoundedScopeImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.BOUNDED_SCOPE;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public int getLowerBound() {
+                return lowerBound;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setLowerBound(int newLowerBound) {
+                int oldLowerBound = lowerBound;
+                lowerBound = newLowerBound;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.BOUNDED_SCOPE__LOWER_BOUND,
+                                        oldLowerBound, lowerBound));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public int getUpperBound() {
+                return upperBound;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setUpperBound(int newUpperBound) {
+                int oldUpperBound = upperBound;
+                upperBound = newUpperBound;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.BOUNDED_SCOPE__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__LOWER_BOUND:
+                        return getLowerBound();
+                case SolverLanguagePackage.BOUNDED_SCOPE__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__LOWER_BOUND:
+                        setLowerBound((Integer) newValue);
+                        return;
+                case SolverLanguagePackage.BOUNDED_SCOPE__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__LOWER_BOUND:
+                        setLowerBound(LOWER_BOUND_EDEFAULT);
+                        return;
+                case SolverLanguagePackage.BOUNDED_SCOPE__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__LOWER_BOUND:
+                        return lowerBound != LOWER_BOUND_EDEFAULT;
+                case SolverLanguagePackage.BOUNDED_SCOPE__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();
+        }
+
+} //BoundedScopeImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CallImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CallImpl.java
new file mode 100644
index 00000000..59c2a372
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CallImpl.java
@@ -0,0 +1,256 @@
+/**
+ */
+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>
+ * </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;
+
+        /**
+         * <!-- 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
+         */
+        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
+         */
+        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
+         */
+        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
+         */
+        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 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();
+                }
+                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;
+                }
+                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;
+                }
+                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;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //CallImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CaseImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CaseImpl.java
new file mode 100644
index 00000000..9c4d6820
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CaseImpl.java
@@ -0,0 +1,254 @@
+/**
+ */
+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
+         */
+        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
+         */
+        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
+         */
+        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
+         */
+        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.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CastExpressionImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CastExpressionImpl.java
new file mode 100644
index 00000000..66baf204
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CastExpressionImpl.java
@@ -0,0 +1,246 @@
+/**
+ */
+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.CastExpression;
+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>Cast Expression</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CastExpressionImpl#getBody <em>Body</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.CastExpressionImpl#getTargetType <em>Target Type</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CastExpressionImpl extends ExpressionImpl implements CastExpression {
+        /**
+         * 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 #getTargetType() <em>Target Type</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getTargetType()
+         * @generated
+         * @ordered
+         */
+        protected Symbol targetType;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected CastExpressionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.CAST_EXPRESSION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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.CAST_EXPRESSION__BODY, oldBody, newBody);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setBody(Expression newBody) {
+                if (newBody != body) {
+                        NotificationChain msgs = null;
+                        if (body != null)
+                                msgs = ((InternalEObject) body).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CAST_EXPRESSION__BODY, null, msgs);
+                        if (newBody != null)
+                                msgs = ((InternalEObject) newBody).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CAST_EXPRESSION__BODY, null, msgs);
+                        msgs = basicSetBody(newBody, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CAST_EXPRESSION__BODY, newBody,
+                                        newBody));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol getTargetType() {
+                if (targetType != null && targetType.eIsProxy()) {
+                        InternalEObject oldTargetType = (InternalEObject) targetType;
+                        targetType = (Symbol) eResolveProxy(oldTargetType);
+                        if (targetType != oldTargetType) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+                                                        SolverLanguagePackage.CAST_EXPRESSION__TARGET_TYPE, oldTargetType, targetType));
+                        }
+                }
+                return targetType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol basicGetTargetType() {
+                return targetType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setTargetType(Symbol newTargetType) {
+                Symbol oldTargetType = targetType;
+                targetType = newTargetType;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CAST_EXPRESSION__TARGET_TYPE,
+                                        oldTargetType, targetType));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.CAST_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.CAST_EXPRESSION__BODY:
+                        return getBody();
+                case SolverLanguagePackage.CAST_EXPRESSION__TARGET_TYPE:
+                        if (resolve)
+                                return getTargetType();
+                        return basicGetTargetType();
+                }
+                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.CAST_EXPRESSION__BODY:
+                        setBody((Expression) newValue);
+                        return;
+                case SolverLanguagePackage.CAST_EXPRESSION__TARGET_TYPE:
+                        setTargetType((Symbol) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.CAST_EXPRESSION__BODY:
+                        setBody((Expression) null);
+                        return;
+                case SolverLanguagePackage.CAST_EXPRESSION__TARGET_TYPE:
+                        setTargetType((Symbol) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.CAST_EXPRESSION__BODY:
+                        return body != null;
+                case SolverLanguagePackage.CAST_EXPRESSION__TARGET_TYPE:
+                        return targetType != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //CastExpressionImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ClassDeclarationImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ClassDeclarationImpl.java
new file mode 100644
index 00000000..a9bfeab7
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ClassDeclarationImpl.java
@@ -0,0 +1,371 @@
+/**
+ */
+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.EObjectResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.viatra.solver.language.solverLanguage.ClassDeclaration;
+import org.eclipse.viatra.solver.language.solverLanguage.Field;
+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>Class Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ClassDeclarationImpl#getFields <em>Fields</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ClassDeclarationImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ClassDeclarationImpl#isAbstract <em>Abstract</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ClassDeclarationImpl#getSupertypes <em>Supertypes</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ClassDeclarationImpl#isRoot <em>Root</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ClassDeclarationImpl extends StatementImpl implements ClassDeclaration {
+        /**
+         * The cached value of the '{@link #getFields() <em>Fields</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getFields()
+         * @generated
+         * @ordered
+         */
+        protected EList<Field> fields;
+
+        /**
+         * 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 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 #getSupertypes() <em>Supertypes</em>}' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getSupertypes()
+         * @generated
+         * @ordered
+         */
+        protected EList<Symbol> supertypes;
+
+        /**
+         * The default value of the '{@link #isRoot() <em>Root</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #isRoot()
+         * @generated
+         * @ordered
+         */
+        protected static final boolean ROOT_EDEFAULT = false;
+
+        /**
+         * The cached value of the '{@link #isRoot() <em>Root</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #isRoot()
+         * @generated
+         * @ordered
+         */
+        protected boolean root = ROOT_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ClassDeclarationImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.CLASS_DECLARATION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Field> getFields() {
+                if (fields == null) {
+                        fields = new EObjectContainmentEList<Field>(Field.class, this,
+                                        SolverLanguagePackage.CLASS_DECLARATION__FIELDS);
+                }
+                return fields;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getName() {
+                return name;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setName(String newName) {
+                String oldName = name;
+                name = newName;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CLASS_DECLARATION__NAME,
+                                        oldName, name));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public boolean isAbstract() {
+                return abstract_;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setAbstract(boolean newAbstract) {
+                boolean oldAbstract = abstract_;
+                abstract_ = newAbstract;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CLASS_DECLARATION__ABSTRACT,
+                                        oldAbstract, abstract_));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Symbol> getSupertypes() {
+                if (supertypes == null) {
+                        supertypes = new EObjectResolvingEList<Symbol>(Symbol.class, this,
+                                        SolverLanguagePackage.CLASS_DECLARATION__SUPERTYPES);
+                }
+                return supertypes;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public boolean isRoot() {
+                return root;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setRoot(boolean newRoot) {
+                boolean oldRoot = root;
+                root = newRoot;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CLASS_DECLARATION__ROOT,
+                                        oldRoot, root));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.CLASS_DECLARATION__FIELDS:
+                        return ((InternalEList<?>) getFields()).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_DECLARATION__FIELDS:
+                        return getFields();
+                case SolverLanguagePackage.CLASS_DECLARATION__NAME:
+                        return getName();
+                case SolverLanguagePackage.CLASS_DECLARATION__ABSTRACT:
+                        return isAbstract();
+                case SolverLanguagePackage.CLASS_DECLARATION__SUPERTYPES:
+                        return getSupertypes();
+                case SolverLanguagePackage.CLASS_DECLARATION__ROOT:
+                        return isRoot();
+                }
+                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_DECLARATION__FIELDS:
+                        getFields().clear();
+                        getFields().addAll((Collection<? extends Field>) newValue);
+                        return;
+                case SolverLanguagePackage.CLASS_DECLARATION__NAME:
+                        setName((String) newValue);
+                        return;
+                case SolverLanguagePackage.CLASS_DECLARATION__ABSTRACT:
+                        setAbstract((Boolean) newValue);
+                        return;
+                case SolverLanguagePackage.CLASS_DECLARATION__SUPERTYPES:
+                        getSupertypes().clear();
+                        getSupertypes().addAll((Collection<? extends Symbol>) newValue);
+                        return;
+                case SolverLanguagePackage.CLASS_DECLARATION__ROOT:
+                        setRoot((Boolean) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.CLASS_DECLARATION__FIELDS:
+                        getFields().clear();
+                        return;
+                case SolverLanguagePackage.CLASS_DECLARATION__NAME:
+                        setName(NAME_EDEFAULT);
+                        return;
+                case SolverLanguagePackage.CLASS_DECLARATION__ABSTRACT:
+                        setAbstract(ABSTRACT_EDEFAULT);
+                        return;
+                case SolverLanguagePackage.CLASS_DECLARATION__SUPERTYPES:
+                        getSupertypes().clear();
+                        return;
+                case SolverLanguagePackage.CLASS_DECLARATION__ROOT:
+                        setRoot(ROOT_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.CLASS_DECLARATION__FIELDS:
+                        return fields != null && !fields.isEmpty();
+                case SolverLanguagePackage.CLASS_DECLARATION__NAME:
+                        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+                case SolverLanguagePackage.CLASS_DECLARATION__ABSTRACT:
+                        return abstract_ != ABSTRACT_EDEFAULT;
+                case SolverLanguagePackage.CLASS_DECLARATION__SUPERTYPES:
+                        return supertypes != null && !supertypes.isEmpty();
+                case SolverLanguagePackage.CLASS_DECLARATION__ROOT:
+                        return root != ROOT_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(" (name: ");
+                result.append(name);
+                result.append(", abstract: ");
+                result.append(abstract_);
+                result.append(", root: ");
+                result.append(root);
+                result.append(')');
+                return result.toString();
+        }
+
+} //ClassDeclarationImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ConditionalExpressionImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ConditionalExpressionImpl.java
new file mode 100644
index 00000000..30d5c6c1
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ConditionalExpressionImpl.java
@@ -0,0 +1,328 @@
+/**
+ */
+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.ConditionalExpression;
+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>Conditional Expression</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ConditionalExpressionImpl#getCondition <em>Condition</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ConditionalExpressionImpl#getThen <em>Then</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ConditionalExpressionImpl#getElse <em>Else</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ConditionalExpressionImpl extends ExpressionImpl implements ConditionalExpression {
+        /**
+         * 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 ConditionalExpressionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.CONDITIONAL_EXPRESSION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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.CONDITIONAL_EXPRESSION__CONDITION, oldCondition, newCondition);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setCondition(Expression newCondition) {
+                if (newCondition != condition) {
+                        NotificationChain msgs = null;
+                        if (condition != null)
+                                msgs = ((InternalEObject) condition).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CONDITIONAL_EXPRESSION__CONDITION, null, msgs);
+                        if (newCondition != null)
+                                msgs = ((InternalEObject) newCondition).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CONDITIONAL_EXPRESSION__CONDITION, null, msgs);
+                        msgs = basicSetCondition(newCondition, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.CONDITIONAL_EXPRESSION__CONDITION, newCondition, newCondition));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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.CONDITIONAL_EXPRESSION__THEN, oldThen, newThen);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setThen(Expression newThen) {
+                if (newThen != then) {
+                        NotificationChain msgs = null;
+                        if (then != null)
+                                msgs = ((InternalEObject) then).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CONDITIONAL_EXPRESSION__THEN, null, msgs);
+                        if (newThen != null)
+                                msgs = ((InternalEObject) newThen).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CONDITIONAL_EXPRESSION__THEN, null, msgs);
+                        msgs = basicSetThen(newThen, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CONDITIONAL_EXPRESSION__THEN,
+                                        newThen, newThen));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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.CONDITIONAL_EXPRESSION__ELSE, oldElse, newElse);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setElse(Expression newElse) {
+                if (newElse != else_) {
+                        NotificationChain msgs = null;
+                        if (else_ != null)
+                                msgs = ((InternalEObject) else_).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CONDITIONAL_EXPRESSION__ELSE, null, msgs);
+                        if (newElse != null)
+                                msgs = ((InternalEObject) newElse).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.CONDITIONAL_EXPRESSION__ELSE, null, msgs);
+                        msgs = basicSetElse(newElse, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.CONDITIONAL_EXPRESSION__ELSE,
+                                        newElse, newElse));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.CONDITIONAL_EXPRESSION__CONDITION:
+                        return basicSetCondition(null, msgs);
+                case SolverLanguagePackage.CONDITIONAL_EXPRESSION__THEN:
+                        return basicSetThen(null, msgs);
+                case SolverLanguagePackage.CONDITIONAL_EXPRESSION__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.CONDITIONAL_EXPRESSION__CONDITION:
+                        return getCondition();
+                case SolverLanguagePackage.CONDITIONAL_EXPRESSION__THEN:
+                        return getThen();
+                case SolverLanguagePackage.CONDITIONAL_EXPRESSION__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.CONDITIONAL_EXPRESSION__CONDITION:
+                        setCondition((Expression) newValue);
+                        return;
+                case SolverLanguagePackage.CONDITIONAL_EXPRESSION__THEN:
+                        setThen((Expression) newValue);
+                        return;
+                case SolverLanguagePackage.CONDITIONAL_EXPRESSION__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.CONDITIONAL_EXPRESSION__CONDITION:
+                        setCondition((Expression) null);
+                        return;
+                case SolverLanguagePackage.CONDITIONAL_EXPRESSION__THEN:
+                        setThen((Expression) null);
+                        return;
+                case SolverLanguagePackage.CONDITIONAL_EXPRESSION__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.CONDITIONAL_EXPRESSION__CONDITION:
+                        return condition != null;
+                case SolverLanguagePackage.CONDITIONAL_EXPRESSION__THEN:
+                        return then != null;
+                case SolverLanguagePackage.CONDITIONAL_EXPRESSION__ELSE:
+                        return else_ != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //ConditionalExpressionImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ConjunctionImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ConjunctionImpl.java
new file mode 100644
index 00000000..6ac60dc1
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ConjunctionImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.viatra.solver.language.solverLanguage.Conjunction;
+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 -->
+ *
+ * @generated
+ */
+public class ConjunctionImpl extends MultiaryExpessionImpl implements Conjunction {
+        /**
+         * <!-- 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;
+        }
+
+} //ConjunctionImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CountImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CountImpl.java
new file mode 100644
index 00000000..b4a870c7
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/CountImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.viatra.solver.language.solverLanguage.Count;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Count</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CountImpl extends AggregateExpressionImpl implements Count {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected CountImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.COUNT;
+        }
+
+} //CountImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DatatypeImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DatatypeImpl.java
new file mode 100644
index 00000000..eeb6a1d4
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DatatypeImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.viatra.solver.language.solverLanguage.Datatype;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Datatype</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class DatatypeImpl extends RelationImpl implements Datatype {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected DatatypeImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.DATATYPE;
+        }
+
+} //DatatypeImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DefaultAssertionImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DefaultAssertionImpl.java
new file mode 100644
index 00000000..52d5240c
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DefaultAssertionImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.viatra.solver.language.solverLanguage.DefaultAssertion;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Default Assertion</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class DefaultAssertionImpl extends AbstractAssertionImpl implements DefaultAssertion {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected DefaultAssertionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.DEFAULT_ASSERTION;
+        }
+
+} //DefaultAssertionImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DisjunctionImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DisjunctionImpl.java
new file mode 100644
index 00000000..a13a92f5
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/DisjunctionImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.viatra.solver.language.solverLanguage.Disjunction;
+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 -->
+ *
+ * @generated
+ */
+public class DisjunctionImpl extends MultiaryExpessionImpl implements Disjunction {
+        /**
+         * <!-- 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;
+        }
+
+} //DisjunctionImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/EmptyLiteralImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/EmptyLiteralImpl.java
new file mode 100644
index 00000000..b5dc7e54
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/EmptyLiteralImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.viatra.solver.language.solverLanguage.EmptyLiteral;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Empty Literal</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class EmptyLiteralImpl extends LiteralImpl implements EmptyLiteral {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected EmptyLiteralImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.EMPTY_LITERAL;
+        }
+
+} //EmptyLiteralImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/EnumDeclarationImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/EnumDeclarationImpl.java
new file mode 100644
index 00000000..1ddcc2f1
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/EnumDeclarationImpl.java
@@ -0,0 +1,224 @@
+/**
+ */
+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.EnumDeclaration;
+import org.eclipse.viatra.solver.language.solverLanguage.EnumLiteral;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Enum Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.EnumDeclarationImpl#getLiterals <em>Literals</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.EnumDeclarationImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class EnumDeclarationImpl extends StatementImpl implements EnumDeclaration {
+        /**
+         * The cached value of the '{@link #getLiterals() <em>Literals</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getLiterals()
+         * @generated
+         * @ordered
+         */
+        protected EList<EnumLiteral> literals;
+
+        /**
+         * 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 EnumDeclarationImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.ENUM_DECLARATION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<EnumLiteral> getLiterals() {
+                if (literals == null) {
+                        literals = new EObjectContainmentEList<EnumLiteral>(EnumLiteral.class, this,
+                                        SolverLanguagePackage.ENUM_DECLARATION__LITERALS);
+                }
+                return literals;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getName() {
+                return name;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setName(String newName) {
+                String oldName = name;
+                name = newName;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.ENUM_DECLARATION__NAME, oldName,
+                                        name));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.ENUM_DECLARATION__LITERALS:
+                        return ((InternalEList<?>) getLiterals()).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_DECLARATION__LITERALS:
+                        return getLiterals();
+                case SolverLanguagePackage.ENUM_DECLARATION__NAME:
+                        return getName();
+                }
+                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_DECLARATION__LITERALS:
+                        getLiterals().clear();
+                        getLiterals().addAll((Collection<? extends EnumLiteral>) newValue);
+                        return;
+                case SolverLanguagePackage.ENUM_DECLARATION__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.ENUM_DECLARATION__LITERALS:
+                        getLiterals().clear();
+                        return;
+                case SolverLanguagePackage.ENUM_DECLARATION__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.ENUM_DECLARATION__LITERALS:
+                        return literals != null && !literals.isEmpty();
+                case SolverLanguagePackage.ENUM_DECLARATION__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();
+        }
+
+} //EnumDeclarationImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/EnumLiteralImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/EnumLiteralImpl.java
new file mode 100644
index 00000000..5b7f9cb1
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/EnumLiteralImpl.java
@@ -0,0 +1,165 @@
+/**
+ */
+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.EnumLiteral;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Enum Literal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.EnumLiteralImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class EnumLiteralImpl extends MinimalEObjectImpl.Container implements EnumLiteral {
+        /**
+         * 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 EnumLiteralImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.ENUM_LITERAL;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getName() {
+                return name;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setName(String newName) {
+                String oldName = name;
+                name = newName;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.ENUM_LITERAL__NAME, oldName,
+                                        name));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.ENUM_LITERAL__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.ENUM_LITERAL__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.ENUM_LITERAL__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.ENUM_LITERAL__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();
+        }
+
+} //EnumLiteralImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExactMultiplicityImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExactMultiplicityImpl.java
new file mode 100644
index 00000000..f981aede
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExactMultiplicityImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+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.ExactMultiplicity;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * 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.ExactMultiplicityImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ExactMultiplicityImpl extends MultiplicityImpl implements ExactMultiplicity {
+        /**
+         * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected static final int VALUE_EDEFAULT = 0;
+
+        /**
+         * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected int value = VALUE_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ExactMultiplicityImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.EXACT_MULTIPLICITY;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public int getValue() {
+                return value;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setValue(int newValue) {
+                int oldValue = value;
+                value = newValue;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.EXACT_MULTIPLICITY__VALUE,
+                                        oldValue, value));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXACT_MULTIPLICITY__VALUE:
+                        return getValue();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXACT_MULTIPLICITY__VALUE:
+                        setValue((Integer) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXACT_MULTIPLICITY__VALUE:
+                        setValue(VALUE_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXACT_MULTIPLICITY__VALUE:
+                        return value != VALUE_EDEFAULT;
+                }
+                return super.eIsSet(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy())
+                        return super.toString();
+
+                StringBuilder result = new StringBuilder(super.toString());
+                result.append(" (value: ");
+                result.append(value);
+                result.append(')');
+                return result.toString();
+        }
+
+} //ExactMultiplicityImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExactScopeImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExactScopeImpl.java
new file mode 100644
index 00000000..80b06171
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExactScopeImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+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.ExactScope;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Exact Scope</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExactScopeImpl#getSize <em>Size</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ExactScopeImpl extends ScopeDeclarationImpl implements ExactScope {
+        /**
+         * The default value of the '{@link #getSize() <em>Size</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getSize()
+         * @generated
+         * @ordered
+         */
+        protected static final int SIZE_EDEFAULT = 0;
+
+        /**
+         * The cached value of the '{@link #getSize() <em>Size</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getSize()
+         * @generated
+         * @ordered
+         */
+        protected int size = SIZE_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ExactScopeImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.EXACT_SCOPE;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public int getSize() {
+                return size;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setSize(int newSize) {
+                int oldSize = size;
+                size = newSize;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.EXACT_SCOPE__SIZE, oldSize,
+                                        size));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXACT_SCOPE__SIZE:
+                        return getSize();
+                }
+                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.EXACT_SCOPE__SIZE:
+                        setSize((Integer) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXACT_SCOPE__SIZE:
+                        setSize(SIZE_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXACT_SCOPE__SIZE:
+                        return size != SIZE_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(" (size: ");
+                result.append(size);
+                result.append(')');
+                return result.toString();
+        }
+
+} //ExactScopeImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExpressionArgumentImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExpressionArgumentImpl.java
new file mode 100644
index 00000000..7e84a49a
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExpressionArgumentImpl.java
@@ -0,0 +1,182 @@
+/**
+ */
+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.ExpressionArgument;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * 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.ExpressionArgumentImpl#getExpression <em>Expression</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ExpressionArgumentImpl extends ArgumentImpl implements ExpressionArgument {
+        /**
+         * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getExpression()
+         * @generated
+         * @ordered
+         */
+        protected Expression expression;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ExpressionArgumentImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.EXPRESSION_ARGUMENT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Expression getExpression() {
+                return expression;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetExpression(Expression newExpression, NotificationChain msgs) {
+                Expression oldExpression = expression;
+                expression = newExpression;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.EXPRESSION_ARGUMENT__EXPRESSION, oldExpression, newExpression);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setExpression(Expression newExpression) {
+                if (newExpression != expression) {
+                        NotificationChain msgs = null;
+                        if (expression != null)
+                                msgs = ((InternalEObject) expression).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.EXPRESSION_ARGUMENT__EXPRESSION, null, msgs);
+                        if (newExpression != null)
+                                msgs = ((InternalEObject) newExpression).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.EXPRESSION_ARGUMENT__EXPRESSION, null, msgs);
+                        msgs = basicSetExpression(newExpression, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.EXPRESSION_ARGUMENT__EXPRESSION,
+                                        newExpression, newExpression));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXPRESSION_ARGUMENT__EXPRESSION:
+                        return basicSetExpression(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.EXPRESSION_ARGUMENT__EXPRESSION:
+                        return getExpression();
+                }
+                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.EXPRESSION_ARGUMENT__EXPRESSION:
+                        setExpression((Expression) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXPRESSION_ARGUMENT__EXPRESSION:
+                        setExpression((Expression) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXPRESSION_ARGUMENT__EXPRESSION:
+                        return expression != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //ExpressionArgumentImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExpressionImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExpressionImpl.java
new file mode 100644
index 00000000..0b917b30
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExpressionImpl.java
@@ -0,0 +1,151 @@
+/**
+ */
+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.Expression;
+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>Expression</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExpressionImpl#getExistsVariables <em>Exists Variables</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class ExpressionImpl extends StatementImpl implements Expression {
+        /**
+         * The cached value of the '{@link #getExistsVariables() <em>Exists Variables</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getExistsVariables()
+         * @generated
+         * @ordered
+         */
+        protected EList<Variable> existsVariables;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ExpressionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.EXPRESSION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Variable> getExistsVariables() {
+                if (existsVariables == null) {
+                        existsVariables = new EObjectContainmentEList<Variable>(Variable.class, this,
+                                        SolverLanguagePackage.EXPRESSION__EXISTS_VARIABLES);
+                }
+                return existsVariables;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXPRESSION__EXISTS_VARIABLES:
+                        return ((InternalEList<?>) getExistsVariables()).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.EXPRESSION__EXISTS_VARIABLES:
+                        return getExistsVariables();
+                }
+                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.EXPRESSION__EXISTS_VARIABLES:
+                        getExistsVariables().clear();
+                        getExistsVariables().addAll((Collection<? extends Variable>) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXPRESSION__EXISTS_VARIABLES:
+                        getExistsVariables().clear();
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXPRESSION__EXISTS_VARIABLES:
+                        return existsVariables != null && !existsVariables.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //ExpressionImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternAggregationOperatorDeclarationImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternAggregationOperatorDeclarationImpl.java
new file mode 100644
index 00000000..f3a34f73
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternAggregationOperatorDeclarationImpl.java
@@ -0,0 +1,227 @@
+/**
+ */
+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.ExternAggregationOperatorDeclaration;
+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>Extern Aggregation Operator Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExternAggregationOperatorDeclarationImpl#getArgumentType <em>Argument Type</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExternAggregationOperatorDeclarationImpl#getResultType <em>Result Type</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ExternAggregationOperatorDeclarationImpl extends ExternDeclarationImpl
+                implements ExternAggregationOperatorDeclaration {
+        /**
+         * The cached value of the '{@link #getArgumentType() <em>Argument Type</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getArgumentType()
+         * @generated
+         * @ordered
+         */
+        protected Symbol argumentType;
+
+        /**
+         * The cached value of the '{@link #getResultType() <em>Result Type</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getResultType()
+         * @generated
+         * @ordered
+         */
+        protected Symbol resultType;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ExternAggregationOperatorDeclarationImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.EXTERN_AGGREGATION_OPERATOR_DECLARATION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol getArgumentType() {
+                if (argumentType != null && argumentType.eIsProxy()) {
+                        InternalEObject oldArgumentType = (InternalEObject) argumentType;
+                        argumentType = (Symbol) eResolveProxy(oldArgumentType);
+                        if (argumentType != oldArgumentType) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+                                                        SolverLanguagePackage.EXTERN_AGGREGATION_OPERATOR_DECLARATION__ARGUMENT_TYPE,
+                                                        oldArgumentType, argumentType));
+                        }
+                }
+                return argumentType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol basicGetArgumentType() {
+                return argumentType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setArgumentType(Symbol newArgumentType) {
+                Symbol oldArgumentType = argumentType;
+                argumentType = newArgumentType;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.EXTERN_AGGREGATION_OPERATOR_DECLARATION__ARGUMENT_TYPE, oldArgumentType,
+                                        argumentType));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol getResultType() {
+                if (resultType != null && resultType.eIsProxy()) {
+                        InternalEObject oldResultType = (InternalEObject) resultType;
+                        resultType = (Symbol) eResolveProxy(oldResultType);
+                        if (resultType != oldResultType) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+                                                        SolverLanguagePackage.EXTERN_AGGREGATION_OPERATOR_DECLARATION__RESULT_TYPE, oldResultType,
+                                                        resultType));
+                        }
+                }
+                return resultType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol basicGetResultType() {
+                return resultType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setResultType(Symbol newResultType) {
+                Symbol oldResultType = resultType;
+                resultType = newResultType;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.EXTERN_AGGREGATION_OPERATOR_DECLARATION__RESULT_TYPE, oldResultType,
+                                        resultType));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXTERN_AGGREGATION_OPERATOR_DECLARATION__ARGUMENT_TYPE:
+                        if (resolve)
+                                return getArgumentType();
+                        return basicGetArgumentType();
+                case SolverLanguagePackage.EXTERN_AGGREGATION_OPERATOR_DECLARATION__RESULT_TYPE:
+                        if (resolve)
+                                return getResultType();
+                        return basicGetResultType();
+                }
+                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_AGGREGATION_OPERATOR_DECLARATION__ARGUMENT_TYPE:
+                        setArgumentType((Symbol) newValue);
+                        return;
+                case SolverLanguagePackage.EXTERN_AGGREGATION_OPERATOR_DECLARATION__RESULT_TYPE:
+                        setResultType((Symbol) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXTERN_AGGREGATION_OPERATOR_DECLARATION__ARGUMENT_TYPE:
+                        setArgumentType((Symbol) null);
+                        return;
+                case SolverLanguagePackage.EXTERN_AGGREGATION_OPERATOR_DECLARATION__RESULT_TYPE:
+                        setResultType((Symbol) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXTERN_AGGREGATION_OPERATOR_DECLARATION__ARGUMENT_TYPE:
+                        return argumentType != null;
+                case SolverLanguagePackage.EXTERN_AGGREGATION_OPERATOR_DECLARATION__RESULT_TYPE:
+                        return resultType != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //ExternAggregationOperatorDeclarationImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternDatatypeDeclarationImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternDatatypeDeclarationImpl.java
new file mode 100644
index 00000000..f2411a6b
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternDatatypeDeclarationImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.viatra.solver.language.solverLanguage.ExternDatatypeDeclaration;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Extern Datatype Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ExternDatatypeDeclarationImpl extends ExternDeclarationImpl implements ExternDatatypeDeclaration {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ExternDatatypeDeclarationImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.EXTERN_DATATYPE_DECLARATION;
+        }
+
+} //ExternDatatypeDeclarationImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternDeclarationImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternDeclarationImpl.java
new file mode 100644
index 00000000..4086decd
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternDeclarationImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+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.ExternDeclaration;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Extern Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExternDeclarationImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class ExternDeclarationImpl extends StatementImpl implements ExternDeclaration {
+        /**
+         * 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 ExternDeclarationImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.EXTERN_DECLARATION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getName() {
+                return name;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setName(String newName) {
+                String oldName = name;
+                name = newName;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.EXTERN_DECLARATION__NAME,
+                                        oldName, name));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXTERN_DECLARATION__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.EXTERN_DECLARATION__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.EXTERN_DECLARATION__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.EXTERN_DECLARATION__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();
+        }
+
+} //ExternDeclarationImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternFunctionDeclarationImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternFunctionDeclarationImpl.java
new file mode 100644
index 00000000..83ec9f13
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternFunctionDeclarationImpl.java
@@ -0,0 +1,159 @@
+/**
+ */
+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.ExternFunctionDeclaration;
+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>Extern Function Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExternFunctionDeclarationImpl#getResultType <em>Result Type</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ExternFunctionDeclarationImpl extends ExternFunctorDeclarationImpl implements ExternFunctionDeclaration {
+        /**
+         * The cached value of the '{@link #getResultType() <em>Result Type</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getResultType()
+         * @generated
+         * @ordered
+         */
+        protected Symbol resultType;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ExternFunctionDeclarationImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.EXTERN_FUNCTION_DECLARATION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol getResultType() {
+                if (resultType != null && resultType.eIsProxy()) {
+                        InternalEObject oldResultType = (InternalEObject) resultType;
+                        resultType = (Symbol) eResolveProxy(oldResultType);
+                        if (resultType != oldResultType) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+                                                        SolverLanguagePackage.EXTERN_FUNCTION_DECLARATION__RESULT_TYPE, oldResultType, resultType));
+                        }
+                }
+                return resultType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol basicGetResultType() {
+                return resultType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setResultType(Symbol newResultType) {
+                Symbol oldResultType = resultType;
+                resultType = newResultType;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.EXTERN_FUNCTION_DECLARATION__RESULT_TYPE, oldResultType, resultType));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXTERN_FUNCTION_DECLARATION__RESULT_TYPE:
+                        if (resolve)
+                                return getResultType();
+                        return basicGetResultType();
+                }
+                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_FUNCTION_DECLARATION__RESULT_TYPE:
+                        setResultType((Symbol) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXTERN_FUNCTION_DECLARATION__RESULT_TYPE:
+                        setResultType((Symbol) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXTERN_FUNCTION_DECLARATION__RESULT_TYPE:
+                        return resultType != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //ExternFunctionDeclarationImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternFunctorDeclarationImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternFunctorDeclarationImpl.java
new file mode 100644
index 00000000..f3c58b99
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternFunctorDeclarationImpl.java
@@ -0,0 +1,184 @@
+/**
+ */
+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.ExternFunctorDeclaration;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Extern Functor Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExternFunctorDeclarationImpl#getArgumentList <em>Argument List</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class ExternFunctorDeclarationImpl extends ExternDeclarationImpl implements ExternFunctorDeclaration {
+        /**
+         * 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;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ExternFunctorDeclarationImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.EXTERN_FUNCTOR_DECLARATION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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.EXTERN_FUNCTOR_DECLARATION__ARGUMENT_LIST, oldArgumentList, newArgumentList);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setArgumentList(ArgumentList newArgumentList) {
+                if (newArgumentList != argumentList) {
+                        NotificationChain msgs = null;
+                        if (argumentList != null)
+                                msgs = ((InternalEObject) argumentList).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.EXTERN_FUNCTOR_DECLARATION__ARGUMENT_LIST, null,
+                                                msgs);
+                        if (newArgumentList != null)
+                                msgs = ((InternalEObject) newArgumentList).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.EXTERN_FUNCTOR_DECLARATION__ARGUMENT_LIST, null,
+                                                msgs);
+                        msgs = basicSetArgumentList(newArgumentList, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.EXTERN_FUNCTOR_DECLARATION__ARGUMENT_LIST, newArgumentList, newArgumentList));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXTERN_FUNCTOR_DECLARATION__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.EXTERN_FUNCTOR_DECLARATION__ARGUMENT_LIST:
+                        return getArgumentList();
+                }
+                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_FUNCTOR_DECLARATION__ARGUMENT_LIST:
+                        setArgumentList((ArgumentList) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXTERN_FUNCTOR_DECLARATION__ARGUMENT_LIST:
+                        setArgumentList((ArgumentList) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXTERN_FUNCTOR_DECLARATION__ARGUMENT_LIST:
+                        return argumentList != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //ExternFunctorDeclarationImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternPredicateDeclarationImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternPredicateDeclarationImpl.java
new file mode 100644
index 00000000..fa6646bf
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ExternPredicateDeclarationImpl.java
@@ -0,0 +1,260 @@
+/**
+ */
+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.ExternPredicateDeclaration;
+import org.eclipse.viatra.solver.language.solverLanguage.InlinePredicateAttrributes;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Extern Predicate Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExternPredicateDeclarationImpl#isError <em>Error</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ExternPredicateDeclarationImpl#isFunctional <em>Functional</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ExternPredicateDeclarationImpl extends ExternFunctorDeclarationImpl implements ExternPredicateDeclaration {
+        /**
+         * 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;
+
+        /**
+         * 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;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ExternPredicateDeclarationImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.EXTERN_PREDICATE_DECLARATION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public boolean isError() {
+                return error;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setError(boolean newError) {
+                boolean oldError = error;
+                error = newError;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.EXTERN_PREDICATE_DECLARATION__ERROR, oldError, error));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public boolean isFunctional() {
+                return functional;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setFunctional(boolean newFunctional) {
+                boolean oldFunctional = functional;
+                functional = newFunctional;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.EXTERN_PREDICATE_DECLARATION__FUNCTIONAL, oldFunctional, functional));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXTERN_PREDICATE_DECLARATION__ERROR:
+                        return isError();
+                case SolverLanguagePackage.EXTERN_PREDICATE_DECLARATION__FUNCTIONAL:
+                        return isFunctional();
+                }
+                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_PREDICATE_DECLARATION__ERROR:
+                        setError((Boolean) newValue);
+                        return;
+                case SolverLanguagePackage.EXTERN_PREDICATE_DECLARATION__FUNCTIONAL:
+                        setFunctional((Boolean) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXTERN_PREDICATE_DECLARATION__ERROR:
+                        setError(ERROR_EDEFAULT);
+                        return;
+                case SolverLanguagePackage.EXTERN_PREDICATE_DECLARATION__FUNCTIONAL:
+                        setFunctional(FUNCTIONAL_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.EXTERN_PREDICATE_DECLARATION__ERROR:
+                        return error != ERROR_EDEFAULT;
+                case SolverLanguagePackage.EXTERN_PREDICATE_DECLARATION__FUNCTIONAL:
+                        return functional != FUNCTIONAL_EDEFAULT;
+                }
+                return super.eIsSet(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+                if (baseClass == InlinePredicateAttrributes.class) {
+                        switch (derivedFeatureID) {
+                        case SolverLanguagePackage.EXTERN_PREDICATE_DECLARATION__ERROR:
+                                return SolverLanguagePackage.INLINE_PREDICATE_ATTRRIBUTES__ERROR;
+                        case SolverLanguagePackage.EXTERN_PREDICATE_DECLARATION__FUNCTIONAL:
+                                return SolverLanguagePackage.INLINE_PREDICATE_ATTRRIBUTES__FUNCTIONAL;
+                        default:
+                                return -1;
+                        }
+                }
+                return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+                if (baseClass == InlinePredicateAttrributes.class) {
+                        switch (baseFeatureID) {
+                        case SolverLanguagePackage.INLINE_PREDICATE_ATTRRIBUTES__ERROR:
+                                return SolverLanguagePackage.EXTERN_PREDICATE_DECLARATION__ERROR;
+                        case SolverLanguagePackage.INLINE_PREDICATE_ATTRRIBUTES__FUNCTIONAL:
+                                return SolverLanguagePackage.EXTERN_PREDICATE_DECLARATION__FUNCTIONAL;
+                        default:
+                                return -1;
+                        }
+                }
+                return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy())
+                        return super.toString();
+
+                StringBuilder result = new StringBuilder(super.toString());
+                result.append(" (error: ");
+                result.append(error);
+                result.append(", functional: ");
+                result.append(functional);
+                result.append(')');
+                return result.toString();
+        }
+
+} //ExternPredicateDeclarationImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FieldImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FieldImpl.java
new file mode 100644
index 00000000..20fc50b9
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FieldImpl.java
@@ -0,0 +1,488 @@
+/**
+ */
+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.Field;
+import org.eclipse.viatra.solver.language.solverLanguage.Multiplicity;
+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</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FieldImpl#isContainment <em>Containment</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FieldImpl#isCrossReference <em>Cross Reference</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FieldImpl#getOpposite <em>Opposite</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FieldImpl#getMultiplicity <em>Multiplicity</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FieldImpl#getType <em>Type</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FieldImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class FieldImpl extends MinimalEObjectImpl.Container implements Field {
+        /**
+         * 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 default value of the '{@link #isCrossReference() <em>Cross Reference</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #isCrossReference()
+         * @generated
+         * @ordered
+         */
+        protected static final boolean CROSS_REFERENCE_EDEFAULT = false;
+
+        /**
+         * The cached value of the '{@link #isCrossReference() <em>Cross Reference</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #isCrossReference()
+         * @generated
+         * @ordered
+         */
+        protected boolean crossReference = CROSS_REFERENCE_EDEFAULT;
+
+        /**
+         * The cached value of the '{@link #getOpposite() <em>Opposite</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getOpposite()
+         * @generated
+         * @ordered
+         */
+        protected Symbol opposite;
+
+        /**
+         * 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 cached value of the '{@link #getType() <em>Type</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getType()
+         * @generated
+         * @ordered
+         */
+        protected Symbol type;
+
+        /**
+         * 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 FieldImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.FIELD;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public boolean isContainment() {
+                return containment;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setContainment(boolean newContainment) {
+                boolean oldContainment = containment;
+                containment = newContainment;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.FIELD__CONTAINMENT,
+                                        oldContainment, containment));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public boolean isCrossReference() {
+                return crossReference;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setCrossReference(boolean newCrossReference) {
+                boolean oldCrossReference = crossReference;
+                crossReference = newCrossReference;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.FIELD__CROSS_REFERENCE,
+                                        oldCrossReference, crossReference));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol getOpposite() {
+                if (opposite != null && opposite.eIsProxy()) {
+                        InternalEObject oldOpposite = (InternalEObject) opposite;
+                        opposite = (Symbol) eResolveProxy(oldOpposite);
+                        if (opposite != oldOpposite) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, SolverLanguagePackage.FIELD__OPPOSITE,
+                                                        oldOpposite, opposite));
+                        }
+                }
+                return opposite;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol basicGetOpposite() {
+                return opposite;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setOpposite(Symbol newOpposite) {
+                Symbol oldOpposite = opposite;
+                opposite = newOpposite;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.FIELD__OPPOSITE, oldOpposite,
+                                        opposite));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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.FIELD__MULTIPLICITY, oldMultiplicity, newMultiplicity);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setMultiplicity(Multiplicity newMultiplicity) {
+                if (newMultiplicity != multiplicity) {
+                        NotificationChain msgs = null;
+                        if (multiplicity != null)
+                                msgs = ((InternalEObject) multiplicity).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.FIELD__MULTIPLICITY, null, msgs);
+                        if (newMultiplicity != null)
+                                msgs = ((InternalEObject) newMultiplicity).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.FIELD__MULTIPLICITY, null, msgs);
+                        msgs = basicSetMultiplicity(newMultiplicity, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.FIELD__MULTIPLICITY,
+                                        newMultiplicity, newMultiplicity));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol getType() {
+                if (type != null && type.eIsProxy()) {
+                        InternalEObject oldType = (InternalEObject) type;
+                        type = (Symbol) eResolveProxy(oldType);
+                        if (type != oldType) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, SolverLanguagePackage.FIELD__TYPE,
+                                                        oldType, type));
+                        }
+                }
+                return type;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol basicGetType() {
+                return type;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setType(Symbol newType) {
+                Symbol oldType = type;
+                type = newType;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.FIELD__TYPE, oldType, type));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getName() {
+                return name;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setName(String newName) {
+                String oldName = name;
+                name = newName;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.FIELD__NAME, oldName, name));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.FIELD__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.FIELD__CONTAINMENT:
+                        return isContainment();
+                case SolverLanguagePackage.FIELD__CROSS_REFERENCE:
+                        return isCrossReference();
+                case SolverLanguagePackage.FIELD__OPPOSITE:
+                        if (resolve)
+                                return getOpposite();
+                        return basicGetOpposite();
+                case SolverLanguagePackage.FIELD__MULTIPLICITY:
+                        return getMultiplicity();
+                case SolverLanguagePackage.FIELD__TYPE:
+                        if (resolve)
+                                return getType();
+                        return basicGetType();
+                case SolverLanguagePackage.FIELD__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.FIELD__CONTAINMENT:
+                        setContainment((Boolean) newValue);
+                        return;
+                case SolverLanguagePackage.FIELD__CROSS_REFERENCE:
+                        setCrossReference((Boolean) newValue);
+                        return;
+                case SolverLanguagePackage.FIELD__OPPOSITE:
+                        setOpposite((Symbol) newValue);
+                        return;
+                case SolverLanguagePackage.FIELD__MULTIPLICITY:
+                        setMultiplicity((Multiplicity) newValue);
+                        return;
+                case SolverLanguagePackage.FIELD__TYPE:
+                        setType((Symbol) newValue);
+                        return;
+                case SolverLanguagePackage.FIELD__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.FIELD__CONTAINMENT:
+                        setContainment(CONTAINMENT_EDEFAULT);
+                        return;
+                case SolverLanguagePackage.FIELD__CROSS_REFERENCE:
+                        setCrossReference(CROSS_REFERENCE_EDEFAULT);
+                        return;
+                case SolverLanguagePackage.FIELD__OPPOSITE:
+                        setOpposite((Symbol) null);
+                        return;
+                case SolverLanguagePackage.FIELD__MULTIPLICITY:
+                        setMultiplicity((Multiplicity) null);
+                        return;
+                case SolverLanguagePackage.FIELD__TYPE:
+                        setType((Symbol) null);
+                        return;
+                case SolverLanguagePackage.FIELD__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.FIELD__CONTAINMENT:
+                        return containment != CONTAINMENT_EDEFAULT;
+                case SolverLanguagePackage.FIELD__CROSS_REFERENCE:
+                        return crossReference != CROSS_REFERENCE_EDEFAULT;
+                case SolverLanguagePackage.FIELD__OPPOSITE:
+                        return opposite != null;
+                case SolverLanguagePackage.FIELD__MULTIPLICITY:
+                        return multiplicity != null;
+                case SolverLanguagePackage.FIELD__TYPE:
+                        return type != null;
+                case SolverLanguagePackage.FIELD__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(" (containment: ");
+                result.append(containment);
+                result.append(", crossReference: ");
+                result.append(crossReference);
+                result.append(", name: ");
+                result.append(name);
+                result.append(')');
+                return result.toString();
+        }
+
+} //FieldImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ForallImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ForallImpl.java
new file mode 100644
index 00000000..0007f67f
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ForallImpl.java
@@ -0,0 +1,182 @@
+/**
+ */
+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.Forall;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Forall</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ForallImpl#getBody <em>Body</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ForallImpl extends AggregateExpressionImpl implements Forall {
+        /**
+         * 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 ForallImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.FORALL;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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.FORALL__BODY, oldBody, newBody);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setBody(Expression newBody) {
+                if (newBody != body) {
+                        NotificationChain msgs = null;
+                        if (body != null)
+                                msgs = ((InternalEObject) body).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.FORALL__BODY, null, msgs);
+                        if (newBody != null)
+                                msgs = ((InternalEObject) newBody).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.FORALL__BODY, null, msgs);
+                        msgs = basicSetBody(newBody, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.FORALL__BODY, newBody,
+                                        newBody));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.FORALL__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.FORALL__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.FORALL__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.FORALL__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.FORALL__BODY:
+                        return body != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //ForallImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FunctionDefinitionImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FunctionDefinitionImpl.java
new file mode 100644
index 00000000..9fa59d1c
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FunctionDefinitionImpl.java
@@ -0,0 +1,159 @@
+/**
+ */
+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.FunctionDefinition;
+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>Function Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FunctionDefinitionImpl#getResultType <em>Result Type</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class FunctionDefinitionImpl extends FunctorDefinitonImpl implements FunctionDefinition {
+        /**
+         * The cached value of the '{@link #getResultType() <em>Result Type</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getResultType()
+         * @generated
+         * @ordered
+         */
+        protected Symbol resultType;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected FunctionDefinitionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.FUNCTION_DEFINITION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol getResultType() {
+                if (resultType != null && resultType.eIsProxy()) {
+                        InternalEObject oldResultType = (InternalEObject) resultType;
+                        resultType = (Symbol) eResolveProxy(oldResultType);
+                        if (resultType != oldResultType) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+                                                        SolverLanguagePackage.FUNCTION_DEFINITION__RESULT_TYPE, oldResultType, resultType));
+                        }
+                }
+                return resultType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol basicGetResultType() {
+                return resultType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setResultType(Symbol newResultType) {
+                Symbol oldResultType = resultType;
+                resultType = newResultType;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.FUNCTION_DEFINITION__RESULT_TYPE, oldResultType, resultType));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.FUNCTION_DEFINITION__RESULT_TYPE:
+                        if (resolve)
+                                return getResultType();
+                        return basicGetResultType();
+                }
+                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.FUNCTION_DEFINITION__RESULT_TYPE:
+                        setResultType((Symbol) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.FUNCTION_DEFINITION__RESULT_TYPE:
+                        setResultType((Symbol) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.FUNCTION_DEFINITION__RESULT_TYPE:
+                        return resultType != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //FunctionDefinitionImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FunctionImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FunctionImpl.java
new file mode 100644
index 00000000..2a3e7e8b
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FunctionImpl.java
@@ -0,0 +1,159 @@
+/**
+ */
+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.Datatype;
+import org.eclipse.viatra.solver.language.solverLanguage.Function;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Function</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FunctionImpl#getResultType <em>Result Type</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class FunctionImpl extends FunctorImpl implements Function {
+        /**
+         * The cached value of the '{@link #getResultType() <em>Result Type</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getResultType()
+         * @generated
+         * @ordered
+         */
+        protected Datatype resultType;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected FunctionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.FUNCTION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Datatype getResultType() {
+                if (resultType != null && resultType.eIsProxy()) {
+                        InternalEObject oldResultType = (InternalEObject) resultType;
+                        resultType = (Datatype) eResolveProxy(oldResultType);
+                        if (resultType != oldResultType) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+                                                        SolverLanguagePackage.FUNCTION__RESULT_TYPE, oldResultType, resultType));
+                        }
+                }
+                return resultType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Datatype basicGetResultType() {
+                return resultType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setResultType(Datatype newResultType) {
+                Datatype oldResultType = resultType;
+                resultType = newResultType;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.FUNCTION__RESULT_TYPE,
+                                        oldResultType, resultType));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.FUNCTION__RESULT_TYPE:
+                        if (resolve)
+                                return getResultType();
+                        return basicGetResultType();
+                }
+                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.FUNCTION__RESULT_TYPE:
+                        setResultType((Datatype) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.FUNCTION__RESULT_TYPE:
+                        setResultType((Datatype) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.FUNCTION__RESULT_TYPE:
+                        return resultType != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //FunctionImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FunctorDefinitonImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FunctorDefinitonImpl.java
new file mode 100644
index 00000000..0dff447f
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FunctorDefinitonImpl.java
@@ -0,0 +1,255 @@
+/**
+ */
+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.FunctorDefiniton;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Functor Definiton</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FunctorDefinitonImpl#getHead <em>Head</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FunctorDefinitonImpl#getBody <em>Body</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class FunctorDefinitonImpl extends StatementImpl implements FunctorDefiniton {
+        /**
+         * 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;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected FunctorDefinitonImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.FUNCTOR_DEFINITON;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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.FUNCTOR_DEFINITON__HEAD, oldHead, newHead);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setHead(Expression newHead) {
+                if (newHead != head) {
+                        NotificationChain msgs = null;
+                        if (head != null)
+                                msgs = ((InternalEObject) head).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.FUNCTOR_DEFINITON__HEAD, null, msgs);
+                        if (newHead != null)
+                                msgs = ((InternalEObject) newHead).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.FUNCTOR_DEFINITON__HEAD, null, msgs);
+                        msgs = basicSetHead(newHead, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.FUNCTOR_DEFINITON__HEAD,
+                                        newHead, newHead));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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.FUNCTOR_DEFINITON__BODY, oldBody, newBody);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setBody(Expression newBody) {
+                if (newBody != body) {
+                        NotificationChain msgs = null;
+                        if (body != null)
+                                msgs = ((InternalEObject) body).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.FUNCTOR_DEFINITON__BODY, null, msgs);
+                        if (newBody != null)
+                                msgs = ((InternalEObject) newBody).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.FUNCTOR_DEFINITON__BODY, null, msgs);
+                        msgs = basicSetBody(newBody, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.FUNCTOR_DEFINITON__BODY,
+                                        newBody, newBody));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.FUNCTOR_DEFINITON__HEAD:
+                        return basicSetHead(null, msgs);
+                case SolverLanguagePackage.FUNCTOR_DEFINITON__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.FUNCTOR_DEFINITON__HEAD:
+                        return getHead();
+                case SolverLanguagePackage.FUNCTOR_DEFINITON__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.FUNCTOR_DEFINITON__HEAD:
+                        setHead((Expression) newValue);
+                        return;
+                case SolverLanguagePackage.FUNCTOR_DEFINITON__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.FUNCTOR_DEFINITON__HEAD:
+                        setHead((Expression) null);
+                        return;
+                case SolverLanguagePackage.FUNCTOR_DEFINITON__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.FUNCTOR_DEFINITON__HEAD:
+                        return head != null;
+                case SolverLanguagePackage.FUNCTOR_DEFINITON__BODY:
+                        return body != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //FunctorDefinitonImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FunctorImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FunctorImpl.java
new file mode 100644
index 00000000..f0003552
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/FunctorImpl.java
@@ -0,0 +1,151 @@
+/**
+ */
+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.Functor;
+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>Functor</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.FunctorImpl#getParameters <em>Parameters</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class FunctorImpl extends SymbolImpl implements Functor {
+        /**
+         * 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<Variable> parameters;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected FunctorImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.FUNCTOR;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Variable> getParameters() {
+                if (parameters == null) {
+                        parameters = new EObjectContainmentEList<Variable>(Variable.class, this,
+                                        SolverLanguagePackage.FUNCTOR__PARAMETERS);
+                }
+                return parameters;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.FUNCTOR__PARAMETERS:
+                        return ((InternalEList<?>) getParameters()).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.FUNCTOR__PARAMETERS:
+                        return getParameters();
+                }
+                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.FUNCTOR__PARAMETERS:
+                        getParameters().clear();
+                        getParameters().addAll((Collection<? extends Variable>) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.FUNCTOR__PARAMETERS:
+                        getParameters().clear();
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.FUNCTOR__PARAMETERS:
+                        return parameters != null && !parameters.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //FunctorImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ImportImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ImportImpl.java
new file mode 100644
index 00000000..5d37e837
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ImportImpl.java
@@ -0,0 +1,165 @@
+/**
+ */
+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.Import;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Import</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ImportImpl#getAlias <em>Alias</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ImportImpl extends MinimalEObjectImpl.Container implements Import {
+        /**
+         * The default value of the '{@link #getAlias() <em>Alias</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getAlias()
+         * @generated
+         * @ordered
+         */
+        protected static final String ALIAS_EDEFAULT = null;
+
+        /**
+         * The cached value of the '{@link #getAlias() <em>Alias</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getAlias()
+         * @generated
+         * @ordered
+         */
+        protected String alias = ALIAS_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ImportImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.IMPORT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getAlias() {
+                return alias;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setAlias(String newAlias) {
+                String oldAlias = alias;
+                alias = newAlias;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.IMPORT__ALIAS, oldAlias,
+                                        alias));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.IMPORT__ALIAS:
+                        return getAlias();
+                }
+                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.IMPORT__ALIAS:
+                        setAlias((String) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.IMPORT__ALIAS:
+                        setAlias(ALIAS_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.IMPORT__ALIAS:
+                        return ALIAS_EDEFAULT == null ? alias != null : !ALIAS_EDEFAULT.equals(alias);
+                }
+                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(" (alias: ");
+                result.append(alias);
+                result.append(')');
+                return result.toString();
+        }
+
+} //ImportImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/InfinityLiteralImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/InfinityLiteralImpl.java
new file mode 100644
index 00000000..ab6025ff
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/InfinityLiteralImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+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>Infinity Literal</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class InfinityLiteralImpl extends LiteralImpl implements InfinityLiteral {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected InfinityLiteralImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.INFINITY_LITERAL;
+        }
+
+} //InfinityLiteralImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IntLiteralImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IntLiteralImpl.java
new file mode 100644
index 00000000..0e247f42
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IntLiteralImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+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.IntLiteral;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Int Literal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.IntLiteralImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class IntLiteralImpl extends LiteralImpl implements IntLiteral {
+        /**
+         * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected static final int VALUE_EDEFAULT = 0;
+
+        /**
+         * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected int value = VALUE_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected IntLiteralImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.INT_LITERAL;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public int getValue() {
+                return value;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setValue(int newValue) {
+                int oldValue = value;
+                value = newValue;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.INT_LITERAL__VALUE, oldValue,
+                                        value));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.INT_LITERAL__VALUE:
+                        return getValue();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                case SolverLanguagePackage.INT_LITERAL__VALUE:
+                        setValue((Integer) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.INT_LITERAL__VALUE:
+                        setValue(VALUE_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.INT_LITERAL__VALUE:
+                        return value != VALUE_EDEFAULT;
+                }
+                return super.eIsSet(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy())
+                        return super.toString();
+
+                StringBuilder result = new StringBuilder(super.toString());
+                result.append(" (value: ");
+                result.append(value);
+                result.append(')');
+                return result.toString();
+        }
+
+} //IntLiteralImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IntervalImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IntervalImpl.java
new file mode 100644
index 00000000..d599db6d
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/IntervalImpl.java
@@ -0,0 +1,255 @@
+/**
+ */
+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
+         */
+        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
+         */
+        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
+         */
+        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
+         */
+        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.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LetBindingImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LetBindingImpl.java
new file mode 100644
index 00000000..1f724c55
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LetBindingImpl.java
@@ -0,0 +1,391 @@
+/**
+ */
+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.Expression;
+import org.eclipse.viatra.solver.language.solverLanguage.LetBinding;
+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>Let Binding</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.LetBindingImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.LetBindingImpl#getVariable <em>Variable</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.LetBindingImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.LetBindingImpl#getType <em>Type</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class LetBindingImpl extends MinimalEObjectImpl.Container implements LetBinding {
+        /**
+         * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected Expression value;
+
+        /**
+         * The cached value of the '{@link #getVariable() <em>Variable</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getVariable()
+         * @generated
+         * @ordered
+         */
+        protected Variable variable;
+
+        /**
+         * 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 #getType() <em>Type</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getType()
+         * @generated
+         * @ordered
+         */
+        protected Symbol type;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected LetBindingImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.LET_BINDING;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Expression getValue() {
+                return value;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetValue(Expression newValue, NotificationChain msgs) {
+                Expression oldValue = value;
+                value = newValue;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.LET_BINDING__VALUE, oldValue, newValue);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setValue(Expression newValue) {
+                if (newValue != value) {
+                        NotificationChain msgs = null;
+                        if (value != null)
+                                msgs = ((InternalEObject) value).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.LET_BINDING__VALUE, null, msgs);
+                        if (newValue != null)
+                                msgs = ((InternalEObject) newValue).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.LET_BINDING__VALUE, null, msgs);
+                        msgs = basicSetValue(newValue, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.LET_BINDING__VALUE, newValue,
+                                        newValue));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Variable getVariable() {
+                return variable;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetVariable(Variable newVariable, NotificationChain msgs) {
+                Variable oldVariable = variable;
+                variable = newVariable;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.LET_BINDING__VARIABLE, oldVariable, newVariable);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setVariable(Variable newVariable) {
+                if (newVariable != variable) {
+                        NotificationChain msgs = null;
+                        if (variable != null)
+                                msgs = ((InternalEObject) variable).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.LET_BINDING__VARIABLE, null, msgs);
+                        if (newVariable != null)
+                                msgs = ((InternalEObject) newVariable).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.LET_BINDING__VARIABLE, null, msgs);
+                        msgs = basicSetVariable(newVariable, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.LET_BINDING__VARIABLE,
+                                        newVariable, newVariable));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getName() {
+                return name;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setName(String newName) {
+                String oldName = name;
+                name = newName;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.LET_BINDING__NAME, oldName,
+                                        name));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol getType() {
+                if (type != null && type.eIsProxy()) {
+                        InternalEObject oldType = (InternalEObject) type;
+                        type = (Symbol) eResolveProxy(oldType);
+                        if (type != oldType) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, SolverLanguagePackage.LET_BINDING__TYPE,
+                                                        oldType, type));
+                        }
+                }
+                return type;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol basicGetType() {
+                return type;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setType(Symbol newType) {
+                Symbol oldType = type;
+                type = newType;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.LET_BINDING__TYPE, oldType,
+                                        type));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.LET_BINDING__VALUE:
+                        return basicSetValue(null, msgs);
+                case SolverLanguagePackage.LET_BINDING__VARIABLE:
+                        return basicSetVariable(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.LET_BINDING__VALUE:
+                        return getValue();
+                case SolverLanguagePackage.LET_BINDING__VARIABLE:
+                        return getVariable();
+                case SolverLanguagePackage.LET_BINDING__NAME:
+                        return getName();
+                case SolverLanguagePackage.LET_BINDING__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.LET_BINDING__VALUE:
+                        setValue((Expression) newValue);
+                        return;
+                case SolverLanguagePackage.LET_BINDING__VARIABLE:
+                        setVariable((Variable) newValue);
+                        return;
+                case SolverLanguagePackage.LET_BINDING__NAME:
+                        setName((String) newValue);
+                        return;
+                case SolverLanguagePackage.LET_BINDING__TYPE:
+                        setType((Symbol) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.LET_BINDING__VALUE:
+                        setValue((Expression) null);
+                        return;
+                case SolverLanguagePackage.LET_BINDING__VARIABLE:
+                        setVariable((Variable) null);
+                        return;
+                case SolverLanguagePackage.LET_BINDING__NAME:
+                        setName(NAME_EDEFAULT);
+                        return;
+                case SolverLanguagePackage.LET_BINDING__TYPE:
+                        setType((Symbol) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.LET_BINDING__VALUE:
+                        return value != null;
+                case SolverLanguagePackage.LET_BINDING__VARIABLE:
+                        return variable != null;
+                case SolverLanguagePackage.LET_BINDING__NAME:
+                        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+                case SolverLanguagePackage.LET_BINDING__TYPE:
+                        return type != 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(" (name: ");
+                result.append(name);
+                result.append(')');
+                return result.toString();
+        }
+
+} //LetBindingImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LetExpressionImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LetExpressionImpl.java
new file mode 100644
index 00000000..2aa319c6
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LetExpressionImpl.java
@@ -0,0 +1,228 @@
+/**
+ */
+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.Expression;
+import org.eclipse.viatra.solver.language.solverLanguage.LetBinding;
+import org.eclipse.viatra.solver.language.solverLanguage.LetExpression;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Let Expression</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.LetExpressionImpl#getBindings <em>Bindings</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.LetExpressionImpl#getBody <em>Body</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class LetExpressionImpl extends ExpressionImpl implements LetExpression {
+        /**
+         * The cached value of the '{@link #getBindings() <em>Bindings</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getBindings()
+         * @generated
+         * @ordered
+         */
+        protected EList<LetBinding> bindings;
+
+        /**
+         * 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 LetExpressionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.LET_EXPRESSION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<LetBinding> getBindings() {
+                if (bindings == null) {
+                        bindings = new EObjectContainmentEList<LetBinding>(LetBinding.class, this,
+                                        SolverLanguagePackage.LET_EXPRESSION__BINDINGS);
+                }
+                return bindings;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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.LET_EXPRESSION__BODY, oldBody, newBody);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setBody(Expression newBody) {
+                if (newBody != body) {
+                        NotificationChain msgs = null;
+                        if (body != null)
+                                msgs = ((InternalEObject) body).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.LET_EXPRESSION__BODY, null, msgs);
+                        if (newBody != null)
+                                msgs = ((InternalEObject) newBody).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.LET_EXPRESSION__BODY, null, msgs);
+                        msgs = basicSetBody(newBody, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.LET_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.LET_EXPRESSION__BINDINGS:
+                        return ((InternalEList<?>) getBindings()).basicRemove(otherEnd, msgs);
+                case SolverLanguagePackage.LET_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.LET_EXPRESSION__BINDINGS:
+                        return getBindings();
+                case SolverLanguagePackage.LET_EXPRESSION__BODY:
+                        return getBody();
+                }
+                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.LET_EXPRESSION__BINDINGS:
+                        getBindings().clear();
+                        getBindings().addAll((Collection<? extends LetBinding>) newValue);
+                        return;
+                case SolverLanguagePackage.LET_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.LET_EXPRESSION__BINDINGS:
+                        getBindings().clear();
+                        return;
+                case SolverLanguagePackage.LET_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.LET_EXPRESSION__BINDINGS:
+                        return bindings != null && !bindings.isEmpty();
+                case SolverLanguagePackage.LET_EXPRESSION__BODY:
+                        return body != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //LetExpressionImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LiteralImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LiteralImpl.java
new file mode 100644
index 00000000..4222a258
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LiteralImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.viatra.solver.language.solverLanguage.Literal;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Literal</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class LiteralImpl extends ExpressionImpl implements Literal {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected LiteralImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.LITERAL;
+        }
+
+} //LiteralImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LogicLiteralImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LogicLiteralImpl.java
new file mode 100644
index 00000000..6eb60cd5
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LogicLiteralImpl.java
@@ -0,0 +1,165 @@
+/**
+ */
+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.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>Logic Literal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.LogicLiteralImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class LogicLiteralImpl extends LiteralImpl implements LogicLiteral {
+        /**
+         * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected static final LogicValue VALUE_EDEFAULT = LogicValue.UNKNOWN;
+
+        /**
+         * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected LogicValue value = VALUE_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected LogicLiteralImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.LOGIC_LITERAL;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public LogicValue getValue() {
+                return value;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setValue(LogicValue newValue) {
+                LogicValue oldValue = value;
+                value = newValue == null ? VALUE_EDEFAULT : newValue;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.LOGIC_LITERAL__VALUE, oldValue,
+                                        value));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.LOGIC_LITERAL__VALUE:
+                        return getValue();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                case SolverLanguagePackage.LOGIC_LITERAL__VALUE:
+                        setValue((LogicValue) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.LOGIC_LITERAL__VALUE:
+                        setValue(VALUE_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.LOGIC_LITERAL__VALUE:
+                        return value != VALUE_EDEFAULT;
+                }
+                return super.eIsSet(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy())
+                        return super.toString();
+
+                StringBuilder result = new StringBuilder(super.toString());
+                result.append(" (value: ");
+                result.append(value);
+                result.append(')');
+                return result.toString();
+        }
+
+} //LogicLiteralImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LowerBoundedScopeImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LowerBoundedScopeImpl.java
new file mode 100644
index 00000000..56716e2c
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/LowerBoundedScopeImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+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.LowerBoundedScope;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Lower Bounded Scope</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.LowerBoundedScopeImpl#getLowerBound <em>Lower Bound</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class LowerBoundedScopeImpl extends ScopeDeclarationImpl implements LowerBoundedScope {
+        /**
+         * 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 LowerBoundedScopeImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.LOWER_BOUNDED_SCOPE;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public int getLowerBound() {
+                return lowerBound;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setLowerBound(int newLowerBound) {
+                int oldLowerBound = lowerBound;
+                lowerBound = newLowerBound;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.LOWER_BOUNDED_SCOPE__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__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__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__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__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();
+        }
+
+} //LowerBoundedScopeImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MetricImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MetricImpl.java
new file mode 100644
index 00000000..0dfc03a6
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MetricImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.viatra.solver.language.solverLanguage.Metric;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Metric</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class MetricImpl extends FunctionImpl implements Metric {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected MetricImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.METRIC;
+        }
+
+} //MetricImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MultiaryExpessionImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MultiaryExpessionImpl.java
new file mode 100644
index 00000000..75d28976
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MultiaryExpessionImpl.java
@@ -0,0 +1,151 @@
+/**
+ */
+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.Expression;
+import org.eclipse.viatra.solver.language.solverLanguage.MultiaryExpession;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Multiary Expession</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.MultiaryExpessionImpl#getChildren <em>Children</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class MultiaryExpessionImpl extends ExpressionImpl implements MultiaryExpession {
+        /**
+         * 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 MultiaryExpessionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.MULTIARY_EXPESSION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Expression> getChildren() {
+                if (children == null) {
+                        children = new EObjectContainmentEList<Expression>(Expression.class, this,
+                                        SolverLanguagePackage.MULTIARY_EXPESSION__CHILDREN);
+                }
+                return children;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.MULTIARY_EXPESSION__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.MULTIARY_EXPESSION__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.MULTIARY_EXPESSION__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.MULTIARY_EXPESSION__CHILDREN:
+                        getChildren().clear();
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.MULTIARY_EXPESSION__CHILDREN:
+                        return children != null && !children.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //MultiaryExpessionImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MultiplicityImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MultiplicityImpl.java
new file mode 100644
index 00000000..1f8c27a4
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/MultiplicityImpl.java
@@ -0,0 +1,39 @@
+/**
+ */
+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.Multiplicity;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Multiplicity</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class MultiplicityImpl extends MinimalEObjectImpl.Container implements Multiplicity {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected MultiplicityImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.MULTIPLICITY;
+        }
+
+} //MultiplicityImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/NamespaceImportImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/NamespaceImportImpl.java
new file mode 100644
index 00000000..24ac11e5
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/NamespaceImportImpl.java
@@ -0,0 +1,166 @@
+/**
+ */
+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.NamespaceImport;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Namespace Import</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.NamespaceImportImpl#getImportedNamespace <em>Imported Namespace</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class NamespaceImportImpl extends ImportImpl implements NamespaceImport {
+        /**
+         * The default value of the '{@link #getImportedNamespace() <em>Imported Namespace</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getImportedNamespace()
+         * @generated
+         * @ordered
+         */
+        protected static final String IMPORTED_NAMESPACE_EDEFAULT = null;
+
+        /**
+         * The cached value of the '{@link #getImportedNamespace() <em>Imported Namespace</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getImportedNamespace()
+         * @generated
+         * @ordered
+         */
+        protected String importedNamespace = IMPORTED_NAMESPACE_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected NamespaceImportImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.NAMESPACE_IMPORT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getImportedNamespace() {
+                return importedNamespace;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setImportedNamespace(String newImportedNamespace) {
+                String oldImportedNamespace = importedNamespace;
+                importedNamespace = newImportedNamespace;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.NAMESPACE_IMPORT__IMPORTED_NAMESPACE, oldImportedNamespace,
+                                        importedNamespace));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.NAMESPACE_IMPORT__IMPORTED_NAMESPACE:
+                        return getImportedNamespace();
+                }
+                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.NAMESPACE_IMPORT__IMPORTED_NAMESPACE:
+                        setImportedNamespace((String) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.NAMESPACE_IMPORT__IMPORTED_NAMESPACE:
+                        setImportedNamespace(IMPORTED_NAMESPACE_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.NAMESPACE_IMPORT__IMPORTED_NAMESPACE:
+                        return IMPORTED_NAMESPACE_EDEFAULT == null ? importedNamespace != null
+                                        : !IMPORTED_NAMESPACE_EDEFAULT.equals(importedNamespace);
+                }
+                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(" (importedNamespace: ");
+                result.append(importedNamespace);
+                result.append(')');
+                return result.toString();
+        }
+
+} //NamespaceImportImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/NodeImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/NodeImpl.java
new file mode 100644
index 00000000..7307fada
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/NodeImpl.java
@@ -0,0 +1,163 @@
+/**
+ */
+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.Node;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Node</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.NodeImpl#isNamed <em>Named</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class NodeImpl extends SymbolImpl implements Node {
+        /**
+         * The default value of the '{@link #isNamed() <em>Named</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #isNamed()
+         * @generated
+         * @ordered
+         */
+        protected static final boolean NAMED_EDEFAULT = false;
+
+        /**
+         * The cached value of the '{@link #isNamed() <em>Named</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #isNamed()
+         * @generated
+         * @ordered
+         */
+        protected boolean named = NAMED_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected NodeImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.NODE;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public boolean isNamed() {
+                return named;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setNamed(boolean newNamed) {
+                boolean oldNamed = named;
+                named = newNamed;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.NODE__NAMED, oldNamed, named));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.NODE__NAMED:
+                        return isNamed();
+                }
+                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.NODE__NAMED:
+                        setNamed((Boolean) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.NODE__NAMED:
+                        setNamed(NAMED_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.NODE__NAMED:
+                        return named != NAMED_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(" (named: ");
+                result.append(named);
+                result.append(')');
+                return result.toString();
+        }
+
+} //NodeImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ObjectiveDeclarationImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ObjectiveDeclarationImpl.java
new file mode 100644
index 00000000..541c06ec
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ObjectiveDeclarationImpl.java
@@ -0,0 +1,253 @@
+/**
+ */
+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.ObjectiveDeclaration;
+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 Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ObjectiveDeclarationImpl#getKind <em>Kind</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ObjectiveDeclarationImpl#getObjective <em>Objective</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ObjectiveDeclarationImpl extends StatementImpl implements ObjectiveDeclaration {
+        /**
+         * 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.MINIMIZATION;
+
+        /**
+         * 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 ObjectiveDeclarationImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.OBJECTIVE_DECLARATION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ObjectiveKind getKind() {
+                return kind;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setKind(ObjectiveKind newKind) {
+                ObjectiveKind oldKind = kind;
+                kind = newKind == null ? KIND_EDEFAULT : newKind;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.OBJECTIVE_DECLARATION__KIND,
+                                        oldKind, kind));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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_DECLARATION__OBJECTIVE, oldObjective, newObjective);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setObjective(Expression newObjective) {
+                if (newObjective != objective) {
+                        NotificationChain msgs = null;
+                        if (objective != null)
+                                msgs = ((InternalEObject) objective).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.OBJECTIVE_DECLARATION__OBJECTIVE, null, msgs);
+                        if (newObjective != null)
+                                msgs = ((InternalEObject) newObjective).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.OBJECTIVE_DECLARATION__OBJECTIVE, null, msgs);
+                        msgs = basicSetObjective(newObjective, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.OBJECTIVE_DECLARATION__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_DECLARATION__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_DECLARATION__KIND:
+                        return getKind();
+                case SolverLanguagePackage.OBJECTIVE_DECLARATION__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_DECLARATION__KIND:
+                        setKind((ObjectiveKind) newValue);
+                        return;
+                case SolverLanguagePackage.OBJECTIVE_DECLARATION__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_DECLARATION__KIND:
+                        setKind(KIND_EDEFAULT);
+                        return;
+                case SolverLanguagePackage.OBJECTIVE_DECLARATION__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_DECLARATION__KIND:
+                        return kind != KIND_EDEFAULT;
+                case SolverLanguagePackage.OBJECTIVE_DECLARATION__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();
+        }
+
+} //ObjectiveDeclarationImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/OperatorImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/OperatorImpl.java
new file mode 100644
index 00000000..13f190c9
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/OperatorImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.viatra.solver.language.solverLanguage.Operator;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Operator</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class OperatorImpl extends FunctionImpl implements Operator {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected OperatorImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.OPERATOR;
+        }
+
+} //OperatorImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PathComponentImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PathComponentImpl.java
new file mode 100644
index 00000000..afad504d
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PathComponentImpl.java
@@ -0,0 +1,341 @@
+/**
+ */
+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.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.viatra.solver.language.solverLanguage.PathComponent;
+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>Path Component</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PathComponentImpl#getSymbol <em>Symbol</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PathComponentImpl#isInverse <em>Inverse</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PathComponentImpl#isTransitiveClosure <em>Transitive Closure</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PathComponentImpl#isReflexiveTransitiveClosure <em>Reflexive Transitive Closure</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class PathComponentImpl extends MinimalEObjectImpl.Container implements PathComponent {
+        /**
+         * The cached value of the '{@link #getSymbol() <em>Symbol</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getSymbol()
+         * @generated
+         * @ordered
+         */
+        protected Symbol symbol;
+
+        /**
+         * The default value of the '{@link #isInverse() <em>Inverse</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #isInverse()
+         * @generated
+         * @ordered
+         */
+        protected static final boolean INVERSE_EDEFAULT = false;
+
+        /**
+         * The cached value of the '{@link #isInverse() <em>Inverse</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #isInverse()
+         * @generated
+         * @ordered
+         */
+        protected boolean inverse = INVERSE_EDEFAULT;
+
+        /**
+         * 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 PathComponentImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.PATH_COMPONENT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol getSymbol() {
+                if (symbol != null && symbol.eIsProxy()) {
+                        InternalEObject oldSymbol = (InternalEObject) symbol;
+                        symbol = (Symbol) eResolveProxy(oldSymbol);
+                        if (symbol != oldSymbol) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+                                                        SolverLanguagePackage.PATH_COMPONENT__SYMBOL, oldSymbol, symbol));
+                        }
+                }
+                return symbol;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol basicGetSymbol() {
+                return symbol;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setSymbol(Symbol newSymbol) {
+                Symbol oldSymbol = symbol;
+                symbol = newSymbol;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PATH_COMPONENT__SYMBOL,
+                                        oldSymbol, symbol));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public boolean isInverse() {
+                return inverse;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setInverse(boolean newInverse) {
+                boolean oldInverse = inverse;
+                inverse = newInverse;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PATH_COMPONENT__INVERSE,
+                                        oldInverse, inverse));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public boolean isTransitiveClosure() {
+                return transitiveClosure;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setTransitiveClosure(boolean newTransitiveClosure) {
+                boolean oldTransitiveClosure = transitiveClosure;
+                transitiveClosure = newTransitiveClosure;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.PATH_COMPONENT__TRANSITIVE_CLOSURE, oldTransitiveClosure, transitiveClosure));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public boolean isReflexiveTransitiveClosure() {
+                return reflexiveTransitiveClosure;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setReflexiveTransitiveClosure(boolean newReflexiveTransitiveClosure) {
+                boolean oldReflexiveTransitiveClosure = reflexiveTransitiveClosure;
+                reflexiveTransitiveClosure = newReflexiveTransitiveClosure;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.PATH_COMPONENT__REFLEXIVE_TRANSITIVE_CLOSURE, oldReflexiveTransitiveClosure,
+                                        reflexiveTransitiveClosure));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.PATH_COMPONENT__SYMBOL:
+                        if (resolve)
+                                return getSymbol();
+                        return basicGetSymbol();
+                case SolverLanguagePackage.PATH_COMPONENT__INVERSE:
+                        return isInverse();
+                case SolverLanguagePackage.PATH_COMPONENT__TRANSITIVE_CLOSURE:
+                        return isTransitiveClosure();
+                case SolverLanguagePackage.PATH_COMPONENT__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.PATH_COMPONENT__SYMBOL:
+                        setSymbol((Symbol) newValue);
+                        return;
+                case SolverLanguagePackage.PATH_COMPONENT__INVERSE:
+                        setInverse((Boolean) newValue);
+                        return;
+                case SolverLanguagePackage.PATH_COMPONENT__TRANSITIVE_CLOSURE:
+                        setTransitiveClosure((Boolean) newValue);
+                        return;
+                case SolverLanguagePackage.PATH_COMPONENT__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.PATH_COMPONENT__SYMBOL:
+                        setSymbol((Symbol) null);
+                        return;
+                case SolverLanguagePackage.PATH_COMPONENT__INVERSE:
+                        setInverse(INVERSE_EDEFAULT);
+                        return;
+                case SolverLanguagePackage.PATH_COMPONENT__TRANSITIVE_CLOSURE:
+                        setTransitiveClosure(TRANSITIVE_CLOSURE_EDEFAULT);
+                        return;
+                case SolverLanguagePackage.PATH_COMPONENT__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.PATH_COMPONENT__SYMBOL:
+                        return symbol != null;
+                case SolverLanguagePackage.PATH_COMPONENT__INVERSE:
+                        return inverse != INVERSE_EDEFAULT;
+                case SolverLanguagePackage.PATH_COMPONENT__TRANSITIVE_CLOSURE:
+                        return transitiveClosure != TRANSITIVE_CLOSURE_EDEFAULT;
+                case SolverLanguagePackage.PATH_COMPONENT__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(" (inverse: ");
+                result.append(inverse);
+                result.append(", transitiveClosure: ");
+                result.append(transitiveClosure);
+                result.append(", reflexiveTransitiveClosure: ");
+                result.append(reflexiveTransitiveClosure);
+                result.append(')');
+                return result.toString();
+        }
+
+} //PathComponentImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateDefinitionImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateDefinitionImpl.java
new file mode 100644
index 00000000..c6afa7f5
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateDefinitionImpl.java
@@ -0,0 +1,260 @@
+/**
+ */
+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.InlinePredicateAttrributes;
+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#isError <em>Error</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.PredicateDefinitionImpl#isFunctional <em>Functional</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class PredicateDefinitionImpl extends FunctorDefinitonImpl implements PredicateDefinition {
+        /**
+         * 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;
+
+        /**
+         * 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;
+
+        /**
+         * <!-- 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
+         */
+        public boolean isError() {
+                return error;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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
+         */
+        public boolean isFunctional() {
+                return functional;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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 Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.PREDICATE_DEFINITION__ERROR:
+                        return isError();
+                case SolverLanguagePackage.PREDICATE_DEFINITION__FUNCTIONAL:
+                        return isFunctional();
+                }
+                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__ERROR:
+                        setError((Boolean) newValue);
+                        return;
+                case SolverLanguagePackage.PREDICATE_DEFINITION__FUNCTIONAL:
+                        setFunctional((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__ERROR:
+                        setError(ERROR_EDEFAULT);
+                        return;
+                case SolverLanguagePackage.PREDICATE_DEFINITION__FUNCTIONAL:
+                        setFunctional(FUNCTIONAL_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.PREDICATE_DEFINITION__ERROR:
+                        return error != ERROR_EDEFAULT;
+                case SolverLanguagePackage.PREDICATE_DEFINITION__FUNCTIONAL:
+                        return functional != FUNCTIONAL_EDEFAULT;
+                }
+                return super.eIsSet(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+                if (baseClass == InlinePredicateAttrributes.class) {
+                        switch (derivedFeatureID) {
+                        case SolverLanguagePackage.PREDICATE_DEFINITION__ERROR:
+                                return SolverLanguagePackage.INLINE_PREDICATE_ATTRRIBUTES__ERROR;
+                        case SolverLanguagePackage.PREDICATE_DEFINITION__FUNCTIONAL:
+                                return SolverLanguagePackage.INLINE_PREDICATE_ATTRRIBUTES__FUNCTIONAL;
+                        default:
+                                return -1;
+                        }
+                }
+                return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+                if (baseClass == InlinePredicateAttrributes.class) {
+                        switch (baseFeatureID) {
+                        case SolverLanguagePackage.INLINE_PREDICATE_ATTRRIBUTES__ERROR:
+                                return SolverLanguagePackage.PREDICATE_DEFINITION__ERROR;
+                        case SolverLanguagePackage.INLINE_PREDICATE_ATTRRIBUTES__FUNCTIONAL:
+                                return SolverLanguagePackage.PREDICATE_DEFINITION__FUNCTIONAL;
+                        default:
+                                return -1;
+                        }
+                }
+                return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy())
+                        return super.toString();
+
+                StringBuilder result = new StringBuilder(super.toString());
+                result.append(" (error: ");
+                result.append(error);
+                result.append(", functional: ");
+                result.append(functional);
+                result.append(')');
+                return result.toString();
+        }
+
+} //PredicateDefinitionImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateImpl.java
new file mode 100644
index 00000000..316217af
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/PredicateImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+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 -->
+ *
+ * @generated
+ */
+public class PredicateImpl extends RelationImpl implements Predicate {
+        /**
+         * <!-- 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;
+        }
+
+} //PredicateImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ProblemImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ProblemImpl.java
new file mode 100644
index 00000000..08cec167
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ProblemImpl.java
@@ -0,0 +1,298 @@
+/**
+ */
+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.Import;
+import org.eclipse.viatra.solver.language.solverLanguage.Problem;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+import org.eclipse.viatra.solver.language.solverLanguage.Statement;
+import org.eclipse.viatra.solver.language.solverLanguage.Symbol;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Problem</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ProblemImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ProblemImpl#getStatements <em>Statements</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ProblemImpl#getSymbols <em>Symbols</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ProblemImpl#getImports <em>Imports</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ProblemImpl extends MinimalEObjectImpl.Container implements Problem {
+        /**
+         * 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 #getStatements() <em>Statements</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getStatements()
+         * @generated
+         * @ordered
+         */
+        protected EList<Statement> statements;
+
+        /**
+         * The cached value of the '{@link #getSymbols() <em>Symbols</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getSymbols()
+         * @generated
+         * @ordered
+         */
+        protected EList<Symbol> symbols;
+
+        /**
+         * The cached value of the '{@link #getImports() <em>Imports</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getImports()
+         * @generated
+         * @ordered
+         */
+        protected EList<Import> imports;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ProblemImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.PROBLEM;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getName() {
+                return name;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setName(String newName) {
+                String oldName = name;
+                name = newName;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.PROBLEM__NAME, oldName, name));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Statement> getStatements() {
+                if (statements == null) {
+                        statements = new EObjectContainmentEList<Statement>(Statement.class, this,
+                                        SolverLanguagePackage.PROBLEM__STATEMENTS);
+                }
+                return statements;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Symbol> getSymbols() {
+                if (symbols == null) {
+                        symbols = new EObjectContainmentEList<Symbol>(Symbol.class, this, SolverLanguagePackage.PROBLEM__SYMBOLS);
+                }
+                return symbols;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Import> getImports() {
+                if (imports == null) {
+                        imports = new EObjectContainmentEList<Import>(Import.class, this, SolverLanguagePackage.PROBLEM__IMPORTS);
+                }
+                return imports;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.PROBLEM__STATEMENTS:
+                        return ((InternalEList<?>) getStatements()).basicRemove(otherEnd, msgs);
+                case SolverLanguagePackage.PROBLEM__SYMBOLS:
+                        return ((InternalEList<?>) getSymbols()).basicRemove(otherEnd, msgs);
+                case SolverLanguagePackage.PROBLEM__IMPORTS:
+                        return ((InternalEList<?>) getImports()).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.PROBLEM__NAME:
+                        return getName();
+                case SolverLanguagePackage.PROBLEM__STATEMENTS:
+                        return getStatements();
+                case SolverLanguagePackage.PROBLEM__SYMBOLS:
+                        return getSymbols();
+                case SolverLanguagePackage.PROBLEM__IMPORTS:
+                        return getImports();
+                }
+                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.PROBLEM__NAME:
+                        setName((String) newValue);
+                        return;
+                case SolverLanguagePackage.PROBLEM__STATEMENTS:
+                        getStatements().clear();
+                        getStatements().addAll((Collection<? extends Statement>) newValue);
+                        return;
+                case SolverLanguagePackage.PROBLEM__SYMBOLS:
+                        getSymbols().clear();
+                        getSymbols().addAll((Collection<? extends Symbol>) newValue);
+                        return;
+                case SolverLanguagePackage.PROBLEM__IMPORTS:
+                        getImports().clear();
+                        getImports().addAll((Collection<? extends Import>) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.PROBLEM__NAME:
+                        setName(NAME_EDEFAULT);
+                        return;
+                case SolverLanguagePackage.PROBLEM__STATEMENTS:
+                        getStatements().clear();
+                        return;
+                case SolverLanguagePackage.PROBLEM__SYMBOLS:
+                        getSymbols().clear();
+                        return;
+                case SolverLanguagePackage.PROBLEM__IMPORTS:
+                        getImports().clear();
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.PROBLEM__NAME:
+                        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+                case SolverLanguagePackage.PROBLEM__STATEMENTS:
+                        return statements != null && !statements.isEmpty();
+                case SolverLanguagePackage.PROBLEM__SYMBOLS:
+                        return symbols != null && !symbols.isEmpty();
+                case SolverLanguagePackage.PROBLEM__IMPORTS:
+                        return imports != null && !imports.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(" (name: ");
+                result.append(name);
+                result.append(')');
+                return result.toString();
+        }
+
+} //ProblemImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/RealLiteralImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/RealLiteralImpl.java
new file mode 100644
index 00000000..7ab526b6
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/RealLiteralImpl.java
@@ -0,0 +1,166 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+
+import java.math.BigDecimal;
+
+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.RealLiteral;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Real Literal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.RealLiteralImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class RealLiteralImpl extends LiteralImpl implements RealLiteral {
+        /**
+         * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected static final BigDecimal VALUE_EDEFAULT = null;
+
+        /**
+         * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected BigDecimal value = VALUE_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected RealLiteralImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.REAL_LITERAL;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public BigDecimal getValue() {
+                return value;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setValue(BigDecimal newValue) {
+                BigDecimal oldValue = value;
+                value = newValue;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.REAL_LITERAL__VALUE, oldValue,
+                                        value));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.REAL_LITERAL__VALUE:
+                        return getValue();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                case SolverLanguagePackage.REAL_LITERAL__VALUE:
+                        setValue((BigDecimal) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.REAL_LITERAL__VALUE:
+                        setValue(VALUE_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.REAL_LITERAL__VALUE:
+                        return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+                }
+                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(" (value: ");
+                result.append(value);
+                result.append(')');
+                return result.toString();
+        }
+
+} //RealLiteralImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ReferenceImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ReferenceImpl.java
new file mode 100644
index 00000000..6224f3aa
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ReferenceImpl.java
@@ -0,0 +1,151 @@
+/**
+ */
+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.PathComponent;
+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#getComponents <em>Components</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ReferenceImpl extends ExpressionImpl implements Reference {
+        /**
+         * The cached value of the '{@link #getComponents() <em>Components</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getComponents()
+         * @generated
+         * @ordered
+         */
+        protected EList<PathComponent> components;
+
+        /**
+         * <!-- 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
+         */
+        public EList<PathComponent> getComponents() {
+                if (components == null) {
+                        components = new EObjectContainmentEList<PathComponent>(PathComponent.class, this,
+                                        SolverLanguagePackage.REFERENCE__COMPONENTS);
+                }
+                return components;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.REFERENCE__COMPONENTS:
+                        return ((InternalEList<?>) getComponents()).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.REFERENCE__COMPONENTS:
+                        return getComponents();
+                }
+                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.REFERENCE__COMPONENTS:
+                        getComponents().clear();
+                        getComponents().addAll((Collection<? extends PathComponent>) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.REFERENCE__COMPONENTS:
+                        getComponents().clear();
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.REFERENCE__COMPONENTS:
+                        return components != null && !components.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //ReferenceImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/RelationImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/RelationImpl.java
new file mode 100644
index 00000000..9c612858
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/RelationImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package org.eclipse.viatra.solver.language.solverLanguage.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.viatra.solver.language.solverLanguage.Relation;
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Relation</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class RelationImpl extends FunctorImpl implements Relation {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected RelationImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.RELATION;
+        }
+
+} //RelationImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ScopeDeclarationImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ScopeDeclarationImpl.java
new file mode 100644
index 00000000..31c2fa9f
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/ScopeDeclarationImpl.java
@@ -0,0 +1,159 @@
+/**
+ */
+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.ScopeDeclaration;
+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>Scope Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.ScopeDeclarationImpl#getType <em>Type</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ScopeDeclarationImpl extends StatementImpl implements ScopeDeclaration {
+        /**
+         * The cached value of the '{@link #getType() <em>Type</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getType()
+         * @generated
+         * @ordered
+         */
+        protected Symbol type;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ScopeDeclarationImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.SCOPE_DECLARATION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol getType() {
+                if (type != null && type.eIsProxy()) {
+                        InternalEObject oldType = (InternalEObject) type;
+                        type = (Symbol) eResolveProxy(oldType);
+                        if (type != oldType) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+                                                        SolverLanguagePackage.SCOPE_DECLARATION__TYPE, oldType, type));
+                        }
+                }
+                return type;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol basicGetType() {
+                return type;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setType(Symbol newType) {
+                Symbol oldType = type;
+                type = newType;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.SCOPE_DECLARATION__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_DECLARATION__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_DECLARATION__TYPE:
+                        setType((Symbol) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.SCOPE_DECLARATION__TYPE:
+                        setType((Symbol) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.SCOPE_DECLARATION__TYPE:
+                        return type != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //ScopeDeclarationImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguageFactoryImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguageFactoryImpl.java
new file mode 100644
index 00000000..96e741b9
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguageFactoryImpl.java
@@ -0,0 +1,985 @@
+/**
+ */
+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;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+import org.eclipse.viatra.solver.language.solverLanguage.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class SolverLanguageFactoryImpl extends EFactoryImpl implements SolverLanguageFactory {
+        /**
+         * Creates the default factory implementation.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public static SolverLanguageFactory init() {
+                try {
+                        SolverLanguageFactory theSolverLanguageFactory = (SolverLanguageFactory) EPackage.Registry.INSTANCE
+                                        .getEFactory(SolverLanguagePackage.eNS_URI);
+                        if (theSolverLanguageFactory != null) {
+                                return theSolverLanguageFactory;
+                        }
+                } catch (Exception exception) {
+                        EcorePlugin.INSTANCE.log(exception);
+                }
+                return new SolverLanguageFactoryImpl();
+        }
+
+        /**
+         * Creates an instance of the factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public SolverLanguageFactoryImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EObject create(EClass eClass) {
+                switch (eClass.getClassifierID()) {
+                case SolverLanguagePackage.PATH_COMPONENT:
+                        return createPathComponent();
+                case SolverLanguagePackage.CALL:
+                        return createCall();
+                case SolverLanguagePackage.REFERENCE:
+                        return createReference();
+                case SolverLanguagePackage.ARGUMENT_LIST:
+                        return createArgumentList();
+                case SolverLanguagePackage.EXPRESSION_ARGUMENT:
+                        return createExpressionArgument();
+                case SolverLanguagePackage.STAR_ARGUMENT:
+                        return createStarArgument();
+                case SolverLanguagePackage.VARIABLE:
+                        return createVariable();
+                case SolverLanguagePackage.UNARY_EXPRESSION:
+                        return createUnaryExpression();
+                case SolverLanguagePackage.BINARY_EXPRESSION:
+                        return createBinaryExpression();
+                case SolverLanguagePackage.DISJUNCTION:
+                        return createDisjunction();
+                case SolverLanguagePackage.CONJUNCTION:
+                        return createConjunction();
+                case SolverLanguagePackage.CONDITIONAL_EXPRESSION:
+                        return createConditionalExpression();
+                case SolverLanguagePackage.SWITCH:
+                        return createSwitch();
+                case SolverLanguagePackage.CASE:
+                        return createCase();
+                case SolverLanguagePackage.LET_EXPRESSION:
+                        return createLetExpression();
+                case SolverLanguagePackage.LET_BINDING:
+                        return createLetBinding();
+                case SolverLanguagePackage.INT_LITERAL:
+                        return createIntLiteral();
+                case SolverLanguagePackage.REAL_LITERAL:
+                        return createRealLiteral();
+                case SolverLanguagePackage.STRING_LITERAL:
+                        return createStringLiteral();
+                case SolverLanguagePackage.LOGIC_LITERAL:
+                        return createLogicLiteral();
+                case SolverLanguagePackage.EMPTY_LITERAL:
+                        return createEmptyLiteral();
+                case SolverLanguagePackage.CAST_EXPRESSION:
+                        return createCastExpression();
+                case SolverLanguagePackage.COUNT:
+                        return createCount();
+                case SolverLanguagePackage.AGGREGATION:
+                        return createAggregation();
+                case SolverLanguagePackage.FORALL:
+                        return createForall();
+                case SolverLanguagePackage.TYPE_REFERENCE:
+                        return createTypeReference();
+                case SolverLanguagePackage.INFINITY_LITERAL:
+                        return createInfinityLiteral();
+                case SolverLanguagePackage.INTERVAL:
+                        return createInterval();
+                case SolverLanguagePackage.BASE_RELATION:
+                        return createBaseRelation();
+                case SolverLanguagePackage.PREDICATE:
+                        return createPredicate();
+                case SolverLanguagePackage.DATATYPE:
+                        return createDatatype();
+                case SolverLanguagePackage.METRIC:
+                        return createMetric();
+                case SolverLanguagePackage.OPERATOR:
+                        return createOperator();
+                case SolverLanguagePackage.NODE:
+                        return createNode();
+                case SolverLanguagePackage.PREDICATE_DEFINITION:
+                        return createPredicateDefinition();
+                case SolverLanguagePackage.FUNCTION_DEFINITION:
+                        return createFunctionDefinition();
+                case SolverLanguagePackage.EXTERN_PREDICATE_DECLARATION:
+                        return createExternPredicateDeclaration();
+                case SolverLanguagePackage.EXTERN_FUNCTION_DECLARATION:
+                        return createExternFunctionDeclaration();
+                case SolverLanguagePackage.EXTERN_AGGREGATION_OPERATOR_DECLARATION:
+                        return createExternAggregationOperatorDeclaration();
+                case SolverLanguagePackage.EXTERN_DATATYPE_DECLARATION:
+                        return createExternDatatypeDeclaration();
+                case SolverLanguagePackage.CLASS_DECLARATION:
+                        return createClassDeclaration();
+                case SolverLanguagePackage.ENUM_DECLARATION:
+                        return createEnumDeclaration();
+                case SolverLanguagePackage.ENUM_LITERAL:
+                        return createEnumLiteral();
+                case SolverLanguagePackage.FIELD:
+                        return createField();
+                case SolverLanguagePackage.DEFAULT_ASSERTION:
+                        return createDefaultAssertion();
+                case SolverLanguagePackage.ASSERTION:
+                        return createAssertion();
+                case SolverLanguagePackage.UNBOUNDED_MULTIPLICITY:
+                        return createUnboundedMultiplicity();
+                case SolverLanguagePackage.EXACT_MULTIPLICITY:
+                        return createExactMultiplicity();
+                case SolverLanguagePackage.BOUNDED_MULTIPLICITY:
+                        return createBoundedMultiplicity();
+                case SolverLanguagePackage.AGGREGATION_OPERATOR:
+                        return createAggregationOperator();
+                case SolverLanguagePackage.PROBLEM:
+                        return createProblem();
+                case SolverLanguagePackage.TYPED_STAR_ARGUMENT:
+                        return createTypedStarArgument();
+                case SolverLanguagePackage.TYPED_VARIABLE_ARGUMENT:
+                        return createTypedVariableArgument();
+                case SolverLanguagePackage.UNNAMED_ERROR_PREDICATE_DEFINTION:
+                        return createUnnamedErrorPredicateDefintion();
+                case SolverLanguagePackage.OBJECTIVE_DECLARATION:
+                        return createObjectiveDeclaration();
+                case SolverLanguagePackage.SCOPE_DECLARATION:
+                        return createScopeDeclaration();
+                case SolverLanguagePackage.EXACT_SCOPE:
+                        return createExactScope();
+                case SolverLanguagePackage.BOUNDED_SCOPE:
+                        return createBoundedScope();
+                case SolverLanguagePackage.LOWER_BOUNDED_SCOPE:
+                        return createLowerBoundedScope();
+                case SolverLanguagePackage.NAMESPACE_IMPORT:
+                        return createNamespaceImport();
+                case SolverLanguagePackage.IMPORT:
+                        return createImport();
+                case SolverLanguagePackage.URI_IMPORT:
+                        return createUriImport();
+                default:
+                        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+                }
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object createFromString(EDataType eDataType, String initialValue) {
+                switch (eDataType.getClassifierID()) {
+                case SolverLanguagePackage.UNARY_OPERATOR:
+                        return createUnaryOperatorFromString(eDataType, initialValue);
+                case SolverLanguagePackage.BINARY_OPERATOR:
+                        return createBinaryOperatorFromString(eDataType, initialValue);
+                case SolverLanguagePackage.LOGIC_VALUE:
+                        return createLogicValueFromString(eDataType, initialValue);
+                case SolverLanguagePackage.OBJECTIVE_KIND:
+                        return createObjectiveKindFromString(eDataType, initialValue);
+                case SolverLanguagePackage.ATTRIBUTE_KIND:
+                        return createAttributeKindFromString(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.UNARY_OPERATOR:
+                        return convertUnaryOperatorToString(eDataType, instanceValue);
+                case SolverLanguagePackage.BINARY_OPERATOR:
+                        return convertBinaryOperatorToString(eDataType, instanceValue);
+                case SolverLanguagePackage.LOGIC_VALUE:
+                        return convertLogicValueToString(eDataType, instanceValue);
+                case SolverLanguagePackage.OBJECTIVE_KIND:
+                        return convertObjectiveKindToString(eDataType, instanceValue);
+                case SolverLanguagePackage.ATTRIBUTE_KIND:
+                        return convertAttributeKindToString(eDataType, instanceValue);
+                default:
+                        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+                }
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public PathComponent createPathComponent() {
+                PathComponentImpl pathComponent = new PathComponentImpl();
+                return pathComponent;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Call createCall() {
+                CallImpl call = new CallImpl();
+                return call;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Reference createReference() {
+                ReferenceImpl reference = new ReferenceImpl();
+                return reference;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ArgumentList createArgumentList() {
+                ArgumentListImpl argumentList = new ArgumentListImpl();
+                return argumentList;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ExpressionArgument createExpressionArgument() {
+                ExpressionArgumentImpl expressionArgument = new ExpressionArgumentImpl();
+                return expressionArgument;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public StarArgument createStarArgument() {
+                StarArgumentImpl starArgument = new StarArgumentImpl();
+                return starArgument;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Variable createVariable() {
+                VariableImpl variable = new VariableImpl();
+                return variable;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public UnaryExpression createUnaryExpression() {
+                UnaryExpressionImpl unaryExpression = new UnaryExpressionImpl();
+                return unaryExpression;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public BinaryExpression createBinaryExpression() {
+                BinaryExpressionImpl binaryExpression = new BinaryExpressionImpl();
+                return binaryExpression;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Disjunction createDisjunction() {
+                DisjunctionImpl disjunction = new DisjunctionImpl();
+                return disjunction;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Conjunction createConjunction() {
+                ConjunctionImpl conjunction = new ConjunctionImpl();
+                return conjunction;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ConditionalExpression createConditionalExpression() {
+                ConditionalExpressionImpl conditionalExpression = new ConditionalExpressionImpl();
+                return conditionalExpression;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Switch createSwitch() {
+                SwitchImpl switch_ = new SwitchImpl();
+                return switch_;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Case createCase() {
+                CaseImpl case_ = new CaseImpl();
+                return case_;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public LetExpression createLetExpression() {
+                LetExpressionImpl letExpression = new LetExpressionImpl();
+                return letExpression;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public LetBinding createLetBinding() {
+                LetBindingImpl letBinding = new LetBindingImpl();
+                return letBinding;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public IntLiteral createIntLiteral() {
+                IntLiteralImpl intLiteral = new IntLiteralImpl();
+                return intLiteral;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public RealLiteral createRealLiteral() {
+                RealLiteralImpl realLiteral = new RealLiteralImpl();
+                return realLiteral;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public StringLiteral createStringLiteral() {
+                StringLiteralImpl stringLiteral = new StringLiteralImpl();
+                return stringLiteral;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public LogicLiteral createLogicLiteral() {
+                LogicLiteralImpl logicLiteral = new LogicLiteralImpl();
+                return logicLiteral;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EmptyLiteral createEmptyLiteral() {
+                EmptyLiteralImpl emptyLiteral = new EmptyLiteralImpl();
+                return emptyLiteral;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public CastExpression createCastExpression() {
+                CastExpressionImpl castExpression = new CastExpressionImpl();
+                return castExpression;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Count createCount() {
+                CountImpl count = new CountImpl();
+                return count;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Aggregation createAggregation() {
+                AggregationImpl aggregation = new AggregationImpl();
+                return aggregation;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Forall createForall() {
+                ForallImpl forall = new ForallImpl();
+                return forall;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public TypeReference createTypeReference() {
+                TypeReferenceImpl typeReference = new TypeReferenceImpl();
+                return typeReference;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public InfinityLiteral createInfinityLiteral() {
+                InfinityLiteralImpl infinityLiteral = new InfinityLiteralImpl();
+                return infinityLiteral;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Interval createInterval() {
+                IntervalImpl interval = new IntervalImpl();
+                return interval;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public BaseRelation createBaseRelation() {
+                BaseRelationImpl baseRelation = new BaseRelationImpl();
+                return baseRelation;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Predicate createPredicate() {
+                PredicateImpl predicate = new PredicateImpl();
+                return predicate;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Datatype createDatatype() {
+                DatatypeImpl datatype = new DatatypeImpl();
+                return datatype;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Metric createMetric() {
+                MetricImpl metric = new MetricImpl();
+                return metric;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Operator createOperator() {
+                OperatorImpl operator = new OperatorImpl();
+                return operator;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Node createNode() {
+                NodeImpl node = new NodeImpl();
+                return node;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public PredicateDefinition createPredicateDefinition() {
+                PredicateDefinitionImpl predicateDefinition = new PredicateDefinitionImpl();
+                return predicateDefinition;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public FunctionDefinition createFunctionDefinition() {
+                FunctionDefinitionImpl functionDefinition = new FunctionDefinitionImpl();
+                return functionDefinition;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ExternPredicateDeclaration createExternPredicateDeclaration() {
+                ExternPredicateDeclarationImpl externPredicateDeclaration = new ExternPredicateDeclarationImpl();
+                return externPredicateDeclaration;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ExternFunctionDeclaration createExternFunctionDeclaration() {
+                ExternFunctionDeclarationImpl externFunctionDeclaration = new ExternFunctionDeclarationImpl();
+                return externFunctionDeclaration;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ExternAggregationOperatorDeclaration createExternAggregationOperatorDeclaration() {
+                ExternAggregationOperatorDeclarationImpl externAggregationOperatorDeclaration = new ExternAggregationOperatorDeclarationImpl();
+                return externAggregationOperatorDeclaration;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ExternDatatypeDeclaration createExternDatatypeDeclaration() {
+                ExternDatatypeDeclarationImpl externDatatypeDeclaration = new ExternDatatypeDeclarationImpl();
+                return externDatatypeDeclaration;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ClassDeclaration createClassDeclaration() {
+                ClassDeclarationImpl classDeclaration = new ClassDeclarationImpl();
+                return classDeclaration;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EnumDeclaration createEnumDeclaration() {
+                EnumDeclarationImpl enumDeclaration = new EnumDeclarationImpl();
+                return enumDeclaration;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EnumLiteral createEnumLiteral() {
+                EnumLiteralImpl enumLiteral = new EnumLiteralImpl();
+                return enumLiteral;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Field createField() {
+                FieldImpl field = new FieldImpl();
+                return field;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public DefaultAssertion createDefaultAssertion() {
+                DefaultAssertionImpl defaultAssertion = new DefaultAssertionImpl();
+                return defaultAssertion;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Assertion createAssertion() {
+                AssertionImpl assertion = new AssertionImpl();
+                return assertion;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public UnboundedMultiplicity createUnboundedMultiplicity() {
+                UnboundedMultiplicityImpl unboundedMultiplicity = new UnboundedMultiplicityImpl();
+                return unboundedMultiplicity;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ExactMultiplicity createExactMultiplicity() {
+                ExactMultiplicityImpl exactMultiplicity = new ExactMultiplicityImpl();
+                return exactMultiplicity;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public BoundedMultiplicity createBoundedMultiplicity() {
+                BoundedMultiplicityImpl boundedMultiplicity = new BoundedMultiplicityImpl();
+                return boundedMultiplicity;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public AggregationOperator createAggregationOperator() {
+                AggregationOperatorImpl aggregationOperator = new AggregationOperatorImpl();
+                return aggregationOperator;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Problem createProblem() {
+                ProblemImpl problem = new ProblemImpl();
+                return problem;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public TypedStarArgument createTypedStarArgument() {
+                TypedStarArgumentImpl typedStarArgument = new TypedStarArgumentImpl();
+                return typedStarArgument;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public TypedVariableArgument createTypedVariableArgument() {
+                TypedVariableArgumentImpl typedVariableArgument = new TypedVariableArgumentImpl();
+                return typedVariableArgument;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public UnnamedErrorPredicateDefintion createUnnamedErrorPredicateDefintion() {
+                UnnamedErrorPredicateDefintionImpl unnamedErrorPredicateDefintion = new UnnamedErrorPredicateDefintionImpl();
+                return unnamedErrorPredicateDefintion;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ObjectiveDeclaration createObjectiveDeclaration() {
+                ObjectiveDeclarationImpl objectiveDeclaration = new ObjectiveDeclarationImpl();
+                return objectiveDeclaration;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ScopeDeclaration createScopeDeclaration() {
+                ScopeDeclarationImpl scopeDeclaration = new ScopeDeclarationImpl();
+                return scopeDeclaration;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ExactScope createExactScope() {
+                ExactScopeImpl exactScope = new ExactScopeImpl();
+                return exactScope;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public BoundedScope createBoundedScope() {
+                BoundedScopeImpl boundedScope = new BoundedScopeImpl();
+                return boundedScope;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public LowerBoundedScope createLowerBoundedScope() {
+                LowerBoundedScopeImpl lowerBoundedScope = new LowerBoundedScopeImpl();
+                return lowerBoundedScope;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NamespaceImport createNamespaceImport() {
+                NamespaceImportImpl namespaceImport = new NamespaceImportImpl();
+                return namespaceImport;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Import createImport() {
+                ImportImpl import_ = new ImportImpl();
+                return import_;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public UriImport createUriImport() {
+                UriImportImpl uriImport = new UriImportImpl();
+                return uriImport;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public UnaryOperator createUnaryOperatorFromString(EDataType eDataType, String initialValue) {
+                UnaryOperator result = UnaryOperator.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 convertUnaryOperatorToString(EDataType eDataType, Object instanceValue) {
+                return instanceValue == null ? null : instanceValue.toString();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public BinaryOperator createBinaryOperatorFromString(EDataType eDataType, String initialValue) {
+                BinaryOperator result = BinaryOperator.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 convertBinaryOperatorToString(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) {
+                return instanceValue == null ? null : instanceValue.toString();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public AttributeKind createAttributeKindFromString(EDataType eDataType, String initialValue) {
+                AttributeKind result = AttributeKind.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 convertAttributeKindToString(EDataType eDataType, Object instanceValue) {
+                return instanceValue == null ? null : instanceValue.toString();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public SolverLanguagePackage getSolverLanguagePackage() {
+                return (SolverLanguagePackage) getEPackage();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @deprecated
+         * @generated
+         */
+        @Deprecated
+        public static SolverLanguagePackage getPackage() {
+                return SolverLanguagePackage.eINSTANCE;
+        }
+
+} //SolverLanguageFactoryImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguagePackageImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguagePackageImpl.java
new file mode 100644
index 00000000..52dde045
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SolverLanguagePackageImpl.java
@@ -0,0 +1,3364 @@
+/**
+ */
+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.AbstractAssertion;
+import org.eclipse.viatra.solver.language.solverLanguage.AggregateExpression;
+import org.eclipse.viatra.solver.language.solverLanguage.Aggregation;
+import org.eclipse.viatra.solver.language.solverLanguage.AggregationOperator;
+import org.eclipse.viatra.solver.language.solverLanguage.Argument;
+import org.eclipse.viatra.solver.language.solverLanguage.ArgumentList;
+import org.eclipse.viatra.solver.language.solverLanguage.Assertion;
+import org.eclipse.viatra.solver.language.solverLanguage.Attribute;
+import org.eclipse.viatra.solver.language.solverLanguage.AttributeKind;
+import org.eclipse.viatra.solver.language.solverLanguage.BaseRelation;
+import org.eclipse.viatra.solver.language.solverLanguage.BinaryExpression;
+import org.eclipse.viatra.solver.language.solverLanguage.BinaryOperator;
+import org.eclipse.viatra.solver.language.solverLanguage.BoundedMultiplicity;
+import org.eclipse.viatra.solver.language.solverLanguage.BoundedScope;
+import org.eclipse.viatra.solver.language.solverLanguage.Call;
+import org.eclipse.viatra.solver.language.solverLanguage.Case;
+import org.eclipse.viatra.solver.language.solverLanguage.CastExpression;
+import org.eclipse.viatra.solver.language.solverLanguage.ClassDeclaration;
+import org.eclipse.viatra.solver.language.solverLanguage.ConditionalExpression;
+import org.eclipse.viatra.solver.language.solverLanguage.Conjunction;
+import org.eclipse.viatra.solver.language.solverLanguage.Count;
+import org.eclipse.viatra.solver.language.solverLanguage.Datatype;
+import org.eclipse.viatra.solver.language.solverLanguage.DefaultAssertion;
+import org.eclipse.viatra.solver.language.solverLanguage.Disjunction;
+import org.eclipse.viatra.solver.language.solverLanguage.EmptyLiteral;
+import org.eclipse.viatra.solver.language.solverLanguage.EnumDeclaration;
+import org.eclipse.viatra.solver.language.solverLanguage.EnumLiteral;
+import org.eclipse.viatra.solver.language.solverLanguage.ExactMultiplicity;
+import org.eclipse.viatra.solver.language.solverLanguage.ExactScope;
+import org.eclipse.viatra.solver.language.solverLanguage.Expression;
+import org.eclipse.viatra.solver.language.solverLanguage.ExpressionArgument;
+import org.eclipse.viatra.solver.language.solverLanguage.ExternAggregationOperatorDeclaration;
+import org.eclipse.viatra.solver.language.solverLanguage.ExternDatatypeDeclaration;
+import org.eclipse.viatra.solver.language.solverLanguage.ExternDeclaration;
+import org.eclipse.viatra.solver.language.solverLanguage.ExternFunctionDeclaration;
+import org.eclipse.viatra.solver.language.solverLanguage.ExternFunctorDeclaration;
+import org.eclipse.viatra.solver.language.solverLanguage.ExternPredicateDeclaration;
+import org.eclipse.viatra.solver.language.solverLanguage.Field;
+import org.eclipse.viatra.solver.language.solverLanguage.Forall;
+import org.eclipse.viatra.solver.language.solverLanguage.Function;
+import org.eclipse.viatra.solver.language.solverLanguage.FunctionDefinition;
+import org.eclipse.viatra.solver.language.solverLanguage.Functor;
+import org.eclipse.viatra.solver.language.solverLanguage.FunctorDefiniton;
+import org.eclipse.viatra.solver.language.solverLanguage.Import;
+import org.eclipse.viatra.solver.language.solverLanguage.InfinityLiteral;
+import org.eclipse.viatra.solver.language.solverLanguage.InlinePredicateAttrributes;
+import org.eclipse.viatra.solver.language.solverLanguage.IntLiteral;
+import org.eclipse.viatra.solver.language.solverLanguage.Interval;
+import org.eclipse.viatra.solver.language.solverLanguage.LetBinding;
+import org.eclipse.viatra.solver.language.solverLanguage.LetExpression;
+import org.eclipse.viatra.solver.language.solverLanguage.Literal;
+import org.eclipse.viatra.solver.language.solverLanguage.LogicLiteral;
+import org.eclipse.viatra.solver.language.solverLanguage.LogicValue;
+import org.eclipse.viatra.solver.language.solverLanguage.LowerBoundedScope;
+import org.eclipse.viatra.solver.language.solverLanguage.Metric;
+import org.eclipse.viatra.solver.language.solverLanguage.MultiaryExpession;
+import org.eclipse.viatra.solver.language.solverLanguage.Multiplicity;
+import org.eclipse.viatra.solver.language.solverLanguage.NamespaceImport;
+import org.eclipse.viatra.solver.language.solverLanguage.Node;
+import org.eclipse.viatra.solver.language.solverLanguage.ObjectiveDeclaration;
+import org.eclipse.viatra.solver.language.solverLanguage.ObjectiveKind;
+import org.eclipse.viatra.solver.language.solverLanguage.Operator;
+import org.eclipse.viatra.solver.language.solverLanguage.PathComponent;
+import org.eclipse.viatra.solver.language.solverLanguage.Predicate;
+import org.eclipse.viatra.solver.language.solverLanguage.PredicateDefinition;
+import org.eclipse.viatra.solver.language.solverLanguage.Problem;
+import org.eclipse.viatra.solver.language.solverLanguage.RealLiteral;
+import org.eclipse.viatra.solver.language.solverLanguage.Reference;
+import org.eclipse.viatra.solver.language.solverLanguage.Relation;
+import org.eclipse.viatra.solver.language.solverLanguage.ScopeDeclaration;
+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.StringLiteral;
+import org.eclipse.viatra.solver.language.solverLanguage.Switch;
+import org.eclipse.viatra.solver.language.solverLanguage.Symbol;
+import org.eclipse.viatra.solver.language.solverLanguage.TypeReference;
+import org.eclipse.viatra.solver.language.solverLanguage.TypedArgument;
+import org.eclipse.viatra.solver.language.solverLanguage.TypedStarArgument;
+import org.eclipse.viatra.solver.language.solverLanguage.TypedVariableArgument;
+import org.eclipse.viatra.solver.language.solverLanguage.UnaryExpression;
+import org.eclipse.viatra.solver.language.solverLanguage.UnaryOperator;
+import org.eclipse.viatra.solver.language.solverLanguage.UnboundedMultiplicity;
+import org.eclipse.viatra.solver.language.solverLanguage.UnnamedErrorPredicateDefintion;
+import org.eclipse.viatra.solver.language.solverLanguage.UriImport;
+import org.eclipse.viatra.solver.language.solverLanguage.Variable;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class SolverLanguagePackageImpl extends EPackageImpl implements SolverLanguagePackage {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass pathComponentEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass symbolEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass callEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass referenceEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass expressionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass argumentEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass argumentListEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass expressionArgumentEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass starArgumentEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass typedArgumentEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass multiaryExpessionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass variableEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass unaryExpressionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass binaryExpressionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass disjunctionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass conjunctionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass conditionalExpressionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass switchEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass caseEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass letExpressionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass letBindingEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass literalEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass intLiteralEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass realLiteralEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass stringLiteralEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass logicLiteralEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass emptyLiteralEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass castExpressionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass aggregateExpressionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass countEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass aggregationEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass forallEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass typeReferenceEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass infinityLiteralEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass intervalEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass functorEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass relationEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass baseRelationEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass predicateEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass datatypeEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass functionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass metricEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass operatorEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass nodeEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass statementEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass abstractAssertionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass functorDefinitonEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass predicateDefinitionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass functionDefinitionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass attributeEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass externDeclarationEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass externFunctorDeclarationEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass externPredicateDeclarationEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass externFunctionDeclarationEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass externAggregationOperatorDeclarationEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass externDatatypeDeclarationEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass classDeclarationEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass enumDeclarationEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass enumLiteralEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass fieldEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass multiplicityEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass defaultAssertionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass assertionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass unboundedMultiplicityEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass exactMultiplicityEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass boundedMultiplicityEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass inlinePredicateAttrributesEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass aggregationOperatorEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass problemEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass typedStarArgumentEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass typedVariableArgumentEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass unnamedErrorPredicateDefintionEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass objectiveDeclarationEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass scopeDeclarationEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass exactScopeEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass boundedScopeEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass lowerBoundedScopeEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass namespaceImportEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass importEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass uriImportEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EEnum unaryOperatorEEnum = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EEnum binaryOperatorEEnum = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EEnum logicValueEEnum = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EEnum objectiveKindEEnum = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EEnum attributeKindEEnum = null;
+
+        /**
+         * Creates an instance of the model <b>Package</b>, registered with
+         * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+         * package URI value.
+         * <p>Note: the correct way to create the package is via the static
+         * factory method {@link #init init()}, which also performs
+         * initialization of the package, or returns the registered package,
+         * if one already exists.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.emf.ecore.EPackage.Registry
+         * @see org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage#eNS_URI
+         * @see #init()
+         * @generated
+         */
+        private SolverLanguagePackageImpl() {
+                super(eNS_URI, SolverLanguageFactory.eINSTANCE);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private static boolean isInited = false;
+
+        /**
+         * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+         *
+         * <p>This method is used to initialize {@link SolverLanguagePackage#eINSTANCE} when that field is accessed.
+         * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #eNS_URI
+         * @see #createPackageContents()
+         * @see #initializePackageContents()
+         * @generated
+         */
+        public static SolverLanguagePackage init() {
+                if (isInited)
+                        return (SolverLanguagePackage) EPackage.Registry.INSTANCE.getEPackage(SolverLanguagePackage.eNS_URI);
+
+                // Obtain or create and register package
+                Object registeredSolverLanguagePackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+                SolverLanguagePackageImpl theSolverLanguagePackage = registeredSolverLanguagePackage instanceof SolverLanguagePackageImpl
+                                ? (SolverLanguagePackageImpl) registeredSolverLanguagePackage
+                                : new SolverLanguagePackageImpl();
+
+                isInited = true;
+
+                // Create package meta-data objects
+                theSolverLanguagePackage.createPackageContents();
+
+                // Initialize created meta-data
+                theSolverLanguagePackage.initializePackageContents();
+
+                // Mark meta-data to indicate it can't be changed
+                theSolverLanguagePackage.freeze();
+
+                // Update the registry and return the package
+                EPackage.Registry.INSTANCE.put(SolverLanguagePackage.eNS_URI, theSolverLanguagePackage);
+                return theSolverLanguagePackage;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getPathComponent() {
+                return pathComponentEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getPathComponent_Symbol() {
+                return (EReference) pathComponentEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getPathComponent_Inverse() {
+                return (EAttribute) pathComponentEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getPathComponent_TransitiveClosure() {
+                return (EAttribute) pathComponentEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getPathComponent_ReflexiveTransitiveClosure() {
+                return (EAttribute) pathComponentEClass.getEStructuralFeatures().get(3);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getSymbol() {
+                return symbolEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getSymbol_Name() {
+                return (EAttribute) symbolEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getCall() {
+                return callEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getCall_Functor() {
+                return (EReference) callEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getCall_ArgumentList() {
+                return (EReference) callEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getReference() {
+                return referenceEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getReference_Components() {
+                return (EReference) referenceEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getExpression() {
+                return expressionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getExpression_ExistsVariables() {
+                return (EReference) expressionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getArgument() {
+                return argumentEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getArgumentList() {
+                return argumentListEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getArgumentList_Arguments() {
+                return (EReference) argumentListEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getExpressionArgument() {
+                return expressionArgumentEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getExpressionArgument_Expression() {
+                return (EReference) expressionArgumentEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getStarArgument() {
+                return starArgumentEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getTypedArgument() {
+                return typedArgumentEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getTypedArgument_TypeReference() {
+                return (EReference) typedArgumentEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getMultiaryExpession() {
+                return multiaryExpessionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getMultiaryExpession_Children() {
+                return (EReference) multiaryExpessionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getVariable() {
+                return variableEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getVariable_TypeReference() {
+                return (EReference) variableEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getUnaryExpression() {
+                return unaryExpressionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getUnaryExpression_Body() {
+                return (EReference) unaryExpressionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getUnaryExpression_Op() {
+                return (EAttribute) unaryExpressionEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getBinaryExpression() {
+                return binaryExpressionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getBinaryExpression_Op() {
+                return (EAttribute) binaryExpressionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getBinaryExpression_Left() {
+                return (EReference) binaryExpressionEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getBinaryExpression_Right() {
+                return (EReference) binaryExpressionEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getDisjunction() {
+                return disjunctionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getConjunction() {
+                return conjunctionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getConditionalExpression() {
+                return conditionalExpressionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getConditionalExpression_Condition() {
+                return (EReference) conditionalExpressionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getConditionalExpression_Then() {
+                return (EReference) conditionalExpressionEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getConditionalExpression_Else() {
+                return (EReference) conditionalExpressionEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getSwitch() {
+                return switchEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getSwitch_Cases() {
+                return (EReference) switchEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getCase() {
+                return caseEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getCase_Condition() {
+                return (EReference) caseEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getCase_Body() {
+                return (EReference) caseEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getLetExpression() {
+                return letExpressionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getLetExpression_Bindings() {
+                return (EReference) letExpressionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getLetExpression_Body() {
+                return (EReference) letExpressionEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getLetBinding() {
+                return letBindingEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getLetBinding_Value() {
+                return (EReference) letBindingEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getLetBinding_Variable() {
+                return (EReference) letBindingEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getLetBinding_Name() {
+                return (EAttribute) letBindingEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getLetBinding_Type() {
+                return (EReference) letBindingEClass.getEStructuralFeatures().get(3);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getLiteral() {
+                return literalEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getIntLiteral() {
+                return intLiteralEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getIntLiteral_Value() {
+                return (EAttribute) intLiteralEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getRealLiteral() {
+                return realLiteralEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getRealLiteral_Value() {
+                return (EAttribute) realLiteralEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getStringLiteral() {
+                return stringLiteralEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getStringLiteral_Value() {
+                return (EAttribute) stringLiteralEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getLogicLiteral() {
+                return logicLiteralEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getLogicLiteral_Value() {
+                return (EAttribute) logicLiteralEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getEmptyLiteral() {
+                return emptyLiteralEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getCastExpression() {
+                return castExpressionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getCastExpression_Body() {
+                return (EReference) castExpressionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getCastExpression_TargetType() {
+                return (EReference) castExpressionEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getAggregateExpression() {
+                return aggregateExpressionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getAggregateExpression_ForallVariables() {
+                return (EReference) aggregateExpressionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getAggregateExpression_Condition() {
+                return (EReference) aggregateExpressionEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getCount() {
+                return countEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getAggregation() {
+                return aggregationEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getAggregation_Value() {
+                return (EReference) aggregationEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getAggregation_Op() {
+                return (EReference) aggregationEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getForall() {
+                return forallEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getForall_Body() {
+                return (EReference) forallEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getTypeReference() {
+                return typeReferenceEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getTypeReference_ForceObjectType() {
+                return (EAttribute) typeReferenceEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getTypeReference_Type() {
+                return (EReference) typeReferenceEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getInfinityLiteral() {
+                return infinityLiteralEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getInterval() {
+                return intervalEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getInterval_LowerBound() {
+                return (EReference) intervalEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getInterval_UpperBound() {
+                return (EReference) intervalEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getFunctor() {
+                return functorEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getFunctor_Parameters() {
+                return (EReference) functorEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getRelation() {
+                return relationEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getBaseRelation() {
+                return baseRelationEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getPredicate() {
+                return predicateEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getDatatype() {
+                return datatypeEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getFunction() {
+                return functionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getFunction_ResultType() {
+                return (EReference) functionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getMetric() {
+                return metricEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getOperator() {
+                return operatorEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getNode() {
+                return nodeEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getNode_Named() {
+                return (EAttribute) nodeEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getStatement() {
+                return statementEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getAbstractAssertion() {
+                return abstractAssertionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getAbstractAssertion_Expression() {
+                return (EReference) abstractAssertionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getAbstractAssertion_Range() {
+                return (EReference) abstractAssertionEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getFunctorDefiniton() {
+                return functorDefinitonEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getFunctorDefiniton_Head() {
+                return (EReference) functorDefinitonEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getFunctorDefiniton_Body() {
+                return (EReference) functorDefinitonEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getPredicateDefinition() {
+                return predicateDefinitionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getFunctionDefinition() {
+                return functionDefinitionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getFunctionDefinition_ResultType() {
+                return (EReference) functionDefinitionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getAttribute() {
+                return attributeEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getAttribute_Target() {
+                return (EReference) attributeEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getAttribute_Kind() {
+                return (EAttribute) attributeEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getExternDeclaration() {
+                return externDeclarationEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getExternDeclaration_Name() {
+                return (EAttribute) externDeclarationEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getExternFunctorDeclaration() {
+                return externFunctorDeclarationEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getExternFunctorDeclaration_ArgumentList() {
+                return (EReference) externFunctorDeclarationEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getExternPredicateDeclaration() {
+                return externPredicateDeclarationEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getExternFunctionDeclaration() {
+                return externFunctionDeclarationEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getExternFunctionDeclaration_ResultType() {
+                return (EReference) externFunctionDeclarationEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getExternAggregationOperatorDeclaration() {
+                return externAggregationOperatorDeclarationEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getExternAggregationOperatorDeclaration_ArgumentType() {
+                return (EReference) externAggregationOperatorDeclarationEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getExternAggregationOperatorDeclaration_ResultType() {
+                return (EReference) externAggregationOperatorDeclarationEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getExternDatatypeDeclaration() {
+                return externDatatypeDeclarationEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getClassDeclaration() {
+                return classDeclarationEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getClassDeclaration_Fields() {
+                return (EReference) classDeclarationEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getClassDeclaration_Name() {
+                return (EAttribute) classDeclarationEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getClassDeclaration_Abstract() {
+                return (EAttribute) classDeclarationEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getClassDeclaration_Supertypes() {
+                return (EReference) classDeclarationEClass.getEStructuralFeatures().get(3);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getClassDeclaration_Root() {
+                return (EAttribute) classDeclarationEClass.getEStructuralFeatures().get(4);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getEnumDeclaration() {
+                return enumDeclarationEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getEnumDeclaration_Literals() {
+                return (EReference) enumDeclarationEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getEnumDeclaration_Name() {
+                return (EAttribute) enumDeclarationEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getEnumLiteral() {
+                return enumLiteralEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getEnumLiteral_Name() {
+                return (EAttribute) enumLiteralEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getField() {
+                return fieldEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getField_Containment() {
+                return (EAttribute) fieldEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getField_CrossReference() {
+                return (EAttribute) fieldEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getField_Opposite() {
+                return (EReference) fieldEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getField_Multiplicity() {
+                return (EReference) fieldEClass.getEStructuralFeatures().get(3);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getField_Type() {
+                return (EReference) fieldEClass.getEStructuralFeatures().get(4);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getField_Name() {
+                return (EAttribute) fieldEClass.getEStructuralFeatures().get(5);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getMultiplicity() {
+                return multiplicityEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getDefaultAssertion() {
+                return defaultAssertionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getAssertion() {
+                return assertionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getUnboundedMultiplicity() {
+                return unboundedMultiplicityEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getExactMultiplicity() {
+                return exactMultiplicityEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getExactMultiplicity_Value() {
+                return (EAttribute) exactMultiplicityEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getBoundedMultiplicity() {
+                return boundedMultiplicityEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getBoundedMultiplicity_LowerBound() {
+                return (EAttribute) boundedMultiplicityEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getBoundedMultiplicity_UpperBound() {
+                return (EAttribute) boundedMultiplicityEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getInlinePredicateAttrributes() {
+                return inlinePredicateAttrributesEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getInlinePredicateAttrributes_Error() {
+                return (EAttribute) inlinePredicateAttrributesEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getInlinePredicateAttrributes_Functional() {
+                return (EAttribute) inlinePredicateAttrributesEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getAggregationOperator() {
+                return aggregationOperatorEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getAggregationOperator_ArgumentType() {
+                return (EReference) aggregationOperatorEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getAggregationOperator_ResultType() {
+                return (EReference) aggregationOperatorEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getProblem() {
+                return problemEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getProblem_Name() {
+                return (EAttribute) problemEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getProblem_Statements() {
+                return (EReference) problemEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getProblem_Symbols() {
+                return (EReference) problemEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getProblem_Imports() {
+                return (EReference) problemEClass.getEStructuralFeatures().get(3);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getTypedStarArgument() {
+                return typedStarArgumentEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getTypedVariableArgument() {
+                return typedVariableArgumentEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getTypedVariableArgument_Name() {
+                return (EAttribute) typedVariableArgumentEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getUnnamedErrorPredicateDefintion() {
+                return unnamedErrorPredicateDefintionEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getUnnamedErrorPredicateDefintion_ArgumentList() {
+                return (EReference) unnamedErrorPredicateDefintionEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getUnnamedErrorPredicateDefintion_Body() {
+                return (EReference) unnamedErrorPredicateDefintionEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getObjectiveDeclaration() {
+                return objectiveDeclarationEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getObjectiveDeclaration_Kind() {
+                return (EAttribute) objectiveDeclarationEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getObjectiveDeclaration_Objective() {
+                return (EReference) objectiveDeclarationEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getScopeDeclaration() {
+                return scopeDeclarationEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getScopeDeclaration_Type() {
+                return (EReference) scopeDeclarationEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getExactScope() {
+                return exactScopeEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getExactScope_Size() {
+                return (EAttribute) exactScopeEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getBoundedScope() {
+                return boundedScopeEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getBoundedScope_LowerBound() {
+                return (EAttribute) boundedScopeEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getBoundedScope_UpperBound() {
+                return (EAttribute) boundedScopeEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getLowerBoundedScope() {
+                return lowerBoundedScopeEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getLowerBoundedScope_LowerBound() {
+                return (EAttribute) lowerBoundedScopeEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getNamespaceImport() {
+                return namespaceImportEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getNamespaceImport_ImportedNamespace() {
+                return (EAttribute) namespaceImportEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getImport() {
+                return importEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getImport_Alias() {
+                return (EAttribute) importEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getUriImport() {
+                return uriImportEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getUriImport_Uri() {
+                return (EAttribute) uriImportEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EEnum getUnaryOperator() {
+                return unaryOperatorEEnum;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EEnum getBinaryOperator() {
+                return binaryOperatorEEnum;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EEnum getLogicValue() {
+                return logicValueEEnum;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EEnum getObjectiveKind() {
+                return objectiveKindEEnum;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EEnum getAttributeKind() {
+                return attributeKindEEnum;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public SolverLanguageFactory getSolverLanguageFactory() {
+                return (SolverLanguageFactory) getEFactoryInstance();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private boolean isCreated = false;
+
+        /**
+         * Creates the meta-model objects for the package.  This method is
+         * guarded to have no affect on any invocation but its first.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void createPackageContents() {
+                if (isCreated)
+                        return;
+                isCreated = true;
+
+                // Create classes and their features
+                pathComponentEClass = createEClass(PATH_COMPONENT);
+                createEReference(pathComponentEClass, PATH_COMPONENT__SYMBOL);
+                createEAttribute(pathComponentEClass, PATH_COMPONENT__INVERSE);
+                createEAttribute(pathComponentEClass, PATH_COMPONENT__TRANSITIVE_CLOSURE);
+                createEAttribute(pathComponentEClass, PATH_COMPONENT__REFLEXIVE_TRANSITIVE_CLOSURE);
+
+                symbolEClass = createEClass(SYMBOL);
+                createEAttribute(symbolEClass, SYMBOL__NAME);
+
+                callEClass = createEClass(CALL);
+                createEReference(callEClass, CALL__FUNCTOR);
+                createEReference(callEClass, CALL__ARGUMENT_LIST);
+
+                referenceEClass = createEClass(REFERENCE);
+                createEReference(referenceEClass, REFERENCE__COMPONENTS);
+
+                expressionEClass = createEClass(EXPRESSION);
+                createEReference(expressionEClass, EXPRESSION__EXISTS_VARIABLES);
+
+                argumentEClass = createEClass(ARGUMENT);
+
+                argumentListEClass = createEClass(ARGUMENT_LIST);
+                createEReference(argumentListEClass, ARGUMENT_LIST__ARGUMENTS);
+
+                expressionArgumentEClass = createEClass(EXPRESSION_ARGUMENT);
+                createEReference(expressionArgumentEClass, EXPRESSION_ARGUMENT__EXPRESSION);
+
+                starArgumentEClass = createEClass(STAR_ARGUMENT);
+
+                typedArgumentEClass = createEClass(TYPED_ARGUMENT);
+                createEReference(typedArgumentEClass, TYPED_ARGUMENT__TYPE_REFERENCE);
+
+                multiaryExpessionEClass = createEClass(MULTIARY_EXPESSION);
+                createEReference(multiaryExpessionEClass, MULTIARY_EXPESSION__CHILDREN);
+
+                variableEClass = createEClass(VARIABLE);
+                createEReference(variableEClass, VARIABLE__TYPE_REFERENCE);
+
+                unaryExpressionEClass = createEClass(UNARY_EXPRESSION);
+                createEReference(unaryExpressionEClass, UNARY_EXPRESSION__BODY);
+                createEAttribute(unaryExpressionEClass, UNARY_EXPRESSION__OP);
+
+                binaryExpressionEClass = createEClass(BINARY_EXPRESSION);
+                createEAttribute(binaryExpressionEClass, BINARY_EXPRESSION__OP);
+                createEReference(binaryExpressionEClass, BINARY_EXPRESSION__LEFT);
+                createEReference(binaryExpressionEClass, BINARY_EXPRESSION__RIGHT);
+
+                disjunctionEClass = createEClass(DISJUNCTION);
+
+                conjunctionEClass = createEClass(CONJUNCTION);
+
+                conditionalExpressionEClass = createEClass(CONDITIONAL_EXPRESSION);
+                createEReference(conditionalExpressionEClass, CONDITIONAL_EXPRESSION__CONDITION);
+                createEReference(conditionalExpressionEClass, CONDITIONAL_EXPRESSION__THEN);
+                createEReference(conditionalExpressionEClass, CONDITIONAL_EXPRESSION__ELSE);
+
+                switchEClass = createEClass(SWITCH);
+                createEReference(switchEClass, SWITCH__CASES);
+
+                caseEClass = createEClass(CASE);
+                createEReference(caseEClass, CASE__CONDITION);
+                createEReference(caseEClass, CASE__BODY);
+
+                letExpressionEClass = createEClass(LET_EXPRESSION);
+                createEReference(letExpressionEClass, LET_EXPRESSION__BINDINGS);
+                createEReference(letExpressionEClass, LET_EXPRESSION__BODY);
+
+                letBindingEClass = createEClass(LET_BINDING);
+                createEReference(letBindingEClass, LET_BINDING__VALUE);
+                createEReference(letBindingEClass, LET_BINDING__VARIABLE);
+                createEAttribute(letBindingEClass, LET_BINDING__NAME);
+                createEReference(letBindingEClass, LET_BINDING__TYPE);
+
+                literalEClass = createEClass(LITERAL);
+
+                intLiteralEClass = createEClass(INT_LITERAL);
+                createEAttribute(intLiteralEClass, INT_LITERAL__VALUE);
+
+                realLiteralEClass = createEClass(REAL_LITERAL);
+                createEAttribute(realLiteralEClass, REAL_LITERAL__VALUE);
+
+                stringLiteralEClass = createEClass(STRING_LITERAL);
+                createEAttribute(stringLiteralEClass, STRING_LITERAL__VALUE);
+
+                logicLiteralEClass = createEClass(LOGIC_LITERAL);
+                createEAttribute(logicLiteralEClass, LOGIC_LITERAL__VALUE);
+
+                emptyLiteralEClass = createEClass(EMPTY_LITERAL);
+
+                castExpressionEClass = createEClass(CAST_EXPRESSION);
+                createEReference(castExpressionEClass, CAST_EXPRESSION__BODY);
+                createEReference(castExpressionEClass, CAST_EXPRESSION__TARGET_TYPE);
+
+                aggregateExpressionEClass = createEClass(AGGREGATE_EXPRESSION);
+                createEReference(aggregateExpressionEClass, AGGREGATE_EXPRESSION__FORALL_VARIABLES);
+                createEReference(aggregateExpressionEClass, AGGREGATE_EXPRESSION__CONDITION);
+
+                countEClass = createEClass(COUNT);
+
+                aggregationEClass = createEClass(AGGREGATION);
+                createEReference(aggregationEClass, AGGREGATION__VALUE);
+                createEReference(aggregationEClass, AGGREGATION__OP);
+
+                forallEClass = createEClass(FORALL);
+                createEReference(forallEClass, FORALL__BODY);
+
+                typeReferenceEClass = createEClass(TYPE_REFERENCE);
+                createEAttribute(typeReferenceEClass, TYPE_REFERENCE__FORCE_OBJECT_TYPE);
+                createEReference(typeReferenceEClass, TYPE_REFERENCE__TYPE);
+
+                infinityLiteralEClass = createEClass(INFINITY_LITERAL);
+
+                intervalEClass = createEClass(INTERVAL);
+                createEReference(intervalEClass, INTERVAL__LOWER_BOUND);
+                createEReference(intervalEClass, INTERVAL__UPPER_BOUND);
+
+                functorEClass = createEClass(FUNCTOR);
+                createEReference(functorEClass, FUNCTOR__PARAMETERS);
+
+                relationEClass = createEClass(RELATION);
+
+                baseRelationEClass = createEClass(BASE_RELATION);
+
+                predicateEClass = createEClass(PREDICATE);
+
+                datatypeEClass = createEClass(DATATYPE);
+
+                functionEClass = createEClass(FUNCTION);
+                createEReference(functionEClass, FUNCTION__RESULT_TYPE);
+
+                metricEClass = createEClass(METRIC);
+
+                operatorEClass = createEClass(OPERATOR);
+
+                nodeEClass = createEClass(NODE);
+                createEAttribute(nodeEClass, NODE__NAMED);
+
+                statementEClass = createEClass(STATEMENT);
+
+                abstractAssertionEClass = createEClass(ABSTRACT_ASSERTION);
+                createEReference(abstractAssertionEClass, ABSTRACT_ASSERTION__EXPRESSION);
+                createEReference(abstractAssertionEClass, ABSTRACT_ASSERTION__RANGE);
+
+                functorDefinitonEClass = createEClass(FUNCTOR_DEFINITON);
+                createEReference(functorDefinitonEClass, FUNCTOR_DEFINITON__HEAD);
+                createEReference(functorDefinitonEClass, FUNCTOR_DEFINITON__BODY);
+
+                predicateDefinitionEClass = createEClass(PREDICATE_DEFINITION);
+
+                functionDefinitionEClass = createEClass(FUNCTION_DEFINITION);
+                createEReference(functionDefinitionEClass, FUNCTION_DEFINITION__RESULT_TYPE);
+
+                attributeEClass = createEClass(ATTRIBUTE);
+                createEReference(attributeEClass, ATTRIBUTE__TARGET);
+                createEAttribute(attributeEClass, ATTRIBUTE__KIND);
+
+                externDeclarationEClass = createEClass(EXTERN_DECLARATION);
+                createEAttribute(externDeclarationEClass, EXTERN_DECLARATION__NAME);
+
+                externFunctorDeclarationEClass = createEClass(EXTERN_FUNCTOR_DECLARATION);
+                createEReference(externFunctorDeclarationEClass, EXTERN_FUNCTOR_DECLARATION__ARGUMENT_LIST);
+
+                externPredicateDeclarationEClass = createEClass(EXTERN_PREDICATE_DECLARATION);
+
+                externFunctionDeclarationEClass = createEClass(EXTERN_FUNCTION_DECLARATION);
+                createEReference(externFunctionDeclarationEClass, EXTERN_FUNCTION_DECLARATION__RESULT_TYPE);
+
+                externAggregationOperatorDeclarationEClass = createEClass(EXTERN_AGGREGATION_OPERATOR_DECLARATION);
+                createEReference(externAggregationOperatorDeclarationEClass,
+                                EXTERN_AGGREGATION_OPERATOR_DECLARATION__ARGUMENT_TYPE);
+                createEReference(externAggregationOperatorDeclarationEClass,
+                                EXTERN_AGGREGATION_OPERATOR_DECLARATION__RESULT_TYPE);
+
+                externDatatypeDeclarationEClass = createEClass(EXTERN_DATATYPE_DECLARATION);
+
+                classDeclarationEClass = createEClass(CLASS_DECLARATION);
+                createEReference(classDeclarationEClass, CLASS_DECLARATION__FIELDS);
+                createEAttribute(classDeclarationEClass, CLASS_DECLARATION__NAME);
+                createEAttribute(classDeclarationEClass, CLASS_DECLARATION__ABSTRACT);
+                createEReference(classDeclarationEClass, CLASS_DECLARATION__SUPERTYPES);
+                createEAttribute(classDeclarationEClass, CLASS_DECLARATION__ROOT);
+
+                enumDeclarationEClass = createEClass(ENUM_DECLARATION);
+                createEReference(enumDeclarationEClass, ENUM_DECLARATION__LITERALS);
+                createEAttribute(enumDeclarationEClass, ENUM_DECLARATION__NAME);
+
+                enumLiteralEClass = createEClass(ENUM_LITERAL);
+                createEAttribute(enumLiteralEClass, ENUM_LITERAL__NAME);
+
+                fieldEClass = createEClass(FIELD);
+                createEAttribute(fieldEClass, FIELD__CONTAINMENT);
+                createEAttribute(fieldEClass, FIELD__CROSS_REFERENCE);
+                createEReference(fieldEClass, FIELD__OPPOSITE);
+                createEReference(fieldEClass, FIELD__MULTIPLICITY);
+                createEReference(fieldEClass, FIELD__TYPE);
+                createEAttribute(fieldEClass, FIELD__NAME);
+
+                multiplicityEClass = createEClass(MULTIPLICITY);
+
+                defaultAssertionEClass = createEClass(DEFAULT_ASSERTION);
+
+                assertionEClass = createEClass(ASSERTION);
+
+                unboundedMultiplicityEClass = createEClass(UNBOUNDED_MULTIPLICITY);
+
+                exactMultiplicityEClass = createEClass(EXACT_MULTIPLICITY);
+                createEAttribute(exactMultiplicityEClass, EXACT_MULTIPLICITY__VALUE);
+
+                boundedMultiplicityEClass = createEClass(BOUNDED_MULTIPLICITY);
+                createEAttribute(boundedMultiplicityEClass, BOUNDED_MULTIPLICITY__LOWER_BOUND);
+                createEAttribute(boundedMultiplicityEClass, BOUNDED_MULTIPLICITY__UPPER_BOUND);
+
+                inlinePredicateAttrributesEClass = createEClass(INLINE_PREDICATE_ATTRRIBUTES);
+                createEAttribute(inlinePredicateAttrributesEClass, INLINE_PREDICATE_ATTRRIBUTES__ERROR);
+                createEAttribute(inlinePredicateAttrributesEClass, INLINE_PREDICATE_ATTRRIBUTES__FUNCTIONAL);
+
+                aggregationOperatorEClass = createEClass(AGGREGATION_OPERATOR);
+                createEReference(aggregationOperatorEClass, AGGREGATION_OPERATOR__ARGUMENT_TYPE);
+                createEReference(aggregationOperatorEClass, AGGREGATION_OPERATOR__RESULT_TYPE);
+
+                problemEClass = createEClass(PROBLEM);
+                createEAttribute(problemEClass, PROBLEM__NAME);
+                createEReference(problemEClass, PROBLEM__STATEMENTS);
+                createEReference(problemEClass, PROBLEM__SYMBOLS);
+                createEReference(problemEClass, PROBLEM__IMPORTS);
+
+                typedStarArgumentEClass = createEClass(TYPED_STAR_ARGUMENT);
+
+                typedVariableArgumentEClass = createEClass(TYPED_VARIABLE_ARGUMENT);
+                createEAttribute(typedVariableArgumentEClass, TYPED_VARIABLE_ARGUMENT__NAME);
+
+                unnamedErrorPredicateDefintionEClass = createEClass(UNNAMED_ERROR_PREDICATE_DEFINTION);
+                createEReference(unnamedErrorPredicateDefintionEClass, UNNAMED_ERROR_PREDICATE_DEFINTION__ARGUMENT_LIST);
+                createEReference(unnamedErrorPredicateDefintionEClass, UNNAMED_ERROR_PREDICATE_DEFINTION__BODY);
+
+                objectiveDeclarationEClass = createEClass(OBJECTIVE_DECLARATION);
+                createEAttribute(objectiveDeclarationEClass, OBJECTIVE_DECLARATION__KIND);
+                createEReference(objectiveDeclarationEClass, OBJECTIVE_DECLARATION__OBJECTIVE);
+
+                scopeDeclarationEClass = createEClass(SCOPE_DECLARATION);
+                createEReference(scopeDeclarationEClass, SCOPE_DECLARATION__TYPE);
+
+                exactScopeEClass = createEClass(EXACT_SCOPE);
+                createEAttribute(exactScopeEClass, EXACT_SCOPE__SIZE);
+
+                boundedScopeEClass = createEClass(BOUNDED_SCOPE);
+                createEAttribute(boundedScopeEClass, BOUNDED_SCOPE__LOWER_BOUND);
+                createEAttribute(boundedScopeEClass, BOUNDED_SCOPE__UPPER_BOUND);
+
+                lowerBoundedScopeEClass = createEClass(LOWER_BOUNDED_SCOPE);
+                createEAttribute(lowerBoundedScopeEClass, LOWER_BOUNDED_SCOPE__LOWER_BOUND);
+
+                namespaceImportEClass = createEClass(NAMESPACE_IMPORT);
+                createEAttribute(namespaceImportEClass, NAMESPACE_IMPORT__IMPORTED_NAMESPACE);
+
+                importEClass = createEClass(IMPORT);
+                createEAttribute(importEClass, IMPORT__ALIAS);
+
+                uriImportEClass = createEClass(URI_IMPORT);
+                createEAttribute(uriImportEClass, URI_IMPORT__URI);
+
+                // Create enums
+                unaryOperatorEEnum = createEEnum(UNARY_OPERATOR);
+                binaryOperatorEEnum = createEEnum(BINARY_OPERATOR);
+                logicValueEEnum = createEEnum(LOGIC_VALUE);
+                objectiveKindEEnum = createEEnum(OBJECTIVE_KIND);
+                attributeKindEEnum = createEEnum(ATTRIBUTE_KIND);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private boolean isInitialized = false;
+
+        /**
+         * Complete the initialization of the package and its meta-model.  This
+         * method is guarded to have no affect on any invocation but its first.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void initializePackageContents() {
+                if (isInitialized)
+                        return;
+                isInitialized = true;
+
+                // Initialize package
+                setName(eNAME);
+                setNsPrefix(eNS_PREFIX);
+                setNsURI(eNS_URI);
+
+                // Create type parameters
+
+                // Set bounds for type parameters
+
+                // Add supertypes to classes
+                callEClass.getESuperTypes().add(this.getExpression());
+                referenceEClass.getESuperTypes().add(this.getExpression());
+                expressionEClass.getESuperTypes().add(this.getStatement());
+                expressionArgumentEClass.getESuperTypes().add(this.getArgument());
+                starArgumentEClass.getESuperTypes().add(this.getArgument());
+                typedArgumentEClass.getESuperTypes().add(this.getArgument());
+                multiaryExpessionEClass.getESuperTypes().add(this.getExpression());
+                variableEClass.getESuperTypes().add(this.getSymbol());
+                unaryExpressionEClass.getESuperTypes().add(this.getExpression());
+                binaryExpressionEClass.getESuperTypes().add(this.getExpression());
+                disjunctionEClass.getESuperTypes().add(this.getMultiaryExpession());
+                conjunctionEClass.getESuperTypes().add(this.getMultiaryExpession());
+                conditionalExpressionEClass.getESuperTypes().add(this.getExpression());
+                switchEClass.getESuperTypes().add(this.getExpression());
+                caseEClass.getESuperTypes().add(this.getExpression());
+                letExpressionEClass.getESuperTypes().add(this.getExpression());
+                literalEClass.getESuperTypes().add(this.getExpression());
+                intLiteralEClass.getESuperTypes().add(this.getLiteral());
+                realLiteralEClass.getESuperTypes().add(this.getLiteral());
+                stringLiteralEClass.getESuperTypes().add(this.getLiteral());
+                logicLiteralEClass.getESuperTypes().add(this.getLiteral());
+                emptyLiteralEClass.getESuperTypes().add(this.getLiteral());
+                castExpressionEClass.getESuperTypes().add(this.getExpression());
+                aggregateExpressionEClass.getESuperTypes().add(this.getExpression());
+                countEClass.getESuperTypes().add(this.getAggregateExpression());
+                aggregationEClass.getESuperTypes().add(this.getAggregateExpression());
+                forallEClass.getESuperTypes().add(this.getAggregateExpression());
+                infinityLiteralEClass.getESuperTypes().add(this.getLiteral());
+                intervalEClass.getESuperTypes().add(this.getExpression());
+                functorEClass.getESuperTypes().add(this.getSymbol());
+                relationEClass.getESuperTypes().add(this.getFunctor());
+                baseRelationEClass.getESuperTypes().add(this.getRelation());
+                predicateEClass.getESuperTypes().add(this.getRelation());
+                datatypeEClass.getESuperTypes().add(this.getRelation());
+                functionEClass.getESuperTypes().add(this.getFunctor());
+                metricEClass.getESuperTypes().add(this.getFunction());
+                operatorEClass.getESuperTypes().add(this.getFunction());
+                nodeEClass.getESuperTypes().add(this.getSymbol());
+                abstractAssertionEClass.getESuperTypes().add(this.getStatement());
+                functorDefinitonEClass.getESuperTypes().add(this.getStatement());
+                predicateDefinitionEClass.getESuperTypes().add(this.getFunctorDefiniton());
+                predicateDefinitionEClass.getESuperTypes().add(this.getInlinePredicateAttrributes());
+                functionDefinitionEClass.getESuperTypes().add(this.getFunctorDefiniton());
+                attributeEClass.getESuperTypes().add(this.getStatement());
+                externDeclarationEClass.getESuperTypes().add(this.getStatement());
+                externFunctorDeclarationEClass.getESuperTypes().add(this.getExternDeclaration());
+                externPredicateDeclarationEClass.getESuperTypes().add(this.getExternFunctorDeclaration());
+                externPredicateDeclarationEClass.getESuperTypes().add(this.getInlinePredicateAttrributes());
+                externFunctionDeclarationEClass.getESuperTypes().add(this.getExternFunctorDeclaration());
+                externAggregationOperatorDeclarationEClass.getESuperTypes().add(this.getExternDeclaration());
+                externDatatypeDeclarationEClass.getESuperTypes().add(this.getExternDeclaration());
+                classDeclarationEClass.getESuperTypes().add(this.getStatement());
+                enumDeclarationEClass.getESuperTypes().add(this.getStatement());
+                defaultAssertionEClass.getESuperTypes().add(this.getAbstractAssertion());
+                assertionEClass.getESuperTypes().add(this.getAbstractAssertion());
+                unboundedMultiplicityEClass.getESuperTypes().add(this.getMultiplicity());
+                exactMultiplicityEClass.getESuperTypes().add(this.getMultiplicity());
+                boundedMultiplicityEClass.getESuperTypes().add(this.getMultiplicity());
+                aggregationOperatorEClass.getESuperTypes().add(this.getSymbol());
+                typedStarArgumentEClass.getESuperTypes().add(this.getTypedArgument());
+                typedVariableArgumentEClass.getESuperTypes().add(this.getTypedArgument());
+                unnamedErrorPredicateDefintionEClass.getESuperTypes().add(this.getStatement());
+                objectiveDeclarationEClass.getESuperTypes().add(this.getStatement());
+                scopeDeclarationEClass.getESuperTypes().add(this.getStatement());
+                exactScopeEClass.getESuperTypes().add(this.getScopeDeclaration());
+                boundedScopeEClass.getESuperTypes().add(this.getScopeDeclaration());
+                lowerBoundedScopeEClass.getESuperTypes().add(this.getScopeDeclaration());
+                namespaceImportEClass.getESuperTypes().add(this.getImport());
+                uriImportEClass.getESuperTypes().add(this.getImport());
+
+                // Initialize classes, features, and operations; add parameters
+                initEClass(pathComponentEClass, PathComponent.class, "PathComponent", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getPathComponent_Symbol(), this.getSymbol(), null, "symbol", null, 0, 1, PathComponent.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getPathComponent_Inverse(), ecorePackage.getEBoolean(), "inverse", null, 0, 1,
+                                PathComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                                !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getPathComponent_TransitiveClosure(), ecorePackage.getEBoolean(), "transitiveClosure", null, 0,
+                                1, PathComponent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                                !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getPathComponent_ReflexiveTransitiveClosure(), ecorePackage.getEBoolean(),
+                                "reflexiveTransitiveClosure", null, 0, 1, PathComponent.class, !IS_TRANSIENT, !IS_VOLATILE,
+                                IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(symbolEClass, Symbol.class, "Symbol", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getSymbol_Name(), ecorePackage.getEString(), "name", null, 0, 1, Symbol.class, !IS_TRANSIENT,
+                                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(callEClass, Call.class, "Call", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                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);
+
+                initEClass(referenceEClass, Reference.class, "Reference", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getReference_Components(), this.getPathComponent(), null, "components", null, 0, -1,
+                                Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(expressionEClass, Expression.class, "Expression", IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getExpression_ExistsVariables(), this.getVariable(), null, "existsVariables", null, 0, -1,
+                                Expression.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(argumentEClass, Argument.class, "Argument", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(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(expressionArgumentEClass, ExpressionArgument.class, "ExpressionArgument", !IS_ABSTRACT,
+                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getExpressionArgument_Expression(), this.getExpression(), null, "expression", 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(starArgumentEClass, StarArgument.class, "StarArgument", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(typedArgumentEClass, TypedArgument.class, "TypedArgument", IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getTypedArgument_TypeReference(), this.getTypeReference(), null, "typeReference", 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(multiaryExpessionEClass, MultiaryExpession.class, "MultiaryExpession", IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getMultiaryExpession_Children(), this.getExpression(), null, "children", null, 0, -1,
+                                MultiaryExpession.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(variableEClass, Variable.class, "Variable", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getVariable_TypeReference(), this.getTypeReference(), null, "typeReference", null, 0, 1,
+                                Variable.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);
+                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);
+                initEAttribute(getUnaryExpression_Op(), this.getUnaryOperator(), "op", null, 0, 1, UnaryExpression.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(binaryExpressionEClass, BinaryExpression.class, "BinaryExpression", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                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_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);
+                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(disjunctionEClass, Disjunction.class, "Disjunction", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(conjunctionEClass, Conjunction.class, "Conjunction", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(conditionalExpressionEClass, ConditionalExpression.class, "ConditionalExpression", !IS_ABSTRACT,
+                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getConditionalExpression_Condition(), this.getExpression(), null, "condition", null, 0, 1,
+                                ConditionalExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+                                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getConditionalExpression_Then(), this.getExpression(), null, "then", null, 0, 1,
+                                ConditionalExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+                                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getConditionalExpression_Else(), this.getExpression(), null, "else", null, 0, 1,
+                                ConditionalExpression.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(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(letExpressionEClass, LetExpression.class, "LetExpression", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getLetExpression_Bindings(), this.getLetBinding(), null, "bindings", null, 0, -1,
+                                LetExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getLetExpression_Body(), this.getExpression(), null, "body", null, 0, 1, LetExpression.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(letBindingEClass, LetBinding.class, "LetBinding", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getLetBinding_Value(), this.getExpression(), null, "value", null, 0, 1, LetBinding.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getLetBinding_Variable(), this.getVariable(), null, "variable", null, 0, 1, LetBinding.class,
+                                IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+                                !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getLetBinding_Name(), ecorePackage.getEString(), "name", null, 0, 1, LetBinding.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getLetBinding_Type(), this.getSymbol(), null, "type", null, 0, 1, LetBinding.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(literalEClass, Literal.class, "Literal", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(intLiteralEClass, IntLiteral.class, "IntLiteral", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getIntLiteral_Value(), ecorePackage.getEInt(), "value", null, 0, 1, IntLiteral.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(realLiteralEClass, RealLiteral.class, "RealLiteral", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getRealLiteral_Value(), ecorePackage.getEBigDecimal(), "value", null, 0, 1, RealLiteral.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                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(logicLiteralEClass, LogicLiteral.class, "LogicLiteral", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                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(emptyLiteralEClass, EmptyLiteral.class, "EmptyLiteral", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(castExpressionEClass, CastExpression.class, "CastExpression", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getCastExpression_Body(), this.getExpression(), null, "body", null, 0, 1, CastExpression.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getCastExpression_TargetType(), this.getSymbol(), null, "targetType", null, 0, 1,
+                                CastExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(aggregateExpressionEClass, AggregateExpression.class, "AggregateExpression", IS_ABSTRACT,
+                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getAggregateExpression_ForallVariables(), this.getVariable(), null, "forallVariables", null, 0,
+                                -1, AggregateExpression.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+                                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getAggregateExpression_Condition(), this.getExpression(), null, "condition", null, 0, 1,
+                                AggregateExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+                                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(countEClass, Count.class, "Count", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(aggregationEClass, Aggregation.class, "Aggregation", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getAggregation_Value(), this.getExpression(), null, "value", 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_Op(), this.getSymbol(), null, "op", 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(forallEClass, Forall.class, "Forall", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getForall_Body(), this.getExpression(), null, "body", null, 0, 1, Forall.class, !IS_TRANSIENT,
+                                !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+                                IS_ORDERED);
+
+                initEClass(typeReferenceEClass, TypeReference.class, "TypeReference", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getTypeReference_ForceObjectType(), ecorePackage.getEBoolean(), "forceObjectType", null, 0, 1,
+                                TypeReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                                !IS_DERIVED, IS_ORDERED);
+                initEReference(getTypeReference_Type(), this.getSymbol(), null, "type", null, 0, 1, TypeReference.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(infinityLiteralEClass, InfinityLiteral.class, "InfinityLiteral", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(intervalEClass, Interval.class, "Interval", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                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(functorEClass, Functor.class, "Functor", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getFunctor_Parameters(), this.getVariable(), null, "parameters", null, 0, -1, Functor.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(relationEClass, Relation.class, "Relation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(baseRelationEClass, BaseRelation.class, "BaseRelation", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(predicateEClass, Predicate.class, "Predicate", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(datatypeEClass, Datatype.class, "Datatype", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(functionEClass, Function.class, "Function", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getFunction_ResultType(), this.getDatatype(), null, "resultType", null, 0, 1, Function.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(metricEClass, Metric.class, "Metric", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(operatorEClass, Operator.class, "Operator", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(nodeEClass, Node.class, "Node", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getNode_Named(), ecorePackage.getEBoolean(), "named", null, 0, 1, Node.class, !IS_TRANSIENT,
+                                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(statementEClass, Statement.class, "Statement", IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(abstractAssertionEClass, AbstractAssertion.class, "AbstractAssertion", IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getAbstractAssertion_Expression(), this.getExpression(), null, "expression", null, 0, 1,
+                                AbstractAssertion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getAbstractAssertion_Range(), this.getExpression(), null, "range", null, 0, 1,
+                                AbstractAssertion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(functorDefinitonEClass, FunctorDefiniton.class, "FunctorDefiniton", IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getFunctorDefiniton_Head(), this.getExpression(), null, "head", null, 0, 1,
+                                FunctorDefiniton.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getFunctorDefiniton_Body(), this.getExpression(), null, "body", null, 0, 1,
+                                FunctorDefiniton.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(predicateDefinitionEClass, PredicateDefinition.class, "PredicateDefinition", !IS_ABSTRACT,
+                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(functionDefinitionEClass, FunctionDefinition.class, "FunctionDefinition", !IS_ABSTRACT,
+                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getFunctionDefinition_ResultType(), this.getSymbol(), null, "resultType", null, 0, 1,
+                                FunctionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(attributeEClass, Attribute.class, "Attribute", IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getAttribute_Target(), this.getSymbol(), null, "target", null, 0, 1, Attribute.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getAttribute_Kind(), this.getAttributeKind(), "kind", null, 0, 1, Attribute.class, !IS_TRANSIENT,
+                                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(externDeclarationEClass, ExternDeclaration.class, "ExternDeclaration", IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getExternDeclaration_Name(), ecorePackage.getEString(), "name", null, 0, 1,
+                                ExternDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                                !IS_DERIVED, IS_ORDERED);
+
+                initEClass(externFunctorDeclarationEClass, ExternFunctorDeclaration.class, "ExternFunctorDeclaration",
+                                IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getExternFunctorDeclaration_ArgumentList(), this.getArgumentList(), null, "argumentList", null,
+                                0, 1, ExternFunctorDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+                                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(externPredicateDeclarationEClass, ExternPredicateDeclaration.class, "ExternPredicateDeclaration",
+                                !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(externFunctionDeclarationEClass, ExternFunctionDeclaration.class, "ExternFunctionDeclaration",
+                                !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getExternFunctionDeclaration_ResultType(), this.getSymbol(), null, "resultType", null, 0, 1,
+                                ExternFunctionDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+                                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(externAggregationOperatorDeclarationEClass, ExternAggregationOperatorDeclaration.class,
+                                "ExternAggregationOperatorDeclaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getExternAggregationOperatorDeclaration_ArgumentType(), this.getSymbol(), null, "argumentType",
+                                null, 0, 1, ExternAggregationOperatorDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+                                !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getExternAggregationOperatorDeclaration_ResultType(), this.getSymbol(), null, "resultType", null,
+                                0, 1, ExternAggregationOperatorDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+                                !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(externDatatypeDeclarationEClass, ExternDatatypeDeclaration.class, "ExternDatatypeDeclaration",
+                                !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(classDeclarationEClass, ClassDeclaration.class, "ClassDeclaration", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getClassDeclaration_Fields(), this.getField(), null, "fields", null, 0, -1,
+                                ClassDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getClassDeclaration_Name(), ecorePackage.getEString(), "name", null, 0, 1,
+                                ClassDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                                !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getClassDeclaration_Abstract(), ecorePackage.getEBoolean(), "abstract", null, 0, 1,
+                                ClassDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                                !IS_DERIVED, IS_ORDERED);
+                initEReference(getClassDeclaration_Supertypes(), this.getSymbol(), null, "supertypes", null, 0, -1,
+                                ClassDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getClassDeclaration_Root(), ecorePackage.getEBoolean(), "root", null, 0, 1,
+                                ClassDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                                !IS_DERIVED, IS_ORDERED);
+
+                initEClass(enumDeclarationEClass, EnumDeclaration.class, "EnumDeclaration", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getEnumDeclaration_Literals(), this.getEnumLiteral(), null, "literals", null, 0, -1,
+                                EnumDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getEnumDeclaration_Name(), ecorePackage.getEString(), "name", null, 0, 1, EnumDeclaration.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(enumLiteralEClass, EnumLiteral.class, "EnumLiteral", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getEnumLiteral_Name(), ecorePackage.getEString(), "name", null, 0, 1, EnumLiteral.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(fieldEClass, Field.class, "Field", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getField_Containment(), ecorePackage.getEBoolean(), "containment", null, 0, 1, Field.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getField_CrossReference(), ecorePackage.getEBoolean(), "crossReference", null, 0, 1, Field.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getField_Opposite(), this.getSymbol(), null, "opposite", null, 0, 1, Field.class, !IS_TRANSIENT,
+                                !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+                                IS_ORDERED);
+                initEReference(getField_Multiplicity(), this.getMultiplicity(), null, "multiplicity", null, 0, 1, Field.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getField_Type(), this.getSymbol(), null, "type", null, 0, 1, Field.class, !IS_TRANSIENT,
+                                !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+                                IS_ORDERED);
+                initEAttribute(getField_Name(), ecorePackage.getEString(), "name", null, 0, 1, Field.class, !IS_TRANSIENT,
+                                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(multiplicityEClass, Multiplicity.class, "Multiplicity", IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(defaultAssertionEClass, DefaultAssertion.class, "DefaultAssertion", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(assertionEClass, Assertion.class, "Assertion", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(unboundedMultiplicityEClass, UnboundedMultiplicity.class, "UnboundedMultiplicity", !IS_ABSTRACT,
+                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(exactMultiplicityEClass, ExactMultiplicity.class, "ExactMultiplicity", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getExactMultiplicity_Value(), ecorePackage.getEInt(), "value", 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(inlinePredicateAttrributesEClass, InlinePredicateAttrributes.class, "InlinePredicateAttrributes",
+                                IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getInlinePredicateAttrributes_Error(), ecorePackage.getEBoolean(), "error", null, 0, 1,
+                                InlinePredicateAttrributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getInlinePredicateAttrributes_Functional(), ecorePackage.getEBoolean(), "functional", null, 0, 1,
+                                InlinePredicateAttrributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(aggregationOperatorEClass, AggregationOperator.class, "AggregationOperator", !IS_ABSTRACT,
+                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getAggregationOperator_ArgumentType(), this.getDatatype(), null, "argumentType", null, 0, 1,
+                                AggregationOperator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+                                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getAggregationOperator_ResultType(), this.getDatatype(), null, "resultType", null, 0, 1,
+                                AggregationOperator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+                                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(problemEClass, Problem.class, "Problem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getProblem_Name(), ecorePackage.getEString(), "name", null, 0, 1, Problem.class, !IS_TRANSIENT,
+                                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                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);
+                initEReference(getProblem_Symbols(), this.getSymbol(), null, "symbols", null, 0, -1, Problem.class,
+                                IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+                                !IS_DERIVED, IS_ORDERED);
+                initEReference(getProblem_Imports(), this.getImport(), null, "imports", 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(typedStarArgumentEClass, TypedStarArgument.class, "TypedStarArgument", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(typedVariableArgumentEClass, TypedVariableArgument.class, "TypedVariableArgument", !IS_ABSTRACT,
+                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getTypedVariableArgument_Name(), ecorePackage.getEString(), "name", null, 0, 1,
+                                TypedVariableArgument.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(unnamedErrorPredicateDefintionEClass, UnnamedErrorPredicateDefintion.class,
+                                "UnnamedErrorPredicateDefintion", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getUnnamedErrorPredicateDefintion_ArgumentList(), this.getArgumentList(), null, "argumentList",
+                                null, 0, 1, UnnamedErrorPredicateDefintion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+                                IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getUnnamedErrorPredicateDefintion_Body(), this.getExpression(), null, "body", null, 0, 1,
+                                UnnamedErrorPredicateDefintion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+                                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(objectiveDeclarationEClass, ObjectiveDeclaration.class, "ObjectiveDeclaration", !IS_ABSTRACT,
+                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getObjectiveDeclaration_Kind(), this.getObjectiveKind(), "kind", null, 0, 1,
+                                ObjectiveDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getObjectiveDeclaration_Objective(), this.getExpression(), null, "objective", null, 0, 1,
+                                ObjectiveDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+                                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(scopeDeclarationEClass, ScopeDeclaration.class, "ScopeDeclaration", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getScopeDeclaration_Type(), this.getSymbol(), null, "type", null, 0, 1, ScopeDeclaration.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(exactScopeEClass, ExactScope.class, "ExactScope", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getExactScope_Size(), ecorePackage.getEInt(), "size", null, 0, 1, ExactScope.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(boundedScopeEClass, BoundedScope.class, "BoundedScope", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getBoundedScope_LowerBound(), ecorePackage.getEInt(), "lowerBound", null, 0, 1,
+                                BoundedScope.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                                !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getBoundedScope_UpperBound(), ecorePackage.getEInt(), "upperBound", null, 0, 1,
+                                BoundedScope.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                                !IS_DERIVED, IS_ORDERED);
+
+                initEClass(lowerBoundedScopeEClass, LowerBoundedScope.class, "LowerBoundedScope", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getLowerBoundedScope_LowerBound(), ecorePackage.getEInt(), "lowerBound", null, 0, 1,
+                                LowerBoundedScope.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                                !IS_DERIVED, IS_ORDERED);
+
+                initEClass(namespaceImportEClass, NamespaceImport.class, "NamespaceImport", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getNamespaceImport_ImportedNamespace(), ecorePackage.getEString(), "importedNamespace", null, 0,
+                                1, NamespaceImport.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                                !IS_DERIVED, IS_ORDERED);
+
+                initEClass(importEClass, Import.class, "Import", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getImport_Alias(), ecorePackage.getEString(), "alias", null, 0, 1, Import.class, !IS_TRANSIENT,
+                                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(uriImportEClass, UriImport.class, "UriImport", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getUriImport_Uri(), ecorePackage.getEString(), "uri", null, 0, 1, UriImport.class, !IS_TRANSIENT,
+                                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                // Initialize enums and add enum literals
+                initEEnum(unaryOperatorEEnum, UnaryOperator.class, "UnaryOperator");
+                addEEnumLiteral(unaryOperatorEEnum, UnaryOperator.NOT);
+                addEEnumLiteral(unaryOperatorEEnum, UnaryOperator.PLUS);
+                addEEnumLiteral(unaryOperatorEEnum, UnaryOperator.MINUS);
+                addEEnumLiteral(unaryOperatorEEnum, UnaryOperator.MAYBE);
+
+                initEEnum(binaryOperatorEEnum, BinaryOperator.class, "BinaryOperator");
+                addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.PLUS);
+                addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.MINUS);
+                addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.MULTIPLY);
+                addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.DIVIDE);
+                addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.POW);
+                addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.IN);
+                addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.EQUALS);
+                addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.NOT_EQUALS);
+                addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.LESS);
+                addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.LESS_EQUALS);
+                addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.GREATER);
+                addEEnumLiteral(binaryOperatorEEnum, BinaryOperator.GREATER_EQUALS);
+
+                initEEnum(logicValueEEnum, LogicValue.class, "LogicValue");
+                addEEnumLiteral(logicValueEEnum, LogicValue.UNKNOWN);
+                addEEnumLiteral(logicValueEEnum, LogicValue.FALSE);
+                addEEnumLiteral(logicValueEEnum, LogicValue.TRUE);
+                addEEnumLiteral(logicValueEEnum, LogicValue.ERROR);
+
+                initEEnum(objectiveKindEEnum, ObjectiveKind.class, "ObjectiveKind");
+                addEEnumLiteral(objectiveKindEEnum, ObjectiveKind.MINIMIZATION);
+                addEEnumLiteral(objectiveKindEEnum, ObjectiveKind.MAXIMIZATION);
+
+                initEEnum(attributeKindEEnum, AttributeKind.class, "AttributeKind");
+                addEEnumLiteral(attributeKindEEnum, AttributeKind.FUNCTIONAL);
+                addEEnumLiteral(attributeKindEEnum, AttributeKind.ERROR);
+                addEEnumLiteral(attributeKindEEnum, AttributeKind.ROOT);
+                addEEnumLiteral(attributeKindEEnum, AttributeKind.CONTAINMENT);
+
+                // Create resource
+                createResource(eNS_URI);
+        }
+
+} //SolverLanguagePackageImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StarArgumentImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StarArgumentImpl.java
new file mode 100644
index 00000000..63dd9e11
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StarArgumentImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+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.StarArgument;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Star Argument</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class StarArgumentImpl extends ArgumentImpl implements StarArgument {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected StarArgumentImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.STAR_ARGUMENT;
+        }
+
+} //StarArgumentImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StatementImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StatementImpl.java
new file mode 100644
index 00000000..36404986
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StatementImpl.java
@@ -0,0 +1,39 @@
+/**
+ */
+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.Statement;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Statement</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class StatementImpl extends MinimalEObjectImpl.Container implements Statement {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected StatementImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.STATEMENT;
+        }
+
+} //StatementImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StringLiteralImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StringLiteralImpl.java
new file mode 100644
index 00000000..8b321f80
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/StringLiteralImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+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.StringLiteral;
+
+/**
+ * <!-- begin-user-doc -->
+ * 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.StringLiteralImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class StringLiteralImpl extends LiteralImpl implements StringLiteral {
+        /**
+         * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected static final String VALUE_EDEFAULT = null;
+
+        /**
+         * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected String value = VALUE_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected StringLiteralImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.STRING_LITERAL;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getValue() {
+                return value;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setValue(String newValue) {
+                String oldValue = value;
+                value = newValue;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.STRING_LITERAL__VALUE, oldValue,
+                                        value));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.STRING_LITERAL__VALUE:
+                        return getValue();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                case SolverLanguagePackage.STRING_LITERAL__VALUE:
+                        setValue((String) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.STRING_LITERAL__VALUE:
+                        setValue(VALUE_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.STRING_LITERAL__VALUE:
+                        return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+                }
+                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(" (value: ");
+                result.append(value);
+                result.append(')');
+                return result.toString();
+        }
+
+} //StringLiteralImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SwitchImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SwitchImpl.java
new file mode 100644
index 00000000..df89831b
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SwitchImpl.java
@@ -0,0 +1,150 @@
+/**
+ */
+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
+         */
+        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.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SymbolImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SymbolImpl.java
new file mode 100644
index 00000000..a9f76acb
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/SymbolImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+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.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 -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.SymbolImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class SymbolImpl extends MinimalEObjectImpl.Container implements Symbol {
+        /**
+         * 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 SymbolImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.SYMBOL;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getName() {
+                return name;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setName(String newName) {
+                String oldName = name;
+                name = newName;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.SYMBOL__NAME, oldName, name));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.SYMBOL__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.SYMBOL__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.SYMBOL__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.SYMBOL__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();
+        }
+
+} //SymbolImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TypeReferenceImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TypeReferenceImpl.java
new file mode 100644
index 00000000..a3c76e63
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TypeReferenceImpl.java
@@ -0,0 +1,230 @@
+/**
+ */
+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.emf.ecore.impl.MinimalEObjectImpl;
+
+import org.eclipse.viatra.solver.language.solverLanguage.SolverLanguagePackage;
+import org.eclipse.viatra.solver.language.solverLanguage.Symbol;
+import org.eclipse.viatra.solver.language.solverLanguage.TypeReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Type Reference</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.TypeReferenceImpl#isForceObjectType <em>Force Object Type</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.TypeReferenceImpl#getType <em>Type</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TypeReferenceImpl extends MinimalEObjectImpl.Container implements TypeReference {
+        /**
+         * The default value of the '{@link #isForceObjectType() <em>Force Object Type</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #isForceObjectType()
+         * @generated
+         * @ordered
+         */
+        protected static final boolean FORCE_OBJECT_TYPE_EDEFAULT = false;
+
+        /**
+         * The cached value of the '{@link #isForceObjectType() <em>Force Object Type</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #isForceObjectType()
+         * @generated
+         * @ordered
+         */
+        protected boolean forceObjectType = FORCE_OBJECT_TYPE_EDEFAULT;
+
+        /**
+         * The cached value of the '{@link #getType() <em>Type</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getType()
+         * @generated
+         * @ordered
+         */
+        protected Symbol type;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected TypeReferenceImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.TYPE_REFERENCE;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public boolean isForceObjectType() {
+                return forceObjectType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setForceObjectType(boolean newForceObjectType) {
+                boolean oldForceObjectType = forceObjectType;
+                forceObjectType = newForceObjectType;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.TYPE_REFERENCE__FORCE_OBJECT_TYPE, oldForceObjectType, forceObjectType));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol getType() {
+                if (type != null && type.eIsProxy()) {
+                        InternalEObject oldType = (InternalEObject) type;
+                        type = (Symbol) eResolveProxy(oldType);
+                        if (type != oldType) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+                                                        SolverLanguagePackage.TYPE_REFERENCE__TYPE, oldType, type));
+                        }
+                }
+                return type;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Symbol basicGetType() {
+                return type;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setType(Symbol newType) {
+                Symbol oldType = type;
+                type = newType;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.TYPE_REFERENCE__TYPE, oldType,
+                                        type));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.TYPE_REFERENCE__FORCE_OBJECT_TYPE:
+                        return isForceObjectType();
+                case SolverLanguagePackage.TYPE_REFERENCE__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.TYPE_REFERENCE__FORCE_OBJECT_TYPE:
+                        setForceObjectType((Boolean) newValue);
+                        return;
+                case SolverLanguagePackage.TYPE_REFERENCE__TYPE:
+                        setType((Symbol) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.TYPE_REFERENCE__FORCE_OBJECT_TYPE:
+                        setForceObjectType(FORCE_OBJECT_TYPE_EDEFAULT);
+                        return;
+                case SolverLanguagePackage.TYPE_REFERENCE__TYPE:
+                        setType((Symbol) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.TYPE_REFERENCE__FORCE_OBJECT_TYPE:
+                        return forceObjectType != FORCE_OBJECT_TYPE_EDEFAULT;
+                case SolverLanguagePackage.TYPE_REFERENCE__TYPE:
+                        return type != 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(" (forceObjectType: ");
+                result.append(forceObjectType);
+                result.append(')');
+                return result.toString();
+        }
+
+} //TypeReferenceImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TypedArgumentImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TypedArgumentImpl.java
new file mode 100644
index 00000000..89778fc9
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TypedArgumentImpl.java
@@ -0,0 +1,182 @@
+/**
+ */
+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.SolverLanguagePackage;
+import org.eclipse.viatra.solver.language.solverLanguage.TypeReference;
+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#getTypeReference <em>Type Reference</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class TypedArgumentImpl extends ArgumentImpl implements TypedArgument {
+        /**
+         * The cached value of the '{@link #getTypeReference() <em>Type Reference</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getTypeReference()
+         * @generated
+         * @ordered
+         */
+        protected TypeReference typeReference;
+
+        /**
+         * <!-- 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
+         */
+        public TypeReference getTypeReference() {
+                return typeReference;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetTypeReference(TypeReference newTypeReference, NotificationChain msgs) {
+                TypeReference oldTypeReference = typeReference;
+                typeReference = newTypeReference;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.TYPED_ARGUMENT__TYPE_REFERENCE, oldTypeReference, newTypeReference);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setTypeReference(TypeReference newTypeReference) {
+                if (newTypeReference != typeReference) {
+                        NotificationChain msgs = null;
+                        if (typeReference != null)
+                                msgs = ((InternalEObject) typeReference).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.TYPED_ARGUMENT__TYPE_REFERENCE, null, msgs);
+                        if (newTypeReference != null)
+                                msgs = ((InternalEObject) newTypeReference).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.TYPED_ARGUMENT__TYPE_REFERENCE, null, msgs);
+                        msgs = basicSetTypeReference(newTypeReference, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.TYPED_ARGUMENT__TYPE_REFERENCE,
+                                        newTypeReference, newTypeReference));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.TYPED_ARGUMENT__TYPE_REFERENCE:
+                        return basicSetTypeReference(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.TYPED_ARGUMENT__TYPE_REFERENCE:
+                        return getTypeReference();
+                }
+                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_REFERENCE:
+                        setTypeReference((TypeReference) 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_REFERENCE:
+                        setTypeReference((TypeReference) 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_REFERENCE:
+                        return typeReference != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //TypedArgumentImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TypedStarArgumentImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TypedStarArgumentImpl.java
new file mode 100644
index 00000000..ebee59b6
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TypedStarArgumentImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+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.TypedStarArgument;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Typed Star Argument</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class TypedStarArgumentImpl extends TypedArgumentImpl implements TypedStarArgument {
+        /**
+         * <!-- 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;
+        }
+
+} //TypedStarArgumentImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TypedVariableArgumentImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TypedVariableArgumentImpl.java
new file mode 100644
index 00000000..6c83d121
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/TypedVariableArgumentImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+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.TypedVariableArgument;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Typed Variable Argument</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.TypedVariableArgumentImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TypedVariableArgumentImpl extends TypedArgumentImpl implements TypedVariableArgument {
+        /**
+         * 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 TypedVariableArgumentImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.TYPED_VARIABLE_ARGUMENT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getName() {
+                return name;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setName(String newName) {
+                String oldName = name;
+                name = newName;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.TYPED_VARIABLE_ARGUMENT__NAME,
+                                        oldName, name));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.TYPED_VARIABLE_ARGUMENT__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.TYPED_VARIABLE_ARGUMENT__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.TYPED_VARIABLE_ARGUMENT__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.TYPED_VARIABLE_ARGUMENT__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();
+        }
+
+} //TypedVariableArgumentImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnaryExpressionImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnaryExpressionImpl.java
new file mode 100644
index 00000000..11291304
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnaryExpressionImpl.java
@@ -0,0 +1,253 @@
+/**
+ */
+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.UnaryOperator;
+
+/**
+ * <!-- 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#getBody <em>Body</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.UnaryExpressionImpl#getOp <em>Op</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class UnaryExpressionImpl extends ExpressionImpl implements UnaryExpression {
+        /**
+         * 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 #getOp() <em>Op</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getOp()
+         * @generated
+         * @ordered
+         */
+        protected static final UnaryOperator OP_EDEFAULT = UnaryOperator.NOT;
+
+        /**
+         * The cached value of the '{@link #getOp() <em>Op</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getOp()
+         * @generated
+         * @ordered
+         */
+        protected UnaryOperator op = OP_EDEFAULT;
+
+        /**
+         * <!-- 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
+         */
+        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
+         */
+        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
+         */
+        public UnaryOperator getOp() {
+                return op;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setOp(UnaryOperator newOp) {
+                UnaryOperator 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 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__BODY:
+                        return getBody();
+                case SolverLanguagePackage.UNARY_EXPRESSION__OP:
+                        return getOp();
+                }
+                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__BODY:
+                        setBody((Expression) newValue);
+                        return;
+                case SolverLanguagePackage.UNARY_EXPRESSION__OP:
+                        setOp((UnaryOperator) 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__BODY:
+                        setBody((Expression) null);
+                        return;
+                case SolverLanguagePackage.UNARY_EXPRESSION__OP:
+                        setOp(OP_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.UNARY_EXPRESSION__BODY:
+                        return body != null;
+                case SolverLanguagePackage.UNARY_EXPRESSION__OP:
+                        return op != OP_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(" (op: ");
+                result.append(op);
+                result.append(')');
+                return result.toString();
+        }
+
+} //UnaryExpressionImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnboundedMultiplicityImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnboundedMultiplicityImpl.java
new file mode 100644
index 00000000..d63928d6
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnboundedMultiplicityImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+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.UnboundedMultiplicity;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Unbounded Multiplicity</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class UnboundedMultiplicityImpl extends MultiplicityImpl implements UnboundedMultiplicity {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected UnboundedMultiplicityImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.UNBOUNDED_MULTIPLICITY;
+        }
+
+} //UnboundedMultiplicityImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnnamedErrorPredicateDefintionImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnnamedErrorPredicateDefintionImpl.java
new file mode 100644
index 00000000..87f259a0
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UnnamedErrorPredicateDefintionImpl.java
@@ -0,0 +1,262 @@
+/**
+ */
+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.UnnamedErrorPredicateDefintion;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Unnamed Error Predicate Defintion</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.UnnamedErrorPredicateDefintionImpl#getArgumentList <em>Argument List</em>}</li>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.UnnamedErrorPredicateDefintionImpl#getBody <em>Body</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class UnnamedErrorPredicateDefintionImpl extends StatementImpl implements UnnamedErrorPredicateDefintion {
+        /**
+         * 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 UnnamedErrorPredicateDefintionImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.UNNAMED_ERROR_PREDICATE_DEFINTION;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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_PREDICATE_DEFINTION__ARGUMENT_LIST, oldArgumentList,
+                                        newArgumentList);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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_PREDICATE_DEFINTION__ARGUMENT_LIST,
+                                                null, msgs);
+                        if (newArgumentList != null)
+                                msgs = ((InternalEObject) newArgumentList).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.UNNAMED_ERROR_PREDICATE_DEFINTION__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_PREDICATE_DEFINTION__ARGUMENT_LIST, newArgumentList,
+                                        newArgumentList));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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_PREDICATE_DEFINTION__BODY, oldBody, newBody);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        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_PREDICATE_DEFINTION__BODY, null,
+                                                msgs);
+                        if (newBody != null)
+                                msgs = ((InternalEObject) newBody).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.UNNAMED_ERROR_PREDICATE_DEFINTION__BODY, null,
+                                                msgs);
+                        msgs = basicSetBody(newBody, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.UNNAMED_ERROR_PREDICATE_DEFINTION__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_PREDICATE_DEFINTION__ARGUMENT_LIST:
+                        return basicSetArgumentList(null, msgs);
+                case SolverLanguagePackage.UNNAMED_ERROR_PREDICATE_DEFINTION__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_PREDICATE_DEFINTION__ARGUMENT_LIST:
+                        return getArgumentList();
+                case SolverLanguagePackage.UNNAMED_ERROR_PREDICATE_DEFINTION__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_PREDICATE_DEFINTION__ARGUMENT_LIST:
+                        setArgumentList((ArgumentList) newValue);
+                        return;
+                case SolverLanguagePackage.UNNAMED_ERROR_PREDICATE_DEFINTION__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_PREDICATE_DEFINTION__ARGUMENT_LIST:
+                        setArgumentList((ArgumentList) null);
+                        return;
+                case SolverLanguagePackage.UNNAMED_ERROR_PREDICATE_DEFINTION__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_PREDICATE_DEFINTION__ARGUMENT_LIST:
+                        return argumentList != null;
+                case SolverLanguagePackage.UNNAMED_ERROR_PREDICATE_DEFINTION__BODY:
+                        return body != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //UnnamedErrorPredicateDefintionImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UriImportImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UriImportImpl.java
new file mode 100644
index 00000000..494f80d9
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/UriImportImpl.java
@@ -0,0 +1,163 @@
+/**
+ */
+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.UriImport;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Uri Import</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.UriImportImpl#getUri <em>Uri</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class UriImportImpl extends ImportImpl implements UriImport {
+        /**
+         * The default value of the '{@link #getUri() <em>Uri</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getUri()
+         * @generated
+         * @ordered
+         */
+        protected static final String URI_EDEFAULT = null;
+
+        /**
+         * The cached value of the '{@link #getUri() <em>Uri</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getUri()
+         * @generated
+         * @ordered
+         */
+        protected String uri = URI_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected UriImportImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.URI_IMPORT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getUri() {
+                return uri;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setUri(String newUri) {
+                String oldUri = uri;
+                uri = newUri;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.URI_IMPORT__URI, oldUri, uri));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case SolverLanguagePackage.URI_IMPORT__URI:
+                        return getUri();
+                }
+                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.URI_IMPORT__URI:
+                        setUri((String) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.URI_IMPORT__URI:
+                        setUri(URI_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.URI_IMPORT__URI:
+                        return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
+                }
+                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(" (uri: ");
+                result.append(uri);
+                result.append(')');
+                return result.toString();
+        }
+
+} //UriImportImpl
diff --git a/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/VariableImpl.java b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/VariableImpl.java
new file mode 100644
index 00000000..7b92840a
--- /dev/null
+++ b/Application/org.eclipse.viatra.solver.language.model/src-gen/org/eclipse/viatra/solver/language/solverLanguage/impl/VariableImpl.java
@@ -0,0 +1,182 @@
+/**
+ */
+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.SolverLanguagePackage;
+import org.eclipse.viatra.solver.language.solverLanguage.TypeReference;
+import org.eclipse.viatra.solver.language.solverLanguage.Variable;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Variable</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.viatra.solver.language.solverLanguage.impl.VariableImpl#getTypeReference <em>Type Reference</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class VariableImpl extends SymbolImpl implements Variable {
+        /**
+         * The cached value of the '{@link #getTypeReference() <em>Type Reference</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getTypeReference()
+         * @generated
+         * @ordered
+         */
+        protected TypeReference typeReference;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected VariableImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SolverLanguagePackage.Literals.VARIABLE;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public TypeReference getTypeReference() {
+                return typeReference;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetTypeReference(TypeReference newTypeReference, NotificationChain msgs) {
+                TypeReference oldTypeReference = typeReference;
+                typeReference = newTypeReference;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+                                        SolverLanguagePackage.VARIABLE__TYPE_REFERENCE, oldTypeReference, newTypeReference);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setTypeReference(TypeReference newTypeReference) {
+                if (newTypeReference != typeReference) {
+                        NotificationChain msgs = null;
+                        if (typeReference != null)
+                                msgs = ((InternalEObject) typeReference).eInverseRemove(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.VARIABLE__TYPE_REFERENCE, null, msgs);
+                        if (newTypeReference != null)
+                                msgs = ((InternalEObject) newTypeReference).eInverseAdd(this,
+                                                EOPPOSITE_FEATURE_BASE - SolverLanguagePackage.VARIABLE__TYPE_REFERENCE, null, msgs);
+                        msgs = basicSetTypeReference(newTypeReference, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SolverLanguagePackage.VARIABLE__TYPE_REFERENCE,
+                                        newTypeReference, newTypeReference));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case SolverLanguagePackage.VARIABLE__TYPE_REFERENCE:
+                        return basicSetTypeReference(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.VARIABLE__TYPE_REFERENCE:
+                        return getTypeReference();
+                }
+                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.VARIABLE__TYPE_REFERENCE:
+                        setTypeReference((TypeReference) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.VARIABLE__TYPE_REFERENCE:
+                        setTypeReference((TypeReference) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case SolverLanguagePackage.VARIABLE__TYPE_REFERENCE:
+                        return typeReference != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //VariableImpl