merge with current master, comment numerical solver related logging

189 files changed, 46893 insertions, 422 deletions

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/.project b/Domains/Examples/ModelGenExampleFAM_plugin/.project
index 70920828..570f8a60 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/.project
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/.project
@@ -6,12 +6,12 @@
         </projects>

         <buildSpec>

                 <buildCommand>

-                        <name>org.eclipse.viatra.query.tooling.ui.projectbuilder</name>

+                        <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

                         <arguments>

                         </arguments>

                 </buildCommand>

                 <buildCommand>

-                        <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>

+                        <name>org.eclipse.viatra.query.tooling.ui.projectbuilder</name>

                         <arguments>

                         </arguments>

                 </buildCommand>

@@ -33,8 +33,8 @@
         </buildSpec>

         <natures>

                 <nature>org.eclipse.jdt.core.javanature</nature>

-                <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

                 <nature>org.eclipse.viatra.query.projectnature</nature>

                 <nature>org.eclipse.pde.PluginNature</nature>

+                <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

         </natures>

 </projectDescription>

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionType.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionType.java
index 59fe3fb2..9f2316a0 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionType.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionType.java
@@ -205,6 +205,7 @@ public enum FunctionType implements Enumerator {
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public int getValue() {

           return value;

         }

@@ -214,6 +215,7 @@ public enum FunctionType implements Enumerator {
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public String getName() {

           return name;

         }

@@ -223,6 +225,7 @@ public enum FunctionType implements Enumerator {
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public String getLiteral() {

           return literal;

         }

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalData.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalData.java
index 39639f99..59fa0fd4 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalData.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalData.java
@@ -60,13 +60,13 @@ public interface FunctionalData extends EObject {
          * </p>

          * <!-- end-user-doc -->

          * @return the value of the '<em>Interface</em>' container reference.

-         * @see #setInterface(FunctionalInterface)

+         * @see #setInterface(functionalarchitecture.FunctionalInterface)

          * @see functionalarchitecture.FunctionalarchitecturePackage#getFunctionalData_Interface()

          * @see functionalarchitecture.FunctionalInterface#getData

          * @model opposite="data" transient="false"

          * @generated

          */

-        FunctionalInterface getInterface();

+        functionalarchitecture.FunctionalInterface getInterface();

 

         /**

          * Sets the value of the '{@link functionalarchitecture.FunctionalData#getInterface <em>Interface</em>}' container reference.

@@ -76,6 +76,6 @@ public interface FunctionalData extends EObject {
          * @see #getInterface()

          * @generated

          */

-        void setInterface(FunctionalInterface value);

+        void setInterface(functionalarchitecture.FunctionalInterface value);

 

 } // FunctionalData

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalElement.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalElement.java
index f5a2ff19..5d1d3254 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalElement.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/FunctionalElement.java
@@ -33,13 +33,13 @@ public interface FunctionalElement extends EObject {
          * </p>

          * <!-- end-user-doc -->

          * @return the value of the '<em>Interface</em>' containment reference.

-         * @see #setInterface(FunctionalInterface)

+         * @see #setInterface(functionalarchitecture.FunctionalInterface)

          * @see functionalarchitecture.FunctionalarchitecturePackage#getFunctionalElement_Interface()

          * @see functionalarchitecture.FunctionalInterface#getElement

          * @model opposite="element" containment="true"

          * @generated

          */

-        FunctionalInterface getInterface();

+        functionalarchitecture.FunctionalInterface getInterface();

 

         /**

          * Sets the value of the '{@link functionalarchitecture.FunctionalElement#getInterface <em>Interface</em>}' containment reference.

@@ -49,7 +49,7 @@ public interface FunctionalElement extends EObject {
          * @see #getInterface()

          * @generated

          */

-        void setInterface(FunctionalInterface value);

+        void setInterface(functionalarchitecture.FunctionalInterface value);

 

         /**

          * Returns the value of the '<em><b>Model</b></em>' reference.

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FAMTerminatorImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FAMTerminatorImpl.java
index 382e0170..94cd240a 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FAMTerminatorImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FAMTerminatorImpl.java
@@ -55,6 +55,7 @@ public class FAMTerminatorImpl extends MinimalEObjectImpl.Container implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalData getData() {

                 if (eContainerFeatureID() != FunctionalarchitecturePackage.FAM_TERMINATOR__DATA) return null;

                 return (FunctionalData)eInternalContainer();

@@ -75,6 +76,7 @@ public class FAMTerminatorImpl extends MinimalEObjectImpl.Container implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setData(FunctionalData newData) {

                 if (newData != eInternalContainer() || (eContainerFeatureID() != FunctionalarchitecturePackage.FAM_TERMINATOR__DATA && newData != null)) {

                         if (EcoreUtil.isAncestor(this, newData))

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionImpl.java
index 46736c8c..6e89bc65 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionImpl.java
@@ -79,6 +79,7 @@ public class FunctionImpl extends FunctionalElementImpl implements Function {
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<FunctionalElement> getSubElements() {

                 if (subElements == null) {

                         subElements = new EObjectContainmentWithInverseEList<FunctionalElement>(FunctionalElement.class, this, FunctionalarchitecturePackage.FUNCTION__SUB_ELEMENTS, FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__PARENT);

@@ -91,6 +92,7 @@ public class FunctionImpl extends FunctionalElementImpl implements Function {
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionType getType() {

                 return (FunctionType)TYPE__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false);

         }

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalArchitectureModelImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalArchitectureModelImpl.java
index 78f6d6f2..a7d6c919 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalArchitectureModelImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalArchitectureModelImpl.java
@@ -68,6 +68,7 @@ public class FunctionalArchitectureModelImpl extends MinimalEObjectImpl.Containe
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<FunctionalElement> getRootElements() {

                 if (rootElements == null) {

                         rootElements = new EObjectContainmentEList<FunctionalElement>(FunctionalElement.class, this, FunctionalarchitecturePackage.FUNCTIONAL_ARCHITECTURE_MODEL__ROOT_ELEMENTS);

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalDataImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalDataImpl.java
index 10937e8d..ec8f2cef 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalDataImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalDataImpl.java
@@ -4,7 +4,6 @@ package functionalarchitecture.impl;
 

 import functionalarchitecture.FAMTerminator;

 import functionalarchitecture.FunctionalData;

-import functionalarchitecture.FunctionalInterface;

 import functionalarchitecture.FunctionalarchitecturePackage;

 

 import org.eclipse.emf.common.notify.Notification;

@@ -67,6 +66,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FAMTerminator getTerminator() {

                 return terminator;

         }

@@ -91,6 +91,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setTerminator(FAMTerminator newTerminator) {

                 if (newTerminator != terminator) {

                         NotificationChain msgs = null;

@@ -110,9 +111,10 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
          * <!-- end-user-doc -->

          * @generated

          */

-        public FunctionalInterface getInterface() {

+        @Override

+        public functionalarchitecture.FunctionalInterface getInterface() {

                 if (eContainerFeatureID() != FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE) return null;

-                return (FunctionalInterface)eInternalContainer();

+                return (functionalarchitecture.FunctionalInterface)eInternalContainer();

         }

 

         /**

@@ -120,7 +122,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
          * <!-- end-user-doc -->

          * @generated

          */

-        public NotificationChain basicSetInterface(FunctionalInterface newInterface, NotificationChain msgs) {

+        public NotificationChain basicSetInterface(functionalarchitecture.FunctionalInterface newInterface, NotificationChain msgs) {

                 msgs = eBasicSetContainer((InternalEObject)newInterface, FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE, msgs);

                 return msgs;

         }

@@ -130,7 +132,8 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
          * <!-- end-user-doc -->

          * @generated

          */

-        public void setInterface(FunctionalInterface newInterface) {

+        @Override

+        public void setInterface(functionalarchitecture.FunctionalInterface newInterface) {

                 if (newInterface != eInternalContainer() || (eContainerFeatureID() != FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE && newInterface != null)) {

                         if (EcoreUtil.isAncestor(this, newInterface))

                                 throw new IllegalArgumentException("Recursive containment not allowed for " + toString());

@@ -138,7 +141,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
                         if (eInternalContainer() != null)

                                 msgs = eBasicRemoveFromContainer(msgs);

                         if (newInterface != null)

-                                msgs = ((InternalEObject)newInterface).eInverseAdd(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__DATA, FunctionalInterface.class, msgs);

+                                msgs = ((InternalEObject)newInterface).eInverseAdd(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__DATA, functionalarchitecture.FunctionalInterface.class, msgs);

                         msgs = basicSetInterface(newInterface, msgs);

                         if (msgs != null) msgs.dispatch();

                 }

@@ -161,7 +164,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
                         case FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE:

                                 if (eInternalContainer() != null)

                                         msgs = eBasicRemoveFromContainer(msgs);

-                                return basicSetInterface((FunctionalInterface)otherEnd, msgs);

+                                return basicSetInterface((functionalarchitecture.FunctionalInterface)otherEnd, msgs);

                 }

                 return super.eInverseAdd(otherEnd, featureID, msgs);

         }

@@ -191,7 +194,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
         public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

                 switch (eContainerFeatureID()) {

                         case FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE:

-                                return eInternalContainer().eInverseRemove(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__DATA, FunctionalInterface.class, msgs);

+                                return eInternalContainer().eInverseRemove(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__DATA, functionalarchitecture.FunctionalInterface.class, msgs);

                 }

                 return super.eBasicRemoveFromContainerFeature(msgs);

         }

@@ -224,7 +227,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
                                 setTerminator((FAMTerminator)newValue);

                                 return;

                         case FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE:

-                                setInterface((FunctionalInterface)newValue);

+                                setInterface((functionalarchitecture.FunctionalInterface)newValue);

                                 return;

                 }

                 super.eSet(featureID, newValue);

@@ -242,7 +245,7 @@ public abstract class FunctionalDataImpl extends MinimalEObjectImpl.Container im
                                 setTerminator((FAMTerminator)null);

                                 return;

                         case FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE:

-                                setInterface((FunctionalInterface)null);

+                                setInterface((functionalarchitecture.FunctionalInterface)null);

                                 return;

                 }

                 super.eUnset(featureID);

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalElementImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalElementImpl.java
index 809e9ed5..c923caae 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalElementImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalElementImpl.java
@@ -5,7 +5,6 @@ package functionalarchitecture.impl;
 import functionalarchitecture.Function;

 import functionalarchitecture.FunctionalArchitectureModel;

 import functionalarchitecture.FunctionalElement;

-import functionalarchitecture.FunctionalInterface;

 import functionalarchitecture.FunctionalarchitecturePackage;

 

 import org.eclipse.emf.common.notify.Notification;

@@ -44,7 +43,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
          * @generated

          * @ordered

          */

-        protected FunctionalInterface interface_;

+        protected functionalarchitecture.FunctionalInterface interface_;

 

         /**

          * The cached setting delegate for the '{@link #getModel() <em>Model</em>}' reference.

@@ -80,7 +79,8 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
          * <!-- end-user-doc -->

          * @generated

          */

-        public FunctionalInterface getInterface() {

+        @Override

+        public functionalarchitecture.FunctionalInterface getInterface() {

                 return interface_;

         }

 

@@ -89,8 +89,8 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
          * <!-- end-user-doc -->

          * @generated

          */

-        public NotificationChain basicSetInterface(FunctionalInterface newInterface, NotificationChain msgs) {

-                FunctionalInterface oldInterface = interface_;

+        public NotificationChain basicSetInterface(functionalarchitecture.FunctionalInterface newInterface, NotificationChain msgs) {

+                functionalarchitecture.FunctionalInterface oldInterface = interface_;

                 interface_ = newInterface;

                 if (eNotificationRequired()) {

                         ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__INTERFACE, oldInterface, newInterface);

@@ -104,13 +104,14 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
          * <!-- end-user-doc -->

          * @generated

          */

-        public void setInterface(FunctionalInterface newInterface) {

+        @Override

+        public void setInterface(functionalarchitecture.FunctionalInterface newInterface) {

                 if (newInterface != interface_) {

                         NotificationChain msgs = null;

                         if (interface_ != null)

-                                msgs = ((InternalEObject)interface_).eInverseRemove(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__ELEMENT, FunctionalInterface.class, msgs);

+                                msgs = ((InternalEObject)interface_).eInverseRemove(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__ELEMENT, functionalarchitecture.FunctionalInterface.class, msgs);

                         if (newInterface != null)

-                                msgs = ((InternalEObject)newInterface).eInverseAdd(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__ELEMENT, FunctionalInterface.class, msgs);

+                                msgs = ((InternalEObject)newInterface).eInverseAdd(this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__ELEMENT, functionalarchitecture.FunctionalInterface.class, msgs);

                         msgs = basicSetInterface(newInterface, msgs);

                         if (msgs != null) msgs.dispatch();

                 }

@@ -123,6 +124,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalArchitectureModel getModel() {

                 return (FunctionalArchitectureModel)MODEL__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false);

         }

@@ -141,6 +143,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setModel(FunctionalArchitectureModel newModel) {

                 MODEL__ESETTING_DELEGATE.dynamicSet(this, null, 0, newModel);

         }

@@ -150,6 +153,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Function getParent() {

                 if (eContainerFeatureID() != FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__PARENT) return null;

                 return (Function)eInternalContainer();

@@ -170,6 +174,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setParent(Function newParent) {

                 if (newParent != eInternalContainer() || (eContainerFeatureID() != FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__PARENT && newParent != null)) {

                         if (EcoreUtil.isAncestor(this, newParent))

@@ -197,7 +202,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
                         case FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__INTERFACE:

                                 if (interface_ != null)

                                         msgs = ((InternalEObject)interface_).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__INTERFACE, null, msgs);

-                                return basicSetInterface((FunctionalInterface)otherEnd, msgs);

+                                return basicSetInterface((functionalarchitecture.FunctionalInterface)otherEnd, msgs);

                         case FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__PARENT:

                                 if (eInternalContainer() != null)

                                         msgs = eBasicRemoveFromContainer(msgs);

@@ -264,7 +269,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
         public void eSet(int featureID, Object newValue) {

                 switch (featureID) {

                         case FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__INTERFACE:

-                                setInterface((FunctionalInterface)newValue);

+                                setInterface((functionalarchitecture.FunctionalInterface)newValue);

                                 return;

                         case FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__MODEL:

                                 setModel((FunctionalArchitectureModel)newValue);

@@ -285,7 +290,7 @@ public abstract class FunctionalElementImpl extends MinimalEObjectImpl.Container
         public void eUnset(int featureID) {

                 switch (featureID) {

                         case FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__INTERFACE:

-                                setInterface((FunctionalInterface)null);

+                                setInterface((functionalarchitecture.FunctionalInterface)null);

                                 return;

                         case FunctionalarchitecturePackage.FUNCTIONAL_ELEMENT__MODEL:

                                 setModel((FunctionalArchitectureModel)null);

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInputImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInputImpl.java
index 9df1ec0c..33a136ed 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInputImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInputImpl.java
@@ -66,6 +66,7 @@ public class FunctionalInputImpl extends FunctionalDataImpl implements Functiona
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<InformationLink> getIncomingLinks() {

                 if (incomingLinks == null) {

                         incomingLinks = new EObjectWithInverseResolvingEList<InformationLink>(InformationLink.class, this, FunctionalarchitecturePackage.FUNCTIONAL_INPUT__INCOMING_LINKS, FunctionalarchitecturePackage.INFORMATION_LINK__TO);

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInterfaceImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInterfaceImpl.java
index 20151886..53aa2dac 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInterfaceImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalInterfaceImpl.java
@@ -4,7 +4,6 @@ package functionalarchitecture.impl;
 

 import functionalarchitecture.FunctionalData;

 import functionalarchitecture.FunctionalElement;

-import functionalarchitecture.FunctionalInterface;

 import functionalarchitecture.FunctionalarchitecturePackage;

 

 import java.util.Collection;

@@ -38,7 +37,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *

  * @generated

  */

-public class FunctionalInterfaceImpl extends MinimalEObjectImpl.Container implements FunctionalInterface {

+public class FunctionalInterfaceImpl extends MinimalEObjectImpl.Container implements functionalarchitecture.FunctionalInterface {

         /**

          * The cached value of the '{@link #getData() <em>Data</em>}' containment reference list.

          * <!-- begin-user-doc -->

@@ -73,6 +72,7 @@ public class FunctionalInterfaceImpl extends MinimalEObjectImpl.Container implem
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<FunctionalData> getData() {

                 if (data == null) {

                         data = new EObjectContainmentWithInverseEList<FunctionalData>(FunctionalData.class, this, FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__DATA, FunctionalarchitecturePackage.FUNCTIONAL_DATA__INTERFACE);

@@ -85,6 +85,7 @@ public class FunctionalInterfaceImpl extends MinimalEObjectImpl.Container implem
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalElement getElement() {

                 if (eContainerFeatureID() != FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__ELEMENT) return null;

                 return (FunctionalElement)eInternalContainer();

@@ -105,6 +106,7 @@ public class FunctionalInterfaceImpl extends MinimalEObjectImpl.Container implem
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setElement(FunctionalElement newElement) {

                 if (newElement != eInternalContainer() || (eContainerFeatureID() != FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE__ELEMENT && newElement != null)) {

                         if (EcoreUtil.isAncestor(this, newElement))

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalOutputImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalOutputImpl.java
index 1ae2a964..061af113 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalOutputImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalOutputImpl.java
@@ -66,6 +66,7 @@ public class FunctionalOutputImpl extends FunctionalDataImpl implements Function
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<InformationLink> getOutgoingLinks() {

                 if (outgoingLinks == null) {

                         outgoingLinks = new EObjectContainmentWithInverseEList<InformationLink>(InformationLink.class, this, FunctionalarchitecturePackage.FUNCTIONAL_OUTPUT__OUTGOING_LINKS, FunctionalarchitecturePackage.INFORMATION_LINK__FROM);

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitectureFactoryImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitectureFactoryImpl.java
index 56ecfa25..9c9f495a 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitectureFactoryImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitectureFactoryImpl.java
@@ -2,9 +2,15 @@
  */

 package functionalarchitecture.impl;

 

-import functionalarchitecture.*;

-import functionalarchitecture.FunctionalInterface;

-

+import functionalarchitecture.FAMTerminator;

+import functionalarchitecture.Function;

+import functionalarchitecture.FunctionType;

+import functionalarchitecture.FunctionalArchitectureModel;

+import functionalarchitecture.FunctionalInput;

+import functionalarchitecture.FunctionalOutput;

+import functionalarchitecture.FunctionalarchitectureFactory;

+import functionalarchitecture.FunctionalarchitecturePackage;

+import functionalarchitecture.InformationLink;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EDataType;

 import org.eclipse.emf.ecore.EObject;

@@ -105,6 +111,7 @@ public class FunctionalarchitectureFactoryImpl extends EFactoryImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalArchitectureModel createFunctionalArchitectureModel() {

                 FunctionalArchitectureModelImpl functionalArchitectureModel = new FunctionalArchitectureModelImpl();

                 return functionalArchitectureModel;

@@ -115,6 +122,7 @@ public class FunctionalarchitectureFactoryImpl extends EFactoryImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Function createFunction() {

                 FunctionImpl function = new FunctionImpl();

                 return function;

@@ -125,6 +133,7 @@ public class FunctionalarchitectureFactoryImpl extends EFactoryImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FAMTerminator createFAMTerminator() {

                 FAMTerminatorImpl famTerminator = new FAMTerminatorImpl();

                 return famTerminator;

@@ -135,6 +144,7 @@ public class FunctionalarchitectureFactoryImpl extends EFactoryImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public InformationLink createInformationLink() {

                 InformationLinkImpl informationLink = new InformationLinkImpl();

                 return informationLink;

@@ -145,7 +155,8 @@ public class FunctionalarchitectureFactoryImpl extends EFactoryImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

-        public FunctionalInterface createFunctionalInterface() {

+        @Override

+        public functionalarchitecture.FunctionalInterface createFunctionalInterface() {

                 FunctionalInterfaceImpl functionalInterface = new FunctionalInterfaceImpl();

                 return functionalInterface;

         }

@@ -155,6 +166,7 @@ public class FunctionalarchitectureFactoryImpl extends EFactoryImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalInput createFunctionalInput() {

                 FunctionalInputImpl functionalInput = new FunctionalInputImpl();

                 return functionalInput;

@@ -165,6 +177,7 @@ public class FunctionalarchitectureFactoryImpl extends EFactoryImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalOutput createFunctionalOutput() {

                 FunctionalOutputImpl functionalOutput = new FunctionalOutputImpl();

                 return functionalOutput;

@@ -195,6 +208,7 @@ public class FunctionalarchitectureFactoryImpl extends EFactoryImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalarchitecturePackage getFunctionalarchitecturePackage() {

                 return (FunctionalarchitecturePackage)getEPackage();

         }

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitecturePackageImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitecturePackageImpl.java
index 22c15533..04945f1c 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitecturePackageImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/FunctionalarchitecturePackageImpl.java
@@ -9,7 +9,6 @@ import functionalarchitecture.FunctionalArchitectureModel;
 import functionalarchitecture.FunctionalData;

 import functionalarchitecture.FunctionalElement;

 import functionalarchitecture.FunctionalInput;

-import functionalarchitecture.FunctionalInterface;

 import functionalarchitecture.FunctionalOutput;

 import functionalarchitecture.FunctionalarchitectureFactory;

 import functionalarchitecture.FunctionalarchitecturePackage;

@@ -128,7 +127,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
 

         /**

          * 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 FunctionalarchitecturePackage#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 -->

@@ -142,7 +141,8 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
                 if (isInited) return (FunctionalarchitecturePackage)EPackage.Registry.INSTANCE.getEPackage(FunctionalarchitecturePackage.eNS_URI);

 

                 // Obtain or create and register package

-                FunctionalarchitecturePackageImpl theFunctionalarchitecturePackage = (FunctionalarchitecturePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof FunctionalarchitecturePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new FunctionalarchitecturePackageImpl());

+                Object registeredFunctionalarchitecturePackage = EPackage.Registry.INSTANCE.get(eNS_URI);

+                FunctionalarchitecturePackageImpl theFunctionalarchitecturePackage = registeredFunctionalarchitecturePackage instanceof FunctionalarchitecturePackageImpl ? (FunctionalarchitecturePackageImpl)registeredFunctionalarchitecturePackage : new FunctionalarchitecturePackageImpl();

 

                 isInited = true;

 

@@ -155,7 +155,6 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
                 // Mark meta-data to indicate it can't be changed

                 theFunctionalarchitecturePackage.freeze();

 

-  

                 // Update the registry and return the package

                 EPackage.Registry.INSTANCE.put(FunctionalarchitecturePackage.eNS_URI, theFunctionalarchitecturePackage);

                 return theFunctionalarchitecturePackage;

@@ -166,6 +165,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFunctionalElement() {

                 return functionalElementEClass;

         }

@@ -175,6 +175,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalElement_Interface() {

                 return (EReference)functionalElementEClass.getEStructuralFeatures().get(0);

         }

@@ -184,6 +185,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalElement_Model() {

                 return (EReference)functionalElementEClass.getEStructuralFeatures().get(1);

         }

@@ -193,6 +195,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalElement_Parent() {

                 return (EReference)functionalElementEClass.getEStructuralFeatures().get(2);

         }

@@ -202,6 +205,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFunctionalArchitectureModel() {

                 return functionalArchitectureModelEClass;

         }

@@ -211,6 +215,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalArchitectureModel_RootElements() {

                 return (EReference)functionalArchitectureModelEClass.getEStructuralFeatures().get(0);

         }

@@ -220,6 +225,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFunction() {

                 return functionEClass;

         }

@@ -229,6 +235,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunction_SubElements() {

                 return (EReference)functionEClass.getEStructuralFeatures().get(0);

         }

@@ -238,6 +245,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EAttribute getFunction_Type() {

                 return (EAttribute)functionEClass.getEStructuralFeatures().get(1);

         }

@@ -247,6 +255,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFAMTerminator() {

                 return famTerminatorEClass;

         }

@@ -256,6 +265,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFAMTerminator_Data() {

                 return (EReference)famTerminatorEClass.getEStructuralFeatures().get(0);

         }

@@ -265,6 +275,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getInformationLink() {

                 return informationLinkEClass;

         }

@@ -274,6 +285,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getInformationLink_From() {

                 return (EReference)informationLinkEClass.getEStructuralFeatures().get(0);

         }

@@ -283,6 +295,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getInformationLink_To() {

                 return (EReference)informationLinkEClass.getEStructuralFeatures().get(1);

         }

@@ -292,6 +305,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFunctionalInterface() {

                 return functionalInterfaceEClass;

         }

@@ -301,6 +315,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalInterface_Data() {

                 return (EReference)functionalInterfaceEClass.getEStructuralFeatures().get(0);

         }

@@ -310,6 +325,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalInterface_Element() {

                 return (EReference)functionalInterfaceEClass.getEStructuralFeatures().get(1);

         }

@@ -319,6 +335,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFunctionalInput() {

                 return functionalInputEClass;

         }

@@ -328,6 +345,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalInput_IncomingLinks() {

                 return (EReference)functionalInputEClass.getEStructuralFeatures().get(0);

         }

@@ -337,6 +355,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFunctionalOutput() {

                 return functionalOutputEClass;

         }

@@ -346,6 +365,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalOutput_OutgoingLinks() {

                 return (EReference)functionalOutputEClass.getEStructuralFeatures().get(0);

         }

@@ -355,6 +375,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFunctionalData() {

                 return functionalDataEClass;

         }

@@ -364,6 +385,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalData_Terminator() {

                 return (EReference)functionalDataEClass.getEStructuralFeatures().get(0);

         }

@@ -373,6 +395,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getFunctionalData_Interface() {

                 return (EReference)functionalDataEClass.getEStructuralFeatures().get(1);

         }

@@ -382,6 +405,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EEnum getFunctionType() {

                 return functionTypeEEnum;

         }

@@ -391,6 +415,7 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalarchitectureFactory getFunctionalarchitectureFactory() {

                 return (FunctionalarchitectureFactory)getEFactoryInstance();

         }

@@ -503,9 +528,9 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
                 initEReference(getInformationLink_From(), this.getFunctionalOutput(), this.getFunctionalOutput_OutgoingLinks(), "from", null, 0, 1, InformationLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

                 initEReference(getInformationLink_To(), this.getFunctionalInput(), this.getFunctionalInput_IncomingLinks(), "to", null, 1, 1, InformationLink.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-                initEClass(functionalInterfaceEClass, FunctionalInterface.class, "FunctionalInterface", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-                initEReference(getFunctionalInterface_Data(), this.getFunctionalData(), this.getFunctionalData_Interface(), "data", null, 0, -1, FunctionalInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-                initEReference(getFunctionalInterface_Element(), this.getFunctionalElement(), this.getFunctionalElement_Interface(), "element", null, 0, 1, FunctionalInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEClass(functionalInterfaceEClass, functionalarchitecture.FunctionalInterface.class, "FunctionalInterface", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+                initEReference(getFunctionalInterface_Data(), this.getFunctionalData(), this.getFunctionalData_Interface(), "data", null, 0, -1, functionalarchitecture.FunctionalInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEReference(getFunctionalInterface_Element(), this.getFunctionalElement(), this.getFunctionalElement_Interface(), "element", null, 0, 1, functionalarchitecture.FunctionalInterface.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

                 initEClass(functionalInputEClass, FunctionalInput.class, "FunctionalInput", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

                 initEReference(getFunctionalInput_IncomingLinks(), this.getInformationLink(), this.getInformationLink_To(), "IncomingLinks", null, 0, -1, FunctionalInput.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

@@ -540,12 +565,12 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * @generated

          */

         protected void createEcoreAnnotations() {

-                String source = "http://www.eclipse.org/emf/2002/Ecore";        

+                String source = "http://www.eclipse.org/emf/2002/Ecore";

                 addAnnotation

-                  (this, 

-                   source, 

+                  (this,

+                   source,

                    new String[] {

-                         "settingDelegates", "org.eclipse.viatra.query.querybasedfeature"

+                           "settingDelegates", "org.eclipse.viatra.query.querybasedfeature"

                    });

         }

 

@@ -556,18 +581,18 @@ public class FunctionalarchitecturePackageImpl extends EPackageImpl implements F
          * @generated

          */

         protected void createOrgAnnotations() {

-                String source = "org.eclipse.viatra.query.querybasedfeature";   

+                String source = "org.eclipse.viatra.query.querybasedfeature";

                 addAnnotation

-                  (getFunctionalElement_Model(), 

-                   source, 

+                  (getFunctionalElement_Model(),

+                   source,

                    new String[] {

-                         "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.transima.fam.model"

-                   });  

+                           "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.transima.fam.model"

+                   });

                 addAnnotation

-                  (getFunction_Type(), 

-                   source, 

+                  (getFunction_Type(),

+                   source,

                    new String[] {

-                         "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.transima.fam.type"

+                           "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.transima.fam.type"

                    });

         }

 

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/InformationLinkImpl.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/InformationLinkImpl.java
index 4b46fef8..ead4f9e9 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/InformationLinkImpl.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/impl/InformationLinkImpl.java
@@ -67,6 +67,7 @@ public class InformationLinkImpl extends MinimalEObjectImpl.Container implements
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalOutput getFrom() {

                 if (eContainerFeatureID() != FunctionalarchitecturePackage.INFORMATION_LINK__FROM) return null;

                 return (FunctionalOutput)eInternalContainer();

@@ -87,6 +88,7 @@ public class InformationLinkImpl extends MinimalEObjectImpl.Container implements
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setFrom(FunctionalOutput newFrom) {

                 if (newFrom != eInternalContainer() || (eContainerFeatureID() != FunctionalarchitecturePackage.INFORMATION_LINK__FROM && newFrom != null)) {

                         if (EcoreUtil.isAncestor(this, newFrom))

@@ -108,6 +110,7 @@ public class InformationLinkImpl extends MinimalEObjectImpl.Container implements
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FunctionalInput getTo() {

                 if (to != null && to.eIsProxy()) {

                         InternalEObject oldTo = (InternalEObject)to;

@@ -149,6 +152,7 @@ public class InformationLinkImpl extends MinimalEObjectImpl.Container implements
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setTo(FunctionalInput newTo) {

                 if (newTo != to) {

                         NotificationChain msgs = null;

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureAdapterFactory.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureAdapterFactory.java
index f990a7a4..9846bd62 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureAdapterFactory.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureAdapterFactory.java
@@ -2,9 +2,15 @@
  */

 package functionalarchitecture.util;

 

-import functionalarchitecture.*;

-import functionalarchitecture.FunctionalInterface;

-

+import functionalarchitecture.FAMTerminator;

+import functionalarchitecture.Function;

+import functionalarchitecture.FunctionalArchitectureModel;

+import functionalarchitecture.FunctionalData;

+import functionalarchitecture.FunctionalElement;

+import functionalarchitecture.FunctionalInput;

+import functionalarchitecture.FunctionalOutput;

+import functionalarchitecture.FunctionalarchitecturePackage;

+import functionalarchitecture.InformationLink;

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notifier;

 

@@ -89,7 +95,7 @@ public class FunctionalarchitectureAdapterFactory extends AdapterFactoryImpl {
                                 return createInformationLinkAdapter();

                         }

                         @Override

-                        public Adapter caseFunctionalInterface(FunctionalInterface object) {

+                        public Adapter caseFunctionalInterface(functionalarchitecture.FunctionalInterface object) {

                                 return createFunctionalInterfaceAdapter();

                         }

                         @Override

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureSwitch.java b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureSwitch.java
index b481a978..a1bbb480 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureSwitch.java
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/ecore-gen/functionalarchitecture/util/FunctionalarchitectureSwitch.java
@@ -2,9 +2,15 @@
  */

 package functionalarchitecture.util;

 

-import functionalarchitecture.*;

-import functionalarchitecture.FunctionalInterface;

-

+import functionalarchitecture.FAMTerminator;

+import functionalarchitecture.Function;

+import functionalarchitecture.FunctionalArchitectureModel;

+import functionalarchitecture.FunctionalData;

+import functionalarchitecture.FunctionalElement;

+import functionalarchitecture.FunctionalInput;

+import functionalarchitecture.FunctionalOutput;

+import functionalarchitecture.FunctionalarchitecturePackage;

+import functionalarchitecture.InformationLink;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

 

@@ -99,7 +105,7 @@ public class FunctionalarchitectureSwitch<T> extends Switch<T> {
                                 return result;

                         }

                         case FunctionalarchitecturePackage.FUNCTIONAL_INTERFACE: {

-                                FunctionalInterface functionalInterface = (FunctionalInterface)theEObject;

+                                functionalarchitecture.FunctionalInterface functionalInterface = (functionalarchitecture.FunctionalInterface)theEObject;

                                 T result = caseFunctionalInterface(functionalInterface);

                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

@@ -214,7 +220,7 @@ public class FunctionalarchitectureSwitch<T> extends Switch<T> {
          * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

          * @generated

          */

-        public T caseFunctionalInterface(FunctionalInterface object) {

+        public T caseFunctionalInterface(functionalarchitecture.FunctionalInterface object) {

                 return null;

         }

 

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml b/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
index 213ec0ed..8d99d401 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
@@ -12,13 +12,6 @@
   <extension id="hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">
     <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns" id="hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns">
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.terminatorAndInformation"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.type"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.rootElements"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.parent"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.model"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.hasRoot"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.hasInt"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.transima.fam.hasLeaf"/>
     </group>
   </extension>
 </plugin>
diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/src/hu/bme/mit/inf/dslreasoner/domains/transima/fam/FamPatterns.vql b/Domains/Examples/ModelGenExampleFAM_plugin/src/hu/bme/mit/inf/dslreasoner/domains/transima/fam/FamPatterns.vql
index f0e48d42..1d9a6b6d 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/src/hu/bme/mit/inf/dslreasoner/domains/transima/fam/FamPatterns.vql
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/src/hu/bme/mit/inf/dslreasoner/domains/transima/fam/FamPatterns.vql
@@ -10,7 +10,7 @@ pattern terminatorAndInformation(T : FAMTerminator, I : InformationLink) = {
         InformationLink.to(I,In);

         FunctionalInput.terminator(In,T);

 }

-

+/*

 @QueryBasedFeature 

 pattern type(This : Function, Target : FunctionType) = {

         find rootElements(_Model, This);

diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/.classpath b/Domains/ca.mcgill.rtgmrt.example.modes3/.classpath
new file mode 100644
index 00000000..73ebde52
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+        <classpathentry kind="src" path="ecore-gen"/>
+        <classpathentry kind="src" path="src"/>
+        <classpathentry kind="src" path="xtend-gen"/>
+        <classpathentry kind="src" path="vql-gen"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+        <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/.gitignore b/Domains/ca.mcgill.rtgmrt.example.modes3/.gitignore
new file mode 100644
index 00000000..6cef8ea6
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/.gitignore
@@ -0,0 +1,2 @@
+/bin/
+output/
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/.project b/Domains/ca.mcgill.rtgmrt.example.modes3/.project
new file mode 100644
index 00000000..5e0fbc45
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/.project
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+        <name>ca.mcgill.rtgmrt.example.modes3</name>
+        <comment></comment>
+        <projects>
+        </projects>
+        <buildSpec>
+                <buildCommand>
+                        <name>org.eclipse.viatra.query.tooling.ui.projectbuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.jdt.core.javabuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.pde.ManifestBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.pde.SchemaBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+        </buildSpec>
+        <natures>
+                <nature>org.eclipse.jdt.core.javanature</nature>
+                <nature>org.eclipse.pde.PluginNature</nature>
+                <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+                <nature>org.eclipse.viatra.query.projectnature</nature>
+        </natures>
+</projectDescription>
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/.settings/org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguage.prefs b/Domains/ca.mcgill.rtgmrt.example.modes3/.settings/org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguage.prefs
new file mode 100644
index 00000000..31cda49a
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/.settings/org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguage.prefs
@@ -0,0 +1,27 @@
+BuilderConfiguration.is_project_specific=true
+autobuilding=true
+eclipse.preferences.version=1
+generateEclipseExtensions=true
+generateGeneratedAnnotation=false
+generateManifestEntries=true
+generateMatchProcessors=false
+generateMatchers=NESTED_CLASS
+generateSuppressWarnings=true
+generatedAnnotationComment=
+includeDateInGenerated=false
+outlet.DEFAULT_OUTPUT.cleanDirectory=false
+outlet.DEFAULT_OUTPUT.cleanupDerived=true
+outlet.DEFAULT_OUTPUT.createDirectory=true
+outlet.DEFAULT_OUTPUT.derived=true
+outlet.DEFAULT_OUTPUT.directory=./vql-gen
+outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
+outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
+outlet.DEFAULT_OUTPUT.keepLocalHistory=true
+outlet.DEFAULT_OUTPUT.override=true
+outlet.DEFAULT_OUTPUT.sourceFolder.ecore-gen.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.ecore-gen.ignore=
+outlet.DEFAULT_OUTPUT.sourceFolder.src.directory=
+outlet.DEFAULT_OUTPUT.sourceFolder.src.ignore=
+outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=
+targetJavaVersion=JAVA5
+useJavaCompilerCompliance=true
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/META-INF/MANIFEST.MF b/Domains/ca.mcgill.rtgmrt.example.modes3/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..8f900199
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/META-INF/MANIFEST.MF
@@ -0,0 +1,36 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: ca.mcgill.rtgmrt.example.modes3;singleton:=true
+Bundle-Version: 0.1.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: modes3,
+ modes3.impl,
+ modes3.queries,
+ modes3.util
+Require-Bundle: org.eclipse.viatra.query.runtime,
+ org.eclipse.viatra.query.runtime.rete,
+ org.eclipse.viatra.query.runtime.localsearch,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.core.runtime,
+ org.eclipse.xtend.lib;bundle-version="2.21.0",
+ org.eclipse.xtend.lib.macro;bundle-version="2.21.0",
+ hu.bme.mit.inf.dslreasoner.application;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.logic2ecore;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner;bundle-version="1.0.0",
+ hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
+ org.eclipse.emf.ecore.xmi;bundle-version="2.16.0",
+ hu.bme.mit.inf.dslreasoner.visualisation;bundle-version="1.0.0",
+ org.eclipse.viatra.query.patternlanguage.emf;bundle-version="2.4.0",
+ org.eclipse.viatra.dse;bundle-version="0.24.0"
+Import-Package: org.apache.log4j
+Automatic-Module-Name: ca.mcgill.rtgmrt.example.modes3
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/build.properties b/Domains/ca.mcgill.rtgmrt.example.modes3/build.properties
new file mode 100644
index 00000000..a431f6b2
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/build.properties
@@ -0,0 +1,11 @@
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src/,\
+           ecore-gen/,\
+           vql-gen/,\
+           xtend-gen/
+output.. = bin/
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3Factory.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3Factory.java
new file mode 100644
index 00000000..10ce47a1
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3Factory.java
@@ -0,0 +1,78 @@
+/**
+ */
+package modes3;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see modes3.Modes3Package
+ * @generated
+ */
+public interface Modes3Factory extends EFactory {
+        /**
+         * The singleton instance of the factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        Modes3Factory eINSTANCE = modes3.impl.Modes3FactoryImpl.init();
+
+        /**
+         * Returns a new object of class '<em>Segment</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Segment</em>'.
+         * @generated
+         */
+        Segment createSegment();
+
+        /**
+         * Returns a new object of class '<em>Model Root</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Model Root</em>'.
+         * @generated
+         */
+        Modes3ModelRoot createModes3ModelRoot();
+
+        /**
+         * Returns a new object of class '<em>Turnout</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Turnout</em>'.
+         * @generated
+         */
+        Turnout createTurnout();
+
+        /**
+         * Returns a new object of class '<em>Train</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Train</em>'.
+         * @generated
+         */
+        Train createTrain();
+
+        /**
+         * Returns a new object of class '<em>Simple Segment</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Simple Segment</em>'.
+         * @generated
+         */
+        SimpleSegment createSimpleSegment();
+
+        /**
+         * Returns the package supported by this factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the package supported by this factory.
+         * @generated
+         */
+        Modes3Package getModes3Package();
+
+} //Modes3Factory
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3ModelRoot.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3ModelRoot.java
new file mode 100644
index 00000000..d46ee305
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3ModelRoot.java
@@ -0,0 +1,87 @@
+/**
+ */
+package modes3;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Model Root</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link modes3.Modes3ModelRoot#getId <em>Id</em>}</li>
+ *   <li>{@link modes3.Modes3ModelRoot#getTrains <em>Trains</em>}</li>
+ *   <li>{@link modes3.Modes3ModelRoot#getSegments <em>Segments</em>}</li>
+ *   <li>{@link modes3.Modes3ModelRoot#getTurnouts <em>Turnouts</em>}</li>
+ * </ul>
+ *
+ * @see modes3.Modes3Package#getModes3ModelRoot()
+ * @model
+ * @generated
+ */
+public interface Modes3ModelRoot extends EObject {
+        /**
+         * Returns the value of the '<em><b>Id</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Id</em>' attribute.
+         * @see #setId(int)
+         * @see modes3.Modes3Package#getModes3ModelRoot_Id()
+         * @model
+         * @generated
+         */
+        int getId();
+
+        /**
+         * Sets the value of the '{@link modes3.Modes3ModelRoot#getId <em>Id</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Id</em>' attribute.
+         * @see #getId()
+         * @generated
+         */
+        void setId(int value);
+
+        /**
+         * Returns the value of the '<em><b>Trains</b></em>' containment reference list.
+         * The list contents are of type {@link modes3.Train}.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Trains</em>' containment reference list.
+         * @see modes3.Modes3Package#getModes3ModelRoot_Trains()
+         * @model containment="true"
+         * @generated
+         */
+        EList<Train> getTrains();
+
+        /**
+         * Returns the value of the '<em><b>Segments</b></em>' containment reference list.
+         * The list contents are of type {@link modes3.SimpleSegment}.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Segments</em>' containment reference list.
+         * @see modes3.Modes3Package#getModes3ModelRoot_Segments()
+         * @model containment="true"
+         * @generated
+         */
+        EList<SimpleSegment> getSegments();
+
+        /**
+         * Returns the value of the '<em><b>Turnouts</b></em>' containment reference list.
+         * The list contents are of type {@link modes3.Turnout}.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Turnouts</em>' containment reference list.
+         * @see modes3.Modes3Package#getModes3ModelRoot_Turnouts()
+         * @model containment="true"
+         * @generated
+         */
+        EList<Turnout> getTurnouts();
+
+} // Modes3ModelRoot
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3Package.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3Package.java
new file mode 100644
index 00000000..a19c1955
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Modes3Package.java
@@ -0,0 +1,716 @@
+/**
+ */
+package modes3;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see modes3.Modes3Factory
+ * @model kind="package"
+ * @generated
+ */
+public interface Modes3Package extends EPackage {
+        /**
+         * The package name.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        String eNAME = "modes3";
+
+        /**
+         * The package namespace URI.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        String eNS_URI = "http://www.ece.mcgill.ca/wcet/modes3";
+
+        /**
+         * The package namespace name.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        String eNS_PREFIX = "modes3";
+
+        /**
+         * The singleton instance of the package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        Modes3Package eINSTANCE = modes3.impl.Modes3PackageImpl.init();
+
+        /**
+         * The meta object id for the '{@link modes3.impl.SegmentImpl <em>Segment</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see modes3.impl.SegmentImpl
+         * @see modes3.impl.Modes3PackageImpl#getSegment()
+         * @generated
+         */
+        int SEGMENT = 0;
+
+        /**
+         * The feature id for the '<em><b>Connected To</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int SEGMENT__CONNECTED_TO = 0;
+
+        /**
+         * The feature id for the '<em><b>Occupied By</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int SEGMENT__OCCUPIED_BY = 1;
+
+        /**
+         * The feature id for the '<em><b>Id</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int SEGMENT__ID = 2;
+
+        /**
+         * The number of structural features of the '<em>Segment</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int SEGMENT_FEATURE_COUNT = 3;
+
+        /**
+         * The number of operations of the '<em>Segment</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int SEGMENT_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link modes3.impl.Modes3ModelRootImpl <em>Model Root</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see modes3.impl.Modes3ModelRootImpl
+         * @see modes3.impl.Modes3PackageImpl#getModes3ModelRoot()
+         * @generated
+         */
+        int MODES3_MODEL_ROOT = 1;
+
+        /**
+         * The feature id for the '<em><b>Id</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int MODES3_MODEL_ROOT__ID = 0;
+
+        /**
+         * The feature id for the '<em><b>Trains</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int MODES3_MODEL_ROOT__TRAINS = 1;
+
+        /**
+         * The feature id for the '<em><b>Segments</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int MODES3_MODEL_ROOT__SEGMENTS = 2;
+
+        /**
+         * The feature id for the '<em><b>Turnouts</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int MODES3_MODEL_ROOT__TURNOUTS = 3;
+
+        /**
+         * The number of structural features of the '<em>Model Root</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int MODES3_MODEL_ROOT_FEATURE_COUNT = 4;
+
+        /**
+         * The number of operations of the '<em>Model Root</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int MODES3_MODEL_ROOT_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link modes3.impl.TurnoutImpl <em>Turnout</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see modes3.impl.TurnoutImpl
+         * @see modes3.impl.Modes3PackageImpl#getTurnout()
+         * @generated
+         */
+        int TURNOUT = 2;
+
+        /**
+         * The feature id for the '<em><b>Connected To</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int TURNOUT__CONNECTED_TO = SEGMENT__CONNECTED_TO;
+
+        /**
+         * The feature id for the '<em><b>Occupied By</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int TURNOUT__OCCUPIED_BY = SEGMENT__OCCUPIED_BY;
+
+        /**
+         * The feature id for the '<em><b>Id</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int TURNOUT__ID = SEGMENT__ID;
+
+        /**
+         * The feature id for the '<em><b>Straight</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int TURNOUT__STRAIGHT = SEGMENT_FEATURE_COUNT + 0;
+
+        /**
+         * The feature id for the '<em><b>Divergent</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int TURNOUT__DIVERGENT = SEGMENT_FEATURE_COUNT + 1;
+
+        /**
+         * The number of structural features of the '<em>Turnout</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int TURNOUT_FEATURE_COUNT = SEGMENT_FEATURE_COUNT + 2;
+
+        /**
+         * The number of operations of the '<em>Turnout</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int TURNOUT_OPERATION_COUNT = SEGMENT_OPERATION_COUNT + 0;
+
+        /**
+         * The meta object id for the '{@link modes3.impl.TrainImpl <em>Train</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see modes3.impl.TrainImpl
+         * @see modes3.impl.Modes3PackageImpl#getTrain()
+         * @generated
+         */
+        int TRAIN = 3;
+
+        /**
+         * The feature id for the '<em><b>Location</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int TRAIN__LOCATION = 0;
+
+        /**
+         * The feature id for the '<em><b>Id</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int TRAIN__ID = 1;
+
+        /**
+         * The feature id for the '<em><b>Speed</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int TRAIN__SPEED = 2;
+
+        /**
+         * The number of structural features of the '<em>Train</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int TRAIN_FEATURE_COUNT = 3;
+
+        /**
+         * The number of operations of the '<em>Train</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int TRAIN_OPERATION_COUNT = 0;
+
+
+        /**
+         * The meta object id for the '{@link modes3.impl.SimpleSegmentImpl <em>Simple Segment</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see modes3.impl.SimpleSegmentImpl
+         * @see modes3.impl.Modes3PackageImpl#getSimpleSegment()
+         * @generated
+         */
+        int SIMPLE_SEGMENT = 4;
+
+        /**
+         * The feature id for the '<em><b>Connected To</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int SIMPLE_SEGMENT__CONNECTED_TO = SEGMENT__CONNECTED_TO;
+
+        /**
+         * The feature id for the '<em><b>Occupied By</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int SIMPLE_SEGMENT__OCCUPIED_BY = SEGMENT__OCCUPIED_BY;
+
+        /**
+         * The feature id for the '<em><b>Id</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int SIMPLE_SEGMENT__ID = SEGMENT__ID;
+
+        /**
+         * The number of structural features of the '<em>Simple Segment</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int SIMPLE_SEGMENT_FEATURE_COUNT = SEGMENT_FEATURE_COUNT + 0;
+
+        /**
+         * The number of operations of the '<em>Simple Segment</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int SIMPLE_SEGMENT_OPERATION_COUNT = SEGMENT_OPERATION_COUNT + 0;
+
+
+        /**
+         * Returns the meta object for class '{@link modes3.Segment <em>Segment</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Segment</em>'.
+         * @see modes3.Segment
+         * @generated
+         */
+        EClass getSegment();
+
+        /**
+         * Returns the meta object for the reference list '{@link modes3.Segment#getConnectedTo <em>Connected To</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference list '<em>Connected To</em>'.
+         * @see modes3.Segment#getConnectedTo()
+         * @see #getSegment()
+         * @generated
+         */
+        EReference getSegment_ConnectedTo();
+
+        /**
+         * Returns the meta object for the reference '{@link modes3.Segment#getOccupiedBy <em>Occupied By</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference '<em>Occupied By</em>'.
+         * @see modes3.Segment#getOccupiedBy()
+         * @see #getSegment()
+         * @generated
+         */
+        EReference getSegment_OccupiedBy();
+
+        /**
+         * Returns the meta object for the attribute '{@link modes3.Segment#getId <em>Id</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Id</em>'.
+         * @see modes3.Segment#getId()
+         * @see #getSegment()
+         * @generated
+         */
+        EAttribute getSegment_Id();
+
+        /**
+         * Returns the meta object for class '{@link modes3.Modes3ModelRoot <em>Model Root</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Model Root</em>'.
+         * @see modes3.Modes3ModelRoot
+         * @generated
+         */
+        EClass getModes3ModelRoot();
+
+        /**
+         * Returns the meta object for the attribute '{@link modes3.Modes3ModelRoot#getId <em>Id</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Id</em>'.
+         * @see modes3.Modes3ModelRoot#getId()
+         * @see #getModes3ModelRoot()
+         * @generated
+         */
+        EAttribute getModes3ModelRoot_Id();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link modes3.Modes3ModelRoot#getTrains <em>Trains</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Trains</em>'.
+         * @see modes3.Modes3ModelRoot#getTrains()
+         * @see #getModes3ModelRoot()
+         * @generated
+         */
+        EReference getModes3ModelRoot_Trains();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link modes3.Modes3ModelRoot#getSegments <em>Segments</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Segments</em>'.
+         * @see modes3.Modes3ModelRoot#getSegments()
+         * @see #getModes3ModelRoot()
+         * @generated
+         */
+        EReference getModes3ModelRoot_Segments();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link modes3.Modes3ModelRoot#getTurnouts <em>Turnouts</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Turnouts</em>'.
+         * @see modes3.Modes3ModelRoot#getTurnouts()
+         * @see #getModes3ModelRoot()
+         * @generated
+         */
+        EReference getModes3ModelRoot_Turnouts();
+
+        /**
+         * Returns the meta object for class '{@link modes3.Turnout <em>Turnout</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Turnout</em>'.
+         * @see modes3.Turnout
+         * @generated
+         */
+        EClass getTurnout();
+
+        /**
+         * Returns the meta object for the reference '{@link modes3.Turnout#getStraight <em>Straight</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference '<em>Straight</em>'.
+         * @see modes3.Turnout#getStraight()
+         * @see #getTurnout()
+         * @generated
+         */
+        EReference getTurnout_Straight();
+
+        /**
+         * Returns the meta object for the reference '{@link modes3.Turnout#getDivergent <em>Divergent</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference '<em>Divergent</em>'.
+         * @see modes3.Turnout#getDivergent()
+         * @see #getTurnout()
+         * @generated
+         */
+        EReference getTurnout_Divergent();
+
+        /**
+         * Returns the meta object for class '{@link modes3.Train <em>Train</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Train</em>'.
+         * @see modes3.Train
+         * @generated
+         */
+        EClass getTrain();
+
+        /**
+         * Returns the meta object for the reference '{@link modes3.Train#getLocation <em>Location</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference '<em>Location</em>'.
+         * @see modes3.Train#getLocation()
+         * @see #getTrain()
+         * @generated
+         */
+        EReference getTrain_Location();
+
+        /**
+         * Returns the meta object for the attribute '{@link modes3.Train#getId <em>Id</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Id</em>'.
+         * @see modes3.Train#getId()
+         * @see #getTrain()
+         * @generated
+         */
+        EAttribute getTrain_Id();
+
+        /**
+         * Returns the meta object for the attribute '{@link modes3.Train#getSpeed <em>Speed</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Speed</em>'.
+         * @see modes3.Train#getSpeed()
+         * @see #getTrain()
+         * @generated
+         */
+        EAttribute getTrain_Speed();
+
+        /**
+         * Returns the meta object for class '{@link modes3.SimpleSegment <em>Simple Segment</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Simple Segment</em>'.
+         * @see modes3.SimpleSegment
+         * @generated
+         */
+        EClass getSimpleSegment();
+
+        /**
+         * Returns the factory that creates the instances of the model.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the factory that creates the instances of the model.
+         * @generated
+         */
+        Modes3Factory getModes3Factory();
+
+        /**
+         * <!-- begin-user-doc -->
+         * Defines literals for the meta objects that represent
+         * <ul>
+         *   <li>each class,</li>
+         *   <li>each feature of each class,</li>
+         *   <li>each operation of each class,</li>
+         *   <li>each enum,</li>
+         *   <li>and each data type</li>
+         * </ul>
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        interface Literals {
+                /**
+                 * The meta object literal for the '{@link modes3.impl.SegmentImpl <em>Segment</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see modes3.impl.SegmentImpl
+                 * @see modes3.impl.Modes3PackageImpl#getSegment()
+                 * @generated
+                 */
+                EClass SEGMENT = eINSTANCE.getSegment();
+
+                /**
+                 * The meta object literal for the '<em><b>Connected To</b></em>' reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference SEGMENT__CONNECTED_TO = eINSTANCE.getSegment_ConnectedTo();
+
+                /**
+                 * The meta object literal for the '<em><b>Occupied By</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference SEGMENT__OCCUPIED_BY = eINSTANCE.getSegment_OccupiedBy();
+
+                /**
+                 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute SEGMENT__ID = eINSTANCE.getSegment_Id();
+
+                /**
+                 * The meta object literal for the '{@link modes3.impl.Modes3ModelRootImpl <em>Model Root</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see modes3.impl.Modes3ModelRootImpl
+                 * @see modes3.impl.Modes3PackageImpl#getModes3ModelRoot()
+                 * @generated
+                 */
+                EClass MODES3_MODEL_ROOT = eINSTANCE.getModes3ModelRoot();
+
+                /**
+                 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute MODES3_MODEL_ROOT__ID = eINSTANCE.getModes3ModelRoot_Id();
+
+                /**
+                 * The meta object literal for the '<em><b>Trains</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference MODES3_MODEL_ROOT__TRAINS = eINSTANCE.getModes3ModelRoot_Trains();
+
+                /**
+                 * The meta object literal for the '<em><b>Segments</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference MODES3_MODEL_ROOT__SEGMENTS = eINSTANCE.getModes3ModelRoot_Segments();
+
+                /**
+                 * The meta object literal for the '<em><b>Turnouts</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference MODES3_MODEL_ROOT__TURNOUTS = eINSTANCE.getModes3ModelRoot_Turnouts();
+
+                /**
+                 * The meta object literal for the '{@link modes3.impl.TurnoutImpl <em>Turnout</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see modes3.impl.TurnoutImpl
+                 * @see modes3.impl.Modes3PackageImpl#getTurnout()
+                 * @generated
+                 */
+                EClass TURNOUT = eINSTANCE.getTurnout();
+
+                /**
+                 * The meta object literal for the '<em><b>Straight</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference TURNOUT__STRAIGHT = eINSTANCE.getTurnout_Straight();
+
+                /**
+                 * The meta object literal for the '<em><b>Divergent</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference TURNOUT__DIVERGENT = eINSTANCE.getTurnout_Divergent();
+
+                /**
+                 * The meta object literal for the '{@link modes3.impl.TrainImpl <em>Train</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see modes3.impl.TrainImpl
+                 * @see modes3.impl.Modes3PackageImpl#getTrain()
+                 * @generated
+                 */
+                EClass TRAIN = eINSTANCE.getTrain();
+
+                /**
+                 * The meta object literal for the '<em><b>Location</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference TRAIN__LOCATION = eINSTANCE.getTrain_Location();
+
+                /**
+                 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute TRAIN__ID = eINSTANCE.getTrain_Id();
+
+                /**
+                 * The meta object literal for the '<em><b>Speed</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute TRAIN__SPEED = eINSTANCE.getTrain_Speed();
+
+                /**
+                 * The meta object literal for the '{@link modes3.impl.SimpleSegmentImpl <em>Simple Segment</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see modes3.impl.SimpleSegmentImpl
+                 * @see modes3.impl.Modes3PackageImpl#getSimpleSegment()
+                 * @generated
+                 */
+                EClass SIMPLE_SEGMENT = eINSTANCE.getSimpleSegment();
+
+        }
+
+} //Modes3Package
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Segment.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Segment.java
new file mode 100644
index 00000000..002f25a5
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Segment.java
@@ -0,0 +1,86 @@
+/**
+ */
+package modes3;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Segment</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link modes3.Segment#getConnectedTo <em>Connected To</em>}</li>
+ *   <li>{@link modes3.Segment#getOccupiedBy <em>Occupied By</em>}</li>
+ *   <li>{@link modes3.Segment#getId <em>Id</em>}</li>
+ * </ul>
+ *
+ * @see modes3.Modes3Package#getSegment()
+ * @model
+ * @generated
+ */
+public interface Segment extends EObject {
+        /**
+         * Returns the value of the '<em><b>Connected To</b></em>' reference list.
+         * The list contents are of type {@link modes3.Segment}.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Connected To</em>' reference list.
+         * @see modes3.Modes3Package#getSegment_ConnectedTo()
+         * @model upper="2"
+         * @generated
+         */
+        EList<Segment> getConnectedTo();
+
+        /**
+         * Returns the value of the '<em><b>Occupied By</b></em>' reference.
+         * It is bidirectional and its opposite is '{@link modes3.Train#getLocation <em>Location</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Occupied By</em>' reference.
+         * @see #setOccupiedBy(Train)
+         * @see modes3.Modes3Package#getSegment_OccupiedBy()
+         * @see modes3.Train#getLocation
+         * @model opposite="location"
+         * @generated
+         */
+        Train getOccupiedBy();
+
+        /**
+         * Sets the value of the '{@link modes3.Segment#getOccupiedBy <em>Occupied By</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Occupied By</em>' reference.
+         * @see #getOccupiedBy()
+         * @generated
+         */
+        void setOccupiedBy(Train value);
+
+        /**
+         * Returns the value of the '<em><b>Id</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Id</em>' attribute.
+         * @see #setId(int)
+         * @see modes3.Modes3Package#getSegment_Id()
+         * @model
+         * @generated
+         */
+        int getId();
+
+        /**
+         * Sets the value of the '{@link modes3.Segment#getId <em>Id</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Id</em>' attribute.
+         * @see #getId()
+         * @generated
+         */
+        void setId(int value);
+
+} // Segment
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/SimpleSegment.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/SimpleSegment.java
new file mode 100644
index 00000000..da77510f
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/SimpleSegment.java
@@ -0,0 +1,17 @@
+/**
+ */
+package modes3;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Simple Segment</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see modes3.Modes3Package#getSimpleSegment()
+ * @model
+ * @generated
+ */
+public interface SimpleSegment extends Segment {
+} // SimpleSegment
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Train.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Train.java
new file mode 100644
index 00000000..1829586d
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Train.java
@@ -0,0 +1,94 @@
+/**
+ */
+package modes3;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Train</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link modes3.Train#getLocation <em>Location</em>}</li>
+ *   <li>{@link modes3.Train#getId <em>Id</em>}</li>
+ *   <li>{@link modes3.Train#getSpeed <em>Speed</em>}</li>
+ * </ul>
+ *
+ * @see modes3.Modes3Package#getTrain()
+ * @model
+ * @generated
+ */
+public interface Train extends EObject {
+        /**
+         * Returns the value of the '<em><b>Location</b></em>' reference.
+         * It is bidirectional and its opposite is '{@link modes3.Segment#getOccupiedBy <em>Occupied By</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Location</em>' reference.
+         * @see #setLocation(Segment)
+         * @see modes3.Modes3Package#getTrain_Location()
+         * @see modes3.Segment#getOccupiedBy
+         * @model opposite="occupiedBy" required="true"
+         * @generated
+         */
+        Segment getLocation();
+
+        /**
+         * Sets the value of the '{@link modes3.Train#getLocation <em>Location</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Location</em>' reference.
+         * @see #getLocation()
+         * @generated
+         */
+        void setLocation(Segment value);
+
+        /**
+         * Returns the value of the '<em><b>Id</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Id</em>' attribute.
+         * @see #setId(int)
+         * @see modes3.Modes3Package#getTrain_Id()
+         * @model
+         * @generated
+         */
+        int getId();
+
+        /**
+         * Sets the value of the '{@link modes3.Train#getId <em>Id</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Id</em>' attribute.
+         * @see #getId()
+         * @generated
+         */
+        void setId(int value);
+
+        /**
+         * Returns the value of the '<em><b>Speed</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Speed</em>' attribute.
+         * @see #setSpeed(double)
+         * @see modes3.Modes3Package#getTrain_Speed()
+         * @model
+         * @generated
+         */
+        double getSpeed();
+
+        /**
+         * Sets the value of the '{@link modes3.Train#getSpeed <em>Speed</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Speed</em>' attribute.
+         * @see #getSpeed()
+         * @generated
+         */
+        void setSpeed(double value);
+
+} // Train
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Turnout.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Turnout.java
new file mode 100644
index 00000000..799f8d7b
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/Turnout.java
@@ -0,0 +1,68 @@
+/**
+ */
+package modes3;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Turnout</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link modes3.Turnout#getStraight <em>Straight</em>}</li>
+ *   <li>{@link modes3.Turnout#getDivergent <em>Divergent</em>}</li>
+ * </ul>
+ *
+ * @see modes3.Modes3Package#getTurnout()
+ * @model
+ * @generated
+ */
+public interface Turnout extends Segment {
+        /**
+         * Returns the value of the '<em><b>Straight</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Straight</em>' reference.
+         * @see #setStraight(Segment)
+         * @see modes3.Modes3Package#getTurnout_Straight()
+         * @model required="true"
+         * @generated
+         */
+        Segment getStraight();
+
+        /**
+         * Sets the value of the '{@link modes3.Turnout#getStraight <em>Straight</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Straight</em>' reference.
+         * @see #getStraight()
+         * @generated
+         */
+        void setStraight(Segment value);
+
+        /**
+         * Returns the value of the '<em><b>Divergent</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Divergent</em>' reference.
+         * @see #setDivergent(Segment)
+         * @see modes3.Modes3Package#getTurnout_Divergent()
+         * @model required="true"
+         * @generated
+         */
+        Segment getDivergent();
+
+        /**
+         * Sets the value of the '{@link modes3.Turnout#getDivergent <em>Divergent</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Divergent</em>' reference.
+         * @see #getDivergent()
+         * @generated
+         */
+        void setDivergent(Segment value);
+
+} // Turnout
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3FactoryImpl.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3FactoryImpl.java
new file mode 100644
index 00000000..60947533
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3FactoryImpl.java
@@ -0,0 +1,139 @@
+/**
+ */
+package modes3.impl;
+
+import modes3.*;
+
+import org.eclipse.emf.ecore.EClass;
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class Modes3FactoryImpl extends EFactoryImpl implements Modes3Factory {
+        /**
+         * Creates the default factory implementation.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public static Modes3Factory init() {
+                try {
+                        Modes3Factory theModes3Factory = (Modes3Factory)EPackage.Registry.INSTANCE.getEFactory(Modes3Package.eNS_URI);
+                        if (theModes3Factory != null) {
+                                return theModes3Factory;
+                        }
+                }
+                catch (Exception exception) {
+                        EcorePlugin.INSTANCE.log(exception);
+                }
+                return new Modes3FactoryImpl();
+        }
+
+        /**
+         * Creates an instance of the factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Modes3FactoryImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EObject create(EClass eClass) {
+                switch (eClass.getClassifierID()) {
+                        case Modes3Package.SEGMENT: return createSegment();
+                        case Modes3Package.MODES3_MODEL_ROOT: return createModes3ModelRoot();
+                        case Modes3Package.TURNOUT: return createTurnout();
+                        case Modes3Package.TRAIN: return createTrain();
+                        case Modes3Package.SIMPLE_SEGMENT: return createSimpleSegment();
+                        default:
+                                throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+                }
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Segment createSegment() {
+                SegmentImpl segment = new SegmentImpl();
+                return segment;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Modes3ModelRoot createModes3ModelRoot() {
+                Modes3ModelRootImpl modes3ModelRoot = new Modes3ModelRootImpl();
+                return modes3ModelRoot;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Turnout createTurnout() {
+                TurnoutImpl turnout = new TurnoutImpl();
+                return turnout;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Train createTrain() {
+                TrainImpl train = new TrainImpl();
+                return train;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public SimpleSegment createSimpleSegment() {
+                SimpleSegmentImpl simpleSegment = new SimpleSegmentImpl();
+                return simpleSegment;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Modes3Package getModes3Package() {
+                return (Modes3Package)getEPackage();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @deprecated
+         * @generated
+         */
+        @Deprecated
+        public static Modes3Package getPackage() {
+                return Modes3Package.eINSTANCE;
+        }
+
+} //Modes3FactoryImpl
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3ModelRootImpl.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3ModelRootImpl.java
new file mode 100644
index 00000000..ccab1f29
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3ModelRootImpl.java
@@ -0,0 +1,296 @@
+/**
+ */
+package modes3.impl;
+
+import java.util.Collection;
+
+import modes3.Modes3ModelRoot;
+import modes3.Modes3Package;
+import modes3.SimpleSegment;
+import modes3.Train;
+import modes3.Turnout;
+
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Model Root</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link modes3.impl.Modes3ModelRootImpl#getId <em>Id</em>}</li>
+ *   <li>{@link modes3.impl.Modes3ModelRootImpl#getTrains <em>Trains</em>}</li>
+ *   <li>{@link modes3.impl.Modes3ModelRootImpl#getSegments <em>Segments</em>}</li>
+ *   <li>{@link modes3.impl.Modes3ModelRootImpl#getTurnouts <em>Turnouts</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class Modes3ModelRootImpl extends MinimalEObjectImpl.Container implements Modes3ModelRoot {
+        /**
+         * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getId()
+         * @generated
+         * @ordered
+         */
+        protected static final int ID_EDEFAULT = 0;
+
+        /**
+         * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getId()
+         * @generated
+         * @ordered
+         */
+        protected int id = ID_EDEFAULT;
+
+        /**
+         * The cached value of the '{@link #getTrains() <em>Trains</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getTrains()
+         * @generated
+         * @ordered
+         */
+        protected EList<Train> trains;
+
+        /**
+         * The cached value of the '{@link #getSegments() <em>Segments</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getSegments()
+         * @generated
+         * @ordered
+         */
+        protected EList<SimpleSegment> segments;
+
+        /**
+         * The cached value of the '{@link #getTurnouts() <em>Turnouts</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getTurnouts()
+         * @generated
+         * @ordered
+         */
+        protected EList<Turnout> turnouts;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected Modes3ModelRootImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return Modes3Package.Literals.MODES3_MODEL_ROOT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public int getId() {
+                return id;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setId(int newId) {
+                int oldId = id;
+                id = newId;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, Modes3Package.MODES3_MODEL_ROOT__ID, oldId, id));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Train> getTrains() {
+                if (trains == null) {
+                        trains = new EObjectContainmentEList<Train>(Train.class, this, Modes3Package.MODES3_MODEL_ROOT__TRAINS);
+                }
+                return trains;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<SimpleSegment> getSegments() {
+                if (segments == null) {
+                        segments = new EObjectContainmentEList<SimpleSegment>(SimpleSegment.class, this, Modes3Package.MODES3_MODEL_ROOT__SEGMENTS);
+                }
+                return segments;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Turnout> getTurnouts() {
+                if (turnouts == null) {
+                        turnouts = new EObjectContainmentEList<Turnout>(Turnout.class, this, Modes3Package.MODES3_MODEL_ROOT__TURNOUTS);
+                }
+                return turnouts;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case Modes3Package.MODES3_MODEL_ROOT__TRAINS:
+                                return ((InternalEList<?>)getTrains()).basicRemove(otherEnd, msgs);
+                        case Modes3Package.MODES3_MODEL_ROOT__SEGMENTS:
+                                return ((InternalEList<?>)getSegments()).basicRemove(otherEnd, msgs);
+                        case Modes3Package.MODES3_MODEL_ROOT__TURNOUTS:
+                                return ((InternalEList<?>)getTurnouts()).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 Modes3Package.MODES3_MODEL_ROOT__ID:
+                                return getId();
+                        case Modes3Package.MODES3_MODEL_ROOT__TRAINS:
+                                return getTrains();
+                        case Modes3Package.MODES3_MODEL_ROOT__SEGMENTS:
+                                return getSegments();
+                        case Modes3Package.MODES3_MODEL_ROOT__TURNOUTS:
+                                return getTurnouts();
+                }
+                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 Modes3Package.MODES3_MODEL_ROOT__ID:
+                                setId((Integer)newValue);
+                                return;
+                        case Modes3Package.MODES3_MODEL_ROOT__TRAINS:
+                                getTrains().clear();
+                                getTrains().addAll((Collection<? extends Train>)newValue);
+                                return;
+                        case Modes3Package.MODES3_MODEL_ROOT__SEGMENTS:
+                                getSegments().clear();
+                                getSegments().addAll((Collection<? extends SimpleSegment>)newValue);
+                                return;
+                        case Modes3Package.MODES3_MODEL_ROOT__TURNOUTS:
+                                getTurnouts().clear();
+                                getTurnouts().addAll((Collection<? extends Turnout>)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case Modes3Package.MODES3_MODEL_ROOT__ID:
+                                setId(ID_EDEFAULT);
+                                return;
+                        case Modes3Package.MODES3_MODEL_ROOT__TRAINS:
+                                getTrains().clear();
+                                return;
+                        case Modes3Package.MODES3_MODEL_ROOT__SEGMENTS:
+                                getSegments().clear();
+                                return;
+                        case Modes3Package.MODES3_MODEL_ROOT__TURNOUTS:
+                                getTurnouts().clear();
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case Modes3Package.MODES3_MODEL_ROOT__ID:
+                                return id != ID_EDEFAULT;
+                        case Modes3Package.MODES3_MODEL_ROOT__TRAINS:
+                                return trains != null && !trains.isEmpty();
+                        case Modes3Package.MODES3_MODEL_ROOT__SEGMENTS:
+                                return segments != null && !segments.isEmpty();
+                        case Modes3Package.MODES3_MODEL_ROOT__TURNOUTS:
+                                return turnouts != null && !turnouts.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(" (id: ");
+                result.append(id);
+                result.append(')');
+                return result.toString();
+        }
+
+} //Modes3ModelRootImpl
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3PackageImpl.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3PackageImpl.java
new file mode 100644
index 00000000..557da4c1
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/Modes3PackageImpl.java
@@ -0,0 +1,385 @@
+/**
+ */
+package modes3.impl;
+
+import modes3.Modes3Factory;
+import modes3.Modes3ModelRoot;
+import modes3.Modes3Package;
+import modes3.Segment;
+import modes3.SimpleSegment;
+import modes3.Train;
+import modes3.Turnout;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class Modes3PackageImpl extends EPackageImpl implements Modes3Package {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass segmentEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass modes3ModelRootEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass turnoutEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass trainEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass simpleSegmentEClass = 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 modes3.Modes3Package#eNS_URI
+         * @see #init()
+         * @generated
+         */
+        private Modes3PackageImpl() {
+                super(eNS_URI, Modes3Factory.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 Modes3Package#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 Modes3Package init() {
+                if (isInited) return (Modes3Package)EPackage.Registry.INSTANCE.getEPackage(Modes3Package.eNS_URI);
+
+                // Obtain or create and register package
+                Object registeredModes3Package = EPackage.Registry.INSTANCE.get(eNS_URI);
+                Modes3PackageImpl theModes3Package = registeredModes3Package instanceof Modes3PackageImpl ? (Modes3PackageImpl)registeredModes3Package : new Modes3PackageImpl();
+
+                isInited = true;
+
+                // Create package meta-data objects
+                theModes3Package.createPackageContents();
+
+                // Initialize created meta-data
+                theModes3Package.initializePackageContents();
+
+                // Mark meta-data to indicate it can't be changed
+                theModes3Package.freeze();
+
+                // Update the registry and return the package
+                EPackage.Registry.INSTANCE.put(Modes3Package.eNS_URI, theModes3Package);
+                return theModes3Package;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getSegment() {
+                return segmentEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getSegment_ConnectedTo() {
+                return (EReference)segmentEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getSegment_OccupiedBy() {
+                return (EReference)segmentEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getSegment_Id() {
+                return (EAttribute)segmentEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getModes3ModelRoot() {
+                return modes3ModelRootEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getModes3ModelRoot_Id() {
+                return (EAttribute)modes3ModelRootEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getModes3ModelRoot_Trains() {
+                return (EReference)modes3ModelRootEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getModes3ModelRoot_Segments() {
+                return (EReference)modes3ModelRootEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getModes3ModelRoot_Turnouts() {
+                return (EReference)modes3ModelRootEClass.getEStructuralFeatures().get(3);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getTurnout() {
+                return turnoutEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getTurnout_Straight() {
+                return (EReference)turnoutEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getTurnout_Divergent() {
+                return (EReference)turnoutEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getTrain() {
+                return trainEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getTrain_Location() {
+                return (EReference)trainEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getTrain_Id() {
+                return (EAttribute)trainEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getTrain_Speed() {
+                return (EAttribute)trainEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getSimpleSegment() {
+                return simpleSegmentEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Modes3Factory getModes3Factory() {
+                return (Modes3Factory)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
+                segmentEClass = createEClass(SEGMENT);
+                createEReference(segmentEClass, SEGMENT__CONNECTED_TO);
+                createEReference(segmentEClass, SEGMENT__OCCUPIED_BY);
+                createEAttribute(segmentEClass, SEGMENT__ID);
+
+                modes3ModelRootEClass = createEClass(MODES3_MODEL_ROOT);
+                createEAttribute(modes3ModelRootEClass, MODES3_MODEL_ROOT__ID);
+                createEReference(modes3ModelRootEClass, MODES3_MODEL_ROOT__TRAINS);
+                createEReference(modes3ModelRootEClass, MODES3_MODEL_ROOT__SEGMENTS);
+                createEReference(modes3ModelRootEClass, MODES3_MODEL_ROOT__TURNOUTS);
+
+                turnoutEClass = createEClass(TURNOUT);
+                createEReference(turnoutEClass, TURNOUT__STRAIGHT);
+                createEReference(turnoutEClass, TURNOUT__DIVERGENT);
+
+                trainEClass = createEClass(TRAIN);
+                createEReference(trainEClass, TRAIN__LOCATION);
+                createEAttribute(trainEClass, TRAIN__ID);
+                createEAttribute(trainEClass, TRAIN__SPEED);
+
+                simpleSegmentEClass = createEClass(SIMPLE_SEGMENT);
+        }
+
+        /**
+         * <!-- 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
+                turnoutEClass.getESuperTypes().add(this.getSegment());
+                simpleSegmentEClass.getESuperTypes().add(this.getSegment());
+
+                // Initialize classes, features, and operations; add parameters
+                initEClass(segmentEClass, Segment.class, "Segment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getSegment_ConnectedTo(), this.getSegment(), null, "connectedTo", null, 0, 2, Segment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getSegment_OccupiedBy(), this.getTrain(), this.getTrain_Location(), "occupiedBy", null, 0, 1, Segment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getSegment_Id(), ecorePackage.getEInt(), "id", null, 0, 1, Segment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(modes3ModelRootEClass, Modes3ModelRoot.class, "Modes3ModelRoot", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getModes3ModelRoot_Id(), ecorePackage.getEInt(), "id", null, 0, 1, Modes3ModelRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getModes3ModelRoot_Trains(), this.getTrain(), null, "trains", null, 0, -1, Modes3ModelRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getModes3ModelRoot_Segments(), this.getSimpleSegment(), null, "segments", null, 0, -1, Modes3ModelRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getModes3ModelRoot_Turnouts(), this.getTurnout(), null, "turnouts", null, 0, -1, Modes3ModelRoot.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(turnoutEClass, Turnout.class, "Turnout", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getTurnout_Straight(), this.getSegment(), null, "straight", null, 1, 1, Turnout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getTurnout_Divergent(), this.getSegment(), null, "divergent", null, 1, 1, Turnout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(trainEClass, Train.class, "Train", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getTrain_Location(), this.getSegment(), this.getSegment_OccupiedBy(), "location", null, 1, 1, Train.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getTrain_Id(), ecorePackage.getEInt(), "id", null, 0, 1, Train.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getTrain_Speed(), ecorePackage.getEDouble(), "speed", null, 0, 1, Train.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(simpleSegmentEClass, SimpleSegment.class, "SimpleSegment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+                // Create resource
+                createResource(eNS_URI);
+        }
+
+} //Modes3PackageImpl
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/SegmentImpl.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/SegmentImpl.java
new file mode 100644
index 00000000..905bcec1
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/SegmentImpl.java
@@ -0,0 +1,319 @@
+/**
+ */
+package modes3.impl;
+
+import java.util.Collection;
+
+import modes3.Modes3Package;
+import modes3.Segment;
+import modes3.Train;
+
+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.EObjectResolvingEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Segment</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link modes3.impl.SegmentImpl#getConnectedTo <em>Connected To</em>}</li>
+ *   <li>{@link modes3.impl.SegmentImpl#getOccupiedBy <em>Occupied By</em>}</li>
+ *   <li>{@link modes3.impl.SegmentImpl#getId <em>Id</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class SegmentImpl extends MinimalEObjectImpl.Container implements Segment {
+        /**
+         * The cached value of the '{@link #getConnectedTo() <em>Connected To</em>}' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getConnectedTo()
+         * @generated
+         * @ordered
+         */
+        protected EList<Segment> connectedTo;
+
+        /**
+         * The cached value of the '{@link #getOccupiedBy() <em>Occupied By</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getOccupiedBy()
+         * @generated
+         * @ordered
+         */
+        protected Train occupiedBy;
+
+        /**
+         * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getId()
+         * @generated
+         * @ordered
+         */
+        protected static final int ID_EDEFAULT = 0;
+
+        /**
+         * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getId()
+         * @generated
+         * @ordered
+         */
+        protected int id = ID_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected SegmentImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return Modes3Package.Literals.SEGMENT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Segment> getConnectedTo() {
+                if (connectedTo == null) {
+                        connectedTo = new EObjectResolvingEList<Segment>(Segment.class, this, Modes3Package.SEGMENT__CONNECTED_TO);
+                }
+                return connectedTo;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Train getOccupiedBy() {
+                if (occupiedBy != null && occupiedBy.eIsProxy()) {
+                        InternalEObject oldOccupiedBy = (InternalEObject)occupiedBy;
+                        occupiedBy = (Train)eResolveProxy(oldOccupiedBy);
+                        if (occupiedBy != oldOccupiedBy) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, Modes3Package.SEGMENT__OCCUPIED_BY, oldOccupiedBy, occupiedBy));
+                        }
+                }
+                return occupiedBy;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Train basicGetOccupiedBy() {
+                return occupiedBy;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetOccupiedBy(Train newOccupiedBy, NotificationChain msgs) {
+                Train oldOccupiedBy = occupiedBy;
+                occupiedBy = newOccupiedBy;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Modes3Package.SEGMENT__OCCUPIED_BY, oldOccupiedBy, newOccupiedBy);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setOccupiedBy(Train newOccupiedBy) {
+                if (newOccupiedBy != occupiedBy) {
+                        NotificationChain msgs = null;
+                        if (occupiedBy != null)
+                                msgs = ((InternalEObject)occupiedBy).eInverseRemove(this, Modes3Package.TRAIN__LOCATION, Train.class, msgs);
+                        if (newOccupiedBy != null)
+                                msgs = ((InternalEObject)newOccupiedBy).eInverseAdd(this, Modes3Package.TRAIN__LOCATION, Train.class, msgs);
+                        msgs = basicSetOccupiedBy(newOccupiedBy, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, Modes3Package.SEGMENT__OCCUPIED_BY, newOccupiedBy, newOccupiedBy));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public int getId() {
+                return id;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setId(int newId) {
+                int oldId = id;
+                id = newId;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, Modes3Package.SEGMENT__ID, oldId, id));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case Modes3Package.SEGMENT__OCCUPIED_BY:
+                                if (occupiedBy != null)
+                                        msgs = ((InternalEObject)occupiedBy).eInverseRemove(this, Modes3Package.TRAIN__LOCATION, Train.class, msgs);
+                                return basicSetOccupiedBy((Train)otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case Modes3Package.SEGMENT__OCCUPIED_BY:
+                                return basicSetOccupiedBy(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 Modes3Package.SEGMENT__CONNECTED_TO:
+                                return getConnectedTo();
+                        case Modes3Package.SEGMENT__OCCUPIED_BY:
+                                if (resolve) return getOccupiedBy();
+                                return basicGetOccupiedBy();
+                        case Modes3Package.SEGMENT__ID:
+                                return getId();
+                }
+                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 Modes3Package.SEGMENT__CONNECTED_TO:
+                                getConnectedTo().clear();
+                                getConnectedTo().addAll((Collection<? extends Segment>)newValue);
+                                return;
+                        case Modes3Package.SEGMENT__OCCUPIED_BY:
+                                setOccupiedBy((Train)newValue);
+                                return;
+                        case Modes3Package.SEGMENT__ID:
+                                setId((Integer)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case Modes3Package.SEGMENT__CONNECTED_TO:
+                                getConnectedTo().clear();
+                                return;
+                        case Modes3Package.SEGMENT__OCCUPIED_BY:
+                                setOccupiedBy((Train)null);
+                                return;
+                        case Modes3Package.SEGMENT__ID:
+                                setId(ID_EDEFAULT);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case Modes3Package.SEGMENT__CONNECTED_TO:
+                                return connectedTo != null && !connectedTo.isEmpty();
+                        case Modes3Package.SEGMENT__OCCUPIED_BY:
+                                return occupiedBy != null;
+                        case Modes3Package.SEGMENT__ID:
+                                return id != ID_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(" (id: ");
+                result.append(id);
+                result.append(')');
+                return result.toString();
+        }
+
+} //SegmentImpl
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/SimpleSegmentImpl.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/SimpleSegmentImpl.java
new file mode 100644
index 00000000..e3fd6c34
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/SimpleSegmentImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package modes3.impl;
+
+import modes3.Modes3Package;
+import modes3.SimpleSegment;
+
+import org.eclipse.emf.ecore.EClass;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Simple Segment</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class SimpleSegmentImpl extends SegmentImpl implements SimpleSegment {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected SimpleSegmentImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return Modes3Package.Literals.SIMPLE_SEGMENT;
+        }
+
+} //SimpleSegmentImpl
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/TrainImpl.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/TrainImpl.java
new file mode 100644
index 00000000..f096dca8
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/TrainImpl.java
@@ -0,0 +1,332 @@
+/**
+ */
+package modes3.impl;
+
+import modes3.Modes3Package;
+import modes3.Segment;
+import modes3.Train;
+
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Train</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link modes3.impl.TrainImpl#getLocation <em>Location</em>}</li>
+ *   <li>{@link modes3.impl.TrainImpl#getId <em>Id</em>}</li>
+ *   <li>{@link modes3.impl.TrainImpl#getSpeed <em>Speed</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TrainImpl extends MinimalEObjectImpl.Container implements Train {
+        /**
+         * The cached value of the '{@link #getLocation() <em>Location</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getLocation()
+         * @generated
+         * @ordered
+         */
+        protected Segment location;
+
+        /**
+         * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getId()
+         * @generated
+         * @ordered
+         */
+        protected static final int ID_EDEFAULT = 0;
+
+        /**
+         * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getId()
+         * @generated
+         * @ordered
+         */
+        protected int id = ID_EDEFAULT;
+
+        /**
+         * The default value of the '{@link #getSpeed() <em>Speed</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getSpeed()
+         * @generated
+         * @ordered
+         */
+        protected static final double SPEED_EDEFAULT = 0.0;
+
+        /**
+         * The cached value of the '{@link #getSpeed() <em>Speed</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getSpeed()
+         * @generated
+         * @ordered
+         */
+        protected double speed = SPEED_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected TrainImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return Modes3Package.Literals.TRAIN;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Segment getLocation() {
+                if (location != null && location.eIsProxy()) {
+                        InternalEObject oldLocation = (InternalEObject)location;
+                        location = (Segment)eResolveProxy(oldLocation);
+                        if (location != oldLocation) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, Modes3Package.TRAIN__LOCATION, oldLocation, location));
+                        }
+                }
+                return location;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Segment basicGetLocation() {
+                return location;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetLocation(Segment newLocation, NotificationChain msgs) {
+                Segment oldLocation = location;
+                location = newLocation;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Modes3Package.TRAIN__LOCATION, oldLocation, newLocation);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setLocation(Segment newLocation) {
+                if (newLocation != location) {
+                        NotificationChain msgs = null;
+                        if (location != null)
+                                msgs = ((InternalEObject)location).eInverseRemove(this, Modes3Package.SEGMENT__OCCUPIED_BY, Segment.class, msgs);
+                        if (newLocation != null)
+                                msgs = ((InternalEObject)newLocation).eInverseAdd(this, Modes3Package.SEGMENT__OCCUPIED_BY, Segment.class, msgs);
+                        msgs = basicSetLocation(newLocation, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, Modes3Package.TRAIN__LOCATION, newLocation, newLocation));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public int getId() {
+                return id;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setId(int newId) {
+                int oldId = id;
+                id = newId;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, Modes3Package.TRAIN__ID, oldId, id));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public double getSpeed() {
+                return speed;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setSpeed(double newSpeed) {
+                double oldSpeed = speed;
+                speed = newSpeed;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, Modes3Package.TRAIN__SPEED, oldSpeed, speed));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case Modes3Package.TRAIN__LOCATION:
+                                if (location != null)
+                                        msgs = ((InternalEObject)location).eInverseRemove(this, Modes3Package.SEGMENT__OCCUPIED_BY, Segment.class, msgs);
+                                return basicSetLocation((Segment)otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case Modes3Package.TRAIN__LOCATION:
+                                return basicSetLocation(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 Modes3Package.TRAIN__LOCATION:
+                                if (resolve) return getLocation();
+                                return basicGetLocation();
+                        case Modes3Package.TRAIN__ID:
+                                return getId();
+                        case Modes3Package.TRAIN__SPEED:
+                                return getSpeed();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case Modes3Package.TRAIN__LOCATION:
+                                setLocation((Segment)newValue);
+                                return;
+                        case Modes3Package.TRAIN__ID:
+                                setId((Integer)newValue);
+                                return;
+                        case Modes3Package.TRAIN__SPEED:
+                                setSpeed((Double)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case Modes3Package.TRAIN__LOCATION:
+                                setLocation((Segment)null);
+                                return;
+                        case Modes3Package.TRAIN__ID:
+                                setId(ID_EDEFAULT);
+                                return;
+                        case Modes3Package.TRAIN__SPEED:
+                                setSpeed(SPEED_EDEFAULT);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case Modes3Package.TRAIN__LOCATION:
+                                return location != null;
+                        case Modes3Package.TRAIN__ID:
+                                return id != ID_EDEFAULT;
+                        case Modes3Package.TRAIN__SPEED:
+                                return speed != SPEED_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(" (id: ");
+                result.append(id);
+                result.append(", speed: ");
+                result.append(speed);
+                result.append(')');
+                return result.toString();
+        }
+
+} //TrainImpl
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/TurnoutImpl.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/TurnoutImpl.java
new file mode 100644
index 00000000..d20a104e
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/impl/TurnoutImpl.java
@@ -0,0 +1,216 @@
+/**
+ */
+package modes3.impl;
+
+import modes3.Modes3Package;
+import modes3.Segment;
+import modes3.Turnout;
+
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Turnout</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link modes3.impl.TurnoutImpl#getStraight <em>Straight</em>}</li>
+ *   <li>{@link modes3.impl.TurnoutImpl#getDivergent <em>Divergent</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TurnoutImpl extends SegmentImpl implements Turnout {
+        /**
+         * The cached value of the '{@link #getStraight() <em>Straight</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getStraight()
+         * @generated
+         * @ordered
+         */
+        protected Segment straight;
+
+        /**
+         * The cached value of the '{@link #getDivergent() <em>Divergent</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getDivergent()
+         * @generated
+         * @ordered
+         */
+        protected Segment divergent;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected TurnoutImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return Modes3Package.Literals.TURNOUT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Segment getStraight() {
+                if (straight != null && straight.eIsProxy()) {
+                        InternalEObject oldStraight = (InternalEObject)straight;
+                        straight = (Segment)eResolveProxy(oldStraight);
+                        if (straight != oldStraight) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, Modes3Package.TURNOUT__STRAIGHT, oldStraight, straight));
+                        }
+                }
+                return straight;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Segment basicGetStraight() {
+                return straight;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setStraight(Segment newStraight) {
+                Segment oldStraight = straight;
+                straight = newStraight;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, Modes3Package.TURNOUT__STRAIGHT, oldStraight, straight));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Segment getDivergent() {
+                if (divergent != null && divergent.eIsProxy()) {
+                        InternalEObject oldDivergent = (InternalEObject)divergent;
+                        divergent = (Segment)eResolveProxy(oldDivergent);
+                        if (divergent != oldDivergent) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, Modes3Package.TURNOUT__DIVERGENT, oldDivergent, divergent));
+                        }
+                }
+                return divergent;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Segment basicGetDivergent() {
+                return divergent;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setDivergent(Segment newDivergent) {
+                Segment oldDivergent = divergent;
+                divergent = newDivergent;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, Modes3Package.TURNOUT__DIVERGENT, oldDivergent, divergent));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case Modes3Package.TURNOUT__STRAIGHT:
+                                if (resolve) return getStraight();
+                                return basicGetStraight();
+                        case Modes3Package.TURNOUT__DIVERGENT:
+                                if (resolve) return getDivergent();
+                                return basicGetDivergent();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case Modes3Package.TURNOUT__STRAIGHT:
+                                setStraight((Segment)newValue);
+                                return;
+                        case Modes3Package.TURNOUT__DIVERGENT:
+                                setDivergent((Segment)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case Modes3Package.TURNOUT__STRAIGHT:
+                                setStraight((Segment)null);
+                                return;
+                        case Modes3Package.TURNOUT__DIVERGENT:
+                                setDivergent((Segment)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case Modes3Package.TURNOUT__STRAIGHT:
+                                return straight != null;
+                        case Modes3Package.TURNOUT__DIVERGENT:
+                                return divergent != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //TurnoutImpl
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/util/Modes3AdapterFactory.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/util/Modes3AdapterFactory.java
new file mode 100644
index 00000000..9c5c8d2d
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/util/Modes3AdapterFactory.java
@@ -0,0 +1,192 @@
+/**
+ */
+package modes3.util;
+
+import modes3.*;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see modes3.Modes3Package
+ * @generated
+ */
+public class Modes3AdapterFactory extends AdapterFactoryImpl {
+        /**
+         * The cached model package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected static Modes3Package modelPackage;
+
+        /**
+         * Creates an instance of the adapter factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Modes3AdapterFactory() {
+                if (modelPackage == null) {
+                        modelPackage = Modes3Package.eINSTANCE;
+                }
+        }
+
+        /**
+         * Returns whether this factory is applicable for the type of the object.
+         * <!-- begin-user-doc -->
+         * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+         * <!-- end-user-doc -->
+         * @return whether this factory is applicable for the type of the object.
+         * @generated
+         */
+        @Override
+        public boolean isFactoryForType(Object object) {
+                if (object == modelPackage) {
+                        return true;
+                }
+                if (object instanceof EObject) {
+                        return ((EObject)object).eClass().getEPackage() == modelPackage;
+                }
+                return false;
+        }
+
+        /**
+         * The switch that delegates to the <code>createXXX</code> methods.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected Modes3Switch<Adapter> modelSwitch =
+                new Modes3Switch<Adapter>() {
+                        @Override
+                        public Adapter caseSegment(Segment object) {
+                                return createSegmentAdapter();
+                        }
+                        @Override
+                        public Adapter caseModes3ModelRoot(Modes3ModelRoot object) {
+                                return createModes3ModelRootAdapter();
+                        }
+                        @Override
+                        public Adapter caseTurnout(Turnout object) {
+                                return createTurnoutAdapter();
+                        }
+                        @Override
+                        public Adapter caseTrain(Train object) {
+                                return createTrainAdapter();
+                        }
+                        @Override
+                        public Adapter caseSimpleSegment(SimpleSegment object) {
+                                return createSimpleSegmentAdapter();
+                        }
+                        @Override
+                        public Adapter defaultCase(EObject object) {
+                                return createEObjectAdapter();
+                        }
+                };
+
+        /**
+         * Creates an adapter for the <code>target</code>.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param target the object to adapt.
+         * @return the adapter for the <code>target</code>.
+         * @generated
+         */
+        @Override
+        public Adapter createAdapter(Notifier target) {
+                return modelSwitch.doSwitch((EObject)target);
+        }
+
+
+        /**
+         * Creates a new adapter for an object of class '{@link modes3.Segment <em>Segment</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see modes3.Segment
+         * @generated
+         */
+        public Adapter createSegmentAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link modes3.Modes3ModelRoot <em>Model Root</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see modes3.Modes3ModelRoot
+         * @generated
+         */
+        public Adapter createModes3ModelRootAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link modes3.Turnout <em>Turnout</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see modes3.Turnout
+         * @generated
+         */
+        public Adapter createTurnoutAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link modes3.Train <em>Train</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see modes3.Train
+         * @generated
+         */
+        public Adapter createTrainAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link modes3.SimpleSegment <em>Simple Segment</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see modes3.SimpleSegment
+         * @generated
+         */
+        public Adapter createSimpleSegmentAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for the default case.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @generated
+         */
+        public Adapter createEObjectAdapter() {
+                return null;
+        }
+
+} //Modes3AdapterFactory
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/util/Modes3Switch.java b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/util/Modes3Switch.java
new file mode 100644
index 00000000..0c28861a
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/ecore-gen/modes3/util/Modes3Switch.java
@@ -0,0 +1,196 @@
+/**
+ */
+package modes3.util;
+
+import modes3.*;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see modes3.Modes3Package
+ * @generated
+ */
+public class Modes3Switch<T> extends Switch<T> {
+        /**
+         * The cached model package
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected static Modes3Package modelPackage;
+
+        /**
+         * Creates an instance of the switch.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Modes3Switch() {
+                if (modelPackage == null) {
+                        modelPackage = Modes3Package.eINSTANCE;
+                }
+        }
+
+        /**
+         * Checks whether this is a switch for the given package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param ePackage the package in question.
+         * @return whether this is a switch for the given package.
+         * @generated
+         */
+        @Override
+        protected boolean isSwitchFor(EPackage ePackage) {
+                return ePackage == modelPackage;
+        }
+
+        /**
+         * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the first non-null result returned by a <code>caseXXX</code> call.
+         * @generated
+         */
+        @Override
+        protected T doSwitch(int classifierID, EObject theEObject) {
+                switch (classifierID) {
+                        case Modes3Package.SEGMENT: {
+                                Segment segment = (Segment)theEObject;
+                                T result = caseSegment(segment);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case Modes3Package.MODES3_MODEL_ROOT: {
+                                Modes3ModelRoot modes3ModelRoot = (Modes3ModelRoot)theEObject;
+                                T result = caseModes3ModelRoot(modes3ModelRoot);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case Modes3Package.TURNOUT: {
+                                Turnout turnout = (Turnout)theEObject;
+                                T result = caseTurnout(turnout);
+                                if (result == null) result = caseSegment(turnout);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case Modes3Package.TRAIN: {
+                                Train train = (Train)theEObject;
+                                T result = caseTrain(train);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        case Modes3Package.SIMPLE_SEGMENT: {
+                                SimpleSegment simpleSegment = (SimpleSegment)theEObject;
+                                T result = caseSimpleSegment(simpleSegment);
+                                if (result == null) result = caseSegment(simpleSegment);
+                                if (result == null) result = defaultCase(theEObject);
+                                return result;
+                        }
+                        default: return defaultCase(theEObject);
+                }
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Segment</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Segment</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseSegment(Segment object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Model Root</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Model Root</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseModes3ModelRoot(Modes3ModelRoot object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Turnout</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Turnout</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseTurnout(Turnout object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Train</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Train</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseTrain(Train object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Simple Segment</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Simple Segment</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseSimpleSegment(SimpleSegment object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch, but this is the last case anyway.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+         * @generated
+         */
+        @Override
+        public T defaultCase(EObject object) {
+                return null;
+        }
+
+} //Modes3Switch
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/model/modes3.ecore b/Domains/ca.mcgill.rtgmrt.example.modes3/model/modes3.ecore
new file mode 100644
index 00000000..f7cb28be
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/model/modes3.ecore
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="modes3" nsURI="http://www.ece.mcgill.ca/wcet/modes3" nsPrefix="modes3">
+  <eClassifiers xsi:type="ecore:EClass" name="Segment">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="connectedTo" upperBound="2"
+        eType="#//Segment"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="occupiedBy" eType="#//Train"
+        eOpposite="#//Train/location"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Modes3ModelRoot">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="trains" upperBound="-1"
+        eType="#//Train" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="segments" upperBound="-1"
+        eType="#//SimpleSegment" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="turnouts" upperBound="-1"
+        eType="#//Turnout" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Turnout" eSuperTypes="#//Segment">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="straight" lowerBound="1"
+        eType="#//Segment"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="divergent" lowerBound="1"
+        eType="#//Segment"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Train">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="location" lowerBound="1"
+        eType="#//Segment" eOpposite="#//Segment/occupiedBy"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="speed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="SimpleSegment" eSuperTypes="#//Segment"/>
+</ecore:EPackage>
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/model/modes3.genmodel b/Domains/ca.mcgill.rtgmrt.example.modes3/model/modes3.genmodel
new file mode 100644
index 00000000..1cd4ac41
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/model/modes3.genmodel
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/ca.mcgill.rtgmrt.example.modes3/ecore-gen" modelPluginID="ca.mcgill.rtgmrt.example.modes3"
+    modelName="Modes3" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
+    operationReflection="true" importOrganizing="true">
+  <foreignModel>modes3.ecore</foreignModel>
+  <genPackages prefix="Modes3" disposableProviderFactory="true" ecorePackage="modes3.ecore#/">
+    <genClasses ecoreClass="modes3.ecore#//Segment">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference modes3.ecore#//Segment/connectedTo"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference modes3.ecore#//Segment/occupiedBy"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute modes3.ecore#//Segment/id"/>
+    </genClasses>
+    <genClasses ecoreClass="modes3.ecore#//Modes3ModelRoot">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute modes3.ecore#//Modes3ModelRoot/id"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference modes3.ecore#//Modes3ModelRoot/trains"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference modes3.ecore#//Modes3ModelRoot/segments"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference modes3.ecore#//Modes3ModelRoot/turnouts"/>
+    </genClasses>
+    <genClasses ecoreClass="modes3.ecore#//Turnout">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference modes3.ecore#//Turnout/straight"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference modes3.ecore#//Turnout/divergent"/>
+    </genClasses>
+    <genClasses ecoreClass="modes3.ecore#//Train">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference modes3.ecore#//Train/location"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute modes3.ecore#//Train/id"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute modes3.ecore#//Train/speed"/>
+    </genClasses>
+    <genClasses ecoreClass="modes3.ecore#//SimpleSegment"/>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/plugin.properties b/Domains/ca.mcgill.rtgmrt.example.modes3/plugin.properties
new file mode 100644
index 00000000..4eba0dd8
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/plugin.properties
@@ -0,0 +1,4 @@
+#
+
+pluginName = ca.mcgill.rtgmrt.example.modes3
+providerName = www.example.org
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/plugin.xml b/Domains/ca.mcgill.rtgmrt.example.modes3/plugin.xml
new file mode 100644
index 00000000..f7d32541
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/plugin.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?><?eclipse version="3.0"?><!--
+--><plugin>
+  <extension point="org.eclipse.emf.ecore.generated_package">
+    <!-- @generated modes3 -->
+    <package class="modes3.Modes3Package" genModel="model/modes3.genmodel" uri="http://www.ece.mcgill.ca/wcet/modes3"/>
+  </extension>
+  <extension id="modes3.queries.Modes3Queries" point="org.eclipse.viatra.query.runtime.queryspecification">
+    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:modes3.queries.Modes3Queries" id="modes3.queries.Modes3Queries">
+      <query-specification fqn="modes3.queries.connectedTo"/>
+      <query-specification fqn="modes3.queries.connectedToNotSymmetric"/>
+      <query-specification fqn="modes3.queries.connectedToReflexive"/>
+      <query-specification fqn="modes3.queries.turnoutOutput"/>
+      <query-specification fqn="modes3.queries.outputReflexive"/>
+      <query-specification fqn="modes3.queries.turnoutOutputsAreSame"/>
+      <query-specification fqn="modes3.queries.output"/>
+      <query-specification fqn="modes3.queries.tooManyInputsOfSegment"/>
+      <query-specification fqn="modes3.queries.turnoutConnectedToBothOutputs"/>
+      <query-specification fqn="modes3.queries.adjacent"/>
+      <query-specification fqn="modes3.queries.tooManyInputsOfTurnout"/>
+      <query-specification fqn="modes3.queries.inputsOfTurnout"/>
+      <query-specification fqn="modes3.queries.tooFewInputsOfTurnout"/>
+      <query-specification fqn="modes3.queries.reachable"/>
+      <query-specification fqn="modes3.queries.unreachable"/>
+      <query-specification fqn="modes3.queries.closeTrains_step_2"/>
+      <query-specification fqn="modes3.queries.closeTrains_step_3"/>
+      <query-specification fqn="modes3.queries.closeTrains_step_4"/>
+      <query-specification fqn="modes3.queries.closeTrains_step_5"/>
+      <query-specification fqn="modes3.queries.closeTrains_step_6"/>
+      <query-specification fqn="modes3.queries.closeTrains_step_7"/>
+      <query-specification fqn="modes3.queries.trainLocations_step_2"/>
+      <query-specification fqn="modes3.queries.trainLocations_step_3"/>
+      <query-specification fqn="modes3.queries.misalignedTurnout_step_2"/>
+      <query-specification fqn="modes3.queries.misalignedTurnout_step_3"/>
+      <query-specification fqn="modes3.queries.misalignedTurnout_step_4"/>
+      <query-specification fqn="modes3.queries.misalignedTurnout_step_5"/>
+      <query-specification fqn="modes3.queries.connectedSegmentsDirected"/>
+      <query-specification fqn="modes3.queries.endOfSiding_step_2"/>
+      <query-specification fqn="modes3.queries.endOfSiding_step_3"/>
+      <query-specification fqn="modes3.queries.endOfSiding_step_4"/>
+      <query-specification fqn="modes3.queries.endOfSiding_step_5"/>
+      <query-specification fqn="modes3.queries.multipleConnectedTo"/>
+    </group>
+  </extension>
+</plugin>
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
new file mode 100644
index 00000000..d22bdd8b
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
@@ -0,0 +1,295 @@
+package modes3.queries
+
+import "http://www.ece.mcgill.ca/wcet/modes3"
+
+pattern connectedTo(S1 : Segment, S2 : Segment) {
+        Segment.connectedTo(S1, S2);
+}
+
+@Constraint(message = "connectedToNotSymmetric", severity = "error", key = { S1, S2 })
+pattern connectedToNotSymmetric(S1 : Segment, S2 : Segment) {
+        Segment.connectedTo(S1, S2);
+        neg find connectedTo(S2, S1);
+}
+
+@Constraint(message = "connectedToReflexive", severity = "error", key = { S })
+pattern connectedToReflexive(S : Segment) {
+        Segment.connectedTo(S, S);
+}
+
+pattern turnoutOutput(T : Turnout, S : Segment) {
+        Turnout.straight(T, S);
+} or {
+        Turnout.divergent(T, S);
+}
+
+@Constraint(message = "outputReflexive", severity = "error", key = { T })
+pattern outputReflexive(T : Turnout) {
+        find turnoutOutput(T, T);
+}
+
+@Constraint(message = "turnoutOutputsAreSame", severity = "error", key = { T })
+pattern turnoutOutputsAreSame(T : Turnout) {
+        Turnout.straight(T, S);
+        Turnout.divergent(T, S);
+}
+
+pattern output(S1 : Segment, S2 : Segment) {
+        Segment.connectedTo(S1, S2);
+} or {
+        find turnoutOutput(S1, S2);
+}
+
+@Constraint(message = "tooManyInputsOfSegment", severity = "error", key = { S })
+pattern tooManyInputsOfSegment(S : SimpleSegment) {
+        find output(I1, S);
+        find output(I2, S);
+        find output(I3, S);
+        I1 != I2;
+        I1 != I3;
+        I2 != I3;
+}
+
+@Constraint(message = "turnoutConnectedToBothOutputs", severity = "error", key = { T })
+pattern turnoutConnectedToBothOutputs(T : Turnout) {
+        Turnout.straight(T, Straight);
+        Turnout.divergent(T, Divergent);
+        Segment.connectedTo(T, Straight);
+        Segment.connectedTo(T, Divergent);
+}
+
+pattern adjacent(S1 : Segment, S2 : Segment) {
+        find output(S1, S2);
+} or {
+        find turnoutOutput(S2, S1);
+}
+
+@Constraint(message = "turnoutConnectedToBothOutputs", severity = "error", key = { T })
+pattern tooManyInputsOfTurnout(T : Turnout) {
+        find adjacent(I1, T);
+        find adjacent(I2, T);
+        find adjacent(I3, T);
+        find adjacent(I4, T);
+        I1 != I2;
+        I1 != I3;
+        I1 != I4;
+        I2 != I3;
+        I2 != I4;
+        I3 != I4;
+}
+
+pattern inputsOfTurnout(T : Turnout) {
+        find adjacent(I1, T);
+        find adjacent(I2, T);
+        find adjacent(I3, T);
+        I1 != I2;
+        I1 != I3;
+        I2 != I3;
+}
+
+@Constraint(message = "tooFewInputsOfTurnout", severity = "error", key = { T })
+pattern tooFewInputsOfTurnout(T : Turnout) {
+        neg find inputsOfTurnout(T);
+}
+
+pattern reachable(S1 : Segment, S2 : Segment) {
+        S1 == S2;
+} or {
+        find adjacent+(S1, S2);
+}
+
+@Constraint(message = "unreachable", severity = "error", key = { S1, S2 })
+pattern unreachable(S1 : Segment, S2 : Segment) {
+        neg find reachable(S1, S2);
+}
+
+//
+// closeTrains
+//
+
+pattern closeTrains_step_2(in train : Train) {
+//    frame->t1 = model->trains[i0];
+//    frame->start = frame->t1->location;
+//    if(frame->start != 0){
+// ...
+//    }
+//    + OUTER FOR LOOP COUNTER INCREMENT
+        Train(train);
+}
+
+pattern closeTrains_step_3(in train : Train, in start : Segment) {
+//      int loop_bound1 = frame->start->connected_to_count;
+//      for (int i1 = 0; i1 < loop_bound1; i1++) { LOOP COUNTER INCREMENT IS NOT INCLUDED HERE
+// ...
+//      }
+        Train.location(train, start);
+}
+
+pattern closeTrains_step_4(in train : Train, in start : Segment, in middle : Segment) {
+//          frame->middle = frame->start->connected_to[i1];
+//        int loop_bound2 = frame->middle->connected_to_count;
+
+//        for (int i2 = 0; i2 < loop_bound2; i2++) { LOOP COUNTER INCREMENT IS NOT INCLUDED HERE
+// ...
+//        }
+//        + OUTER FOR LOOP COUNTER INCREMENT
+        Train.location(train, start);
+        Segment.connectedTo(start, middle);
+}
+
+pattern closeTrains_step_5(in train : Train, in start : Segment, in middle : Segment, in end : Segment) {
+//           frame->end = frame->middle->connected_to[i2];
+//          if (frame->start != frame->end) {
+// ...
+//          }
+//          + OUTER FOR LOOP COUNTER INCREMENT
+        Train.location(train, start);
+        Segment.connectedTo(start, middle);
+        Segment.connectedTo(middle, end);
+}
+
+pattern closeTrains_step_6(in train : Train, in start : Segment, in middle : Segment, in end : Segment) {
+//            frame->t2 = frame->end->train;
+//            if (frame->t2 != 0) {
+// ...
+//            }
+        Train.location(train, start);
+        Segment.connectedTo(start, middle);
+        Segment.connectedTo(middle, end);
+        start != end;
+}
+
+pattern closeTrains_step_7(in train : Train, in start : Segment, in middle : Segment, in end : Segment, in otherTrain : Train) {
+//              results->matches[match_cntr].start = frame->start;
+//              results->matches[match_cntr++].end = frame->end;
+        Train.location(train, start);
+        Segment.connectedTo(start, middle);
+        Segment.connectedTo(middle, end);
+        start != end;
+        Segment.occupiedBy(end, otherTrain);
+}
+
+//
+// trainLocations
+//
+
+pattern trainLocations_step_2(in train : Train) {
+//   frame->train = model->trains[i0];
+//   frame->location = frame->train->location;
+//   if (frame->location != NULL) {
+//     ...
+//   }
+
+        Train(train);
+}
+
+pattern trainLocations_step_3(in train : Train, in location : Segment) {
+//     results->matches[match_cntr].location = frame->location;
+//     results->matches[match_cntr++].train = frame->train;
+        Train(train);
+    Train.location(train, location);
+}
+
+//
+// misalignedTurnout
+//
+
+pattern misalignedTurnout_step_2(in turnout : Turnout) {
+//    frame->turnout = model->turnouts[i0];
+//    frame->location = frame->turnout->straight;
+//    if (frame->location != NULL) {
+// ...
+//    }
+        Turnout(turnout);
+}
+
+pattern misalignedTurnout_step_3(in turnout : Turnout, in location : Segment) {
+//      Segment *disconnected = ((Segment *)frame->turnout);
+//      if (disconnected->connected_to[0] != frame->location &&
+//          disconnected->connected_to[1] != frame->location) {
+// ...
+//      }
+        Turnout(turnout);
+        Turnout.straight(turnout, location);
+}
+
+pattern misalignedTurnout_step_4(in turnout : Turnout, in location : Segment) {
+//        frame->train = frame->location->train;
+//        if (frame->train != NULL) {
+// ...
+//        }
+        Turnout(turnout);
+        Turnout.straight(turnout, location);
+        neg find connectedSegmentsDirected(turnout, location);  
+}
+
+pattern misalignedTurnout_step_5(in turnout : Turnout, in location : Segment, in train : Train) {
+//              results->matches[match_cntr].start = frame->start;
+//              results->matches[match_cntr++].end = frame->end;
+        Turnout(turnout);
+        Turnout.straight(turnout, location);
+        neg find connectedSegmentsDirected(turnout, location);
+        Segment.occupiedBy(location, train);
+}
+
+pattern connectedSegmentsDirected(s1 : Segment, s2 : Segment) {
+        Segment.connectedTo(s1, s2);
+}
+
+//
+// endOfSiding
+//
+
+pattern endOfSiding_step_2(in train : Train) {
+//   frame->train = model->trains[i0];
+//   frame->location = frame->train->location;
+//   if (frame->location != NULL) {
+//     ...
+//   }
+
+        Train(train);
+}
+
+pattern endOfSiding_step_3(in train : Train, in location : Segment) {
+//     int loop_bound1 = frame->location->connected_to_count;
+//     for (int i1 = 0; i1 < loop_bound1; i1++) {
+//       ...
+//     }
+        Train(train);
+    Train.location(train, location);
+}
+
+pattern endOfSiding_step_4(in train : Train, in location : Segment, in end : Segment) {
+//       frame->end = frame->location->connected_to[i1];
+//       if (frame->end != NULL &&
+//                       frame->end->connected_to[1] == frame->location &&
+//           frame->end->connected_to[0] == NULL) {
+//         ...
+//       } 
+//       if (frame->end != NULL &&
+//                       frame->end->connected_to[0] == frame->location &&
+//           frame->end->connected_to[1] == NULL) {
+//         ...
+//       }
+        Train(train);
+    Train.location(train, location);
+    Segment.connectedTo(location, end);
+}
+
+pattern endOfSiding_step_5(in train : Train, in location : Segment, in end : Segment) {
+//         results->matches[match_cntr].location = frame->location;
+//         results->matches[match_cntr++].train = frame->train;
+//         ...OR...
+//         results->matches[match_cntr].location = frame->location;
+//         results->matches[match_cntr++].train = frame->train;
+        Train(train);
+    Train.location(train, location);
+    Segment.connectedTo(location, end);
+        neg find multipleConnectedTo(end);
+}
+
+pattern multipleConnectedTo(s : Segment) {
+        Segment.connectedTo(s, n1);
+        Segment.connectedTo(s, n2);
+        n1 != n2;
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/CloseTrainsObjectiveHint.xtend b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/CloseTrainsObjectiveHint.xtend
new file mode 100644
index 00000000..519a228a
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/CloseTrainsObjectiveHint.xtend
@@ -0,0 +1,201 @@
+package modes3.run
+
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ExtendedLinearExpressionBuilderFactory
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostElementMatch
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostElementMatchers
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostObjectiveHint
+import java.util.Collection
+import java.util.Map
+import modes3.Modes3Package
+import modes3.queries.CloseTrains_step_2
+import modes3.queries.CloseTrains_step_3
+import modes3.queries.CloseTrains_step_4
+import modes3.queries.CloseTrains_step_5
+import modes3.queries.CloseTrains_step_6
+import modes3.queries.CloseTrains_step_7
+
+class CloseTrainsObjectiveHint extends CostObjectiveHint {
+        val Type segmentType
+        val Type trainType
+
+        new(extension Ecore2Logic ecore2Logic, Ecore2Logic_Trace ecore2LogicTrace) {
+                extension val Modes3Package = Modes3Package.eINSTANCE
+                segmentType = ecore2LogicTrace.TypeofEClass(segment)
+                trainType = ecore2LogicTrace.TypeofEClass(train)
+        }
+
+        override isExact() {
+                true
+        }
+
+        override createPolyhedronExtensionOperator(Map<String, CostElementMatchers> costElementMatchers) {
+                val step2 = costElementMatchers.get(CloseTrains_step_2.instance.fullyQualifiedName)
+                val step3 = costElementMatchers.get(CloseTrains_step_3.instance.fullyQualifiedName)
+                val step4 = costElementMatchers.get(CloseTrains_step_4.instance.fullyQualifiedName)
+                val step5 = costElementMatchers.get(CloseTrains_step_5.instance.fullyQualifiedName)
+                val step6 = costElementMatchers.get(CloseTrains_step_6.instance.fullyQualifiedName)
+                val step7 = costElementMatchers.get(CloseTrains_step_7.instance.fullyQualifiedName);
+
+                [
+                        val objectiveBuilder = createBuilder
+
+                        for (m : step2.matches) {
+                                val dimension = getDimension(m.match)
+                                objectiveBuilder.add(step2.weight, dimension)
+                                dimension.tightenLowerBound(0)
+                                if (m.multi) {
+                                        createBuilder.add(1, dimension).add(-1, trainType).build.assertEqualsTo(0)
+                                } else {
+                                        dimension.tightenUpperBound(1)
+                                        if (m.must) {
+                                                dimension.tightenLowerBound(1)
+                                        }
+                                }
+                        }
+
+                        val step3Matches = step3.matches
+                        for (m : step3Matches) {
+                                val dimension = getDimension(m.match)
+                                objectiveBuilder.add(step3.weight, dimension)
+                                dimension.tightenLowerBound(0)
+                                if (!m.multi) {
+                                        dimension.tightenUpperBound(1)
+                                        if (m.must) {
+                                                dimension.tightenLowerBound(1)
+                                        }
+                                }
+                        }
+                        for (pair : step3Matches.groupBy[step2.projectMayMatch(match, 2)].entrySet) {
+                                val multiplicityBuilder = createBuilder
+                                for (m : pair.value) {
+                                        multiplicityBuilder.add(1, m.match)
+                                }
+                                multiplicityBuilder.add(-1, pair.key)
+                                multiplicityBuilder.build.assertEqualsTo(0)
+                        }
+                        boundLimit(step3Matches, 2, trainType, 1)
+                        boundLimit(step3Matches, 3, segmentType, 1)
+
+                        val step4Matches = step4.matches
+                        for (m : step4Matches) {
+                                val dimension = getDimension(m.match)
+                                objectiveBuilder.add(step4.weight, dimension)
+                                dimension.tightenLowerBound(0)
+                                if (!m.multi) {
+                                        dimension.tightenUpperBound(1)
+                                        if (m.must) {
+                                                dimension.tightenLowerBound(1)
+                                        }
+                                }
+                        }
+                        for (pair : step4Matches.groupBy[step3.projectMayMatch(match, 2, 3)].entrySet) {
+                                val multiplicityBuilder = createBuilder
+                                for (m : pair.value) {
+                                        multiplicityBuilder.add(1, m.match)
+                                }
+                                multiplicityBuilder.add(-2, pair.key)
+                                multiplicityBuilder.build.tightenUpperBound(0)
+                        }
+                        boundLimit(step4Matches, 2, trainType, 2)
+                        boundLimit(step4Matches, 3, segmentType, 2)
+                        boundLimit(step4Matches, 4, segmentType, 2)
+
+                        val step5Matches = step5.matches
+                        for (m : step5Matches) {
+                                val dimension = getDimension(m.match)
+                                objectiveBuilder.add(step5.weight, dimension)
+                                dimension.tightenLowerBound(0)
+                                if (!m.multi) {
+                                        dimension.tightenUpperBound(1)
+                                        if (m.must) {
+                                                dimension.tightenLowerBound(1)
+                                        }
+                                }
+                        }
+                        for (pair : step5Matches.groupBy[step4.projectMayMatch(match, 2, 3, 4)].entrySet) {
+                                val multiplicityBuilder = createBuilder
+                                for (m : pair.value) {
+                                        multiplicityBuilder.add(1, m.match)
+                                }
+                                multiplicityBuilder.add(-2, pair.key)
+                                multiplicityBuilder.build.tightenUpperBound(0)
+                        }
+                        boundLimit(step5Matches, 2, trainType, 4)
+                        boundLimit(step5Matches, 3, segmentType, 4)
+                        boundLimit(step5Matches, 4, segmentType, 4)
+                        boundLimit(step5Matches, 5, segmentType, 4)
+
+                        val step6Matches = step6.matches
+                        for (m : step6Matches) {
+                                val dimension = getDimension(m.match)
+                                objectiveBuilder.add(step6.weight, dimension)
+                                dimension.tightenLowerBound(0)
+                                if (m.multi) {
+                                        if (m.match.get(3) == m.match.get(5)) {
+                                                createBuilder.add(2, m.match).add(-1, step5.projectMayMatch(m.match, 2, 3, 4, 5)).build.
+                                                        assertEqualsTo(0)
+                                        } else {
+                                                createBuilder.add(1, m.match).add(-1, step5.projectMayMatch(m.match, 2, 3, 4, 5)).build.
+                                                        assertEqualsTo(0)
+                                        }
+                                } else {
+                                        dimension.tightenUpperBound(1)
+                                        if (m.must) {
+                                                dimension.tightenLowerBound(1)
+                                        }
+                                }
+                        }
+                        boundLimit(step6Matches, 2, trainType, 2)
+                        boundLimit(step6Matches, 3, segmentType, 2)
+                        boundLimit(step6Matches, 4, segmentType, 2)
+                        boundLimit(step6Matches, 5, segmentType, 2)
+
+                        val step7Matches = step7.matches
+                        for (m : step7Matches) {
+                                val dimension = getDimension(m.match)
+                                objectiveBuilder.add(step7.weight, dimension)
+                                dimension.tightenLowerBound(0)
+                                if (!m.multi) {
+                                        dimension.tightenUpperBound(1)
+                                        if (m.must) {
+                                                dimension.tightenLowerBound(1)
+                                        }
+                                }
+                        }
+                        for (pair : step7Matches.groupBy[step6.projectMayMatch(match, 2, 3, 4, 5)].entrySet) {
+                                val multiplicityBuilder = createBuilder
+                                for (m : pair.value) {
+                                        multiplicityBuilder.add(1, m.match)
+                                }
+                                multiplicityBuilder.add(-1, pair.key)
+                                multiplicityBuilder.build.tightenUpperBound(0)
+                        }
+                        boundLimit(step7Matches, 2, trainType, 2)
+                        boundLimit(step7Matches, 3, segmentType, 2)
+                        boundLimit(step7Matches, 4, segmentType, 2)
+                        boundLimit(step7Matches, 5, segmentType, 2)
+                        boundLimit(step7Matches, 6, trainType, 2)
+
+                        objectiveBuilder.buildWithBounds
+                ]
+        }
+
+        private static def boundLimit(extension ExtendedLinearExpressionBuilderFactory factory,
+                Collection<CostElementMatch> matches, int index, Type type, int count) {
+                for (pair : matches.groupBy[match.get(index)].entrySet) {
+                        val multiplicityBuilder = createBuilder
+                        for (m : pair.value) {
+                                multiplicityBuilder.add(1, m.match)
+                        }
+                        if (CostElementMatchers.isMulti(pair.key)) {
+                                multiplicityBuilder.add(-count, type)
+                                multiplicityBuilder.build.tightenUpperBound(0)
+                        } else {
+                                multiplicityBuilder.build.tightenUpperBound(count)
+                        }
+                }
+        }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/EndOfSidingObjectiveHint.xtend b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/EndOfSidingObjectiveHint.xtend
new file mode 100644
index 00000000..f7e23a57
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/EndOfSidingObjectiveHint.xtend
@@ -0,0 +1,139 @@
+package modes3.run
+
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ExtendedLinearExpressionBuilderFactory
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostElementMatch
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostElementMatchers
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostObjectiveHint
+import java.util.Collection
+import java.util.Map
+import modes3.Modes3Package
+import modes3.queries.EndOfSiding_step_2
+import modes3.queries.EndOfSiding_step_3
+import modes3.queries.EndOfSiding_step_4
+import modes3.queries.EndOfSiding_step_5
+
+class EndOfSidingObjectiveHint extends CostObjectiveHint {
+        val Type segmentType
+        val Type trainType
+
+        new(extension Ecore2Logic ecore2Logic, Ecore2Logic_Trace ecore2LogicTrace) {
+                extension val Modes3Package = Modes3Package.eINSTANCE
+                segmentType = ecore2LogicTrace.TypeofEClass(segment)
+                trainType = ecore2LogicTrace.TypeofEClass(train)
+        }
+
+        override isExact() {
+                true
+//              false
+        }
+
+        override createPolyhedronExtensionOperator(Map<String, CostElementMatchers> costElementMatchers) {
+                val step2 = costElementMatchers.get(EndOfSiding_step_2.instance.fullyQualifiedName)
+                val step3 = costElementMatchers.get(EndOfSiding_step_3.instance.fullyQualifiedName)
+                val step4 = costElementMatchers.get(EndOfSiding_step_4.instance.fullyQualifiedName)
+                val step5 = costElementMatchers.get(EndOfSiding_step_5.instance.fullyQualifiedName);
+
+                [
+                        val objectiveBuilder = createBuilder
+
+                        for (m : step2.matches) {
+                                val dimension = getDimension(m.match)
+                                objectiveBuilder.add(step2.weight, dimension)
+                                dimension.tightenLowerBound(0)
+                                if (m.multi) {
+                                        createBuilder.add(1, dimension).add(-1, trainType).build.assertEqualsTo(0)
+                                } else {
+                                        dimension.tightenUpperBound(1)
+                                        if (m.must) {
+                                                dimension.tightenLowerBound(1)
+                                        }
+                                }
+                        }
+
+                        val step3Matches = step3.matches
+                        for (m : step3Matches) {
+                                val dimension = getDimension(m.match)
+                                objectiveBuilder.add(step3.weight, dimension)
+                                dimension.tightenLowerBound(0)
+                                if (!m.multi) {
+                                        dimension.tightenUpperBound(1)
+                                        if (m.must) {
+                                                dimension.tightenLowerBound(1)
+                                        }
+                                }
+                        }
+                        for (pair : step3Matches.groupBy[step2.projectMayMatch(match, 2)].entrySet) {
+                                val multiplicityBuilder = createBuilder
+                                for (m : pair.value) {
+                                        multiplicityBuilder.add(1, m.match)
+                                }
+                                multiplicityBuilder.add(-1, pair.key)
+                                multiplicityBuilder.build.assertEqualsTo(0)
+                        }
+                        boundLimit(step3Matches, 2, trainType, 1)
+                        boundLimit(step3Matches, 3, segmentType, 1)
+
+                        val step4Matches = step4.matches
+                        for (m : step4Matches) {
+                                val dimension = getDimension(m.match)
+                                objectiveBuilder.add(step4.weight, dimension)
+                                dimension.tightenLowerBound(0)
+                                if (!m.multi) {
+                                        dimension.tightenUpperBound(1)
+                                        if (m.must) {
+                                                dimension.tightenLowerBound(1)
+                                        }
+                                }
+                        }
+                        for (pair : step4Matches.groupBy[step3.projectMayMatch(match, 2, 3)].entrySet) {
+                                val multiplicityBuilder = createBuilder
+                                for (m : pair.value) {
+                                        multiplicityBuilder.add(1, m.match)
+                                }
+                                multiplicityBuilder.add(-2, pair.key)
+                                multiplicityBuilder.build.tightenUpperBound(0)
+                        }
+                        boundLimit(step4Matches, 2, trainType, 2)
+                        boundLimit(step4Matches, 3, segmentType, 2)
+                        boundLimit(step4Matches, 4, segmentType, 2)
+
+                        val step5Matches = step5.matches
+                        for (m : step5Matches) {
+                                val dimension = getDimension(m.match)
+                                objectiveBuilder.add(step5.weight, dimension)
+                                dimension.tightenLowerBound(0)
+                                if (!m.multi) {
+                                        dimension.tightenUpperBound(1)
+                                        if (m.must) {
+                                                dimension.tightenLowerBound(1)
+                                        }
+                                }
+                                createBuilder.add(1, m.match).add(-1, step4.projectMayMatch(m.match, 2, 3, 4)).build.tightenUpperBound(0)
+                        }
+                        boundLimit(step5Matches, 2, trainType, 1)
+                        boundLimit(step5Matches, 3, segmentType, 2)
+                        boundLimit(step5Matches, 4, segmentType, 1)
+
+                        objectiveBuilder.buildWithBounds
+                ]
+        }
+
+        private static def boundLimit(extension ExtendedLinearExpressionBuilderFactory factory,
+                Collection<CostElementMatch> matches, int index, Type type, int count) {
+                for (pair : matches.groupBy[match.get(index)].entrySet) {
+                        val multiplicityBuilder = createBuilder
+                        for (m : pair.value) {
+                                multiplicityBuilder.add(1, m.match)
+                        }
+                        if (CostElementMatchers.isMulti(pair.key)) {
+                                multiplicityBuilder.add(-count, type)
+                                multiplicityBuilder.build.tightenUpperBound(0)
+                        } else {
+                                multiplicityBuilder.build.tightenUpperBound(count)
+                        }
+                }
+        }
+}
\ No newline at end of file
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/MisalignedTurnoutObjectiveHint.xtend b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/MisalignedTurnoutObjectiveHint.xtend
new file mode 100644
index 00000000..cb014dea
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/MisalignedTurnoutObjectiveHint.xtend
@@ -0,0 +1,140 @@
+package modes3.run
+
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ExtendedLinearExpressionBuilderFactory
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostElementMatch
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostElementMatchers
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostObjectiveHint
+import java.util.Collection
+import java.util.Map
+import modes3.Modes3Package
+import modes3.queries.MisalignedTurnout_step_2
+import modes3.queries.MisalignedTurnout_step_3
+import modes3.queries.MisalignedTurnout_step_4
+import modes3.queries.MisalignedTurnout_step_5
+
+class MisalignedTurnoutObjectiveHint extends CostObjectiveHint {
+        val Type segmentType
+        val Type turnoutType
+        val Type trainType
+
+        new(extension Ecore2Logic ecore2Logic, Ecore2Logic_Trace ecore2LogicTrace) {
+                extension val Modes3Package = Modes3Package.eINSTANCE
+                segmentType = ecore2LogicTrace.TypeofEClass(segment)
+                turnoutType = ecore2LogicTrace.TypeofEClass(turnout)
+                trainType = ecore2LogicTrace.TypeofEClass(train)
+        }
+
+        override isExact() {
+                true
+//              false
+        }
+
+        override createPolyhedronExtensionOperator(Map<String, CostElementMatchers> costElementMatchers) {
+                val step2 = costElementMatchers.get(MisalignedTurnout_step_2.instance.fullyQualifiedName)
+                val step3 = costElementMatchers.get(MisalignedTurnout_step_3.instance.fullyQualifiedName)
+                val step4 = costElementMatchers.get(MisalignedTurnout_step_4.instance.fullyQualifiedName)
+                val step5 = costElementMatchers.get(MisalignedTurnout_step_5.instance.fullyQualifiedName);
+
+                [
+                        val objectiveBuilder = createBuilder
+
+                        for (m : step2.matches) {
+                                val dimension = getDimension(m.match)
+                                objectiveBuilder.add(step2.weight, dimension)
+                                dimension.tightenLowerBound(0)
+                                if (m.multi) {
+                                        createBuilder.add(1, dimension).add(-1, turnoutType).build.assertEqualsTo(0)
+                                } else {
+                                        dimension.tightenUpperBound(1)
+                                        if (m.must) {
+                                                dimension.tightenLowerBound(1)
+                                        }
+                                }
+                        }
+
+                        val step3Matches = step3.matches
+                        for (m : step3Matches) {
+                                val dimension = getDimension(m.match)
+                                objectiveBuilder.add(step3.weight, dimension)
+                                dimension.tightenLowerBound(0)
+                                if (!m.multi) {
+                                        dimension.tightenUpperBound(1)
+                                        if (m.must) {
+                                                dimension.tightenLowerBound(1)
+                                        }
+                                }
+                        }
+                        for (pair : step3Matches.groupBy[step2.projectMayMatch(match, 2)].entrySet) {
+                                val multiplicityBuilder = createBuilder
+                                for (m : pair.value) {
+                                        multiplicityBuilder.add(1, m.match)
+                                }
+                                multiplicityBuilder.add(-1, pair.key)
+                                multiplicityBuilder.build.tightenUpperBound(0)
+                        }
+                        boundLimit(step3Matches, 2, turnoutType, 1)
+                        boundLimit(step3Matches, 3, segmentType, 2)
+
+                        val step4Matches = step4.matches
+                        for (m : step4Matches) {
+                                val dimension = getDimension(m.match)
+                                objectiveBuilder.add(step4.weight, dimension)
+                                dimension.tightenLowerBound(0)
+                                if (!m.multi) {
+                                        dimension.tightenUpperBound(1)
+                                        if (m.must) {
+                                                dimension.tightenLowerBound(1)
+                                        }
+                                }
+                                createBuilder.add(1, m.match).add(-1, step3.projectMayMatch(m.match, 2, 3)).build.tightenUpperBound(0)
+                        }
+                        boundLimit(step4Matches, 2, turnoutType, 1)
+                        boundLimit(step4Matches, 3, segmentType, 2)
+
+                        val step5Matches = step5.matches
+                        for (m : step5Matches) {
+                                val dimension = getDimension(m.match)
+                                objectiveBuilder.add(step5.weight, dimension)
+                                dimension.tightenLowerBound(0)
+                                if (!m.multi) {
+                                        dimension.tightenUpperBound(1)
+                                        if (m.must) {
+                                                dimension.tightenLowerBound(1)
+                                        }
+                                }
+                        }
+                        for (pair : step5Matches.groupBy[step4.projectMayMatch(match, 2, 3)].entrySet) {
+                                val multiplicityBuilder = createBuilder
+                                for (m : pair.value) {
+                                        multiplicityBuilder.add(1, m.match)
+                                }
+                                multiplicityBuilder.add(-1, pair.key)
+                                multiplicityBuilder.build.tightenUpperBound(0)
+                        }
+                        boundLimit(step5Matches, 2, turnoutType, 1)
+                        boundLimit(step5Matches, 3, segmentType, 2)
+                        boundLimit(step5Matches, 4, trainType, 2)
+
+                        objectiveBuilder.buildWithBounds
+                ]
+        }
+
+        private static def boundLimit(extension ExtendedLinearExpressionBuilderFactory factory,
+                Collection<CostElementMatch> matches, int index, Type type, int count) {
+                for (pair : matches.groupBy[match.get(index)].entrySet) {
+                        val multiplicityBuilder = createBuilder
+                        for (m : pair.value) {
+                                multiplicityBuilder.add(1, m.match)
+                        }
+                        if (CostElementMatchers.isMulti(pair.key)) {
+                                multiplicityBuilder.add(-count, type)
+                                multiplicityBuilder.build.tightenUpperBound(0)
+                        } else {
+                                multiplicityBuilder.build.tightenUpperBound(count)
+                        }
+                }
+        }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3ModelGenerator.xtend b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3ModelGenerator.xtend
new file mode 100644
index 00000000..613cb3e4
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3ModelGenerator.xtend
@@ -0,0 +1,357 @@
+package modes3.run
+
+import com.google.common.collect.ImmutableList
+import com.google.common.collect.ImmutableSet
+import hu.bme.mit.inf.dslreasoner.ecore2logic.EReferenceMapper_RelationsOverTypes_Trace
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
+import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor
+import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.Ecore2logicannotationsFactory
+import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.Ecore2logicannotationsPackage
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicProblemBuilder
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDefinition
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult
+import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore
+import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic
+import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2LogicConfiguration
+import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor
+import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.Viatra2LogicAnnotationsPackage
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.TypeInferenceMethod
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.PolyhedralScopePropagatorConstraints
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.PolyhedralScopePropagatorSolver
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePropagatorStrategy
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.BinaryElementRelationLink
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialComplexTypeInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.CostObjectiveConfiguration
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.CostObjectiveElementConfiguration
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.StateCoderStrategy
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.PartialModelAsLogicInterpretation
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.ObjectiveKind
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.ObjectiveThreshold
+import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualiser
+import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace
+import java.util.List
+import modes3.Modes3Factory
+import modes3.Modes3Package
+import modes3.queries.CloseTrains_step_2
+import modes3.queries.CloseTrains_step_3
+import modes3.queries.CloseTrains_step_4
+import modes3.queries.CloseTrains_step_5
+import modes3.queries.CloseTrains_step_6
+import modes3.queries.CloseTrains_step_7
+import modes3.queries.EndOfSiding_step_2
+import modes3.queries.EndOfSiding_step_3
+import modes3.queries.EndOfSiding_step_4
+import modes3.queries.EndOfSiding_step_5
+import modes3.queries.MisalignedTurnout_step_2
+import modes3.queries.MisalignedTurnout_step_3
+import modes3.queries.MisalignedTurnout_step_4
+import modes3.queries.MisalignedTurnout_step_5
+import modes3.queries.Modes3Queries
+import modes3.queries.TrainLocations_step_2
+import modes3.queries.TrainLocations_step_3
+import org.eclipse.emf.ecore.EClass
+import org.eclipse.emf.ecore.EObject
+import org.eclipse.emf.ecore.resource.Resource
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
+import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageStandaloneSetup
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngineOptions
+import org.eclipse.viatra.query.runtime.localsearch.matcher.integration.LocalSearchEMFBackendFactory
+import org.eclipse.viatra.query.runtime.rete.matcher.ReteBackendFactory
+import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
+
+@FinalFieldsConstructor
+class Modes3ModelGenerator {
+        val MonitoringQuery monitoringQuery
+        val int modelSize
+
+        val ecore2Logic = new Ecore2Logic
+        val instanceModel2Logic = new InstanceModel2Logic
+        val viatra2Logic = new Viatra2Logic(ecore2Logic)
+        val solver = new ViatraReasoner
+        extension val LogicProblemBuilder = new LogicProblemBuilder
+
+        def generate() {
+                val metamodel = createMetamodelDescriptor()
+                val metamodelLogic = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration)
+                val segment = ecore2Logic.TypeofEClass(metamodelLogic.trace, Modes3Package.eINSTANCE.segment)
+                val connectedTo = ecore2Logic.relationOfReference(metamodelLogic.trace,
+                        Modes3Package.eINSTANCE.segment_ConnectedTo)
+                val connectedToIndicator = (metamodelLogic.trace.
+                        referenceMapperTrace as EReferenceMapper_RelationsOverTypes_Trace).indicators.get(
+                        Modes3Package.eINSTANCE.segment_ConnectedTo)
+                val inverseAssertion = Assertion(
+                        '''oppositeReference «connectedTo.name» «connectedTo.name»''',
+                        Forall[
+                                val src = addVar('''src''', segment)
+                                val trg = addVar('''trg''', segment)
+                                connectedToIndicator.call(src, trg) <=> connectedToIndicator.call(trg, src)
+                        ]
+                )
+                metamodelLogic.output.assertions += inverseAssertion
+                val inverseAnnotation = Ecore2logicannotationsFactory.eINSTANCE.createInverseRelationAssertion => [
+                        target = inverseAssertion
+                        inverseA = connectedTo
+                        inverseB = connectedTo
+                ]
+                metamodelLogic.output.annotations += inverseAnnotation
+                val initialModel = loadInitialModel()
+                val initialModelLogic = instanceModel2Logic.transform(metamodelLogic, initialModel)
+                val queries = loadQueries
+                val logic = viatra2Logic.transformQueries(queries, initialModelLogic, new Viatra2LogicConfiguration)
+                val config = new ViatraReasonerConfiguration => [
+                        runtimeLimit = 3600
+                        typeScopes => [
+                                minNewElements = modelSize
+                                maxNewElements = modelSize
+                                minNewElementsByType => [
+//                                      put(ecore2Logic.TypeofEClass(metamodelLogic.trace, Modes3Package.eINSTANCE.train), modelSize / 5)
+//                                      put(ecore2Logic.TypeofEClass(metamodelLogic.trace, Modes3Package.eINSTANCE.turnout), modelSize / 5)
+//                                      put(ecore2Logic.TypeofEClass(metamodelLogic.trace, Modes3Package.eINSTANCE.simpleSegment), 3 * modelSize / 5)
+                                ]
+                                maxNewElementsByType => [
+                                        put(ecore2Logic.TypeofEClass(metamodelLogic.trace, Modes3Package.eINSTANCE.train), modelSize / 5)
+                                        put(ecore2Logic.TypeofEClass(metamodelLogic.trace, Modes3Package.eINSTANCE.turnout), modelSize / 5)
+                                        put(ecore2Logic.TypeofEClass(metamodelLogic.trace, Modes3Package.eINSTANCE.simpleSegment), 3 * modelSize / 5)
+                                ]
+                        ]
+                        solutionScope => [
+                                numberOfRequiredSolutions = 1
+                        ]
+                        costObjectives += getObjective(ecore2Logic, metamodelLogic.trace)
+                        scopeWeight = 6
+                        nameNewElements = false
+                        typeInferenceMethod = TypeInferenceMethod.PreliminaryAnalysis
+                        stateCoderStrategy = StateCoderStrategy.PairwiseNeighbourhood
+                        scopePropagatorStrategy = new ScopePropagatorStrategy.Polyhedral(
+                                PolyhedralScopePropagatorConstraints.Relational, PolyhedralScopePropagatorSolver.Clp)
+                        hints += new Modes3TypeScopeHint(ecore2Logic, metamodelLogic.trace)
+                        unitPropagationPatternGenerators += new Modes3UnitPropagationGenerator(ecore2Logic, metamodelLogic.trace)
+                        debugConfiguration => [
+                                partialInterpretatioVisualiser = new GraphvizVisualiser
+//                              partalInterpretationVisualisationFrequency = 50
+                        ]
+                        documentationLevel = DocumentationLevel.NORMAL
+                ]
+                val workspace = new FileSystemWorkspace("output/", "")
+                workspace.writeModel(logic.output, "problem.logicproblem")
+                val solution = solver.solve(logic.output, config, workspace)
+                if (solution instanceof ModelResult) {
+                        println("Saving generated solutions")
+                        val logic2Ecore = new Logic2Ecore(ecore2Logic)
+                        val interpretations = solver.getInterpretations(solution)
+                        for (representationIndex : 0 ..< interpretations.size) {
+                                val interpretation = interpretations.get(representationIndex)
+                                val representationNumber = representationIndex + 1
+                                if (interpretation instanceof PartialModelAsLogicInterpretation) {
+                                        val representation = interpretation.partialInterpretation
+                                        workspace.writeModel(representation, '''solution«representationNumber».partialinterpretation''')
+                                        val partialInterpretation2GML = new PartialInterpretation2Gml
+                                        val gml = partialInterpretation2GML.transform(representation)
+                                        workspace.writeText('''solution«representationNumber».gml''', gml)
+                                        val model = logic2Ecore.transformInterpretation(interpretation, metamodelLogic.trace)
+                                        val iterator = model.eAllContents
+                                        var int id = 0
+                                        while (iterator.hasNext) {
+                                                val obj = iterator.next
+                                                val idFeature = obj.eClass.EAllAttributes.findFirst[name == 'id']
+                                                if (idFeature !== null) {
+                                                        obj.eSet(idFeature, id)
+                                                        id++
+                                                }
+                                        }
+                                        workspace.writeModel(model, '''solution«representationNumber».modes3''')
+                                        if (representation.newElements.size < 160) {
+                                                val rootType = (representation.problem.types.findFirst [
+                                                        name == "Modes3ModelRoot class DefinedPart"
+                                                ] as TypeDefinition)
+                                                val rootIntepretation = representation.partialtypeinterpratation.filter(
+                                                        PartialComplexTypeInterpretation).findFirst [
+                                                        interpretationOf.name == "Modes3ModelRoot class"
+                                                ]
+                                                rootIntepretation.elements.removeAll(rootType.elements)
+                                                representation.problem.elements.removeAll(rootType.elements)
+                                                for (relationInterpretation : representation.partialrelationinterpretation) {
+                                                        relationInterpretation.relationlinks.removeIf [ link |
+                                                                if (link instanceof BinaryElementRelationLink) {
+                                                                        rootType.elements.contains(link.param1) ||
+                                                                                rootType.elements.contains(link.param2)
+                                                                } else {
+                                                                        false
+                                                                }
+                                                        ]
+                                                }
+                                                rootType.elements.clear
+                                                val visualiser = new GraphvizVisualiser
+                                                val visualisation = visualiser.visualiseConcretization(representation)
+                                                visualisation.writeToFile(workspace, '''solution«representationNumber».png''')
+                                        }
+                                } else {
+                                        workspace.writeText('''solution«representationNumber».txt''', interpretation.toString)
+                                }
+                        }
+                } else {
+                        println("Failed to solve problem")
+                        val partial = logic.output
+                        workspace.writeModel(partial, "solution.partialinterpretation")
+                }
+        }
+
+        static def createMetamodelDescriptor() {
+                val eClasses = ImmutableList.copyOf(Modes3Package.eINSTANCE.EClassifiers.filter(EClass))
+                new EcoreMetamodelDescriptor(
+                        eClasses,
+                        emptySet,
+                        false,
+                        emptyList,
+                        emptyList,
+                        ImmutableList.copyOf(eClasses.flatMap[EReferences]),
+                        emptyList
+                )
+        }
+
+        static def List<EObject> loadInitialModel() {
+                #[Modes3Factory.eINSTANCE.createModes3ModelRoot]
+        }
+
+        def loadQueries() {
+                val patternsBuilder = ImmutableList.builder
+                patternsBuilder.addAll(Modes3Queries.instance.specifications)
+                val patterns = patternsBuilder.build
+                val validationPatterns = ImmutableSet.copyOf(patterns.filter [ pattern |
+                        pattern.allAnnotations.exists[name == "Constraint"]
+                ])
+                new ViatraQuerySetDescriptor(
+                        patterns,
+                        validationPatterns,
+                        emptyMap
+                )
+        }
+
+        def getObjective(Ecore2Logic ecore2Logic, Ecore2Logic_Trace ecore2LogicTrace) {
+                new CostObjectiveConfiguration => [
+                        switch (monitoringQuery) {
+                                case closeTrains: {
+                                        elements += new CostObjectiveElementConfiguration => [
+                                                patternQualifiedName = CloseTrains_step_2.instance.fullyQualifiedName
+                                                weight = 14 + 53 + 11
+                                        ]
+                                        elements += new CostObjectiveElementConfiguration => [
+                                                patternQualifiedName = CloseTrains_step_3.instance.fullyQualifiedName
+                                                weight = 21 + 14
+                                        ]
+                                        elements += new CostObjectiveElementConfiguration => [
+                                                patternQualifiedName = CloseTrains_step_4.instance.fullyQualifiedName
+                                                weight = 14 + 44 + 14 + 9
+                                        ]
+                                        elements += new CostObjectiveElementConfiguration => [
+                                                patternQualifiedName = CloseTrains_step_5.instance.fullyQualifiedName
+                                                weight = 14 + 41 + 11
+                                        ]
+                                        elements += new CostObjectiveElementConfiguration => [
+                                                patternQualifiedName = CloseTrains_step_6.instance.fullyQualifiedName
+                                                weight = 27
+                                        ]
+                                        elements += new CostObjectiveElementConfiguration => [
+                                                patternQualifiedName = CloseTrains_step_7.instance.fullyQualifiedName
+                                                weight = 48
+                                        ]
+                                        hint = new CloseTrainsObjectiveHint(ecore2Logic, ecore2LogicTrace)
+                                }
+                                case trainLocations: {
+                                        elements += new CostObjectiveElementConfiguration => [
+                                                patternQualifiedName = TrainLocations_step_2.instance.fullyQualifiedName
+                                                weight = 14 + 53 + 11
+                                        ]
+                                        elements += new CostObjectiveElementConfiguration => [
+                                                patternQualifiedName = TrainLocations_step_3.instance.fullyQualifiedName
+                                                weight = 48
+                                        ]
+                                        hint = new TrainLocationsObjectiveHint(ecore2Logic, ecore2LogicTrace)
+                                }
+                                case misalignedTurnout: {
+                                        elements += new CostObjectiveElementConfiguration => [
+                                                patternQualifiedName = MisalignedTurnout_step_2.instance.fullyQualifiedName
+                                                weight = 14 + 53 + 11
+                                        ]
+                                        elements += new CostObjectiveElementConfiguration => [
+                                                patternQualifiedName = MisalignedTurnout_step_3.instance.fullyQualifiedName
+                                                weight = 108
+                                        ]
+                                        elements += new CostObjectiveElementConfiguration => [
+                                                patternQualifiedName = MisalignedTurnout_step_4.instance.fullyQualifiedName
+                                                weight = 27
+                                        ]
+                                        elements += new CostObjectiveElementConfiguration => [
+                                                patternQualifiedName = MisalignedTurnout_step_5.instance.fullyQualifiedName
+                                                weight = 48
+                                        ]
+                                        hint = new MisalignedTurnoutObjectiveHint(ecore2Logic, ecore2LogicTrace)
+                                }
+                                case endOfSiding: {
+                                        elements += new CostObjectiveElementConfiguration => [
+                                                patternQualifiedName = EndOfSiding_step_2.instance.fullyQualifiedName
+                                                weight = 14 + 53 + 11
+                                        ]
+                                        elements += new CostObjectiveElementConfiguration => [
+                                                patternQualifiedName = EndOfSiding_step_3.instance.fullyQualifiedName
+                                                weight = 21 + 14
+                                        ]
+                                        elements += new CostObjectiveElementConfiguration => [
+                                                patternQualifiedName = EndOfSiding_step_4.instance.fullyQualifiedName
+                                                weight = 14 + 35 + 21 + 15 + 14 + 21 + 15 + 11
+                                        ]
+                                        elements += new CostObjectiveElementConfiguration => [
+                                                patternQualifiedName = EndOfSiding_step_5.instance.fullyQualifiedName
+                                                weight = 48
+                                        ]
+                                        hint = new EndOfSidingObjectiveHint(ecore2Logic, ecore2LogicTrace)
+                                }
+                                default:
+                                        throw new IllegalArgumentException("Unknown monitoring query: " + monitoringQuery)
+                        }
+                        kind = ObjectiveKind.HIGHER_IS_BETTER
+                        threshold = ObjectiveThreshold.NO_THRESHOLD
+                        findExtremum = true
+                ]
+        }
+
+        def static init() {
+                EMFPatternLanguageStandaloneSetup.doSetup
+                ViatraQueryEngineOptions.setSystemDefaultBackends(ReteBackendFactory.INSTANCE, ReteBackendFactory.INSTANCE,
+                        LocalSearchEMFBackendFactory.INSTANCE)
+                LogiclanguagePackage.eINSTANCE.class
+                LogicproblemPackage.eINSTANCE.class
+                PartialinterpretationPackage.eINSTANCE.class
+                Ecore2logicannotationsPackage.eINSTANCE.class
+                Viatra2LogicAnnotationsPackage.eINSTANCE.class
+                Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put("*", new XMIResourceFactoryImpl)
+        }
+
+        def static void main(String[] args) {
+                if (args.length != 2) {
+                        System.err.println("Usage: <query> <model size>")
+                }
+                val monitoringQuery = MonitoringQuery.valueOf(args.get(0))
+                val modelSize = Integer.parseInt(args.get(1))
+                init()
+                val generator = new Modes3ModelGenerator(monitoringQuery, modelSize)
+                generator.generate()
+        }
+
+        private static enum MonitoringQuery {
+                closeTrains,
+                trainLocations,
+                endOfSiding,
+                misalignedTurnout
+        }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3TypeScopeHint.xtend b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3TypeScopeHint.xtend
new file mode 100644
index 00000000..94e5eb08
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3TypeScopeHint.xtend
@@ -0,0 +1,79 @@
+package modes3.run
+
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.Modality
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeConstraintHint
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeExpressionBuilderFactory
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator
+import java.util.Map
+import modes3.Modes3Package
+import modes3.queries.Adjacent
+import org.eclipse.viatra.query.runtime.api.IPatternMatch
+import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation
+
+class Modes3TypeScopeHint implements LinearTypeConstraintHint {
+        static val TURNOUT_NEIGHBOR_COUNT = "turnoutNeighborCount"
+
+        val Type segmentType
+        val Type turnoutType
+
+        new(extension Ecore2Logic ecore2Logic, Ecore2Logic_Trace ecore2LogicTrace) {
+                extension val Modes3Package = Modes3Package.eINSTANCE
+                segmentType = ecore2LogicTrace.TypeofEClass(segment)
+                turnoutType = ecore2LogicTrace.TypeofEClass(turnout)
+        }
+
+        override getAdditionalPatterns(extension PatternGenerator patternGenerator, Map<String, PQuery> fqnToPQuery) {
+                '''
+                        pattern «TURNOUT_NEIGHBOR_COUNT»_helper(problem: LogicProblem, interpretation: PartialInterpretation, source: DefinedElement, target: DefinedElement) {
+                                find interpretation(problem, interpretation);
+                                find mustExist(problem, interpretation, source);
+                                find mustExist(problem, interpretation, target);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "target")»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["source", "target"], Modality.MUST, true, false)»
+                        }
+                
+                        pattern «TURNOUT_NEIGHBOR_COUNT»(problem: LogicProblem, interpretation: PartialInterpretation, element: DefinedElement, N) {
+                                find interpretation(problem, interpretation);
+                                find mustExist(problem, interpretation, element);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "element")»
+                                N == count find «TURNOUT_NEIGHBOR_COUNT»_helper(problem, interpretation, element, _);
+                        }
+                '''
+        }
+
+        override createConstraintUpdater(LinearTypeExpressionBuilderFactory builderFactory) {
+                val turnoutNeighborCountMatcher = builderFactory.createMatcher(TURNOUT_NEIGHBOR_COUNT)
+                val newNeighbors = builderFactory.createBuilder.add(1, segmentType).build
+
+                return [ partialInterpretation |
+                        val requiredNeighbbors = turnoutNeighborCountMatcher.getRemainingCount(partialInterpretation, 3)
+                        newNeighbors.tightenLowerBound(requiredNeighbbors)
+                ]
+        }
+
+        private static def <T extends IPatternMatch> getRemainingCount(ViatraQueryMatcher<T> matcher,
+                PartialInterpretation partialInterpretation, int capacity) {
+                val partialMatch = matcher.newEmptyMatch
+                partialMatch.set(0, partialInterpretation.problem)
+                partialMatch.set(1, partialInterpretation)
+                val iterator = matcher.streamAllMatches(partialMatch).iterator
+                var int max = 0
+                while (iterator.hasNext) {
+                        val match = iterator.next
+                        val n = (match.get(3) as Integer).intValue
+                        if (n < capacity) {
+                                val required = capacity - n
+                                if (max < required) {
+                                        max = required
+                                }
+                        }
+                }
+                max
+        }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3UnitPropagationGenerator.xtend b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3UnitPropagationGenerator.xtend
new file mode 100644
index 00000000..953a21d4
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/Modes3UnitPropagationGenerator.xtend
@@ -0,0 +1,417 @@
+package modes3.run
+
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.Modality
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.UnitPropagationPatternGenerator
+import java.util.Map
+import modes3.Modes3Package
+import modes3.queries.Adjacent
+import modes3.queries.Output
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery
+import org.eclipse.xtend2.lib.StringConcatenationClient
+
+class Modes3UnitPropagationGenerator implements UnitPropagationPatternGenerator {
+        static val MUST_NOT_CONNECTED_TO = "mustNotConnectedTo"
+        static val MUST_NOT_STRAIGHT = "mustNotStraight"
+        static val MUST_NOT_DIVERGENT = "mustNotDivergent"
+        static val MUST_CONNECTED_TO = "mustConnectedTo"
+        static val MUST_STRAIGHT = "mustStraight"
+        static val MUST_DIVERGENT = "mustDivergent"
+
+        val Type segmentType
+        val Type simpleSegmentType
+        val Type turnoutType
+        val Relation connectedToRelation
+        val Relation straightRelation
+        val Relation divergentRelation
+
+        new(extension Ecore2Logic ecore2Logic, Ecore2Logic_Trace ecore2LogicTrace) {
+                extension val Modes3Package = Modes3Package.eINSTANCE
+                segmentType = ecore2LogicTrace.TypeofEClass(segment)
+                simpleSegmentType = ecore2LogicTrace.TypeofEClass(simpleSegment)
+                turnoutType = ecore2LogicTrace.TypeofEClass(turnout)
+                connectedToRelation = ecore2LogicTrace.relationOfReference(segment_ConnectedTo)
+                straightRelation = ecore2LogicTrace.relationOfReference(turnout_Straight)
+                divergentRelation = ecore2LogicTrace.relationOfReference(turnout_Divergent)
+        }
+
+        override getMustPatterns() {
+                #{
+                        connectedToRelation -> MUST_CONNECTED_TO,
+                        straightRelation -> MUST_STRAIGHT,
+                        divergentRelation -> MUST_DIVERGENT
+                }
+        }
+
+        override getMustNotPatterns() {
+                #{
+                        connectedToRelation -> MUST_NOT_CONNECTED_TO,
+                        straightRelation -> MUST_NOT_STRAIGHT,
+                        divergentRelation -> MUST_NOT_DIVERGENT
+                }
+        }
+
+        override getAdditionalPatterns(extension PatternGenerator generator, Map<String, PQuery> fqnToPQuery) {
+                val StringConcatenationClient parameters = '''
+                        problem: LogicProblem, interpretation: PartialInterpretation,
+                        source: DefinedElement, target: DefinedElement
+                '''
+                
+                val StringConcatenationClient commonMustParameterConstraints = '''
+                        find interpretation(problem, interpretation);
+                        find mustExist(problem, interpretation, source);
+                        find mustExist(problem, interpretation, target);
+                '''
+                
+                val StringConcatenationClient commonMayParameterConstraints = '''
+                        find interpretation(problem, interpretation);
+                        find mayExist(problem, interpretation, source);
+                        find mayExist(problem, interpretation, target);
+                '''
+
+                '''
+                        pattern mayInput(«parameters») {
+                                «commonMayParameterConstraints»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["target", "source"], Modality.MAY, true, false)»
+                                neg «referRelation(straightRelation, "target", "source", Modality.MUST, fqnToPQuery)»
+                                neg «referRelation(straightRelation, "target", "source", Modality.MUST, fqnToPQuery)»
+                        }
+                        
+                        pattern multipleMayInput(problem: LogicProblem, interpretation: PartialInterpretation,
+                                                target: DefinedElement) {
+                                find interpretation(problem, interpretation);
+                                find mustExist(problem, interpretation, target);
+                                find mayInput(problem, interpretaton, source1, target);
+                                find mayInput(problem, interpretaton, source2, target);
+                                neg find mustEquivalent(problem, interpretation, source1, source2);
+                        }
+                        
+                        pattern multipleMayStraight(problem: LogicProblem, interpretation: PartialInterpretation,
+                                                source: DefinedElement) {
+                                find interpretation(problem, interpretation);
+                                find mustExist(problem, interpretation, source);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «referRelation(straightRelation, "source", "target1", Modality.MAY, fqnToPQuery)»
+                                «referRelation(straightRelation, "source", "target2", Modality.MAY, fqnToPQuery)»
+                                neg find mustEquivalent(problem, interpretation, target1, target2);
+                        }
+                        
+                        pattern multipleMayDivergent(problem: LogicProblem, interpretation: PartialInterpretation,
+                                                source: DefinedElement) {
+                                find interpretation(problem, interpretation);
+                                find mustExist(problem, interpretation, source);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «referRelation(divergentRelation, "source", "target1", Modality.MAY, fqnToPQuery)»
+                                «referRelation(divergentRelation, "source", "target2", Modality.MAY, fqnToPQuery)»
+                                neg find mustEquivalent(problem, interpretation, target1, target2);
+                        }
+                        
+                        pattern «MUST_CONNECTED_TO»(«parameters») {
+                                «commonMustParameterConstraints»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                find mayInput(problem, interpretaton, source, target);
+                                neg find multipleMayInput(problem, interpretaton, target);
+                                «referRelation(connectedToRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                                neg «referRelation(connectedToRelation, "source", "target", Modality.MUST, fqnToPQuery)»
+                                neg «referRelation(straightRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                                neg «referRelation(divergentRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                        }
+                        
+                        pattern «MUST_STRAIGHT»(«parameters») {
+                                «commonMustParameterConstraints»
+                                neg «referRelation(straightRelation, "source", "_", Modality.MUST, fqnToPQuery)»
+                                neg find multipleMayStraight(problem, interpretation, source);
+                                «referRelation(straightRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                                neg «referRelation(straightRelation, "source", "target", Modality.MUST, fqnToPQuery)»
+                        } or {
+                                «commonMustParameterConstraints»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                find mayInput(problem, interpretaton, source, target);
+                                neg find multipleMayInput(problem, interpretaton, target);
+                                neg «referRelation(connectedToRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                                «referRelation(straightRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                                neg «referRelation(straightRelation, "source", "target", Modality.MUST, fqnToPQuery)»
+                                neg «referRelation(divergentRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                        }
+                        
+                        pattern «MUST_DIVERGENT»(«parameters») {
+                                «commonMustParameterConstraints»
+                                neg «referRelation(divergentRelation, "source", "_", Modality.MUST, fqnToPQuery)»
+                                neg find multipleMayDivergent(problem, interpretation, source);
+                                «referRelation(divergentRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                                neg «referRelation(divergentRelation, "source", "target", Modality.MUST, fqnToPQuery)»
+                        } or {
+                                «commonMustParameterConstraints»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                find mayInput(problem, interpretaton, source, target);
+                                neg find multipleMayInput(problem, interpretaton, target);
+                                neg «referRelation(connectedToRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                                neg «referRelation(straightRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                                «referRelation(divergentRelation, "source", "target", Modality.MAY, fqnToPQuery)»
+                                neg «referRelation(divergentRelation, "source", "target", Modality.MUST, fqnToPQuery)»
+                        }
+                        
+                        pattern turnoutOutput_must_to_true_by_straight(«parameters», T : DefinedElement, S : DefinedElement) {
+                                «commonMayParameterConstraints»
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                T == source;
+                                S == target;
+                        }
+                        
+                        pattern turnoutOutput_must_to_true_by_divergent(«parameters», T : DefinedElement, S : DefinedElement) {
+                                «commonMayParameterConstraints»
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                T == source;
+                                S == target;
+                        }
+                        
+                        pattern output_must_to_true_by_connectedTo(«parameters», S1 : DefinedElement, S2 : DefinedElement) {
+                                «commonMayParameterConstraints»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                S1 == source;
+                                S2 == target;
+                        }
+                        
+                        pattern output_must_to_true_by_straight(«parameters», S1 : DefinedElement, S2 : DefinedElement) {
+                                find turnoutOutput_must_to_true_by_straight(problem, interpretation, source, target, S1, S2);
+                        }
+                        
+                        pattern output_must_to_true_by_divergent(«parameters», S1 : DefinedElement, S2 : DefinedElement) {
+                                find turnoutOutput_must_to_true_by_divergent(problem, interpretation, source, target, S1, S2);
+                        }
+                        
+                        pattern adjacent_must_to_true_by_connectedTo(«parameters», S1 : DefinedElement, S2 : DefinedElement) {
+                                find output_must_to_true_by_connectedTo(problem, interpretation, source, target, S1, S2);
+                        }
+                        
+                        pattern adjacent_must_to_true_by_straight(«parameters», S1 : DefinedElement, S2 : DefinedElement) {
+                                find output_must_to_true_by_straight(problem, interpretation, source, target, S1, S2);
+                        } or {
+                                find turnoutOutput_must_to_true_by_straight(problem, interpretation, source, target, S2, S1);
+                        }
+                        
+                        pattern adjacent_must_to_true_by_divergent(«parameters», S1 : DefinedElement, S2 : DefinedElement) {
+                                find output_must_to_true_by_divergent(problem, interpretation, source, target, S1, S2);
+                        } or {
+                                find turnoutOutput_must_to_true_by_divergent(problem, interpretation, source, target, S2, S1);
+                        }
+                        
+                        pattern connectedToReflexive_must_to_true_by_connectedTo(«parameters», S : DefinedElement) {
+                                find mustExist(problem, interpretation, source);
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "source")»
+                                S == source;
+                                S == target;
+                        }
+                        
+                        pattern outputReflexive_must_to_true_by_straight(«parameters», T : DefinedElement) {
+                                find turnoutOutput_must_to_true_by_straight(problem, interpretation, source, target, T, T);
+                        }
+                        
+                        pattern outputReflexive_must_to_true_by_divergent(«parameters», T : DefinedElement) {
+                                find turnoutOutput_must_to_true_by_divergent(problem, interpretation, source, target, T, T);
+                        }
+                        
+                        pattern turnoutOutputsAreSame_must_to_true_by_straight(«parameters», T : DefinedElement) {
+                                «commonMayParameterConstraints»
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                T == source;
+                                S == target;
+                                «referRelation(divergentRelation, "T", "S", Modality.MUST, fqnToPQuery)»
+                        }
+                        
+                        pattern turnoutOutputsAreSame_must_to_true_by_divergent(«parameters», T : DefinedElement) {
+                                «commonMayParameterConstraints»
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                T == source;
+                                S == target;
+                                «referRelation(straightRelation, "T", "S", Modality.MUST, fqnToPQuery)»
+                        }
+                        
+                        pattern tooManyInputsOfSegment_must_to_true_by_connectedTo(«parameters», S : DefinedElement) {
+                                find mustExist(problem, interpretation, S);
+                                «typeIndexer.referInstanceOf(simpleSegmentType, Modality.MUST, "S")»
+                                find output_must_to_true_by_connectedTo(problem, interpretation, source, target, I1, S);
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Output.instance.fullyQualifiedName), #["I2", "S"], Modality.MUST, true, false)»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Output.instance.fullyQualifiedName), #["I3", "S"], Modality.MUST, true, false)»
+                                I1 != I2;
+                                I1 != I3;
+                                I2 != I3;
+                        }
+                        
+                        pattern tooManyInputsOfSegment_must_to_true_by_straight(«parameters», S : DefinedElement) {
+                                find mustExist(problem, interpretation, S);
+                                «typeIndexer.referInstanceOf(simpleSegmentType, Modality.MUST, "S")»
+                                find output_must_to_true_by_straight(problem, interpretation, source, target, I1, S);
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Output.instance.fullyQualifiedName), #["I2", "S"], Modality.MUST, true, false)»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Output.instance.fullyQualifiedName), #["I3", "S"], Modality.MUST, true, false)»
+                                I1 != I2;
+                                I1 != I3;
+                                I2 != I3;
+                        }
+                        
+                        pattern tooManyInputsOfSegment_must_to_true_by_divergent(«parameters», S : DefinedElement) {
+                                find mustExist(problem, interpretation, S);
+                                «typeIndexer.referInstanceOf(simpleSegmentType, Modality.MUST, "S")»
+                                find output_must_to_true_by_divergent(problem, interpretation, source, target, I1, S);
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Output.instance.fullyQualifiedName), #["I2", "S"], Modality.MUST, true, false)»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Output.instance.fullyQualifiedName), #["I3", "S"], Modality.MUST, true, false)»
+                                I1 != I2;
+                                I1 != I3;
+                                I2 != I3;
+                        }
+                        
+                        pattern turnoutConnectedToBothOutputs_must_to_true_by_connectedTo(«parameters», T : DefinedElement) {
+                                «commonMayParameterConstraints»
+                                find mustExist(problem, interpretation, Straight);
+                                find mustExist(problem, interpretation, Divergent);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "Straight")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "Divergent")»
+                                «referRelation(straightRelation, "T", "Straight", Modality.MUST, fqnToPQuery)»
+                                «referRelation(divergentRelation, "T", "Divergent", Modality.MUST, fqnToPQuery)»
+                                T == source;
+                                Straight == target;
+                                «referRelation(connectedToRelation, "T", "Divergent", Modality.MUST, fqnToPQuery)»
+                        } or {
+                                «commonMayParameterConstraints»
+                                find mustExist(problem, interpretation, Straight);
+                                find mustExist(problem, interpretation, Divergent);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "Straight")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "Divergent")»
+                                «referRelation(straightRelation, "T", "Straight", Modality.MUST, fqnToPQuery)»
+                                «referRelation(divergentRelation, "T", "Divergent", Modality.MUST, fqnToPQuery)»
+                                «referRelation(connectedToRelation, "T", "Straight", Modality.MUST, fqnToPQuery)»
+                                T == source;
+                                Straight == target;
+                        }
+                        
+                        pattern turnoutConnectedToBothOutputs_must_to_true_by_straight(«parameters», T : DefinedElement) {
+                                «commonMayParameterConstraints»
+                                find mustExist(problem, interpretation, Straight);
+                                find mustExist(problem, interpretation, Divergent);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "Straight")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "Divergent")»
+                                T == source;
+                                Straight == target;
+                                «referRelation(divergentRelation, "T", "Divergent", Modality.MUST, fqnToPQuery)»
+                                «referRelation(connectedToRelation, "T", "Straight", Modality.MUST, fqnToPQuery)»
+                                «referRelation(connectedToRelation, "T", "Divergent", Modality.MUST, fqnToPQuery)»
+                        }
+                        
+                        pattern turnoutConnectedToBothOutputs_must_to_true_by_divergent(«parameters», T : DefinedElement) {
+                                «commonMayParameterConstraints»
+                                find mustExist(problem, interpretation, Straight);
+                                find mustExist(problem, interpretation, Divergent);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MAY, "source")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MAY, "target")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "Straight")»
+                                «typeIndexer.referInstanceOf(segmentType, Modality.MUST, "Divergent")»
+                                «referRelation(straightRelation, "T", "Straight", Modality.MUST, fqnToPQuery)»
+                                T == source;
+                                Divergent == target;
+                                «referRelation(connectedToRelation, "T", "Straight", Modality.MUST, fqnToPQuery)»
+                                «referRelation(connectedToRelation, "T", "Divergent", Modality.MUST, fqnToPQuery)»
+                        }
+                        
+                        pattern tooManyInputsOfTurnout_must_to_true_by_connectedTo(«parameters», T : DefinedElement) {
+                                find mustExist(problem, interpretation, S);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "S")»
+                                find adjacent_must_to_true_by_connectedTo(problem, interpretation, source, target, I1, S);
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["I2", "S"], Modality.MUST, true, false)»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["I3", "S"], Modality.MUST, true, false)»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["I4", "S"], Modality.MUST, true, false)»
+                                I1 != I2;
+                                I1 != I3;
+                                I1 != I4;
+                                I2 != I3;
+                                I2 != I4;
+                                I3 != I4;
+                        }
+                        
+                        pattern tooManyInputsOfTurnout_must_to_true_by_straight(«parameters», T : DefinedElement) {
+                                find mustExist(problem, interpretation, S);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "S")»
+                                find adjacent_must_to_true_by_straight(problem, interpretation, source, target, I1, S);
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["I2", "S"], Modality.MUST, true, false)»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["I3", "S"], Modality.MUST, true, false)»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["I4", "S"], Modality.MUST, true, false)»
+                                I1 != I2;
+                                I1 != I3;
+                                I1 != I4;
+                                I2 != I3;
+                                I2 != I4;
+                                I3 != I4;
+                        }
+                        
+                        pattern tooManyInputsOfTurnout_must_to_true_by_divergent(«parameters», T : DefinedElement) {
+                                find mustExist(problem, interpretation, S);
+                                «typeIndexer.referInstanceOf(turnoutType, Modality.MUST, "S")»
+                                find adjacent_must_to_true_by_divergent(problem, interpretation, source, target, I1, S);
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["I2", "S"], Modality.MUST, true, false)»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["I3", "S"], Modality.MUST, true, false)»
+                                «relationDefinitionIndexer.referPattern(fqnToPQuery.get(Adjacent.instance.fullyQualifiedName), #["I4", "S"], Modality.MUST, true, false)»
+                                I1 != I2;
+                                I1 != I3;
+                                I1 != I4;
+                                I2 != I3;
+                                I2 != I4;
+                                I3 != I4;
+                        }
+                        
+                        pattern «MUST_NOT_CONNECTED_TO»_helper(«parameters») {
+                                find connectedToReflexive_must_to_true_by_connectedTo(problem, interpretation, source, target, _);
+                        } or {
+                                find tooManyInputsOfSegment_must_to_true_by_connectedTo(problem, interpretation, source, target, _);
+                        } or {
+                                find turnoutConnectedToBothOutputs_must_to_true_by_connectedTo(problem, interpretation, source, target, _);
+                        } or {
+                                find tooManyInputsOfTurnout_must_to_true_by_connectedTo(problem, interpretation, source, target, _);
+                        }
+                        
+                        pattern «MUST_NOT_CONNECTED_TO»(«parameters») {
+                                find «MUST_NOT_CONNECTED_TO»_helper(problem, interpretation, source, target);
+                        } or {
+                                find «MUST_NOT_CONNECTED_TO»_helper(problem, interpretation, target, source);
+                        }
+                        
+                        pattern «MUST_NOT_STRAIGHT»(«parameters») {
+                                find outputReflexive_must_to_true_by_straight(problem, interpretation, source, target, _);
+                        } or {
+                                find turnoutOutputsAreSame_must_to_true_by_straight(problem, interpretation, source, target, _);
+                        } or {
+                                find tooManyInputsOfSegment_must_to_true_by_straight(problem, interpretation, source, target, _);
+                        } or {
+                                find turnoutConnectedToBothOutputs_must_to_true_by_straight(problem, interpretation, source, target, _);
+                        } or {
+                                find tooManyInputsOfTurnout_must_to_true_by_straight(problem, interpretation, source, target, _);
+                        }
+                        
+                        pattern «MUST_NOT_DIVERGENT»(«parameters») {
+                                find outputReflexive_must_to_true_by_divergent(problem, interpretation, source, target, _);
+                        } or {
+                                find turnoutOutputsAreSame_must_to_true_by_divergent(problem, interpretation, source, target, _);
+                        } or {
+                                find tooManyInputsOfSegment_must_to_true_by_divergent(problem, interpretation, source, target, _);
+                        } or {
+                                find turnoutConnectedToBothOutputs_must_to_true_by_divergent(problem, interpretation, source, target, _);
+                        } or {
+                                find tooManyInputsOfTurnout_must_to_true_by_divergent(problem, interpretation, source, target, _);
+                        }
+                '''
+        }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/TrainLocationsObjectiveHint.xtend b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/TrainLocationsObjectiveHint.xtend
new file mode 100644
index 00000000..cc2d7925
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/src/modes3/run/TrainLocationsObjectiveHint.xtend
@@ -0,0 +1,85 @@
+package modes3.run
+
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ExtendedLinearExpressionBuilderFactory
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostElementMatch
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostElementMatchers
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostObjectiveHint
+import java.util.Collection
+import java.util.Map
+import modes3.Modes3Package
+import modes3.queries.TrainLocations_step_2
+import modes3.queries.TrainLocations_step_3
+
+class TrainLocationsObjectiveHint extends CostObjectiveHint {
+        val Type segmentType
+        val Type trainType
+
+        new(extension Ecore2Logic ecore2Logic, Ecore2Logic_Trace ecore2LogicTrace) {
+                extension val Modes3Package = Modes3Package.eINSTANCE
+                segmentType = ecore2LogicTrace.TypeofEClass(segment)
+                trainType = ecore2LogicTrace.TypeofEClass(train)
+        }
+        
+        override isExact() {
+                true
+        }
+
+        override createPolyhedronExtensionOperator(Map<String, CostElementMatchers> costElementMatchers) {
+                val step2 = costElementMatchers.get(TrainLocations_step_2.instance.fullyQualifiedName)
+                val step3 = costElementMatchers.get(TrainLocations_step_3.instance.fullyQualifiedName);
+
+                [
+                        val objectiveBuilder = createBuilder
+
+                        for (m : step2.matches) {
+                                val dimension = getDimension(m.match)
+                                objectiveBuilder.add(step2.weight, dimension)
+                                dimension.tightenLowerBound(0)
+                                if (m.multi) {
+                                        createBuilder.add(1, dimension).add(-1, trainType).build.assertEqualsTo(0)
+                                } else {
+                                        dimension.tightenUpperBound(1)
+                                        if (m.must) {
+                                                dimension.tightenLowerBound(1)
+                                        }
+                                }
+                        }
+
+                        val step3Matches = step3.matches
+                        for (m : step3Matches) {
+                                val dimension = getDimension(m.match)
+                                objectiveBuilder.add(step3.weight, dimension)
+                                dimension.tightenLowerBound(0)
+                                if (!m.multi) {
+                                        dimension.tightenUpperBound(1)
+                                        if (m.must) {
+                                                dimension.tightenLowerBound(1)
+                                        }
+                                }
+                        }
+                        boundLimit(step3Matches, 2, trainType, 1)
+                        boundLimit(step3Matches, 3, segmentType, 1)
+
+                        objectiveBuilder.buildWithBounds
+                ]
+        }
+
+        private static def boundLimit(extension ExtendedLinearExpressionBuilderFactory factory,
+                Collection<CostElementMatch> matches, int index, Type type, int count) {
+                for (pair : matches.groupBy[match.get(index)].entrySet) {
+                        val multiplicityBuilder = createBuilder
+                        for (m : pair.value) {
+                                multiplicityBuilder.add(1, m.match)
+                        }
+                        if (CostElementMatchers.isMulti(pair.key)) {
+                                multiplicityBuilder.add(-count, type)
+                                multiplicityBuilder.build.tightenUpperBound(0)
+                        } else {
+                                multiplicityBuilder.build.tightenUpperBound(count)
+                        }
+                }
+        }
+}
\ No newline at end of file
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/.gitignore b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/.gitignore
new file mode 100644
index 00000000..a84c2906
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/.gitignore
@@ -0,0 +1,78 @@
+/.ConnectedToReflexive.java._trace
+/.Modes3Queries.java._trace
+/.StraightReflexive.java._trace
+/.DivergentReflexive.java._trace
+/.TurnoutOutputsAreSame.java._trace
+/.Adjacent.java._trace
+/.Output.java._trace
+/.OutputReflexive.java._trace
+/.TooManyAdjacentSegmentsOfSegment.java._trace
+/.Turnout.java._trace
+/.ConnectedTo.java._trace
+/.TurnoutNotConnectedToOutput.java._trace
+/.DisjointNetwork.java._trace
+/.Reachable.java._trace
+/.Unreachable.java._trace
+/.TurnoutInSegments.java._trace
+/.ConnectedToNotSymmetric.java._trace
+/.TurnoutConnectedToBothOutputs.java._trace
+/.TooManyAdjacentTurnouts.java._trace
+/.NoAdjacentSegmentOfSegment.java._trace
+/.TurnoutOutput.java._trace
+/.NoInputOfSegment.java._trace
+/.TooManyInputsOfSegment.java._trace
+/.ExtraInputOfTurnout.java._trace
+/.NoExtraInputOfTurnout.java._trace
+/.TooManyExtraInputsOfTurnout.java._trace
+/.TooManyInputsOfTurnout.java._trace
+/.NonDivergentInputOfTurnout.java._trace
+/.NonStraightInputOfTurnout.java._trace
+/.TooManyNonDivergentInputsOfTurnout.java._trace
+/.TooManyNonStraightInputsOfTurnout.java._trace
+/.InputsOfTurnout.java._trace
+/.TooFewInputsOfTurnout.java._trace
+/.CloseTrains_step_2.java._trace
+/.CloseTrains_step_3.java._trace
+/.CloseTrains_step_4.java._trace
+/.CloseTrains_step_5.java._trace
+/.CloseTrains_step_6.java._trace
+/.CloseTrains_step_7.java._trace
+/.MisalignedTurnout_step_2.java._trace
+/.MisalignedTurnout_step_3.java._trace
+/.MisalignedTurnout_step_4.java._trace
+/.MisalignedTurnout_step_5.java._trace
+/.ConnectedSegmentsDirected.java._trace
+/Adjacent.java
+/CloseTrains_step_2.java
+/CloseTrains_step_3.java
+/CloseTrains_step_4.java
+/CloseTrains_step_5.java
+/CloseTrains_step_6.java
+/CloseTrains_step_7.java
+/ConnectedSegmentsDirected.java
+/ConnectedTo.java
+/ConnectedToNotSymmetric.java
+/ConnectedToReflexive.java
+/InputsOfTurnout.java
+/MisalignedTurnout_step_2.java
+/MisalignedTurnout_step_3.java
+/MisalignedTurnout_step_4.java
+/MisalignedTurnout_step_5.java
+/Modes3Queries.java
+/Output.java
+/OutputReflexive.java
+/Reachable.java
+/TooFewInputsOfTurnout.java
+/TooManyInputsOfSegment.java
+/TooManyInputsOfTurnout.java
+/TurnoutConnectedToBothOutputs.java
+/TurnoutOutput.java
+/TurnoutOutputsAreSame.java
+/Unreachable.java
+/.TrainLocations_step_2.java._trace
+/.TrainLocations_step_3.java._trace
+/.EndOfSiding_step_2.java._trace
+/.EndOfSiding_step_3.java._trace
+/.EndOfSiding_step_4.java._trace
+/.EndOfSiding_step_5.java._trace
+/.MultipleConnectedTo.java._trace
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Adjacent.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Adjacent.java
new file mode 100644
index 00000000..e87f9c18
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Adjacent.java
@@ -0,0 +1,719 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Segment;
+import modes3.queries.Output;
+import modes3.queries.TurnoutOutput;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern adjacent(S1 : Segment, S2 : Segment) {
+ *              find output(S1, S2);
+ *         } or {
+ *              find turnoutOutput(S2, S1);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class Adjacent extends BaseGeneratedEMFQuerySpecification<Adjacent.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.adjacent pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Segment fS1;
+    
+    private Segment fS2;
+    
+    private static List<String> parameterNames = makeImmutableList("S1", "S2");
+    
+    private Match(final Segment pS1, final Segment pS2) {
+      this.fS1 = pS1;
+      this.fS2 = pS2;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "S1": return this.fS1;
+          case "S2": return this.fS2;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fS1;
+          case 1: return this.fS2;
+          default: return null;
+      }
+    }
+    
+    public Segment getS1() {
+      return this.fS1;
+    }
+    
+    public Segment getS2() {
+      return this.fS2;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("S1".equals(parameterName) ) {
+          this.fS1 = (Segment) newValue;
+          return true;
+      }
+      if ("S2".equals(parameterName) ) {
+          this.fS2 = (Segment) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setS1(final Segment pS1) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fS1 = pS1;
+    }
+    
+    public void setS2(final Segment pS2) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fS2 = pS2;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.adjacent";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return Adjacent.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fS1, fS2};
+    }
+    
+    @Override
+    public Adjacent.Match toImmutable() {
+      return isMutable() ? newMatch(fS1, fS2) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"S1\"=" + prettyPrintValue(fS1) + ", ");
+      result.append("\"S2\"=" + prettyPrintValue(fS2));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fS1, fS2);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof Adjacent.Match)) {
+          Adjacent.Match other = (Adjacent.Match) obj;
+          return Objects.equals(fS1, other.fS1) && Objects.equals(fS2, other.fS2);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public Adjacent specification() {
+      return Adjacent.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static Adjacent.Match newEmptyMatch() {
+      return new Mutable(null, null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static Adjacent.Match newMutableMatch(final Segment pS1, final Segment pS2) {
+      return new Mutable(pS1, pS2);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static Adjacent.Match newMatch(final Segment pS1, final Segment pS2) {
+      return new Immutable(pS1, pS2);
+    }
+    
+    private static final class Mutable extends Adjacent.Match {
+      Mutable(final Segment pS1, final Segment pS2) {
+        super(pS1, pS2);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends Adjacent.Match {
+      Immutable(final Segment pS1, final Segment pS2) {
+        super(pS1, pS2);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.adjacent pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern adjacent(S1 : Segment, S2 : Segment) {
+   *    find output(S1, S2);
+   * } or {
+   *    find turnoutOutput(S2, S1);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see Adjacent
+   * 
+   */
+  public static class Matcher extends BaseMatcher<Adjacent.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static Adjacent.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static Adjacent.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_S1 = 0;
+    
+    private static final int POSITION_S2 = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(Adjacent.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<Adjacent.Match> getAllMatches(final Segment pS1, final Segment pS2) {
+      return rawStreamAllMatches(new Object[]{pS1, pS2}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<Adjacent.Match> streamAllMatches(final Segment pS1, final Segment pS2) {
+      return rawStreamAllMatches(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<Adjacent.Match> getOneArbitraryMatch(final Segment pS1, final Segment pS2) {
+      return rawGetOneArbitraryMatch(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Segment pS1, final Segment pS2) {
+      return rawHasMatch(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Segment pS1, final Segment pS2) {
+      return rawCountMatches(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Segment pS1, final Segment pS2, final Consumer<? super Adjacent.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pS1, pS2}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public Adjacent.Match newMatch(final Segment pS1, final Segment pS2) {
+      return Adjacent.Match.newMatch(pS1, pS2);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOfS1(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_S1, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS1() {
+      return rawStreamAllValuesOfS1(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS1() {
+      return rawStreamAllValuesOfS1(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS1(final Adjacent.Match partialMatch) {
+      return rawStreamAllValuesOfS1(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS1(final Segment pS2) {
+      return rawStreamAllValuesOfS1(new Object[]{null, pS2});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS1(final Adjacent.Match partialMatch) {
+      return rawStreamAllValuesOfS1(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS1(final Segment pS2) {
+      return rawStreamAllValuesOfS1(new Object[]{null, pS2}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOfS2(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_S2, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS2() {
+      return rawStreamAllValuesOfS2(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS2() {
+      return rawStreamAllValuesOfS2(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS2(final Adjacent.Match partialMatch) {
+      return rawStreamAllValuesOfS2(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS2(final Segment pS1) {
+      return rawStreamAllValuesOfS2(new Object[]{pS1, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS2(final Adjacent.Match partialMatch) {
+      return rawStreamAllValuesOfS2(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS2(final Segment pS1) {
+      return rawStreamAllValuesOfS2(new Object[]{pS1, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected Adjacent.Match tupleToMatch(final Tuple t) {
+      try {
+          return Adjacent.Match.newMatch((Segment) t.get(POSITION_S1), (Segment) t.get(POSITION_S2));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Adjacent.Match arrayToMatch(final Object[] match) {
+      try {
+          return Adjacent.Match.newMatch((Segment) match[POSITION_S1], (Segment) match[POSITION_S2]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Adjacent.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return Adjacent.Match.newMutableMatch((Segment) match[POSITION_S1], (Segment) match[POSITION_S2]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<Adjacent.Matcher> querySpecification() {
+      return Adjacent.instance();
+    }
+  }
+  
+  private Adjacent() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static Adjacent instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected Adjacent.Matcher instantiate(final ViatraQueryEngine engine) {
+    return Adjacent.Matcher.on(engine);
+  }
+  
+  @Override
+  public Adjacent.Matcher instantiate() {
+    return Adjacent.Matcher.create();
+  }
+  
+  @Override
+  public Adjacent.Match newEmptyMatch() {
+    return Adjacent.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public Adjacent.Match newMatch(final Object... parameters) {
+    return Adjacent.Match.newMatch((modes3.Segment) parameters[0], (modes3.Segment) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link Adjacent} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link Adjacent#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final Adjacent INSTANCE = new Adjacent();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final Adjacent.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_S1 = new PParameter("S1", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_S2 = new PParameter("S2", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_S1, parameter_S2);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.adjacent";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("S1","S2");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_S1 = body.getOrCreateVariableByName("S1");
+          PVariable var_S2 = body.getOrCreateVariableByName("S2");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_S1, parameter_S1),
+             new ExportedParameter(body, var_S2, parameter_S2)
+          ));
+          //    find output(S1, S2)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_S1, var_S2), Output.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      {
+          PBody body = new PBody(this);
+          PVariable var_S1 = body.getOrCreateVariableByName("S1");
+          PVariable var_S2 = body.getOrCreateVariableByName("S2");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_S1, parameter_S1),
+             new ExportedParameter(body, var_S2, parameter_S2)
+          ));
+          //    find turnoutOutput(S2, S1)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_S2, var_S1), TurnoutOutput.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/ConnectedTo.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/ConnectedTo.java
new file mode 100644
index 00000000..a0f14958
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/ConnectedTo.java
@@ -0,0 +1,704 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Segment;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern connectedTo(S1 : Segment, S2 : Segment) {
+ *              Segment.connectedTo(S1, S2);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class ConnectedTo extends BaseGeneratedEMFQuerySpecification<ConnectedTo.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.connectedTo pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Segment fS1;
+    
+    private Segment fS2;
+    
+    private static List<String> parameterNames = makeImmutableList("S1", "S2");
+    
+    private Match(final Segment pS1, final Segment pS2) {
+      this.fS1 = pS1;
+      this.fS2 = pS2;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "S1": return this.fS1;
+          case "S2": return this.fS2;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fS1;
+          case 1: return this.fS2;
+          default: return null;
+      }
+    }
+    
+    public Segment getS1() {
+      return this.fS1;
+    }
+    
+    public Segment getS2() {
+      return this.fS2;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("S1".equals(parameterName) ) {
+          this.fS1 = (Segment) newValue;
+          return true;
+      }
+      if ("S2".equals(parameterName) ) {
+          this.fS2 = (Segment) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setS1(final Segment pS1) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fS1 = pS1;
+    }
+    
+    public void setS2(final Segment pS2) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fS2 = pS2;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.connectedTo";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return ConnectedTo.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fS1, fS2};
+    }
+    
+    @Override
+    public ConnectedTo.Match toImmutable() {
+      return isMutable() ? newMatch(fS1, fS2) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"S1\"=" + prettyPrintValue(fS1) + ", ");
+      result.append("\"S2\"=" + prettyPrintValue(fS2));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fS1, fS2);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof ConnectedTo.Match)) {
+          ConnectedTo.Match other = (ConnectedTo.Match) obj;
+          return Objects.equals(fS1, other.fS1) && Objects.equals(fS2, other.fS2);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public ConnectedTo specification() {
+      return ConnectedTo.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static ConnectedTo.Match newEmptyMatch() {
+      return new Mutable(null, null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static ConnectedTo.Match newMutableMatch(final Segment pS1, final Segment pS2) {
+      return new Mutable(pS1, pS2);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static ConnectedTo.Match newMatch(final Segment pS1, final Segment pS2) {
+      return new Immutable(pS1, pS2);
+    }
+    
+    private static final class Mutable extends ConnectedTo.Match {
+      Mutable(final Segment pS1, final Segment pS2) {
+        super(pS1, pS2);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends ConnectedTo.Match {
+      Immutable(final Segment pS1, final Segment pS2) {
+        super(pS1, pS2);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.connectedTo pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern connectedTo(S1 : Segment, S2 : Segment) {
+   *    Segment.connectedTo(S1, S2);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see ConnectedTo
+   * 
+   */
+  public static class Matcher extends BaseMatcher<ConnectedTo.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static ConnectedTo.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static ConnectedTo.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_S1 = 0;
+    
+    private static final int POSITION_S2 = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(ConnectedTo.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<ConnectedTo.Match> getAllMatches(final Segment pS1, final Segment pS2) {
+      return rawStreamAllMatches(new Object[]{pS1, pS2}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<ConnectedTo.Match> streamAllMatches(final Segment pS1, final Segment pS2) {
+      return rawStreamAllMatches(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<ConnectedTo.Match> getOneArbitraryMatch(final Segment pS1, final Segment pS2) {
+      return rawGetOneArbitraryMatch(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Segment pS1, final Segment pS2) {
+      return rawHasMatch(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Segment pS1, final Segment pS2) {
+      return rawCountMatches(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Segment pS1, final Segment pS2, final Consumer<? super ConnectedTo.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pS1, pS2}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public ConnectedTo.Match newMatch(final Segment pS1, final Segment pS2) {
+      return ConnectedTo.Match.newMatch(pS1, pS2);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOfS1(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_S1, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS1() {
+      return rawStreamAllValuesOfS1(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS1() {
+      return rawStreamAllValuesOfS1(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS1(final ConnectedTo.Match partialMatch) {
+      return rawStreamAllValuesOfS1(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS1(final Segment pS2) {
+      return rawStreamAllValuesOfS1(new Object[]{null, pS2});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS1(final ConnectedTo.Match partialMatch) {
+      return rawStreamAllValuesOfS1(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS1(final Segment pS2) {
+      return rawStreamAllValuesOfS1(new Object[]{null, pS2}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOfS2(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_S2, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS2() {
+      return rawStreamAllValuesOfS2(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS2() {
+      return rawStreamAllValuesOfS2(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS2(final ConnectedTo.Match partialMatch) {
+      return rawStreamAllValuesOfS2(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS2(final Segment pS1) {
+      return rawStreamAllValuesOfS2(new Object[]{pS1, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS2(final ConnectedTo.Match partialMatch) {
+      return rawStreamAllValuesOfS2(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS2(final Segment pS1) {
+      return rawStreamAllValuesOfS2(new Object[]{pS1, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected ConnectedTo.Match tupleToMatch(final Tuple t) {
+      try {
+          return ConnectedTo.Match.newMatch((Segment) t.get(POSITION_S1), (Segment) t.get(POSITION_S2));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected ConnectedTo.Match arrayToMatch(final Object[] match) {
+      try {
+          return ConnectedTo.Match.newMatch((Segment) match[POSITION_S1], (Segment) match[POSITION_S2]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected ConnectedTo.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return ConnectedTo.Match.newMutableMatch((Segment) match[POSITION_S1], (Segment) match[POSITION_S2]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<ConnectedTo.Matcher> querySpecification() {
+      return ConnectedTo.instance();
+    }
+  }
+  
+  private ConnectedTo() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static ConnectedTo instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected ConnectedTo.Matcher instantiate(final ViatraQueryEngine engine) {
+    return ConnectedTo.Matcher.on(engine);
+  }
+  
+  @Override
+  public ConnectedTo.Matcher instantiate() {
+    return ConnectedTo.Matcher.create();
+  }
+  
+  @Override
+  public ConnectedTo.Match newEmptyMatch() {
+    return ConnectedTo.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public ConnectedTo.Match newMatch(final Object... parameters) {
+    return ConnectedTo.Match.newMatch((modes3.Segment) parameters[0], (modes3.Segment) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link ConnectedTo} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link ConnectedTo#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final ConnectedTo INSTANCE = new ConnectedTo();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final ConnectedTo.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_S1 = new PParameter("S1", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_S2 = new PParameter("S2", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_S1, parameter_S2);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.connectedTo";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("S1","S2");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_S1 = body.getOrCreateVariableByName("S1");
+          PVariable var_S2 = body.getOrCreateVariableByName("S2");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_S1, parameter_S1),
+             new ExportedParameter(body, var_S2, parameter_S2)
+          ));
+          //    Segment.connectedTo(S1, S2)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S1, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment", "connectedTo")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_0_, var_S2);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/ConnectedToNotSymmetric.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/ConnectedToNotSymmetric.java
new file mode 100644
index 00000000..91b74c7e
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/ConnectedToNotSymmetric.java
@@ -0,0 +1,724 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Segment;
+import modes3.queries.ConnectedTo;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(message = "connectedToNotSymmetric", severity = "error", key = { S1, S2 })
+ *         pattern connectedToNotSymmetric(S1 : Segment, S2 : Segment) {
+ *              Segment.connectedTo(S1, S2);
+ *              neg find connectedTo(S2, S1);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class ConnectedToNotSymmetric extends BaseGeneratedEMFQuerySpecification<ConnectedToNotSymmetric.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.connectedToNotSymmetric pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Segment fS1;
+    
+    private Segment fS2;
+    
+    private static List<String> parameterNames = makeImmutableList("S1", "S2");
+    
+    private Match(final Segment pS1, final Segment pS2) {
+      this.fS1 = pS1;
+      this.fS2 = pS2;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "S1": return this.fS1;
+          case "S2": return this.fS2;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fS1;
+          case 1: return this.fS2;
+          default: return null;
+      }
+    }
+    
+    public Segment getS1() {
+      return this.fS1;
+    }
+    
+    public Segment getS2() {
+      return this.fS2;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("S1".equals(parameterName) ) {
+          this.fS1 = (Segment) newValue;
+          return true;
+      }
+      if ("S2".equals(parameterName) ) {
+          this.fS2 = (Segment) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setS1(final Segment pS1) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fS1 = pS1;
+    }
+    
+    public void setS2(final Segment pS2) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fS2 = pS2;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.connectedToNotSymmetric";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return ConnectedToNotSymmetric.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fS1, fS2};
+    }
+    
+    @Override
+    public ConnectedToNotSymmetric.Match toImmutable() {
+      return isMutable() ? newMatch(fS1, fS2) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"S1\"=" + prettyPrintValue(fS1) + ", ");
+      result.append("\"S2\"=" + prettyPrintValue(fS2));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fS1, fS2);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof ConnectedToNotSymmetric.Match)) {
+          ConnectedToNotSymmetric.Match other = (ConnectedToNotSymmetric.Match) obj;
+          return Objects.equals(fS1, other.fS1) && Objects.equals(fS2, other.fS2);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public ConnectedToNotSymmetric specification() {
+      return ConnectedToNotSymmetric.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static ConnectedToNotSymmetric.Match newEmptyMatch() {
+      return new Mutable(null, null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static ConnectedToNotSymmetric.Match newMutableMatch(final Segment pS1, final Segment pS2) {
+      return new Mutable(pS1, pS2);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static ConnectedToNotSymmetric.Match newMatch(final Segment pS1, final Segment pS2) {
+      return new Immutable(pS1, pS2);
+    }
+    
+    private static final class Mutable extends ConnectedToNotSymmetric.Match {
+      Mutable(final Segment pS1, final Segment pS2) {
+        super(pS1, pS2);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends ConnectedToNotSymmetric.Match {
+      Immutable(final Segment pS1, final Segment pS2) {
+        super(pS1, pS2);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.connectedToNotSymmetric pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(message = "connectedToNotSymmetric", severity = "error", key = { S1, S2 })
+   * pattern connectedToNotSymmetric(S1 : Segment, S2 : Segment) {
+   *    Segment.connectedTo(S1, S2);
+   *    neg find connectedTo(S2, S1);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see ConnectedToNotSymmetric
+   * 
+   */
+  public static class Matcher extends BaseMatcher<ConnectedToNotSymmetric.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static ConnectedToNotSymmetric.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static ConnectedToNotSymmetric.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_S1 = 0;
+    
+    private static final int POSITION_S2 = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(ConnectedToNotSymmetric.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<ConnectedToNotSymmetric.Match> getAllMatches(final Segment pS1, final Segment pS2) {
+      return rawStreamAllMatches(new Object[]{pS1, pS2}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<ConnectedToNotSymmetric.Match> streamAllMatches(final Segment pS1, final Segment pS2) {
+      return rawStreamAllMatches(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<ConnectedToNotSymmetric.Match> getOneArbitraryMatch(final Segment pS1, final Segment pS2) {
+      return rawGetOneArbitraryMatch(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Segment pS1, final Segment pS2) {
+      return rawHasMatch(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Segment pS1, final Segment pS2) {
+      return rawCountMatches(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Segment pS1, final Segment pS2, final Consumer<? super ConnectedToNotSymmetric.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pS1, pS2}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public ConnectedToNotSymmetric.Match newMatch(final Segment pS1, final Segment pS2) {
+      return ConnectedToNotSymmetric.Match.newMatch(pS1, pS2);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOfS1(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_S1, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS1() {
+      return rawStreamAllValuesOfS1(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS1() {
+      return rawStreamAllValuesOfS1(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS1(final ConnectedToNotSymmetric.Match partialMatch) {
+      return rawStreamAllValuesOfS1(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS1(final Segment pS2) {
+      return rawStreamAllValuesOfS1(new Object[]{null, pS2});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS1(final ConnectedToNotSymmetric.Match partialMatch) {
+      return rawStreamAllValuesOfS1(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS1(final Segment pS2) {
+      return rawStreamAllValuesOfS1(new Object[]{null, pS2}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOfS2(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_S2, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS2() {
+      return rawStreamAllValuesOfS2(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS2() {
+      return rawStreamAllValuesOfS2(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS2(final ConnectedToNotSymmetric.Match partialMatch) {
+      return rawStreamAllValuesOfS2(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS2(final Segment pS1) {
+      return rawStreamAllValuesOfS2(new Object[]{pS1, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS2(final ConnectedToNotSymmetric.Match partialMatch) {
+      return rawStreamAllValuesOfS2(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS2(final Segment pS1) {
+      return rawStreamAllValuesOfS2(new Object[]{pS1, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected ConnectedToNotSymmetric.Match tupleToMatch(final Tuple t) {
+      try {
+          return ConnectedToNotSymmetric.Match.newMatch((Segment) t.get(POSITION_S1), (Segment) t.get(POSITION_S2));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected ConnectedToNotSymmetric.Match arrayToMatch(final Object[] match) {
+      try {
+          return ConnectedToNotSymmetric.Match.newMatch((Segment) match[POSITION_S1], (Segment) match[POSITION_S2]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected ConnectedToNotSymmetric.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return ConnectedToNotSymmetric.Match.newMutableMatch((Segment) match[POSITION_S1], (Segment) match[POSITION_S2]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<ConnectedToNotSymmetric.Matcher> querySpecification() {
+      return ConnectedToNotSymmetric.instance();
+    }
+  }
+  
+  private ConnectedToNotSymmetric() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static ConnectedToNotSymmetric instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected ConnectedToNotSymmetric.Matcher instantiate(final ViatraQueryEngine engine) {
+    return ConnectedToNotSymmetric.Matcher.on(engine);
+  }
+  
+  @Override
+  public ConnectedToNotSymmetric.Matcher instantiate() {
+    return ConnectedToNotSymmetric.Matcher.create();
+  }
+  
+  @Override
+  public ConnectedToNotSymmetric.Match newEmptyMatch() {
+    return ConnectedToNotSymmetric.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public ConnectedToNotSymmetric.Match newMatch(final Object... parameters) {
+    return ConnectedToNotSymmetric.Match.newMatch((modes3.Segment) parameters[0], (modes3.Segment) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link ConnectedToNotSymmetric} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link ConnectedToNotSymmetric#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final ConnectedToNotSymmetric INSTANCE = new ConnectedToNotSymmetric();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final ConnectedToNotSymmetric.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_S1 = new PParameter("S1", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_S2 = new PParameter("S2", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_S1, parameter_S2);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.connectedToNotSymmetric";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("S1","S2");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_S1 = body.getOrCreateVariableByName("S1");
+          PVariable var_S2 = body.getOrCreateVariableByName("S2");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_S1, parameter_S1),
+             new ExportedParameter(body, var_S2, parameter_S2)
+          ));
+          //    Segment.connectedTo(S1, S2)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S1, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment", "connectedTo")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_0_, var_S2);
+          //    neg find connectedTo(S2, S1)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var_S2, var_S1), ConnectedTo.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("message", "connectedToNotSymmetric");
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("S1"), 
+                              new ParameterReference("S2")
+                              }));
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/ConnectedToReflexive.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/ConnectedToReflexive.java
new file mode 100644
index 00000000..948fec73
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/ConnectedToReflexive.java
@@ -0,0 +1,563 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Segment;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(message = "connectedToReflexive", severity = "error", key = { S })
+ *         pattern connectedToReflexive(S : Segment) {
+ *              Segment.connectedTo(S, S);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class ConnectedToReflexive extends BaseGeneratedEMFQuerySpecification<ConnectedToReflexive.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.connectedToReflexive pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Segment fS;
+    
+    private static List<String> parameterNames = makeImmutableList("S");
+    
+    private Match(final Segment pS) {
+      this.fS = pS;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "S": return this.fS;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fS;
+          default: return null;
+      }
+    }
+    
+    public Segment getS() {
+      return this.fS;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("S".equals(parameterName) ) {
+          this.fS = (Segment) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setS(final Segment pS) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fS = pS;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.connectedToReflexive";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return ConnectedToReflexive.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fS};
+    }
+    
+    @Override
+    public ConnectedToReflexive.Match toImmutable() {
+      return isMutable() ? newMatch(fS) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"S\"=" + prettyPrintValue(fS));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fS);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof ConnectedToReflexive.Match)) {
+          ConnectedToReflexive.Match other = (ConnectedToReflexive.Match) obj;
+          return Objects.equals(fS, other.fS);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public ConnectedToReflexive specification() {
+      return ConnectedToReflexive.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static ConnectedToReflexive.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static ConnectedToReflexive.Match newMutableMatch(final Segment pS) {
+      return new Mutable(pS);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static ConnectedToReflexive.Match newMatch(final Segment pS) {
+      return new Immutable(pS);
+    }
+    
+    private static final class Mutable extends ConnectedToReflexive.Match {
+      Mutable(final Segment pS) {
+        super(pS);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends ConnectedToReflexive.Match {
+      Immutable(final Segment pS) {
+        super(pS);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.connectedToReflexive pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(message = "connectedToReflexive", severity = "error", key = { S })
+   * pattern connectedToReflexive(S : Segment) {
+   *    Segment.connectedTo(S, S);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see ConnectedToReflexive
+   * 
+   */
+  public static class Matcher extends BaseMatcher<ConnectedToReflexive.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static ConnectedToReflexive.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static ConnectedToReflexive.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_S = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(ConnectedToReflexive.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<ConnectedToReflexive.Match> getAllMatches(final Segment pS) {
+      return rawStreamAllMatches(new Object[]{pS}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<ConnectedToReflexive.Match> streamAllMatches(final Segment pS) {
+      return rawStreamAllMatches(new Object[]{pS});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<ConnectedToReflexive.Match> getOneArbitraryMatch(final Segment pS) {
+      return rawGetOneArbitraryMatch(new Object[]{pS});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Segment pS) {
+      return rawHasMatch(new Object[]{pS});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Segment pS) {
+      return rawCountMatches(new Object[]{pS});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Segment pS, final Consumer<? super ConnectedToReflexive.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pS}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public ConnectedToReflexive.Match newMatch(final Segment pS) {
+      return ConnectedToReflexive.Match.newMatch(pS);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOfS(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_S, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS() {
+      return rawStreamAllValuesOfS(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS() {
+      return rawStreamAllValuesOfS(emptyArray());
+    }
+    
+    @Override
+    protected ConnectedToReflexive.Match tupleToMatch(final Tuple t) {
+      try {
+          return ConnectedToReflexive.Match.newMatch((Segment) t.get(POSITION_S));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected ConnectedToReflexive.Match arrayToMatch(final Object[] match) {
+      try {
+          return ConnectedToReflexive.Match.newMatch((Segment) match[POSITION_S]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected ConnectedToReflexive.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return ConnectedToReflexive.Match.newMutableMatch((Segment) match[POSITION_S]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<ConnectedToReflexive.Matcher> querySpecification() {
+      return ConnectedToReflexive.instance();
+    }
+  }
+  
+  private ConnectedToReflexive() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static ConnectedToReflexive instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected ConnectedToReflexive.Matcher instantiate(final ViatraQueryEngine engine) {
+    return ConnectedToReflexive.Matcher.on(engine);
+  }
+  
+  @Override
+  public ConnectedToReflexive.Matcher instantiate() {
+    return ConnectedToReflexive.Matcher.create();
+  }
+  
+  @Override
+  public ConnectedToReflexive.Match newEmptyMatch() {
+    return ConnectedToReflexive.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public ConnectedToReflexive.Match newMatch(final Object... parameters) {
+    return ConnectedToReflexive.Match.newMatch((modes3.Segment) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link ConnectedToReflexive} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link ConnectedToReflexive#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final ConnectedToReflexive INSTANCE = new ConnectedToReflexive();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final ConnectedToReflexive.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_S = new PParameter("S", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_S);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.connectedToReflexive";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("S");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_S = body.getOrCreateVariableByName("S");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_S, parameter_S)
+          ));
+          //    Segment.connectedTo(S, S)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment", "connectedTo")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_0_, var_S);
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("message", "connectedToReflexive");
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("S")
+                              }));
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/EndOfSiding_step_2.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/EndOfSiding_step_2.java
new file mode 100644
index 00000000..a8f68dca
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/EndOfSiding_step_2.java
@@ -0,0 +1,564 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Train;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         //
+ *         // endOfSiding
+ *         //
+ *         
+ *         pattern endOfSiding_step_2(in train : Train) {
+ *         //   frame-{@literal >}train = model-{@literal >}trains[i0];
+ *         //   frame-{@literal >}location = frame-{@literal >}train-{@literal >}location;
+ *         //   if (frame-{@literal >}location != NULL) {
+ *         //     ...
+ *         //   }
+ *         
+ *              Train(train);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class EndOfSiding_step_2 extends BaseGeneratedEMFQuerySpecification<EndOfSiding_step_2.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.endOfSiding_step_2 pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Train fTrain;
+    
+    private static List<String> parameterNames = makeImmutableList("train");
+    
+    private Match(final Train pTrain) {
+      this.fTrain = pTrain;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "train": return this.fTrain;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fTrain;
+          default: return null;
+      }
+    }
+    
+    public Train getTrain() {
+      return this.fTrain;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("train".equals(parameterName) ) {
+          this.fTrain = (Train) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setTrain(final Train pTrain) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fTrain = pTrain;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.endOfSiding_step_2";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return EndOfSiding_step_2.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fTrain};
+    }
+    
+    @Override
+    public EndOfSiding_step_2.Match toImmutable() {
+      return isMutable() ? newMatch(fTrain) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"train\"=" + prettyPrintValue(fTrain));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fTrain);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof EndOfSiding_step_2.Match)) {
+          EndOfSiding_step_2.Match other = (EndOfSiding_step_2.Match) obj;
+          return Objects.equals(fTrain, other.fTrain);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public EndOfSiding_step_2 specification() {
+      return EndOfSiding_step_2.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static EndOfSiding_step_2.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static EndOfSiding_step_2.Match newMutableMatch(final Train pTrain) {
+      return new Mutable(pTrain);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static EndOfSiding_step_2.Match newMatch(final Train pTrain) {
+      return new Immutable(pTrain);
+    }
+    
+    private static final class Mutable extends EndOfSiding_step_2.Match {
+      Mutable(final Train pTrain) {
+        super(pTrain);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends EndOfSiding_step_2.Match {
+      Immutable(final Train pTrain) {
+        super(pTrain);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.endOfSiding_step_2 pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * //
+   * // endOfSiding
+   * //
+   * 
+   * pattern endOfSiding_step_2(in train : Train) {
+   * //   frame-{@literal >}train = model-{@literal >}trains[i0];
+   * //   frame-{@literal >}location = frame-{@literal >}train-{@literal >}location;
+   * //   if (frame-{@literal >}location != NULL) {
+   * //     ...
+   * //   }
+   * 
+   *    Train(train);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see EndOfSiding_step_2
+   * 
+   */
+  public static class Matcher extends BaseMatcher<EndOfSiding_step_2.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static EndOfSiding_step_2.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static EndOfSiding_step_2.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_TRAIN = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(EndOfSiding_step_2.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<EndOfSiding_step_2.Match> getAllMatches(final Train pTrain) {
+      return rawStreamAllMatches(new Object[]{pTrain}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<EndOfSiding_step_2.Match> streamAllMatches(final Train pTrain) {
+      return rawStreamAllMatches(new Object[]{pTrain});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<EndOfSiding_step_2.Match> getOneArbitraryMatch(final Train pTrain) {
+      return rawGetOneArbitraryMatch(new Object[]{pTrain});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Train pTrain) {
+      return rawHasMatch(new Object[]{pTrain});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Train pTrain) {
+      return rawCountMatches(new Object[]{pTrain});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Train pTrain, final Consumer<? super EndOfSiding_step_2.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pTrain}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public EndOfSiding_step_2.Match newMatch(final Train pTrain) {
+      return EndOfSiding_step_2.Match.newMatch(pTrain);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Train> rawStreamAllValuesOftrain(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_TRAIN, parameters).map(Train.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Train> getAllValuesOftrain() {
+      return rawStreamAllValuesOftrain(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Train> streamAllValuesOftrain() {
+      return rawStreamAllValuesOftrain(emptyArray());
+    }
+    
+    @Override
+    protected EndOfSiding_step_2.Match tupleToMatch(final Tuple t) {
+      try {
+          return EndOfSiding_step_2.Match.newMatch((Train) t.get(POSITION_TRAIN));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected EndOfSiding_step_2.Match arrayToMatch(final Object[] match) {
+      try {
+          return EndOfSiding_step_2.Match.newMatch((Train) match[POSITION_TRAIN]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected EndOfSiding_step_2.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return EndOfSiding_step_2.Match.newMutableMatch((Train) match[POSITION_TRAIN]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<EndOfSiding_step_2.Matcher> querySpecification() {
+      return EndOfSiding_step_2.instance();
+    }
+  }
+  
+  private EndOfSiding_step_2() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static EndOfSiding_step_2 instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected EndOfSiding_step_2.Matcher instantiate(final ViatraQueryEngine engine) {
+    return EndOfSiding_step_2.Matcher.on(engine);
+  }
+  
+  @Override
+  public EndOfSiding_step_2.Matcher instantiate() {
+    return EndOfSiding_step_2.Matcher.create();
+  }
+  
+  @Override
+  public EndOfSiding_step_2.Match newEmptyMatch() {
+    return EndOfSiding_step_2.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public EndOfSiding_step_2.Match newMatch(final Object... parameters) {
+    return EndOfSiding_step_2.Match.newMatch((modes3.Train) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link EndOfSiding_step_2} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link EndOfSiding_step_2#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final EndOfSiding_step_2 INSTANCE = new EndOfSiding_step_2();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final EndOfSiding_step_2.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_train = new PParameter("train", "modes3.Train", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Train")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_train);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.endOfSiding_step_2";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("train");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_train = body.getOrCreateVariableByName("train");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_train, parameter_train)
+          ));
+          // //   frame->train = model->trains[i0];//   frame->location = frame->train->location;//   if (frame->location != NULL) {//     ...//   }    Train(train)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train")));
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/EndOfSiding_step_3.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/EndOfSiding_step_3.java
new file mode 100644
index 00000000..16b28a9f
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/EndOfSiding_step_3.java
@@ -0,0 +1,717 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Segment;
+import modes3.Train;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern endOfSiding_step_3(in train : Train, in location : Segment) {
+ *         //     int loop_bound1 = frame-{@literal >}location-{@literal >}connected_to_count;
+ *         //     for (int i1 = 0; i1 {@literal <} loop_bound1; i1++) {
+ *         //       ...
+ *         //     }
+ *              Train(train);
+ *             Train.location(train, location);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class EndOfSiding_step_3 extends BaseGeneratedEMFQuerySpecification<EndOfSiding_step_3.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.endOfSiding_step_3 pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Train fTrain;
+    
+    private Segment fLocation;
+    
+    private static List<String> parameterNames = makeImmutableList("train", "location");
+    
+    private Match(final Train pTrain, final Segment pLocation) {
+      this.fTrain = pTrain;
+      this.fLocation = pLocation;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "train": return this.fTrain;
+          case "location": return this.fLocation;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fTrain;
+          case 1: return this.fLocation;
+          default: return null;
+      }
+    }
+    
+    public Train getTrain() {
+      return this.fTrain;
+    }
+    
+    public Segment getLocation() {
+      return this.fLocation;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("train".equals(parameterName) ) {
+          this.fTrain = (Train) newValue;
+          return true;
+      }
+      if ("location".equals(parameterName) ) {
+          this.fLocation = (Segment) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setTrain(final Train pTrain) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fTrain = pTrain;
+    }
+    
+    public void setLocation(final Segment pLocation) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fLocation = pLocation;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.endOfSiding_step_3";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return EndOfSiding_step_3.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fTrain, fLocation};
+    }
+    
+    @Override
+    public EndOfSiding_step_3.Match toImmutable() {
+      return isMutable() ? newMatch(fTrain, fLocation) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"train\"=" + prettyPrintValue(fTrain) + ", ");
+      result.append("\"location\"=" + prettyPrintValue(fLocation));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fTrain, fLocation);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof EndOfSiding_step_3.Match)) {
+          EndOfSiding_step_3.Match other = (EndOfSiding_step_3.Match) obj;
+          return Objects.equals(fTrain, other.fTrain) && Objects.equals(fLocation, other.fLocation);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public EndOfSiding_step_3 specification() {
+      return EndOfSiding_step_3.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static EndOfSiding_step_3.Match newEmptyMatch() {
+      return new Mutable(null, null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static EndOfSiding_step_3.Match newMutableMatch(final Train pTrain, final Segment pLocation) {
+      return new Mutable(pTrain, pLocation);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static EndOfSiding_step_3.Match newMatch(final Train pTrain, final Segment pLocation) {
+      return new Immutable(pTrain, pLocation);
+    }
+    
+    private static final class Mutable extends EndOfSiding_step_3.Match {
+      Mutable(final Train pTrain, final Segment pLocation) {
+        super(pTrain, pLocation);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends EndOfSiding_step_3.Match {
+      Immutable(final Train pTrain, final Segment pLocation) {
+        super(pTrain, pLocation);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.endOfSiding_step_3 pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern endOfSiding_step_3(in train : Train, in location : Segment) {
+   * //     int loop_bound1 = frame-{@literal >}location-{@literal >}connected_to_count;
+   * //     for (int i1 = 0; i1 {@literal <} loop_bound1; i1++) {
+   * //       ...
+   * //     }
+   *    Train(train);
+   *     Train.location(train, location);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see EndOfSiding_step_3
+   * 
+   */
+  public static class Matcher extends BaseMatcher<EndOfSiding_step_3.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static EndOfSiding_step_3.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static EndOfSiding_step_3.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_TRAIN = 0;
+    
+    private static final int POSITION_LOCATION = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(EndOfSiding_step_3.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<EndOfSiding_step_3.Match> getAllMatches(final Train pTrain, final Segment pLocation) {
+      return rawStreamAllMatches(new Object[]{pTrain, pLocation}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<EndOfSiding_step_3.Match> streamAllMatches(final Train pTrain, final Segment pLocation) {
+      return rawStreamAllMatches(new Object[]{pTrain, pLocation});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<EndOfSiding_step_3.Match> getOneArbitraryMatch(final Train pTrain, final Segment pLocation) {
+      return rawGetOneArbitraryMatch(new Object[]{pTrain, pLocation});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Train pTrain, final Segment pLocation) {
+      return rawHasMatch(new Object[]{pTrain, pLocation});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Train pTrain, final Segment pLocation) {
+      return rawCountMatches(new Object[]{pTrain, pLocation});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Train pTrain, final Segment pLocation, final Consumer<? super EndOfSiding_step_3.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pTrain, pLocation}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public EndOfSiding_step_3.Match newMatch(final Train pTrain, final Segment pLocation) {
+      return EndOfSiding_step_3.Match.newMatch(pTrain, pLocation);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Train> rawStreamAllValuesOftrain(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_TRAIN, parameters).map(Train.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Train> getAllValuesOftrain() {
+      return rawStreamAllValuesOftrain(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Train> streamAllValuesOftrain() {
+      return rawStreamAllValuesOftrain(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Train> streamAllValuesOftrain(final EndOfSiding_step_3.Match partialMatch) {
+      return rawStreamAllValuesOftrain(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Train> streamAllValuesOftrain(final Segment pLocation) {
+      return rawStreamAllValuesOftrain(new Object[]{null, pLocation});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Train> getAllValuesOftrain(final EndOfSiding_step_3.Match partialMatch) {
+      return rawStreamAllValuesOftrain(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Train> getAllValuesOftrain(final Segment pLocation) {
+      return rawStreamAllValuesOftrain(new Object[]{null, pLocation}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOflocation(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_LOCATION, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOflocation() {
+      return rawStreamAllValuesOflocation(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOflocation() {
+      return rawStreamAllValuesOflocation(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOflocation(final EndOfSiding_step_3.Match partialMatch) {
+      return rawStreamAllValuesOflocation(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOflocation(final Train pTrain) {
+      return rawStreamAllValuesOflocation(new Object[]{pTrain, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOflocation(final EndOfSiding_step_3.Match partialMatch) {
+      return rawStreamAllValuesOflocation(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOflocation(final Train pTrain) {
+      return rawStreamAllValuesOflocation(new Object[]{pTrain, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected EndOfSiding_step_3.Match tupleToMatch(final Tuple t) {
+      try {
+          return EndOfSiding_step_3.Match.newMatch((Train) t.get(POSITION_TRAIN), (Segment) t.get(POSITION_LOCATION));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected EndOfSiding_step_3.Match arrayToMatch(final Object[] match) {
+      try {
+          return EndOfSiding_step_3.Match.newMatch((Train) match[POSITION_TRAIN], (Segment) match[POSITION_LOCATION]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected EndOfSiding_step_3.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return EndOfSiding_step_3.Match.newMutableMatch((Train) match[POSITION_TRAIN], (Segment) match[POSITION_LOCATION]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<EndOfSiding_step_3.Matcher> querySpecification() {
+      return EndOfSiding_step_3.instance();
+    }
+  }
+  
+  private EndOfSiding_step_3() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static EndOfSiding_step_3 instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected EndOfSiding_step_3.Matcher instantiate(final ViatraQueryEngine engine) {
+    return EndOfSiding_step_3.Matcher.on(engine);
+  }
+  
+  @Override
+  public EndOfSiding_step_3.Matcher instantiate() {
+    return EndOfSiding_step_3.Matcher.create();
+  }
+  
+  @Override
+  public EndOfSiding_step_3.Match newEmptyMatch() {
+    return EndOfSiding_step_3.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public EndOfSiding_step_3.Match newMatch(final Object... parameters) {
+    return EndOfSiding_step_3.Match.newMatch((modes3.Train) parameters[0], (modes3.Segment) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link EndOfSiding_step_3} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link EndOfSiding_step_3#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final EndOfSiding_step_3 INSTANCE = new EndOfSiding_step_3();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final EndOfSiding_step_3.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_train = new PParameter("train", "modes3.Train", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Train")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_location = new PParameter("location", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_train, parameter_location);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.endOfSiding_step_3";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("train","location");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_train = body.getOrCreateVariableByName("train");
+          PVariable var_location = body.getOrCreateVariableByName("location");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_location), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_train, parameter_train),
+             new ExportedParameter(body, var_location, parameter_location)
+          ));
+          // //     int loop_bound1 = frame->location->connected_to_count;//     for (int i1 = 0; i1 < loop_bound1; i1++) {//       ...//     } Train(train)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train")));
+          //     Train.location(train, location)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train", "location")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_0_, var_location);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/EndOfSiding_step_4.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/EndOfSiding_step_4.java
new file mode 100644
index 00000000..73df8514
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/EndOfSiding_step_4.java
@@ -0,0 +1,847 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Segment;
+import modes3.Train;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern endOfSiding_step_4(in train : Train, in location : Segment, in end : Segment) {
+ *         //       frame-{@literal >}end = frame-{@literal >}location-{@literal >}connected_to[i1];
+ *         //       if (frame-{@literal >}end != NULL &&
+ *         //                    frame-{@literal >}end-{@literal >}connected_to[1] == frame-{@literal >}location &&
+ *         //           frame-{@literal >}end-{@literal >}connected_to[0] == NULL) {
+ *         //         ...
+ *         //       } 
+ *         //            if (frame-{@literal >}end != NULL &&
+ *         //                    frame-{@literal >}end-{@literal >}connected_to[0] == frame-{@literal >}location &&
+ *         //           frame-{@literal >}end-{@literal >}connected_to[1] == NULL) {
+ *         //         ...
+ *         //       }
+ *              Train(train);
+ *             Train.location(train, location);
+ *             Segment.connectedTo(location, end);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class EndOfSiding_step_4 extends BaseGeneratedEMFQuerySpecification<EndOfSiding_step_4.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.endOfSiding_step_4 pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Train fTrain;
+    
+    private Segment fLocation;
+    
+    private Segment fEnd;
+    
+    private static List<String> parameterNames = makeImmutableList("train", "location", "end");
+    
+    private Match(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+      this.fTrain = pTrain;
+      this.fLocation = pLocation;
+      this.fEnd = pEnd;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "train": return this.fTrain;
+          case "location": return this.fLocation;
+          case "end": return this.fEnd;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fTrain;
+          case 1: return this.fLocation;
+          case 2: return this.fEnd;
+          default: return null;
+      }
+    }
+    
+    public Train getTrain() {
+      return this.fTrain;
+    }
+    
+    public Segment getLocation() {
+      return this.fLocation;
+    }
+    
+    public Segment getEnd() {
+      return this.fEnd;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("train".equals(parameterName) ) {
+          this.fTrain = (Train) newValue;
+          return true;
+      }
+      if ("location".equals(parameterName) ) {
+          this.fLocation = (Segment) newValue;
+          return true;
+      }
+      if ("end".equals(parameterName) ) {
+          this.fEnd = (Segment) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setTrain(final Train pTrain) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fTrain = pTrain;
+    }
+    
+    public void setLocation(final Segment pLocation) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fLocation = pLocation;
+    }
+    
+    public void setEnd(final Segment pEnd) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fEnd = pEnd;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.endOfSiding_step_4";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return EndOfSiding_step_4.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fTrain, fLocation, fEnd};
+    }
+    
+    @Override
+    public EndOfSiding_step_4.Match toImmutable() {
+      return isMutable() ? newMatch(fTrain, fLocation, fEnd) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"train\"=" + prettyPrintValue(fTrain) + ", ");
+      result.append("\"location\"=" + prettyPrintValue(fLocation) + ", ");
+      result.append("\"end\"=" + prettyPrintValue(fEnd));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fTrain, fLocation, fEnd);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof EndOfSiding_step_4.Match)) {
+          EndOfSiding_step_4.Match other = (EndOfSiding_step_4.Match) obj;
+          return Objects.equals(fTrain, other.fTrain) && Objects.equals(fLocation, other.fLocation) && Objects.equals(fEnd, other.fEnd);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public EndOfSiding_step_4 specification() {
+      return EndOfSiding_step_4.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static EndOfSiding_step_4.Match newEmptyMatch() {
+      return new Mutable(null, null, null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param pEnd the fixed value of pattern parameter end, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static EndOfSiding_step_4.Match newMutableMatch(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+      return new Mutable(pTrain, pLocation, pEnd);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param pEnd the fixed value of pattern parameter end, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static EndOfSiding_step_4.Match newMatch(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+      return new Immutable(pTrain, pLocation, pEnd);
+    }
+    
+    private static final class Mutable extends EndOfSiding_step_4.Match {
+      Mutable(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+        super(pTrain, pLocation, pEnd);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends EndOfSiding_step_4.Match {
+      Immutable(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+        super(pTrain, pLocation, pEnd);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.endOfSiding_step_4 pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern endOfSiding_step_4(in train : Train, in location : Segment, in end : Segment) {
+   * //       frame-{@literal >}end = frame-{@literal >}location-{@literal >}connected_to[i1];
+   * //       if (frame-{@literal >}end != NULL &&
+   * //                  frame-{@literal >}end-{@literal >}connected_to[1] == frame-{@literal >}location &&
+   * //           frame-{@literal >}end-{@literal >}connected_to[0] == NULL) {
+   * //         ...
+   * //       } 
+   * //          if (frame-{@literal >}end != NULL &&
+   * //                  frame-{@literal >}end-{@literal >}connected_to[0] == frame-{@literal >}location &&
+   * //           frame-{@literal >}end-{@literal >}connected_to[1] == NULL) {
+   * //         ...
+   * //       }
+   *    Train(train);
+   *     Train.location(train, location);
+   *     Segment.connectedTo(location, end);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see EndOfSiding_step_4
+   * 
+   */
+  public static class Matcher extends BaseMatcher<EndOfSiding_step_4.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static EndOfSiding_step_4.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static EndOfSiding_step_4.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_TRAIN = 0;
+    
+    private static final int POSITION_LOCATION = 1;
+    
+    private static final int POSITION_END = 2;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(EndOfSiding_step_4.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param pEnd the fixed value of pattern parameter end, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<EndOfSiding_step_4.Match> getAllMatches(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+      return rawStreamAllMatches(new Object[]{pTrain, pLocation, pEnd}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param pEnd the fixed value of pattern parameter end, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<EndOfSiding_step_4.Match> streamAllMatches(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+      return rawStreamAllMatches(new Object[]{pTrain, pLocation, pEnd});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param pEnd the fixed value of pattern parameter end, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<EndOfSiding_step_4.Match> getOneArbitraryMatch(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+      return rawGetOneArbitraryMatch(new Object[]{pTrain, pLocation, pEnd});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param pEnd the fixed value of pattern parameter end, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+      return rawHasMatch(new Object[]{pTrain, pLocation, pEnd});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param pEnd the fixed value of pattern parameter end, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+      return rawCountMatches(new Object[]{pTrain, pLocation, pEnd});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param pEnd the fixed value of pattern parameter end, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Train pTrain, final Segment pLocation, final Segment pEnd, final Consumer<? super EndOfSiding_step_4.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pTrain, pLocation, pEnd}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param pEnd the fixed value of pattern parameter end, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public EndOfSiding_step_4.Match newMatch(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+      return EndOfSiding_step_4.Match.newMatch(pTrain, pLocation, pEnd);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Train> rawStreamAllValuesOftrain(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_TRAIN, parameters).map(Train.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Train> getAllValuesOftrain() {
+      return rawStreamAllValuesOftrain(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Train> streamAllValuesOftrain() {
+      return rawStreamAllValuesOftrain(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Train> streamAllValuesOftrain(final EndOfSiding_step_4.Match partialMatch) {
+      return rawStreamAllValuesOftrain(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Train> streamAllValuesOftrain(final Segment pLocation, final Segment pEnd) {
+      return rawStreamAllValuesOftrain(new Object[]{null, pLocation, pEnd});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Train> getAllValuesOftrain(final EndOfSiding_step_4.Match partialMatch) {
+      return rawStreamAllValuesOftrain(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Train> getAllValuesOftrain(final Segment pLocation, final Segment pEnd) {
+      return rawStreamAllValuesOftrain(new Object[]{null, pLocation, pEnd}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOflocation(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_LOCATION, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOflocation() {
+      return rawStreamAllValuesOflocation(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOflocation() {
+      return rawStreamAllValuesOflocation(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOflocation(final EndOfSiding_step_4.Match partialMatch) {
+      return rawStreamAllValuesOflocation(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOflocation(final Train pTrain, final Segment pEnd) {
+      return rawStreamAllValuesOflocation(new Object[]{pTrain, null, pEnd});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOflocation(final EndOfSiding_step_4.Match partialMatch) {
+      return rawStreamAllValuesOflocation(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOflocation(final Train pTrain, final Segment pEnd) {
+      return rawStreamAllValuesOflocation(new Object[]{pTrain, null, pEnd}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for end.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOfend(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_END, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for end.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfend() {
+      return rawStreamAllValuesOfend(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for end.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfend() {
+      return rawStreamAllValuesOfend(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for end.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfend(final EndOfSiding_step_4.Match partialMatch) {
+      return rawStreamAllValuesOfend(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for end.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfend(final Train pTrain, final Segment pLocation) {
+      return rawStreamAllValuesOfend(new Object[]{pTrain, pLocation, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for end.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfend(final EndOfSiding_step_4.Match partialMatch) {
+      return rawStreamAllValuesOfend(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for end.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfend(final Train pTrain, final Segment pLocation) {
+      return rawStreamAllValuesOfend(new Object[]{pTrain, pLocation, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected EndOfSiding_step_4.Match tupleToMatch(final Tuple t) {
+      try {
+          return EndOfSiding_step_4.Match.newMatch((Train) t.get(POSITION_TRAIN), (Segment) t.get(POSITION_LOCATION), (Segment) t.get(POSITION_END));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected EndOfSiding_step_4.Match arrayToMatch(final Object[] match) {
+      try {
+          return EndOfSiding_step_4.Match.newMatch((Train) match[POSITION_TRAIN], (Segment) match[POSITION_LOCATION], (Segment) match[POSITION_END]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected EndOfSiding_step_4.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return EndOfSiding_step_4.Match.newMutableMatch((Train) match[POSITION_TRAIN], (Segment) match[POSITION_LOCATION], (Segment) match[POSITION_END]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<EndOfSiding_step_4.Matcher> querySpecification() {
+      return EndOfSiding_step_4.instance();
+    }
+  }
+  
+  private EndOfSiding_step_4() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static EndOfSiding_step_4 instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected EndOfSiding_step_4.Matcher instantiate(final ViatraQueryEngine engine) {
+    return EndOfSiding_step_4.Matcher.on(engine);
+  }
+  
+  @Override
+  public EndOfSiding_step_4.Matcher instantiate() {
+    return EndOfSiding_step_4.Matcher.create();
+  }
+  
+  @Override
+  public EndOfSiding_step_4.Match newEmptyMatch() {
+    return EndOfSiding_step_4.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public EndOfSiding_step_4.Match newMatch(final Object... parameters) {
+    return EndOfSiding_step_4.Match.newMatch((modes3.Train) parameters[0], (modes3.Segment) parameters[1], (modes3.Segment) parameters[2]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link EndOfSiding_step_4} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link EndOfSiding_step_4#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final EndOfSiding_step_4 INSTANCE = new EndOfSiding_step_4();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final EndOfSiding_step_4.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_train = new PParameter("train", "modes3.Train", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Train")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_location = new PParameter("location", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_end = new PParameter("end", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_train, parameter_location, parameter_end);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.endOfSiding_step_4";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("train","location","end");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_train = body.getOrCreateVariableByName("train");
+          PVariable var_location = body.getOrCreateVariableByName("location");
+          PVariable var_end = body.getOrCreateVariableByName("end");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_location), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_end), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_train, parameter_train),
+             new ExportedParameter(body, var_location, parameter_location),
+             new ExportedParameter(body, var_end, parameter_end)
+          ));
+          // //       frame->end = frame->location->connected_to[i1];//       if (frame->end != NULL &&//                        frame->end->connected_to[1] == frame->location &&//           frame->end->connected_to[0] == NULL) {//         ...//       } //         if (frame->end != NULL &&//                     frame->end->connected_to[0] == frame->location &&//           frame->end->connected_to[1] == NULL) {//         ...//       }   Train(train)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train")));
+          //     Train.location(train, location)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train", "location")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_0_, var_location);
+          //     Segment.connectedTo(location, end)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_location), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_location, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment", "connectedTo")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_1_, var_end);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/EndOfSiding_step_5.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/EndOfSiding_step_5.java
new file mode 100644
index 00000000..48a2697d
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/EndOfSiding_step_5.java
@@ -0,0 +1,841 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Segment;
+import modes3.Train;
+import modes3.queries.MultipleConnectedTo;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern endOfSiding_step_5(in train : Train, in location : Segment, in end : Segment) {
+ *         //         results-{@literal >}matches[match_cntr].location = frame-{@literal >}location;
+ *         //         results-{@literal >}matches[match_cntr++].train = frame-{@literal >}train;
+ *         //         ...OR...
+ *         //         results-{@literal >}matches[match_cntr].location = frame-{@literal >}location;
+ *         //         results-{@literal >}matches[match_cntr++].train = frame-{@literal >}train;
+ *              Train(train);
+ *             Train.location(train, location);
+ *             Segment.connectedTo(location, end);
+ *              neg find multipleConnectedTo(end);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class EndOfSiding_step_5 extends BaseGeneratedEMFQuerySpecification<EndOfSiding_step_5.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.endOfSiding_step_5 pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Train fTrain;
+    
+    private Segment fLocation;
+    
+    private Segment fEnd;
+    
+    private static List<String> parameterNames = makeImmutableList("train", "location", "end");
+    
+    private Match(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+      this.fTrain = pTrain;
+      this.fLocation = pLocation;
+      this.fEnd = pEnd;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "train": return this.fTrain;
+          case "location": return this.fLocation;
+          case "end": return this.fEnd;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fTrain;
+          case 1: return this.fLocation;
+          case 2: return this.fEnd;
+          default: return null;
+      }
+    }
+    
+    public Train getTrain() {
+      return this.fTrain;
+    }
+    
+    public Segment getLocation() {
+      return this.fLocation;
+    }
+    
+    public Segment getEnd() {
+      return this.fEnd;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("train".equals(parameterName) ) {
+          this.fTrain = (Train) newValue;
+          return true;
+      }
+      if ("location".equals(parameterName) ) {
+          this.fLocation = (Segment) newValue;
+          return true;
+      }
+      if ("end".equals(parameterName) ) {
+          this.fEnd = (Segment) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setTrain(final Train pTrain) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fTrain = pTrain;
+    }
+    
+    public void setLocation(final Segment pLocation) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fLocation = pLocation;
+    }
+    
+    public void setEnd(final Segment pEnd) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fEnd = pEnd;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.endOfSiding_step_5";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return EndOfSiding_step_5.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fTrain, fLocation, fEnd};
+    }
+    
+    @Override
+    public EndOfSiding_step_5.Match toImmutable() {
+      return isMutable() ? newMatch(fTrain, fLocation, fEnd) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"train\"=" + prettyPrintValue(fTrain) + ", ");
+      result.append("\"location\"=" + prettyPrintValue(fLocation) + ", ");
+      result.append("\"end\"=" + prettyPrintValue(fEnd));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fTrain, fLocation, fEnd);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof EndOfSiding_step_5.Match)) {
+          EndOfSiding_step_5.Match other = (EndOfSiding_step_5.Match) obj;
+          return Objects.equals(fTrain, other.fTrain) && Objects.equals(fLocation, other.fLocation) && Objects.equals(fEnd, other.fEnd);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public EndOfSiding_step_5 specification() {
+      return EndOfSiding_step_5.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static EndOfSiding_step_5.Match newEmptyMatch() {
+      return new Mutable(null, null, null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param pEnd the fixed value of pattern parameter end, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static EndOfSiding_step_5.Match newMutableMatch(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+      return new Mutable(pTrain, pLocation, pEnd);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param pEnd the fixed value of pattern parameter end, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static EndOfSiding_step_5.Match newMatch(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+      return new Immutable(pTrain, pLocation, pEnd);
+    }
+    
+    private static final class Mutable extends EndOfSiding_step_5.Match {
+      Mutable(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+        super(pTrain, pLocation, pEnd);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends EndOfSiding_step_5.Match {
+      Immutable(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+        super(pTrain, pLocation, pEnd);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.endOfSiding_step_5 pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern endOfSiding_step_5(in train : Train, in location : Segment, in end : Segment) {
+   * //         results-{@literal >}matches[match_cntr].location = frame-{@literal >}location;
+   * //         results-{@literal >}matches[match_cntr++].train = frame-{@literal >}train;
+   * //         ...OR...
+   * //         results-{@literal >}matches[match_cntr].location = frame-{@literal >}location;
+   * //         results-{@literal >}matches[match_cntr++].train = frame-{@literal >}train;
+   *    Train(train);
+   *     Train.location(train, location);
+   *     Segment.connectedTo(location, end);
+   *    neg find multipleConnectedTo(end);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see EndOfSiding_step_5
+   * 
+   */
+  public static class Matcher extends BaseMatcher<EndOfSiding_step_5.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static EndOfSiding_step_5.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static EndOfSiding_step_5.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_TRAIN = 0;
+    
+    private static final int POSITION_LOCATION = 1;
+    
+    private static final int POSITION_END = 2;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(EndOfSiding_step_5.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param pEnd the fixed value of pattern parameter end, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<EndOfSiding_step_5.Match> getAllMatches(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+      return rawStreamAllMatches(new Object[]{pTrain, pLocation, pEnd}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param pEnd the fixed value of pattern parameter end, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<EndOfSiding_step_5.Match> streamAllMatches(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+      return rawStreamAllMatches(new Object[]{pTrain, pLocation, pEnd});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param pEnd the fixed value of pattern parameter end, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<EndOfSiding_step_5.Match> getOneArbitraryMatch(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+      return rawGetOneArbitraryMatch(new Object[]{pTrain, pLocation, pEnd});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param pEnd the fixed value of pattern parameter end, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+      return rawHasMatch(new Object[]{pTrain, pLocation, pEnd});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param pEnd the fixed value of pattern parameter end, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+      return rawCountMatches(new Object[]{pTrain, pLocation, pEnd});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param pEnd the fixed value of pattern parameter end, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Train pTrain, final Segment pLocation, final Segment pEnd, final Consumer<? super EndOfSiding_step_5.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pTrain, pLocation, pEnd}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param pEnd the fixed value of pattern parameter end, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public EndOfSiding_step_5.Match newMatch(final Train pTrain, final Segment pLocation, final Segment pEnd) {
+      return EndOfSiding_step_5.Match.newMatch(pTrain, pLocation, pEnd);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Train> rawStreamAllValuesOftrain(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_TRAIN, parameters).map(Train.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Train> getAllValuesOftrain() {
+      return rawStreamAllValuesOftrain(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Train> streamAllValuesOftrain() {
+      return rawStreamAllValuesOftrain(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Train> streamAllValuesOftrain(final EndOfSiding_step_5.Match partialMatch) {
+      return rawStreamAllValuesOftrain(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Train> streamAllValuesOftrain(final Segment pLocation, final Segment pEnd) {
+      return rawStreamAllValuesOftrain(new Object[]{null, pLocation, pEnd});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Train> getAllValuesOftrain(final EndOfSiding_step_5.Match partialMatch) {
+      return rawStreamAllValuesOftrain(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Train> getAllValuesOftrain(final Segment pLocation, final Segment pEnd) {
+      return rawStreamAllValuesOftrain(new Object[]{null, pLocation, pEnd}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOflocation(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_LOCATION, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOflocation() {
+      return rawStreamAllValuesOflocation(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOflocation() {
+      return rawStreamAllValuesOflocation(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOflocation(final EndOfSiding_step_5.Match partialMatch) {
+      return rawStreamAllValuesOflocation(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOflocation(final Train pTrain, final Segment pEnd) {
+      return rawStreamAllValuesOflocation(new Object[]{pTrain, null, pEnd});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOflocation(final EndOfSiding_step_5.Match partialMatch) {
+      return rawStreamAllValuesOflocation(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOflocation(final Train pTrain, final Segment pEnd) {
+      return rawStreamAllValuesOflocation(new Object[]{pTrain, null, pEnd}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for end.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOfend(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_END, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for end.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfend() {
+      return rawStreamAllValuesOfend(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for end.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfend() {
+      return rawStreamAllValuesOfend(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for end.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfend(final EndOfSiding_step_5.Match partialMatch) {
+      return rawStreamAllValuesOfend(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for end.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfend(final Train pTrain, final Segment pLocation) {
+      return rawStreamAllValuesOfend(new Object[]{pTrain, pLocation, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for end.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfend(final EndOfSiding_step_5.Match partialMatch) {
+      return rawStreamAllValuesOfend(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for end.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfend(final Train pTrain, final Segment pLocation) {
+      return rawStreamAllValuesOfend(new Object[]{pTrain, pLocation, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected EndOfSiding_step_5.Match tupleToMatch(final Tuple t) {
+      try {
+          return EndOfSiding_step_5.Match.newMatch((Train) t.get(POSITION_TRAIN), (Segment) t.get(POSITION_LOCATION), (Segment) t.get(POSITION_END));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected EndOfSiding_step_5.Match arrayToMatch(final Object[] match) {
+      try {
+          return EndOfSiding_step_5.Match.newMatch((Train) match[POSITION_TRAIN], (Segment) match[POSITION_LOCATION], (Segment) match[POSITION_END]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected EndOfSiding_step_5.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return EndOfSiding_step_5.Match.newMutableMatch((Train) match[POSITION_TRAIN], (Segment) match[POSITION_LOCATION], (Segment) match[POSITION_END]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<EndOfSiding_step_5.Matcher> querySpecification() {
+      return EndOfSiding_step_5.instance();
+    }
+  }
+  
+  private EndOfSiding_step_5() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static EndOfSiding_step_5 instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected EndOfSiding_step_5.Matcher instantiate(final ViatraQueryEngine engine) {
+    return EndOfSiding_step_5.Matcher.on(engine);
+  }
+  
+  @Override
+  public EndOfSiding_step_5.Matcher instantiate() {
+    return EndOfSiding_step_5.Matcher.create();
+  }
+  
+  @Override
+  public EndOfSiding_step_5.Match newEmptyMatch() {
+    return EndOfSiding_step_5.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public EndOfSiding_step_5.Match newMatch(final Object... parameters) {
+    return EndOfSiding_step_5.Match.newMatch((modes3.Train) parameters[0], (modes3.Segment) parameters[1], (modes3.Segment) parameters[2]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link EndOfSiding_step_5} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link EndOfSiding_step_5#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final EndOfSiding_step_5 INSTANCE = new EndOfSiding_step_5();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final EndOfSiding_step_5.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_train = new PParameter("train", "modes3.Train", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Train")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_location = new PParameter("location", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_end = new PParameter("end", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_train, parameter_location, parameter_end);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.endOfSiding_step_5";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("train","location","end");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_train = body.getOrCreateVariableByName("train");
+          PVariable var_location = body.getOrCreateVariableByName("location");
+          PVariable var_end = body.getOrCreateVariableByName("end");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_location), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_end), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_train, parameter_train),
+             new ExportedParameter(body, var_location, parameter_location),
+             new ExportedParameter(body, var_end, parameter_end)
+          ));
+          // //         results->matches[match_cntr].location = frame->location;//         results->matches[match_cntr++].train = frame->train;//         ...OR...//         results->matches[match_cntr].location = frame->location;//         results->matches[match_cntr++].train = frame->train;    Train(train)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train")));
+          //     Train.location(train, location)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train", "location")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_0_, var_location);
+          //     Segment.connectedTo(location, end)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_location), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_location, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment", "connectedTo")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_1_, var_end);
+          //    neg find multipleConnectedTo(end)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var_end), MultipleConnectedTo.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/InputsOfTurnout.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/InputsOfTurnout.java
new file mode 100644
index 00000000..2f2eea11
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/InputsOfTurnout.java
@@ -0,0 +1,570 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Turnout;
+import modes3.queries.Adjacent;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern inputsOfTurnout(T : Turnout) {
+ *              find adjacent(I1, T);
+ *              find adjacent(I2, T);
+ *              find adjacent(I3, T);
+ *              I1 != I2;
+ *              I1 != I3;
+ *              I2 != I3;
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class InputsOfTurnout extends BaseGeneratedEMFQuerySpecification<InputsOfTurnout.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.inputsOfTurnout pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Turnout fT;
+    
+    private static List<String> parameterNames = makeImmutableList("T");
+    
+    private Match(final Turnout pT) {
+      this.fT = pT;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "T": return this.fT;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fT;
+          default: return null;
+      }
+    }
+    
+    public Turnout getT() {
+      return this.fT;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("T".equals(parameterName) ) {
+          this.fT = (Turnout) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setT(final Turnout pT) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fT = pT;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.inputsOfTurnout";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return InputsOfTurnout.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fT};
+    }
+    
+    @Override
+    public InputsOfTurnout.Match toImmutable() {
+      return isMutable() ? newMatch(fT) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"T\"=" + prettyPrintValue(fT));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fT);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof InputsOfTurnout.Match)) {
+          InputsOfTurnout.Match other = (InputsOfTurnout.Match) obj;
+          return Objects.equals(fT, other.fT);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public InputsOfTurnout specification() {
+      return InputsOfTurnout.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static InputsOfTurnout.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static InputsOfTurnout.Match newMutableMatch(final Turnout pT) {
+      return new Mutable(pT);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static InputsOfTurnout.Match newMatch(final Turnout pT) {
+      return new Immutable(pT);
+    }
+    
+    private static final class Mutable extends InputsOfTurnout.Match {
+      Mutable(final Turnout pT) {
+        super(pT);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends InputsOfTurnout.Match {
+      Immutable(final Turnout pT) {
+        super(pT);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.inputsOfTurnout pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern inputsOfTurnout(T : Turnout) {
+   *    find adjacent(I1, T);
+   *    find adjacent(I2, T);
+   *    find adjacent(I3, T);
+   *    I1 != I2;
+   *    I1 != I3;
+   *    I2 != I3;
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see InputsOfTurnout
+   * 
+   */
+  public static class Matcher extends BaseMatcher<InputsOfTurnout.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static InputsOfTurnout.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static InputsOfTurnout.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_T = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(InputsOfTurnout.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<InputsOfTurnout.Match> getAllMatches(final Turnout pT) {
+      return rawStreamAllMatches(new Object[]{pT}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<InputsOfTurnout.Match> streamAllMatches(final Turnout pT) {
+      return rawStreamAllMatches(new Object[]{pT});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<InputsOfTurnout.Match> getOneArbitraryMatch(final Turnout pT) {
+      return rawGetOneArbitraryMatch(new Object[]{pT});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Turnout pT) {
+      return rawHasMatch(new Object[]{pT});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Turnout pT) {
+      return rawCountMatches(new Object[]{pT});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Turnout pT, final Consumer<? super InputsOfTurnout.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pT}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public InputsOfTurnout.Match newMatch(final Turnout pT) {
+      return InputsOfTurnout.Match.newMatch(pT);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Turnout> rawStreamAllValuesOfT(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_T, parameters).map(Turnout.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Turnout> getAllValuesOfT() {
+      return rawStreamAllValuesOfT(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Turnout> streamAllValuesOfT() {
+      return rawStreamAllValuesOfT(emptyArray());
+    }
+    
+    @Override
+    protected InputsOfTurnout.Match tupleToMatch(final Tuple t) {
+      try {
+          return InputsOfTurnout.Match.newMatch((Turnout) t.get(POSITION_T));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected InputsOfTurnout.Match arrayToMatch(final Object[] match) {
+      try {
+          return InputsOfTurnout.Match.newMatch((Turnout) match[POSITION_T]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected InputsOfTurnout.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return InputsOfTurnout.Match.newMutableMatch((Turnout) match[POSITION_T]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<InputsOfTurnout.Matcher> querySpecification() {
+      return InputsOfTurnout.instance();
+    }
+  }
+  
+  private InputsOfTurnout() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static InputsOfTurnout instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected InputsOfTurnout.Matcher instantiate(final ViatraQueryEngine engine) {
+    return InputsOfTurnout.Matcher.on(engine);
+  }
+  
+  @Override
+  public InputsOfTurnout.Matcher instantiate() {
+    return InputsOfTurnout.Matcher.create();
+  }
+  
+  @Override
+  public InputsOfTurnout.Match newEmptyMatch() {
+    return InputsOfTurnout.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public InputsOfTurnout.Match newMatch(final Object... parameters) {
+    return InputsOfTurnout.Match.newMatch((modes3.Turnout) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link InputsOfTurnout} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link InputsOfTurnout#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final InputsOfTurnout INSTANCE = new InputsOfTurnout();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final InputsOfTurnout.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_T = new PParameter("T", "modes3.Turnout", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_T);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.inputsOfTurnout";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("T");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_T = body.getOrCreateVariableByName("T");
+          PVariable var_I1 = body.getOrCreateVariableByName("I1");
+          PVariable var_I2 = body.getOrCreateVariableByName("I2");
+          PVariable var_I3 = body.getOrCreateVariableByName("I3");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_T, parameter_T)
+          ));
+          //    find adjacent(I1, T)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_I1, var_T), Adjacent.instance().getInternalQueryRepresentation());
+          //    find adjacent(I2, T)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_I2, var_T), Adjacent.instance().getInternalQueryRepresentation());
+          //    find adjacent(I3, T)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_I3, var_T), Adjacent.instance().getInternalQueryRepresentation());
+          //    I1 != I2
+          new Inequality(body, var_I1, var_I2);
+          //    I1 != I3
+          new Inequality(body, var_I1, var_I3);
+          //    I2 != I3
+          new Inequality(body, var_I2, var_I3);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Modes3Queries.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Modes3Queries.java
new file mode 100644
index 00000000..d1238d61
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Modes3Queries.java
@@ -0,0 +1,405 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import modes3.queries.Adjacent;
+import modes3.queries.CloseTrains_step_2;
+import modes3.queries.CloseTrains_step_3;
+import modes3.queries.CloseTrains_step_4;
+import modes3.queries.CloseTrains_step_5;
+import modes3.queries.CloseTrains_step_6;
+import modes3.queries.CloseTrains_step_7;
+import modes3.queries.ConnectedSegmentsDirected;
+import modes3.queries.ConnectedTo;
+import modes3.queries.ConnectedToNotSymmetric;
+import modes3.queries.ConnectedToReflexive;
+import modes3.queries.EndOfSiding_step_2;
+import modes3.queries.EndOfSiding_step_3;
+import modes3.queries.EndOfSiding_step_4;
+import modes3.queries.EndOfSiding_step_5;
+import modes3.queries.InputsOfTurnout;
+import modes3.queries.MisalignedTurnout_step_2;
+import modes3.queries.MisalignedTurnout_step_3;
+import modes3.queries.MisalignedTurnout_step_4;
+import modes3.queries.MisalignedTurnout_step_5;
+import modes3.queries.MultipleConnectedTo;
+import modes3.queries.Output;
+import modes3.queries.OutputReflexive;
+import modes3.queries.Reachable;
+import modes3.queries.TooFewInputsOfTurnout;
+import modes3.queries.TooManyInputsOfSegment;
+import modes3.queries.TooManyInputsOfTurnout;
+import modes3.queries.TrainLocations_step_2;
+import modes3.queries.TrainLocations_step_3;
+import modes3.queries.TurnoutConnectedToBothOutputs;
+import modes3.queries.TurnoutOutput;
+import modes3.queries.TurnoutOutputsAreSame;
+import modes3.queries.Unreachable;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
+
+/**
+ * A pattern group formed of all public patterns defined in Modes3Queries.vql.
+ * 
+ * <p>Use the static instance as any {@link interface org.eclipse.viatra.query.runtime.api.IQueryGroup}, to conveniently prepare
+ * a VIATRA Query engine for matching all patterns originally defined in file Modes3Queries.vql,
+ * in order to achieve better performance than one-by-one on-demand matcher initialization.
+ * 
+ * <p> From package modes3.queries, the group contains the definition of the following patterns: <ul>
+ * <li>connectedTo</li>
+ * <li>connectedToNotSymmetric</li>
+ * <li>connectedToReflexive</li>
+ * <li>turnoutOutput</li>
+ * <li>outputReflexive</li>
+ * <li>turnoutOutputsAreSame</li>
+ * <li>output</li>
+ * <li>tooManyInputsOfSegment</li>
+ * <li>turnoutConnectedToBothOutputs</li>
+ * <li>adjacent</li>
+ * <li>tooManyInputsOfTurnout</li>
+ * <li>inputsOfTurnout</li>
+ * <li>tooFewInputsOfTurnout</li>
+ * <li>reachable</li>
+ * <li>unreachable</li>
+ * <li>closeTrains_step_2</li>
+ * <li>closeTrains_step_3</li>
+ * <li>closeTrains_step_4</li>
+ * <li>closeTrains_step_5</li>
+ * <li>closeTrains_step_6</li>
+ * <li>closeTrains_step_7</li>
+ * <li>trainLocations_step_2</li>
+ * <li>trainLocations_step_3</li>
+ * <li>misalignedTurnout_step_2</li>
+ * <li>misalignedTurnout_step_3</li>
+ * <li>misalignedTurnout_step_4</li>
+ * <li>misalignedTurnout_step_5</li>
+ * <li>connectedSegmentsDirected</li>
+ * <li>endOfSiding_step_2</li>
+ * <li>endOfSiding_step_3</li>
+ * <li>endOfSiding_step_4</li>
+ * <li>endOfSiding_step_5</li>
+ * <li>multipleConnectedTo</li>
+ * </ul>
+ * 
+ * @see IQueryGroup
+ * 
+ */
+@SuppressWarnings("all")
+public final class Modes3Queries extends BaseGeneratedPatternGroup {
+  /**
+   * Access the pattern group.
+   * 
+   * @return the singleton instance of the group
+   * @throws ViatraQueryRuntimeException if there was an error loading the generated code of pattern specifications
+   * 
+   */
+  public static Modes3Queries instance() {
+    if (INSTANCE == null) {
+        INSTANCE = new Modes3Queries();
+    }
+    return INSTANCE;
+  }
+  
+  private static Modes3Queries INSTANCE;
+  
+  private Modes3Queries() {
+    querySpecifications.add(ConnectedTo.instance());
+    querySpecifications.add(ConnectedToNotSymmetric.instance());
+    querySpecifications.add(ConnectedToReflexive.instance());
+    querySpecifications.add(TurnoutOutput.instance());
+    querySpecifications.add(OutputReflexive.instance());
+    querySpecifications.add(TurnoutOutputsAreSame.instance());
+    querySpecifications.add(Output.instance());
+    querySpecifications.add(TooManyInputsOfSegment.instance());
+    querySpecifications.add(TurnoutConnectedToBothOutputs.instance());
+    querySpecifications.add(Adjacent.instance());
+    querySpecifications.add(TooManyInputsOfTurnout.instance());
+    querySpecifications.add(InputsOfTurnout.instance());
+    querySpecifications.add(TooFewInputsOfTurnout.instance());
+    querySpecifications.add(Reachable.instance());
+    querySpecifications.add(Unreachable.instance());
+    querySpecifications.add(CloseTrains_step_2.instance());
+    querySpecifications.add(CloseTrains_step_3.instance());
+    querySpecifications.add(CloseTrains_step_4.instance());
+    querySpecifications.add(CloseTrains_step_5.instance());
+    querySpecifications.add(CloseTrains_step_6.instance());
+    querySpecifications.add(CloseTrains_step_7.instance());
+    querySpecifications.add(TrainLocations_step_2.instance());
+    querySpecifications.add(TrainLocations_step_3.instance());
+    querySpecifications.add(MisalignedTurnout_step_2.instance());
+    querySpecifications.add(MisalignedTurnout_step_3.instance());
+    querySpecifications.add(MisalignedTurnout_step_4.instance());
+    querySpecifications.add(MisalignedTurnout_step_5.instance());
+    querySpecifications.add(ConnectedSegmentsDirected.instance());
+    querySpecifications.add(EndOfSiding_step_2.instance());
+    querySpecifications.add(EndOfSiding_step_3.instance());
+    querySpecifications.add(EndOfSiding_step_4.instance());
+    querySpecifications.add(EndOfSiding_step_5.instance());
+    querySpecifications.add(MultipleConnectedTo.instance());
+  }
+  
+  public ConnectedTo getConnectedTo() {
+    return ConnectedTo.instance();
+  }
+  
+  public ConnectedTo.Matcher getConnectedTo(final ViatraQueryEngine engine) {
+    return ConnectedTo.Matcher.on(engine);
+  }
+  
+  public ConnectedToNotSymmetric getConnectedToNotSymmetric() {
+    return ConnectedToNotSymmetric.instance();
+  }
+  
+  public ConnectedToNotSymmetric.Matcher getConnectedToNotSymmetric(final ViatraQueryEngine engine) {
+    return ConnectedToNotSymmetric.Matcher.on(engine);
+  }
+  
+  public ConnectedToReflexive getConnectedToReflexive() {
+    return ConnectedToReflexive.instance();
+  }
+  
+  public ConnectedToReflexive.Matcher getConnectedToReflexive(final ViatraQueryEngine engine) {
+    return ConnectedToReflexive.Matcher.on(engine);
+  }
+  
+  public TurnoutOutput getTurnoutOutput() {
+    return TurnoutOutput.instance();
+  }
+  
+  public TurnoutOutput.Matcher getTurnoutOutput(final ViatraQueryEngine engine) {
+    return TurnoutOutput.Matcher.on(engine);
+  }
+  
+  public OutputReflexive getOutputReflexive() {
+    return OutputReflexive.instance();
+  }
+  
+  public OutputReflexive.Matcher getOutputReflexive(final ViatraQueryEngine engine) {
+    return OutputReflexive.Matcher.on(engine);
+  }
+  
+  public TurnoutOutputsAreSame getTurnoutOutputsAreSame() {
+    return TurnoutOutputsAreSame.instance();
+  }
+  
+  public TurnoutOutputsAreSame.Matcher getTurnoutOutputsAreSame(final ViatraQueryEngine engine) {
+    return TurnoutOutputsAreSame.Matcher.on(engine);
+  }
+  
+  public Output getOutput() {
+    return Output.instance();
+  }
+  
+  public Output.Matcher getOutput(final ViatraQueryEngine engine) {
+    return Output.Matcher.on(engine);
+  }
+  
+  public TooManyInputsOfSegment getTooManyInputsOfSegment() {
+    return TooManyInputsOfSegment.instance();
+  }
+  
+  public TooManyInputsOfSegment.Matcher getTooManyInputsOfSegment(final ViatraQueryEngine engine) {
+    return TooManyInputsOfSegment.Matcher.on(engine);
+  }
+  
+  public TurnoutConnectedToBothOutputs getTurnoutConnectedToBothOutputs() {
+    return TurnoutConnectedToBothOutputs.instance();
+  }
+  
+  public TurnoutConnectedToBothOutputs.Matcher getTurnoutConnectedToBothOutputs(final ViatraQueryEngine engine) {
+    return TurnoutConnectedToBothOutputs.Matcher.on(engine);
+  }
+  
+  public Adjacent getAdjacent() {
+    return Adjacent.instance();
+  }
+  
+  public Adjacent.Matcher getAdjacent(final ViatraQueryEngine engine) {
+    return Adjacent.Matcher.on(engine);
+  }
+  
+  public TooManyInputsOfTurnout getTooManyInputsOfTurnout() {
+    return TooManyInputsOfTurnout.instance();
+  }
+  
+  public TooManyInputsOfTurnout.Matcher getTooManyInputsOfTurnout(final ViatraQueryEngine engine) {
+    return TooManyInputsOfTurnout.Matcher.on(engine);
+  }
+  
+  public InputsOfTurnout getInputsOfTurnout() {
+    return InputsOfTurnout.instance();
+  }
+  
+  public InputsOfTurnout.Matcher getInputsOfTurnout(final ViatraQueryEngine engine) {
+    return InputsOfTurnout.Matcher.on(engine);
+  }
+  
+  public TooFewInputsOfTurnout getTooFewInputsOfTurnout() {
+    return TooFewInputsOfTurnout.instance();
+  }
+  
+  public TooFewInputsOfTurnout.Matcher getTooFewInputsOfTurnout(final ViatraQueryEngine engine) {
+    return TooFewInputsOfTurnout.Matcher.on(engine);
+  }
+  
+  public Reachable getReachable() {
+    return Reachable.instance();
+  }
+  
+  public Reachable.Matcher getReachable(final ViatraQueryEngine engine) {
+    return Reachable.Matcher.on(engine);
+  }
+  
+  public Unreachable getUnreachable() {
+    return Unreachable.instance();
+  }
+  
+  public Unreachable.Matcher getUnreachable(final ViatraQueryEngine engine) {
+    return Unreachable.Matcher.on(engine);
+  }
+  
+  public CloseTrains_step_2 getCloseTrains_step_2() {
+    return CloseTrains_step_2.instance();
+  }
+  
+  public CloseTrains_step_2.Matcher getCloseTrains_step_2(final ViatraQueryEngine engine) {
+    return CloseTrains_step_2.Matcher.on(engine);
+  }
+  
+  public CloseTrains_step_3 getCloseTrains_step_3() {
+    return CloseTrains_step_3.instance();
+  }
+  
+  public CloseTrains_step_3.Matcher getCloseTrains_step_3(final ViatraQueryEngine engine) {
+    return CloseTrains_step_3.Matcher.on(engine);
+  }
+  
+  public CloseTrains_step_4 getCloseTrains_step_4() {
+    return CloseTrains_step_4.instance();
+  }
+  
+  public CloseTrains_step_4.Matcher getCloseTrains_step_4(final ViatraQueryEngine engine) {
+    return CloseTrains_step_4.Matcher.on(engine);
+  }
+  
+  public CloseTrains_step_5 getCloseTrains_step_5() {
+    return CloseTrains_step_5.instance();
+  }
+  
+  public CloseTrains_step_5.Matcher getCloseTrains_step_5(final ViatraQueryEngine engine) {
+    return CloseTrains_step_5.Matcher.on(engine);
+  }
+  
+  public CloseTrains_step_6 getCloseTrains_step_6() {
+    return CloseTrains_step_6.instance();
+  }
+  
+  public CloseTrains_step_6.Matcher getCloseTrains_step_6(final ViatraQueryEngine engine) {
+    return CloseTrains_step_6.Matcher.on(engine);
+  }
+  
+  public CloseTrains_step_7 getCloseTrains_step_7() {
+    return CloseTrains_step_7.instance();
+  }
+  
+  public CloseTrains_step_7.Matcher getCloseTrains_step_7(final ViatraQueryEngine engine) {
+    return CloseTrains_step_7.Matcher.on(engine);
+  }
+  
+  public TrainLocations_step_2 getTrainLocations_step_2() {
+    return TrainLocations_step_2.instance();
+  }
+  
+  public TrainLocations_step_2.Matcher getTrainLocations_step_2(final ViatraQueryEngine engine) {
+    return TrainLocations_step_2.Matcher.on(engine);
+  }
+  
+  public TrainLocations_step_3 getTrainLocations_step_3() {
+    return TrainLocations_step_3.instance();
+  }
+  
+  public TrainLocations_step_3.Matcher getTrainLocations_step_3(final ViatraQueryEngine engine) {
+    return TrainLocations_step_3.Matcher.on(engine);
+  }
+  
+  public MisalignedTurnout_step_2 getMisalignedTurnout_step_2() {
+    return MisalignedTurnout_step_2.instance();
+  }
+  
+  public MisalignedTurnout_step_2.Matcher getMisalignedTurnout_step_2(final ViatraQueryEngine engine) {
+    return MisalignedTurnout_step_2.Matcher.on(engine);
+  }
+  
+  public MisalignedTurnout_step_3 getMisalignedTurnout_step_3() {
+    return MisalignedTurnout_step_3.instance();
+  }
+  
+  public MisalignedTurnout_step_3.Matcher getMisalignedTurnout_step_3(final ViatraQueryEngine engine) {
+    return MisalignedTurnout_step_3.Matcher.on(engine);
+  }
+  
+  public MisalignedTurnout_step_4 getMisalignedTurnout_step_4() {
+    return MisalignedTurnout_step_4.instance();
+  }
+  
+  public MisalignedTurnout_step_4.Matcher getMisalignedTurnout_step_4(final ViatraQueryEngine engine) {
+    return MisalignedTurnout_step_4.Matcher.on(engine);
+  }
+  
+  public MisalignedTurnout_step_5 getMisalignedTurnout_step_5() {
+    return MisalignedTurnout_step_5.instance();
+  }
+  
+  public MisalignedTurnout_step_5.Matcher getMisalignedTurnout_step_5(final ViatraQueryEngine engine) {
+    return MisalignedTurnout_step_5.Matcher.on(engine);
+  }
+  
+  public ConnectedSegmentsDirected getConnectedSegmentsDirected() {
+    return ConnectedSegmentsDirected.instance();
+  }
+  
+  public ConnectedSegmentsDirected.Matcher getConnectedSegmentsDirected(final ViatraQueryEngine engine) {
+    return ConnectedSegmentsDirected.Matcher.on(engine);
+  }
+  
+  public EndOfSiding_step_2 getEndOfSiding_step_2() {
+    return EndOfSiding_step_2.instance();
+  }
+  
+  public EndOfSiding_step_2.Matcher getEndOfSiding_step_2(final ViatraQueryEngine engine) {
+    return EndOfSiding_step_2.Matcher.on(engine);
+  }
+  
+  public EndOfSiding_step_3 getEndOfSiding_step_3() {
+    return EndOfSiding_step_3.instance();
+  }
+  
+  public EndOfSiding_step_3.Matcher getEndOfSiding_step_3(final ViatraQueryEngine engine) {
+    return EndOfSiding_step_3.Matcher.on(engine);
+  }
+  
+  public EndOfSiding_step_4 getEndOfSiding_step_4() {
+    return EndOfSiding_step_4.instance();
+  }
+  
+  public EndOfSiding_step_4.Matcher getEndOfSiding_step_4(final ViatraQueryEngine engine) {
+    return EndOfSiding_step_4.Matcher.on(engine);
+  }
+  
+  public EndOfSiding_step_5 getEndOfSiding_step_5() {
+    return EndOfSiding_step_5.instance();
+  }
+  
+  public EndOfSiding_step_5.Matcher getEndOfSiding_step_5(final ViatraQueryEngine engine) {
+    return EndOfSiding_step_5.Matcher.on(engine);
+  }
+  
+  public MultipleConnectedTo getMultipleConnectedTo() {
+    return MultipleConnectedTo.instance();
+  }
+  
+  public MultipleConnectedTo.Matcher getMultipleConnectedTo(final ViatraQueryEngine engine) {
+    return MultipleConnectedTo.Matcher.on(engine);
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/MultipleConnectedTo.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/MultipleConnectedTo.java
new file mode 100644
index 00000000..277006c9
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/MultipleConnectedTo.java
@@ -0,0 +1,565 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Segment;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern multipleConnectedTo(s : Segment) {
+ *              Segment.connectedTo(s, n1);
+ *              Segment.connectedTo(s, n2);
+ *              n1 != n2;
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class MultipleConnectedTo extends BaseGeneratedEMFQuerySpecification<MultipleConnectedTo.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.multipleConnectedTo pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Segment fS;
+    
+    private static List<String> parameterNames = makeImmutableList("s");
+    
+    private Match(final Segment pS) {
+      this.fS = pS;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "s": return this.fS;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fS;
+          default: return null;
+      }
+    }
+    
+    public Segment getS() {
+      return this.fS;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("s".equals(parameterName) ) {
+          this.fS = (Segment) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setS(final Segment pS) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fS = pS;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.multipleConnectedTo";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return MultipleConnectedTo.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fS};
+    }
+    
+    @Override
+    public MultipleConnectedTo.Match toImmutable() {
+      return isMutable() ? newMatch(fS) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"s\"=" + prettyPrintValue(fS));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fS);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof MultipleConnectedTo.Match)) {
+          MultipleConnectedTo.Match other = (MultipleConnectedTo.Match) obj;
+          return Objects.equals(fS, other.fS);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public MultipleConnectedTo specification() {
+      return MultipleConnectedTo.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static MultipleConnectedTo.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pS the fixed value of pattern parameter s, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static MultipleConnectedTo.Match newMutableMatch(final Segment pS) {
+      return new Mutable(pS);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pS the fixed value of pattern parameter s, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static MultipleConnectedTo.Match newMatch(final Segment pS) {
+      return new Immutable(pS);
+    }
+    
+    private static final class Mutable extends MultipleConnectedTo.Match {
+      Mutable(final Segment pS) {
+        super(pS);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends MultipleConnectedTo.Match {
+      Immutable(final Segment pS) {
+        super(pS);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.multipleConnectedTo pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern multipleConnectedTo(s : Segment) {
+   *    Segment.connectedTo(s, n1);
+   *    Segment.connectedTo(s, n2);
+   *    n1 != n2;
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see MultipleConnectedTo
+   * 
+   */
+  public static class Matcher extends BaseMatcher<MultipleConnectedTo.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static MultipleConnectedTo.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static MultipleConnectedTo.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_S = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(MultipleConnectedTo.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pS the fixed value of pattern parameter s, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<MultipleConnectedTo.Match> getAllMatches(final Segment pS) {
+      return rawStreamAllMatches(new Object[]{pS}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pS the fixed value of pattern parameter s, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<MultipleConnectedTo.Match> streamAllMatches(final Segment pS) {
+      return rawStreamAllMatches(new Object[]{pS});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pS the fixed value of pattern parameter s, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<MultipleConnectedTo.Match> getOneArbitraryMatch(final Segment pS) {
+      return rawGetOneArbitraryMatch(new Object[]{pS});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pS the fixed value of pattern parameter s, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Segment pS) {
+      return rawHasMatch(new Object[]{pS});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pS the fixed value of pattern parameter s, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Segment pS) {
+      return rawCountMatches(new Object[]{pS});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pS the fixed value of pattern parameter s, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Segment pS, final Consumer<? super MultipleConnectedTo.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pS}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pS the fixed value of pattern parameter s, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public MultipleConnectedTo.Match newMatch(final Segment pS) {
+      return MultipleConnectedTo.Match.newMatch(pS);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for s.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOfs(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_S, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for s.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfs() {
+      return rawStreamAllValuesOfs(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for s.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfs() {
+      return rawStreamAllValuesOfs(emptyArray());
+    }
+    
+    @Override
+    protected MultipleConnectedTo.Match tupleToMatch(final Tuple t) {
+      try {
+          return MultipleConnectedTo.Match.newMatch((Segment) t.get(POSITION_S));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected MultipleConnectedTo.Match arrayToMatch(final Object[] match) {
+      try {
+          return MultipleConnectedTo.Match.newMatch((Segment) match[POSITION_S]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected MultipleConnectedTo.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return MultipleConnectedTo.Match.newMutableMatch((Segment) match[POSITION_S]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<MultipleConnectedTo.Matcher> querySpecification() {
+      return MultipleConnectedTo.instance();
+    }
+  }
+  
+  private MultipleConnectedTo() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static MultipleConnectedTo instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected MultipleConnectedTo.Matcher instantiate(final ViatraQueryEngine engine) {
+    return MultipleConnectedTo.Matcher.on(engine);
+  }
+  
+  @Override
+  public MultipleConnectedTo.Matcher instantiate() {
+    return MultipleConnectedTo.Matcher.create();
+  }
+  
+  @Override
+  public MultipleConnectedTo.Match newEmptyMatch() {
+    return MultipleConnectedTo.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public MultipleConnectedTo.Match newMatch(final Object... parameters) {
+    return MultipleConnectedTo.Match.newMatch((modes3.Segment) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link MultipleConnectedTo} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link MultipleConnectedTo#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final MultipleConnectedTo INSTANCE = new MultipleConnectedTo();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final MultipleConnectedTo.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_s = new PParameter("s", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_s);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.multipleConnectedTo";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("s");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_s = body.getOrCreateVariableByName("s");
+          PVariable var_n1 = body.getOrCreateVariableByName("n1");
+          PVariable var_n2 = body.getOrCreateVariableByName("n2");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_s), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_s, parameter_s)
+          ));
+          //    Segment.connectedTo(s, n1)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_s), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_s, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment", "connectedTo")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_0_, var_n1);
+          //    Segment.connectedTo(s, n2)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_s), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_s, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment", "connectedTo")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_1_, var_n2);
+          //    n1 != n2
+          new Inequality(body, var_n1, var_n2);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Output.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Output.java
new file mode 100644
index 00000000..615b33af
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Output.java
@@ -0,0 +1,724 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Segment;
+import modes3.queries.TurnoutOutput;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern output(S1 : Segment, S2 : Segment) {
+ *              Segment.connectedTo(S1, S2);
+ *         } or {
+ *              find turnoutOutput(S1, S2);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class Output extends BaseGeneratedEMFQuerySpecification<Output.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.output pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Segment fS1;
+    
+    private Segment fS2;
+    
+    private static List<String> parameterNames = makeImmutableList("S1", "S2");
+    
+    private Match(final Segment pS1, final Segment pS2) {
+      this.fS1 = pS1;
+      this.fS2 = pS2;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "S1": return this.fS1;
+          case "S2": return this.fS2;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fS1;
+          case 1: return this.fS2;
+          default: return null;
+      }
+    }
+    
+    public Segment getS1() {
+      return this.fS1;
+    }
+    
+    public Segment getS2() {
+      return this.fS2;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("S1".equals(parameterName) ) {
+          this.fS1 = (Segment) newValue;
+          return true;
+      }
+      if ("S2".equals(parameterName) ) {
+          this.fS2 = (Segment) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setS1(final Segment pS1) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fS1 = pS1;
+    }
+    
+    public void setS2(final Segment pS2) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fS2 = pS2;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.output";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return Output.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fS1, fS2};
+    }
+    
+    @Override
+    public Output.Match toImmutable() {
+      return isMutable() ? newMatch(fS1, fS2) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"S1\"=" + prettyPrintValue(fS1) + ", ");
+      result.append("\"S2\"=" + prettyPrintValue(fS2));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fS1, fS2);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof Output.Match)) {
+          Output.Match other = (Output.Match) obj;
+          return Objects.equals(fS1, other.fS1) && Objects.equals(fS2, other.fS2);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public Output specification() {
+      return Output.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static Output.Match newEmptyMatch() {
+      return new Mutable(null, null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static Output.Match newMutableMatch(final Segment pS1, final Segment pS2) {
+      return new Mutable(pS1, pS2);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static Output.Match newMatch(final Segment pS1, final Segment pS2) {
+      return new Immutable(pS1, pS2);
+    }
+    
+    private static final class Mutable extends Output.Match {
+      Mutable(final Segment pS1, final Segment pS2) {
+        super(pS1, pS2);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends Output.Match {
+      Immutable(final Segment pS1, final Segment pS2) {
+        super(pS1, pS2);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.output pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern output(S1 : Segment, S2 : Segment) {
+   *    Segment.connectedTo(S1, S2);
+   * } or {
+   *    find turnoutOutput(S1, S2);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see Output
+   * 
+   */
+  public static class Matcher extends BaseMatcher<Output.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static Output.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static Output.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_S1 = 0;
+    
+    private static final int POSITION_S2 = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(Output.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<Output.Match> getAllMatches(final Segment pS1, final Segment pS2) {
+      return rawStreamAllMatches(new Object[]{pS1, pS2}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<Output.Match> streamAllMatches(final Segment pS1, final Segment pS2) {
+      return rawStreamAllMatches(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<Output.Match> getOneArbitraryMatch(final Segment pS1, final Segment pS2) {
+      return rawGetOneArbitraryMatch(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Segment pS1, final Segment pS2) {
+      return rawHasMatch(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Segment pS1, final Segment pS2) {
+      return rawCountMatches(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Segment pS1, final Segment pS2, final Consumer<? super Output.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pS1, pS2}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public Output.Match newMatch(final Segment pS1, final Segment pS2) {
+      return Output.Match.newMatch(pS1, pS2);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOfS1(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_S1, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS1() {
+      return rawStreamAllValuesOfS1(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS1() {
+      return rawStreamAllValuesOfS1(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS1(final Output.Match partialMatch) {
+      return rawStreamAllValuesOfS1(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS1(final Segment pS2) {
+      return rawStreamAllValuesOfS1(new Object[]{null, pS2});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS1(final Output.Match partialMatch) {
+      return rawStreamAllValuesOfS1(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS1(final Segment pS2) {
+      return rawStreamAllValuesOfS1(new Object[]{null, pS2}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOfS2(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_S2, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS2() {
+      return rawStreamAllValuesOfS2(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS2() {
+      return rawStreamAllValuesOfS2(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS2(final Output.Match partialMatch) {
+      return rawStreamAllValuesOfS2(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS2(final Segment pS1) {
+      return rawStreamAllValuesOfS2(new Object[]{pS1, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS2(final Output.Match partialMatch) {
+      return rawStreamAllValuesOfS2(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS2(final Segment pS1) {
+      return rawStreamAllValuesOfS2(new Object[]{pS1, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected Output.Match tupleToMatch(final Tuple t) {
+      try {
+          return Output.Match.newMatch((Segment) t.get(POSITION_S1), (Segment) t.get(POSITION_S2));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Output.Match arrayToMatch(final Object[] match) {
+      try {
+          return Output.Match.newMatch((Segment) match[POSITION_S1], (Segment) match[POSITION_S2]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Output.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return Output.Match.newMutableMatch((Segment) match[POSITION_S1], (Segment) match[POSITION_S2]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<Output.Matcher> querySpecification() {
+      return Output.instance();
+    }
+  }
+  
+  private Output() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static Output instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected Output.Matcher instantiate(final ViatraQueryEngine engine) {
+    return Output.Matcher.on(engine);
+  }
+  
+  @Override
+  public Output.Matcher instantiate() {
+    return Output.Matcher.create();
+  }
+  
+  @Override
+  public Output.Match newEmptyMatch() {
+    return Output.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public Output.Match newMatch(final Object... parameters) {
+    return Output.Match.newMatch((modes3.Segment) parameters[0], (modes3.Segment) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link Output} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link Output#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final Output INSTANCE = new Output();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final Output.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_S1 = new PParameter("S1", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_S2 = new PParameter("S2", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_S1, parameter_S2);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.output";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("S1","S2");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_S1 = body.getOrCreateVariableByName("S1");
+          PVariable var_S2 = body.getOrCreateVariableByName("S2");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_S1, parameter_S1),
+             new ExportedParameter(body, var_S2, parameter_S2)
+          ));
+          //    Segment.connectedTo(S1, S2)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S1, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment", "connectedTo")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_0_, var_S2);
+          bodies.add(body);
+      }
+      {
+          PBody body = new PBody(this);
+          PVariable var_S1 = body.getOrCreateVariableByName("S1");
+          PVariable var_S2 = body.getOrCreateVariableByName("S2");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_S1, parameter_S1),
+             new ExportedParameter(body, var_S2, parameter_S2)
+          ));
+          //    find turnoutOutput(S1, S2)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_S1, var_S2), TurnoutOutput.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/OutputReflexive.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/OutputReflexive.java
new file mode 100644
index 00000000..3d90ede5
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/OutputReflexive.java
@@ -0,0 +1,559 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Turnout;
+import modes3.queries.TurnoutOutput;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(message = "outputReflexive", severity = "error", key = { T })
+ *         pattern outputReflexive(T : Turnout) {
+ *              find turnoutOutput(T, T);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class OutputReflexive extends BaseGeneratedEMFQuerySpecification<OutputReflexive.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.outputReflexive pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Turnout fT;
+    
+    private static List<String> parameterNames = makeImmutableList("T");
+    
+    private Match(final Turnout pT) {
+      this.fT = pT;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "T": return this.fT;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fT;
+          default: return null;
+      }
+    }
+    
+    public Turnout getT() {
+      return this.fT;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("T".equals(parameterName) ) {
+          this.fT = (Turnout) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setT(final Turnout pT) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fT = pT;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.outputReflexive";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return OutputReflexive.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fT};
+    }
+    
+    @Override
+    public OutputReflexive.Match toImmutable() {
+      return isMutable() ? newMatch(fT) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"T\"=" + prettyPrintValue(fT));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fT);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof OutputReflexive.Match)) {
+          OutputReflexive.Match other = (OutputReflexive.Match) obj;
+          return Objects.equals(fT, other.fT);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public OutputReflexive specification() {
+      return OutputReflexive.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static OutputReflexive.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static OutputReflexive.Match newMutableMatch(final Turnout pT) {
+      return new Mutable(pT);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static OutputReflexive.Match newMatch(final Turnout pT) {
+      return new Immutable(pT);
+    }
+    
+    private static final class Mutable extends OutputReflexive.Match {
+      Mutable(final Turnout pT) {
+        super(pT);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends OutputReflexive.Match {
+      Immutable(final Turnout pT) {
+        super(pT);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.outputReflexive pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(message = "outputReflexive", severity = "error", key = { T })
+   * pattern outputReflexive(T : Turnout) {
+   *    find turnoutOutput(T, T);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see OutputReflexive
+   * 
+   */
+  public static class Matcher extends BaseMatcher<OutputReflexive.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static OutputReflexive.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static OutputReflexive.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_T = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(OutputReflexive.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<OutputReflexive.Match> getAllMatches(final Turnout pT) {
+      return rawStreamAllMatches(new Object[]{pT}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<OutputReflexive.Match> streamAllMatches(final Turnout pT) {
+      return rawStreamAllMatches(new Object[]{pT});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<OutputReflexive.Match> getOneArbitraryMatch(final Turnout pT) {
+      return rawGetOneArbitraryMatch(new Object[]{pT});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Turnout pT) {
+      return rawHasMatch(new Object[]{pT});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Turnout pT) {
+      return rawCountMatches(new Object[]{pT});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Turnout pT, final Consumer<? super OutputReflexive.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pT}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public OutputReflexive.Match newMatch(final Turnout pT) {
+      return OutputReflexive.Match.newMatch(pT);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Turnout> rawStreamAllValuesOfT(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_T, parameters).map(Turnout.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Turnout> getAllValuesOfT() {
+      return rawStreamAllValuesOfT(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Turnout> streamAllValuesOfT() {
+      return rawStreamAllValuesOfT(emptyArray());
+    }
+    
+    @Override
+    protected OutputReflexive.Match tupleToMatch(final Tuple t) {
+      try {
+          return OutputReflexive.Match.newMatch((Turnout) t.get(POSITION_T));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected OutputReflexive.Match arrayToMatch(final Object[] match) {
+      try {
+          return OutputReflexive.Match.newMatch((Turnout) match[POSITION_T]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected OutputReflexive.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return OutputReflexive.Match.newMutableMatch((Turnout) match[POSITION_T]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<OutputReflexive.Matcher> querySpecification() {
+      return OutputReflexive.instance();
+    }
+  }
+  
+  private OutputReflexive() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static OutputReflexive instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected OutputReflexive.Matcher instantiate(final ViatraQueryEngine engine) {
+    return OutputReflexive.Matcher.on(engine);
+  }
+  
+  @Override
+  public OutputReflexive.Matcher instantiate() {
+    return OutputReflexive.Matcher.create();
+  }
+  
+  @Override
+  public OutputReflexive.Match newEmptyMatch() {
+    return OutputReflexive.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public OutputReflexive.Match newMatch(final Object... parameters) {
+    return OutputReflexive.Match.newMatch((modes3.Turnout) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link OutputReflexive} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link OutputReflexive#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final OutputReflexive INSTANCE = new OutputReflexive();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final OutputReflexive.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_T = new PParameter("T", "modes3.Turnout", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_T);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.outputReflexive";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("T");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_T = body.getOrCreateVariableByName("T");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_T, parameter_T)
+          ));
+          //    find turnoutOutput(T, T)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_T, var_T), TurnoutOutput.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("message", "outputReflexive");
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("T")
+                              }));
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Reachable.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Reachable.java
new file mode 100644
index 00000000..93d43c21
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Reachable.java
@@ -0,0 +1,719 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Segment;
+import modes3.queries.Adjacent;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.BinaryTransitiveClosure;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern reachable(S1 : Segment, S2 : Segment) {
+ *              S1 == S2;
+ *         } or {
+ *              find adjacent+(S1, S2);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class Reachable extends BaseGeneratedEMFQuerySpecification<Reachable.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.reachable pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Segment fS1;
+    
+    private Segment fS2;
+    
+    private static List<String> parameterNames = makeImmutableList("S1", "S2");
+    
+    private Match(final Segment pS1, final Segment pS2) {
+      this.fS1 = pS1;
+      this.fS2 = pS2;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "S1": return this.fS1;
+          case "S2": return this.fS2;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fS1;
+          case 1: return this.fS2;
+          default: return null;
+      }
+    }
+    
+    public Segment getS1() {
+      return this.fS1;
+    }
+    
+    public Segment getS2() {
+      return this.fS2;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("S1".equals(parameterName) ) {
+          this.fS1 = (Segment) newValue;
+          return true;
+      }
+      if ("S2".equals(parameterName) ) {
+          this.fS2 = (Segment) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setS1(final Segment pS1) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fS1 = pS1;
+    }
+    
+    public void setS2(final Segment pS2) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fS2 = pS2;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.reachable";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return Reachable.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fS1, fS2};
+    }
+    
+    @Override
+    public Reachable.Match toImmutable() {
+      return isMutable() ? newMatch(fS1, fS2) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"S1\"=" + prettyPrintValue(fS1) + ", ");
+      result.append("\"S2\"=" + prettyPrintValue(fS2));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fS1, fS2);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof Reachable.Match)) {
+          Reachable.Match other = (Reachable.Match) obj;
+          return Objects.equals(fS1, other.fS1) && Objects.equals(fS2, other.fS2);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public Reachable specification() {
+      return Reachable.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static Reachable.Match newEmptyMatch() {
+      return new Mutable(null, null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static Reachable.Match newMutableMatch(final Segment pS1, final Segment pS2) {
+      return new Mutable(pS1, pS2);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static Reachable.Match newMatch(final Segment pS1, final Segment pS2) {
+      return new Immutable(pS1, pS2);
+    }
+    
+    private static final class Mutable extends Reachable.Match {
+      Mutable(final Segment pS1, final Segment pS2) {
+        super(pS1, pS2);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends Reachable.Match {
+      Immutable(final Segment pS1, final Segment pS2) {
+        super(pS1, pS2);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.reachable pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern reachable(S1 : Segment, S2 : Segment) {
+   *    S1 == S2;
+   * } or {
+   *    find adjacent+(S1, S2);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see Reachable
+   * 
+   */
+  public static class Matcher extends BaseMatcher<Reachable.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static Reachable.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static Reachable.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_S1 = 0;
+    
+    private static final int POSITION_S2 = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(Reachable.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<Reachable.Match> getAllMatches(final Segment pS1, final Segment pS2) {
+      return rawStreamAllMatches(new Object[]{pS1, pS2}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<Reachable.Match> streamAllMatches(final Segment pS1, final Segment pS2) {
+      return rawStreamAllMatches(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<Reachable.Match> getOneArbitraryMatch(final Segment pS1, final Segment pS2) {
+      return rawGetOneArbitraryMatch(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Segment pS1, final Segment pS2) {
+      return rawHasMatch(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Segment pS1, final Segment pS2) {
+      return rawCountMatches(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Segment pS1, final Segment pS2, final Consumer<? super Reachable.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pS1, pS2}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public Reachable.Match newMatch(final Segment pS1, final Segment pS2) {
+      return Reachable.Match.newMatch(pS1, pS2);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOfS1(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_S1, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS1() {
+      return rawStreamAllValuesOfS1(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS1() {
+      return rawStreamAllValuesOfS1(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS1(final Reachable.Match partialMatch) {
+      return rawStreamAllValuesOfS1(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS1(final Segment pS2) {
+      return rawStreamAllValuesOfS1(new Object[]{null, pS2});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS1(final Reachable.Match partialMatch) {
+      return rawStreamAllValuesOfS1(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS1(final Segment pS2) {
+      return rawStreamAllValuesOfS1(new Object[]{null, pS2}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOfS2(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_S2, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS2() {
+      return rawStreamAllValuesOfS2(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS2() {
+      return rawStreamAllValuesOfS2(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS2(final Reachable.Match partialMatch) {
+      return rawStreamAllValuesOfS2(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS2(final Segment pS1) {
+      return rawStreamAllValuesOfS2(new Object[]{pS1, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS2(final Reachable.Match partialMatch) {
+      return rawStreamAllValuesOfS2(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS2(final Segment pS1) {
+      return rawStreamAllValuesOfS2(new Object[]{pS1, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected Reachable.Match tupleToMatch(final Tuple t) {
+      try {
+          return Reachable.Match.newMatch((Segment) t.get(POSITION_S1), (Segment) t.get(POSITION_S2));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Reachable.Match arrayToMatch(final Object[] match) {
+      try {
+          return Reachable.Match.newMatch((Segment) match[POSITION_S1], (Segment) match[POSITION_S2]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Reachable.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return Reachable.Match.newMutableMatch((Segment) match[POSITION_S1], (Segment) match[POSITION_S2]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<Reachable.Matcher> querySpecification() {
+      return Reachable.instance();
+    }
+  }
+  
+  private Reachable() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static Reachable instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected Reachable.Matcher instantiate(final ViatraQueryEngine engine) {
+    return Reachable.Matcher.on(engine);
+  }
+  
+  @Override
+  public Reachable.Matcher instantiate() {
+    return Reachable.Matcher.create();
+  }
+  
+  @Override
+  public Reachable.Match newEmptyMatch() {
+    return Reachable.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public Reachable.Match newMatch(final Object... parameters) {
+    return Reachable.Match.newMatch((modes3.Segment) parameters[0], (modes3.Segment) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link Reachable} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link Reachable#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final Reachable INSTANCE = new Reachable();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final Reachable.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_S1 = new PParameter("S1", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_S2 = new PParameter("S2", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_S1, parameter_S2);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.reachable";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("S1","S2");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_S1 = body.getOrCreateVariableByName("S1");
+          PVariable var_S2 = body.getOrCreateVariableByName("S2");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_S1, parameter_S1),
+             new ExportedParameter(body, var_S2, parameter_S2)
+          ));
+          //    S1 == S2
+          new Equality(body, var_S1, var_S2);
+          bodies.add(body);
+      }
+      {
+          PBody body = new PBody(this);
+          PVariable var_S1 = body.getOrCreateVariableByName("S1");
+          PVariable var_S2 = body.getOrCreateVariableByName("S2");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_S1, parameter_S1),
+             new ExportedParameter(body, var_S2, parameter_S2)
+          ));
+          //    find adjacent+(S1, S2)
+          new BinaryTransitiveClosure(body, Tuples.flatTupleOf(var_S1, var_S2), Adjacent.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooFewInputsOfTurnout.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooFewInputsOfTurnout.java
new file mode 100644
index 00000000..088640ca
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooFewInputsOfTurnout.java
@@ -0,0 +1,559 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Turnout;
+import modes3.queries.InputsOfTurnout;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(message = "tooFewInputsOfTurnout", severity = "error", key = { T })
+ *         pattern tooFewInputsOfTurnout(T : Turnout) {
+ *              neg find inputsOfTurnout(T);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class TooFewInputsOfTurnout extends BaseGeneratedEMFQuerySpecification<TooFewInputsOfTurnout.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.tooFewInputsOfTurnout pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Turnout fT;
+    
+    private static List<String> parameterNames = makeImmutableList("T");
+    
+    private Match(final Turnout pT) {
+      this.fT = pT;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "T": return this.fT;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fT;
+          default: return null;
+      }
+    }
+    
+    public Turnout getT() {
+      return this.fT;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("T".equals(parameterName) ) {
+          this.fT = (Turnout) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setT(final Turnout pT) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fT = pT;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.tooFewInputsOfTurnout";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return TooFewInputsOfTurnout.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fT};
+    }
+    
+    @Override
+    public TooFewInputsOfTurnout.Match toImmutable() {
+      return isMutable() ? newMatch(fT) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"T\"=" + prettyPrintValue(fT));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fT);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof TooFewInputsOfTurnout.Match)) {
+          TooFewInputsOfTurnout.Match other = (TooFewInputsOfTurnout.Match) obj;
+          return Objects.equals(fT, other.fT);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public TooFewInputsOfTurnout specification() {
+      return TooFewInputsOfTurnout.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static TooFewInputsOfTurnout.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static TooFewInputsOfTurnout.Match newMutableMatch(final Turnout pT) {
+      return new Mutable(pT);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static TooFewInputsOfTurnout.Match newMatch(final Turnout pT) {
+      return new Immutable(pT);
+    }
+    
+    private static final class Mutable extends TooFewInputsOfTurnout.Match {
+      Mutable(final Turnout pT) {
+        super(pT);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends TooFewInputsOfTurnout.Match {
+      Immutable(final Turnout pT) {
+        super(pT);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.tooFewInputsOfTurnout pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(message = "tooFewInputsOfTurnout", severity = "error", key = { T })
+   * pattern tooFewInputsOfTurnout(T : Turnout) {
+   *    neg find inputsOfTurnout(T);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see TooFewInputsOfTurnout
+   * 
+   */
+  public static class Matcher extends BaseMatcher<TooFewInputsOfTurnout.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static TooFewInputsOfTurnout.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static TooFewInputsOfTurnout.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_T = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(TooFewInputsOfTurnout.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<TooFewInputsOfTurnout.Match> getAllMatches(final Turnout pT) {
+      return rawStreamAllMatches(new Object[]{pT}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<TooFewInputsOfTurnout.Match> streamAllMatches(final Turnout pT) {
+      return rawStreamAllMatches(new Object[]{pT});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<TooFewInputsOfTurnout.Match> getOneArbitraryMatch(final Turnout pT) {
+      return rawGetOneArbitraryMatch(new Object[]{pT});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Turnout pT) {
+      return rawHasMatch(new Object[]{pT});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Turnout pT) {
+      return rawCountMatches(new Object[]{pT});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Turnout pT, final Consumer<? super TooFewInputsOfTurnout.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pT}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public TooFewInputsOfTurnout.Match newMatch(final Turnout pT) {
+      return TooFewInputsOfTurnout.Match.newMatch(pT);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Turnout> rawStreamAllValuesOfT(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_T, parameters).map(Turnout.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Turnout> getAllValuesOfT() {
+      return rawStreamAllValuesOfT(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Turnout> streamAllValuesOfT() {
+      return rawStreamAllValuesOfT(emptyArray());
+    }
+    
+    @Override
+    protected TooFewInputsOfTurnout.Match tupleToMatch(final Tuple t) {
+      try {
+          return TooFewInputsOfTurnout.Match.newMatch((Turnout) t.get(POSITION_T));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected TooFewInputsOfTurnout.Match arrayToMatch(final Object[] match) {
+      try {
+          return TooFewInputsOfTurnout.Match.newMatch((Turnout) match[POSITION_T]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected TooFewInputsOfTurnout.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return TooFewInputsOfTurnout.Match.newMutableMatch((Turnout) match[POSITION_T]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<TooFewInputsOfTurnout.Matcher> querySpecification() {
+      return TooFewInputsOfTurnout.instance();
+    }
+  }
+  
+  private TooFewInputsOfTurnout() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static TooFewInputsOfTurnout instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected TooFewInputsOfTurnout.Matcher instantiate(final ViatraQueryEngine engine) {
+    return TooFewInputsOfTurnout.Matcher.on(engine);
+  }
+  
+  @Override
+  public TooFewInputsOfTurnout.Matcher instantiate() {
+    return TooFewInputsOfTurnout.Matcher.create();
+  }
+  
+  @Override
+  public TooFewInputsOfTurnout.Match newEmptyMatch() {
+    return TooFewInputsOfTurnout.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public TooFewInputsOfTurnout.Match newMatch(final Object... parameters) {
+    return TooFewInputsOfTurnout.Match.newMatch((modes3.Turnout) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link TooFewInputsOfTurnout} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link TooFewInputsOfTurnout#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final TooFewInputsOfTurnout INSTANCE = new TooFewInputsOfTurnout();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final TooFewInputsOfTurnout.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_T = new PParameter("T", "modes3.Turnout", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_T);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.tooFewInputsOfTurnout";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("T");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_T = body.getOrCreateVariableByName("T");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_T, parameter_T)
+          ));
+          //    neg find inputsOfTurnout(T)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var_T), InputsOfTurnout.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("message", "tooFewInputsOfTurnout");
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("T")
+                              }));
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooManyInputsOfSegment.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooManyInputsOfSegment.java
new file mode 100644
index 00000000..d12ec23e
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooManyInputsOfSegment.java
@@ -0,0 +1,583 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.SimpleSegment;
+import modes3.queries.Output;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(message = "tooManyInputsOfSegment", severity = "error", key = { S })
+ *         pattern tooManyInputsOfSegment(S : SimpleSegment) {
+ *              find output(I1, S);
+ *              find output(I2, S);
+ *              find output(I3, S);
+ *              I1 != I2;
+ *              I1 != I3;
+ *              I2 != I3;
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class TooManyInputsOfSegment extends BaseGeneratedEMFQuerySpecification<TooManyInputsOfSegment.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.tooManyInputsOfSegment pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private SimpleSegment fS;
+    
+    private static List<String> parameterNames = makeImmutableList("S");
+    
+    private Match(final SimpleSegment pS) {
+      this.fS = pS;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "S": return this.fS;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fS;
+          default: return null;
+      }
+    }
+    
+    public SimpleSegment getS() {
+      return this.fS;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("S".equals(parameterName) ) {
+          this.fS = (SimpleSegment) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setS(final SimpleSegment pS) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fS = pS;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.tooManyInputsOfSegment";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return TooManyInputsOfSegment.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fS};
+    }
+    
+    @Override
+    public TooManyInputsOfSegment.Match toImmutable() {
+      return isMutable() ? newMatch(fS) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"S\"=" + prettyPrintValue(fS));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fS);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof TooManyInputsOfSegment.Match)) {
+          TooManyInputsOfSegment.Match other = (TooManyInputsOfSegment.Match) obj;
+          return Objects.equals(fS, other.fS);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public TooManyInputsOfSegment specification() {
+      return TooManyInputsOfSegment.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static TooManyInputsOfSegment.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static TooManyInputsOfSegment.Match newMutableMatch(final SimpleSegment pS) {
+      return new Mutable(pS);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static TooManyInputsOfSegment.Match newMatch(final SimpleSegment pS) {
+      return new Immutable(pS);
+    }
+    
+    private static final class Mutable extends TooManyInputsOfSegment.Match {
+      Mutable(final SimpleSegment pS) {
+        super(pS);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends TooManyInputsOfSegment.Match {
+      Immutable(final SimpleSegment pS) {
+        super(pS);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.tooManyInputsOfSegment pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(message = "tooManyInputsOfSegment", severity = "error", key = { S })
+   * pattern tooManyInputsOfSegment(S : SimpleSegment) {
+   *    find output(I1, S);
+   *    find output(I2, S);
+   *    find output(I3, S);
+   *    I1 != I2;
+   *    I1 != I3;
+   *    I2 != I3;
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see TooManyInputsOfSegment
+   * 
+   */
+  public static class Matcher extends BaseMatcher<TooManyInputsOfSegment.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static TooManyInputsOfSegment.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static TooManyInputsOfSegment.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_S = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(TooManyInputsOfSegment.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<TooManyInputsOfSegment.Match> getAllMatches(final SimpleSegment pS) {
+      return rawStreamAllMatches(new Object[]{pS}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<TooManyInputsOfSegment.Match> streamAllMatches(final SimpleSegment pS) {
+      return rawStreamAllMatches(new Object[]{pS});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<TooManyInputsOfSegment.Match> getOneArbitraryMatch(final SimpleSegment pS) {
+      return rawGetOneArbitraryMatch(new Object[]{pS});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final SimpleSegment pS) {
+      return rawHasMatch(new Object[]{pS});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final SimpleSegment pS) {
+      return rawCountMatches(new Object[]{pS});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final SimpleSegment pS, final Consumer<? super TooManyInputsOfSegment.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pS}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public TooManyInputsOfSegment.Match newMatch(final SimpleSegment pS) {
+      return TooManyInputsOfSegment.Match.newMatch(pS);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<SimpleSegment> rawStreamAllValuesOfS(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_S, parameters).map(SimpleSegment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<SimpleSegment> getAllValuesOfS() {
+      return rawStreamAllValuesOfS(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<SimpleSegment> streamAllValuesOfS() {
+      return rawStreamAllValuesOfS(emptyArray());
+    }
+    
+    @Override
+    protected TooManyInputsOfSegment.Match tupleToMatch(final Tuple t) {
+      try {
+          return TooManyInputsOfSegment.Match.newMatch((SimpleSegment) t.get(POSITION_S));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected TooManyInputsOfSegment.Match arrayToMatch(final Object[] match) {
+      try {
+          return TooManyInputsOfSegment.Match.newMatch((SimpleSegment) match[POSITION_S]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected TooManyInputsOfSegment.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return TooManyInputsOfSegment.Match.newMutableMatch((SimpleSegment) match[POSITION_S]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<TooManyInputsOfSegment.Matcher> querySpecification() {
+      return TooManyInputsOfSegment.instance();
+    }
+  }
+  
+  private TooManyInputsOfSegment() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static TooManyInputsOfSegment instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected TooManyInputsOfSegment.Matcher instantiate(final ViatraQueryEngine engine) {
+    return TooManyInputsOfSegment.Matcher.on(engine);
+  }
+  
+  @Override
+  public TooManyInputsOfSegment.Matcher instantiate() {
+    return TooManyInputsOfSegment.Matcher.create();
+  }
+  
+  @Override
+  public TooManyInputsOfSegment.Match newEmptyMatch() {
+    return TooManyInputsOfSegment.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public TooManyInputsOfSegment.Match newMatch(final Object... parameters) {
+    return TooManyInputsOfSegment.Match.newMatch((modes3.SimpleSegment) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link TooManyInputsOfSegment} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link TooManyInputsOfSegment#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final TooManyInputsOfSegment INSTANCE = new TooManyInputsOfSegment();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final TooManyInputsOfSegment.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_S = new PParameter("S", "modes3.SimpleSegment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "SimpleSegment")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_S);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.tooManyInputsOfSegment";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("S");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_S = body.getOrCreateVariableByName("S");
+          PVariable var_I1 = body.getOrCreateVariableByName("I1");
+          PVariable var_I2 = body.getOrCreateVariableByName("I2");
+          PVariable var_I3 = body.getOrCreateVariableByName("I3");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "SimpleSegment")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_S, parameter_S)
+          ));
+          //    find output(I1, S)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_I1, var_S), Output.instance().getInternalQueryRepresentation());
+          //    find output(I2, S)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_I2, var_S), Output.instance().getInternalQueryRepresentation());
+          //    find output(I3, S)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_I3, var_S), Output.instance().getInternalQueryRepresentation());
+          //    I1 != I2
+          new Inequality(body, var_I1, var_I2);
+          //    I1 != I3
+          new Inequality(body, var_I1, var_I3);
+          //    I2 != I3
+          new Inequality(body, var_I2, var_I3);
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("message", "tooManyInputsOfSegment");
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("S")
+                              }));
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooManyInputsOfTurnout.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooManyInputsOfTurnout.java
new file mode 100644
index 00000000..93076cbb
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TooManyInputsOfTurnout.java
@@ -0,0 +1,600 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Turnout;
+import modes3.queries.Adjacent;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(message = "turnoutConnectedToBothOutputs", severity = "error", key = { T })
+ *         pattern tooManyInputsOfTurnout(T : Turnout) {
+ *              find adjacent(I1, T);
+ *              find adjacent(I2, T);
+ *              find adjacent(I3, T);
+ *              find adjacent(I4, T);
+ *              I1 != I2;
+ *              I1 != I3;
+ *              I1 != I4;
+ *              I2 != I3;
+ *              I2 != I4;
+ *              I3 != I4;
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class TooManyInputsOfTurnout extends BaseGeneratedEMFQuerySpecification<TooManyInputsOfTurnout.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.tooManyInputsOfTurnout pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Turnout fT;
+    
+    private static List<String> parameterNames = makeImmutableList("T");
+    
+    private Match(final Turnout pT) {
+      this.fT = pT;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "T": return this.fT;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fT;
+          default: return null;
+      }
+    }
+    
+    public Turnout getT() {
+      return this.fT;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("T".equals(parameterName) ) {
+          this.fT = (Turnout) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setT(final Turnout pT) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fT = pT;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.tooManyInputsOfTurnout";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return TooManyInputsOfTurnout.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fT};
+    }
+    
+    @Override
+    public TooManyInputsOfTurnout.Match toImmutable() {
+      return isMutable() ? newMatch(fT) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"T\"=" + prettyPrintValue(fT));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fT);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof TooManyInputsOfTurnout.Match)) {
+          TooManyInputsOfTurnout.Match other = (TooManyInputsOfTurnout.Match) obj;
+          return Objects.equals(fT, other.fT);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public TooManyInputsOfTurnout specification() {
+      return TooManyInputsOfTurnout.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static TooManyInputsOfTurnout.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static TooManyInputsOfTurnout.Match newMutableMatch(final Turnout pT) {
+      return new Mutable(pT);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static TooManyInputsOfTurnout.Match newMatch(final Turnout pT) {
+      return new Immutable(pT);
+    }
+    
+    private static final class Mutable extends TooManyInputsOfTurnout.Match {
+      Mutable(final Turnout pT) {
+        super(pT);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends TooManyInputsOfTurnout.Match {
+      Immutable(final Turnout pT) {
+        super(pT);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.tooManyInputsOfTurnout pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(message = "turnoutConnectedToBothOutputs", severity = "error", key = { T })
+   * pattern tooManyInputsOfTurnout(T : Turnout) {
+   *    find adjacent(I1, T);
+   *    find adjacent(I2, T);
+   *    find adjacent(I3, T);
+   *    find adjacent(I4, T);
+   *    I1 != I2;
+   *    I1 != I3;
+   *    I1 != I4;
+   *    I2 != I3;
+   *    I2 != I4;
+   *    I3 != I4;
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see TooManyInputsOfTurnout
+   * 
+   */
+  public static class Matcher extends BaseMatcher<TooManyInputsOfTurnout.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static TooManyInputsOfTurnout.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static TooManyInputsOfTurnout.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_T = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(TooManyInputsOfTurnout.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<TooManyInputsOfTurnout.Match> getAllMatches(final Turnout pT) {
+      return rawStreamAllMatches(new Object[]{pT}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<TooManyInputsOfTurnout.Match> streamAllMatches(final Turnout pT) {
+      return rawStreamAllMatches(new Object[]{pT});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<TooManyInputsOfTurnout.Match> getOneArbitraryMatch(final Turnout pT) {
+      return rawGetOneArbitraryMatch(new Object[]{pT});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Turnout pT) {
+      return rawHasMatch(new Object[]{pT});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Turnout pT) {
+      return rawCountMatches(new Object[]{pT});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Turnout pT, final Consumer<? super TooManyInputsOfTurnout.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pT}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public TooManyInputsOfTurnout.Match newMatch(final Turnout pT) {
+      return TooManyInputsOfTurnout.Match.newMatch(pT);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Turnout> rawStreamAllValuesOfT(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_T, parameters).map(Turnout.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Turnout> getAllValuesOfT() {
+      return rawStreamAllValuesOfT(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Turnout> streamAllValuesOfT() {
+      return rawStreamAllValuesOfT(emptyArray());
+    }
+    
+    @Override
+    protected TooManyInputsOfTurnout.Match tupleToMatch(final Tuple t) {
+      try {
+          return TooManyInputsOfTurnout.Match.newMatch((Turnout) t.get(POSITION_T));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected TooManyInputsOfTurnout.Match arrayToMatch(final Object[] match) {
+      try {
+          return TooManyInputsOfTurnout.Match.newMatch((Turnout) match[POSITION_T]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected TooManyInputsOfTurnout.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return TooManyInputsOfTurnout.Match.newMutableMatch((Turnout) match[POSITION_T]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<TooManyInputsOfTurnout.Matcher> querySpecification() {
+      return TooManyInputsOfTurnout.instance();
+    }
+  }
+  
+  private TooManyInputsOfTurnout() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static TooManyInputsOfTurnout instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected TooManyInputsOfTurnout.Matcher instantiate(final ViatraQueryEngine engine) {
+    return TooManyInputsOfTurnout.Matcher.on(engine);
+  }
+  
+  @Override
+  public TooManyInputsOfTurnout.Matcher instantiate() {
+    return TooManyInputsOfTurnout.Matcher.create();
+  }
+  
+  @Override
+  public TooManyInputsOfTurnout.Match newEmptyMatch() {
+    return TooManyInputsOfTurnout.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public TooManyInputsOfTurnout.Match newMatch(final Object... parameters) {
+    return TooManyInputsOfTurnout.Match.newMatch((modes3.Turnout) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link TooManyInputsOfTurnout} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link TooManyInputsOfTurnout#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final TooManyInputsOfTurnout INSTANCE = new TooManyInputsOfTurnout();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final TooManyInputsOfTurnout.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_T = new PParameter("T", "modes3.Turnout", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_T);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.tooManyInputsOfTurnout";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("T");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_T = body.getOrCreateVariableByName("T");
+          PVariable var_I1 = body.getOrCreateVariableByName("I1");
+          PVariable var_I2 = body.getOrCreateVariableByName("I2");
+          PVariable var_I3 = body.getOrCreateVariableByName("I3");
+          PVariable var_I4 = body.getOrCreateVariableByName("I4");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_T, parameter_T)
+          ));
+          //    find adjacent(I1, T)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_I1, var_T), Adjacent.instance().getInternalQueryRepresentation());
+          //    find adjacent(I2, T)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_I2, var_T), Adjacent.instance().getInternalQueryRepresentation());
+          //    find adjacent(I3, T)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_I3, var_T), Adjacent.instance().getInternalQueryRepresentation());
+          //    find adjacent(I4, T)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_I4, var_T), Adjacent.instance().getInternalQueryRepresentation());
+          //    I1 != I2
+          new Inequality(body, var_I1, var_I2);
+          //    I1 != I3
+          new Inequality(body, var_I1, var_I3);
+          //    I1 != I4
+          new Inequality(body, var_I1, var_I4);
+          //    I2 != I3
+          new Inequality(body, var_I2, var_I3);
+          //    I2 != I4
+          new Inequality(body, var_I2, var_I4);
+          //    I3 != I4
+          new Inequality(body, var_I3, var_I4);
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("message", "turnoutConnectedToBothOutputs");
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("T")
+                              }));
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TrainLocations_step_2.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TrainLocations_step_2.java
new file mode 100644
index 00000000..5bf153c3
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TrainLocations_step_2.java
@@ -0,0 +1,564 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Train;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         //
+ *         // trainLocations
+ *         //
+ *         
+ *         pattern trainLocations_step_2(in train : Train) {
+ *         //   frame-{@literal >}train = model-{@literal >}trains[i0];
+ *         //   frame-{@literal >}location = frame-{@literal >}train-{@literal >}location;
+ *         //   if (frame-{@literal >}location != NULL) {
+ *         //     ...
+ *         //   }
+ *         
+ *              Train(train);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class TrainLocations_step_2 extends BaseGeneratedEMFQuerySpecification<TrainLocations_step_2.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.trainLocations_step_2 pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Train fTrain;
+    
+    private static List<String> parameterNames = makeImmutableList("train");
+    
+    private Match(final Train pTrain) {
+      this.fTrain = pTrain;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "train": return this.fTrain;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fTrain;
+          default: return null;
+      }
+    }
+    
+    public Train getTrain() {
+      return this.fTrain;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("train".equals(parameterName) ) {
+          this.fTrain = (Train) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setTrain(final Train pTrain) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fTrain = pTrain;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.trainLocations_step_2";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return TrainLocations_step_2.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fTrain};
+    }
+    
+    @Override
+    public TrainLocations_step_2.Match toImmutable() {
+      return isMutable() ? newMatch(fTrain) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"train\"=" + prettyPrintValue(fTrain));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fTrain);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof TrainLocations_step_2.Match)) {
+          TrainLocations_step_2.Match other = (TrainLocations_step_2.Match) obj;
+          return Objects.equals(fTrain, other.fTrain);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public TrainLocations_step_2 specification() {
+      return TrainLocations_step_2.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static TrainLocations_step_2.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static TrainLocations_step_2.Match newMutableMatch(final Train pTrain) {
+      return new Mutable(pTrain);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static TrainLocations_step_2.Match newMatch(final Train pTrain) {
+      return new Immutable(pTrain);
+    }
+    
+    private static final class Mutable extends TrainLocations_step_2.Match {
+      Mutable(final Train pTrain) {
+        super(pTrain);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends TrainLocations_step_2.Match {
+      Immutable(final Train pTrain) {
+        super(pTrain);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.trainLocations_step_2 pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * //
+   * // trainLocations
+   * //
+   * 
+   * pattern trainLocations_step_2(in train : Train) {
+   * //   frame-{@literal >}train = model-{@literal >}trains[i0];
+   * //   frame-{@literal >}location = frame-{@literal >}train-{@literal >}location;
+   * //   if (frame-{@literal >}location != NULL) {
+   * //     ...
+   * //   }
+   * 
+   *    Train(train);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see TrainLocations_step_2
+   * 
+   */
+  public static class Matcher extends BaseMatcher<TrainLocations_step_2.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static TrainLocations_step_2.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static TrainLocations_step_2.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_TRAIN = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(TrainLocations_step_2.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<TrainLocations_step_2.Match> getAllMatches(final Train pTrain) {
+      return rawStreamAllMatches(new Object[]{pTrain}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<TrainLocations_step_2.Match> streamAllMatches(final Train pTrain) {
+      return rawStreamAllMatches(new Object[]{pTrain});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<TrainLocations_step_2.Match> getOneArbitraryMatch(final Train pTrain) {
+      return rawGetOneArbitraryMatch(new Object[]{pTrain});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Train pTrain) {
+      return rawHasMatch(new Object[]{pTrain});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Train pTrain) {
+      return rawCountMatches(new Object[]{pTrain});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Train pTrain, final Consumer<? super TrainLocations_step_2.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pTrain}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public TrainLocations_step_2.Match newMatch(final Train pTrain) {
+      return TrainLocations_step_2.Match.newMatch(pTrain);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Train> rawStreamAllValuesOftrain(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_TRAIN, parameters).map(Train.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Train> getAllValuesOftrain() {
+      return rawStreamAllValuesOftrain(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Train> streamAllValuesOftrain() {
+      return rawStreamAllValuesOftrain(emptyArray());
+    }
+    
+    @Override
+    protected TrainLocations_step_2.Match tupleToMatch(final Tuple t) {
+      try {
+          return TrainLocations_step_2.Match.newMatch((Train) t.get(POSITION_TRAIN));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected TrainLocations_step_2.Match arrayToMatch(final Object[] match) {
+      try {
+          return TrainLocations_step_2.Match.newMatch((Train) match[POSITION_TRAIN]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected TrainLocations_step_2.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return TrainLocations_step_2.Match.newMutableMatch((Train) match[POSITION_TRAIN]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<TrainLocations_step_2.Matcher> querySpecification() {
+      return TrainLocations_step_2.instance();
+    }
+  }
+  
+  private TrainLocations_step_2() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static TrainLocations_step_2 instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected TrainLocations_step_2.Matcher instantiate(final ViatraQueryEngine engine) {
+    return TrainLocations_step_2.Matcher.on(engine);
+  }
+  
+  @Override
+  public TrainLocations_step_2.Matcher instantiate() {
+    return TrainLocations_step_2.Matcher.create();
+  }
+  
+  @Override
+  public TrainLocations_step_2.Match newEmptyMatch() {
+    return TrainLocations_step_2.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public TrainLocations_step_2.Match newMatch(final Object... parameters) {
+    return TrainLocations_step_2.Match.newMatch((modes3.Train) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link TrainLocations_step_2} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link TrainLocations_step_2#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final TrainLocations_step_2 INSTANCE = new TrainLocations_step_2();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final TrainLocations_step_2.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_train = new PParameter("train", "modes3.Train", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Train")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_train);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.trainLocations_step_2";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("train");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_train = body.getOrCreateVariableByName("train");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_train, parameter_train)
+          ));
+          // //   frame->train = model->trains[i0];//   frame->location = frame->train->location;//   if (frame->location != NULL) {//     ...//   }    Train(train)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train")));
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TrainLocations_step_3.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TrainLocations_step_3.java
new file mode 100644
index 00000000..edbd4af3
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TrainLocations_step_3.java
@@ -0,0 +1,713 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Segment;
+import modes3.Train;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern trainLocations_step_3(in train : Train, in location : Segment) {
+ *         //     results-{@literal >}matches[match_cntr].location = frame-{@literal >}location;
+ *         //     results-{@literal >}matches[match_cntr++].train = frame-{@literal >}train;
+ *              Train(train);
+ *             Train.location(train, location);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class TrainLocations_step_3 extends BaseGeneratedEMFQuerySpecification<TrainLocations_step_3.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.trainLocations_step_3 pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Train fTrain;
+    
+    private Segment fLocation;
+    
+    private static List<String> parameterNames = makeImmutableList("train", "location");
+    
+    private Match(final Train pTrain, final Segment pLocation) {
+      this.fTrain = pTrain;
+      this.fLocation = pLocation;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "train": return this.fTrain;
+          case "location": return this.fLocation;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fTrain;
+          case 1: return this.fLocation;
+          default: return null;
+      }
+    }
+    
+    public Train getTrain() {
+      return this.fTrain;
+    }
+    
+    public Segment getLocation() {
+      return this.fLocation;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("train".equals(parameterName) ) {
+          this.fTrain = (Train) newValue;
+          return true;
+      }
+      if ("location".equals(parameterName) ) {
+          this.fLocation = (Segment) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setTrain(final Train pTrain) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fTrain = pTrain;
+    }
+    
+    public void setLocation(final Segment pLocation) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fLocation = pLocation;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.trainLocations_step_3";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return TrainLocations_step_3.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fTrain, fLocation};
+    }
+    
+    @Override
+    public TrainLocations_step_3.Match toImmutable() {
+      return isMutable() ? newMatch(fTrain, fLocation) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"train\"=" + prettyPrintValue(fTrain) + ", ");
+      result.append("\"location\"=" + prettyPrintValue(fLocation));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fTrain, fLocation);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof TrainLocations_step_3.Match)) {
+          TrainLocations_step_3.Match other = (TrainLocations_step_3.Match) obj;
+          return Objects.equals(fTrain, other.fTrain) && Objects.equals(fLocation, other.fLocation);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public TrainLocations_step_3 specification() {
+      return TrainLocations_step_3.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static TrainLocations_step_3.Match newEmptyMatch() {
+      return new Mutable(null, null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static TrainLocations_step_3.Match newMutableMatch(final Train pTrain, final Segment pLocation) {
+      return new Mutable(pTrain, pLocation);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static TrainLocations_step_3.Match newMatch(final Train pTrain, final Segment pLocation) {
+      return new Immutable(pTrain, pLocation);
+    }
+    
+    private static final class Mutable extends TrainLocations_step_3.Match {
+      Mutable(final Train pTrain, final Segment pLocation) {
+        super(pTrain, pLocation);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends TrainLocations_step_3.Match {
+      Immutable(final Train pTrain, final Segment pLocation) {
+        super(pTrain, pLocation);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.trainLocations_step_3 pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern trainLocations_step_3(in train : Train, in location : Segment) {
+   * //     results-{@literal >}matches[match_cntr].location = frame-{@literal >}location;
+   * //     results-{@literal >}matches[match_cntr++].train = frame-{@literal >}train;
+   *    Train(train);
+   *     Train.location(train, location);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see TrainLocations_step_3
+   * 
+   */
+  public static class Matcher extends BaseMatcher<TrainLocations_step_3.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static TrainLocations_step_3.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static TrainLocations_step_3.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_TRAIN = 0;
+    
+    private static final int POSITION_LOCATION = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(TrainLocations_step_3.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<TrainLocations_step_3.Match> getAllMatches(final Train pTrain, final Segment pLocation) {
+      return rawStreamAllMatches(new Object[]{pTrain, pLocation}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<TrainLocations_step_3.Match> streamAllMatches(final Train pTrain, final Segment pLocation) {
+      return rawStreamAllMatches(new Object[]{pTrain, pLocation});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<TrainLocations_step_3.Match> getOneArbitraryMatch(final Train pTrain, final Segment pLocation) {
+      return rawGetOneArbitraryMatch(new Object[]{pTrain, pLocation});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Train pTrain, final Segment pLocation) {
+      return rawHasMatch(new Object[]{pTrain, pLocation});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Train pTrain, final Segment pLocation) {
+      return rawCountMatches(new Object[]{pTrain, pLocation});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Train pTrain, final Segment pLocation, final Consumer<? super TrainLocations_step_3.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pTrain, pLocation}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pTrain the fixed value of pattern parameter train, or null if not bound.
+     * @param pLocation the fixed value of pattern parameter location, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public TrainLocations_step_3.Match newMatch(final Train pTrain, final Segment pLocation) {
+      return TrainLocations_step_3.Match.newMatch(pTrain, pLocation);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Train> rawStreamAllValuesOftrain(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_TRAIN, parameters).map(Train.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Train> getAllValuesOftrain() {
+      return rawStreamAllValuesOftrain(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Train> streamAllValuesOftrain() {
+      return rawStreamAllValuesOftrain(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Train> streamAllValuesOftrain(final TrainLocations_step_3.Match partialMatch) {
+      return rawStreamAllValuesOftrain(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Train> streamAllValuesOftrain(final Segment pLocation) {
+      return rawStreamAllValuesOftrain(new Object[]{null, pLocation});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Train> getAllValuesOftrain(final TrainLocations_step_3.Match partialMatch) {
+      return rawStreamAllValuesOftrain(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for train.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Train> getAllValuesOftrain(final Segment pLocation) {
+      return rawStreamAllValuesOftrain(new Object[]{null, pLocation}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOflocation(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_LOCATION, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOflocation() {
+      return rawStreamAllValuesOflocation(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOflocation() {
+      return rawStreamAllValuesOflocation(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOflocation(final TrainLocations_step_3.Match partialMatch) {
+      return rawStreamAllValuesOflocation(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOflocation(final Train pTrain) {
+      return rawStreamAllValuesOflocation(new Object[]{pTrain, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOflocation(final TrainLocations_step_3.Match partialMatch) {
+      return rawStreamAllValuesOflocation(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for location.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOflocation(final Train pTrain) {
+      return rawStreamAllValuesOflocation(new Object[]{pTrain, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected TrainLocations_step_3.Match tupleToMatch(final Tuple t) {
+      try {
+          return TrainLocations_step_3.Match.newMatch((Train) t.get(POSITION_TRAIN), (Segment) t.get(POSITION_LOCATION));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected TrainLocations_step_3.Match arrayToMatch(final Object[] match) {
+      try {
+          return TrainLocations_step_3.Match.newMatch((Train) match[POSITION_TRAIN], (Segment) match[POSITION_LOCATION]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected TrainLocations_step_3.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return TrainLocations_step_3.Match.newMutableMatch((Train) match[POSITION_TRAIN], (Segment) match[POSITION_LOCATION]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<TrainLocations_step_3.Matcher> querySpecification() {
+      return TrainLocations_step_3.instance();
+    }
+  }
+  
+  private TrainLocations_step_3() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static TrainLocations_step_3 instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected TrainLocations_step_3.Matcher instantiate(final ViatraQueryEngine engine) {
+    return TrainLocations_step_3.Matcher.on(engine);
+  }
+  
+  @Override
+  public TrainLocations_step_3.Matcher instantiate() {
+    return TrainLocations_step_3.Matcher.create();
+  }
+  
+  @Override
+  public TrainLocations_step_3.Match newEmptyMatch() {
+    return TrainLocations_step_3.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public TrainLocations_step_3.Match newMatch(final Object... parameters) {
+    return TrainLocations_step_3.Match.newMatch((modes3.Train) parameters[0], (modes3.Segment) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link TrainLocations_step_3} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link TrainLocations_step_3#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final TrainLocations_step_3 INSTANCE = new TrainLocations_step_3();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final TrainLocations_step_3.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_train = new PParameter("train", "modes3.Train", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Train")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_location = new PParameter("location", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_train, parameter_location);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.trainLocations_step_3";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("train","location");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_train = body.getOrCreateVariableByName("train");
+          PVariable var_location = body.getOrCreateVariableByName("location");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_location), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_train, parameter_train),
+             new ExportedParameter(body, var_location, parameter_location)
+          ));
+          // //     results->matches[match_cntr].location = frame->location;//     results->matches[match_cntr++].train = frame->train; Train(train)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train")));
+          //     Train.location(train, location)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_train, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Train", "location")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_0_, var_location);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TurnoutConnectedToBothOutputs.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TurnoutConnectedToBothOutputs.java
new file mode 100644
index 00000000..674bb275
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TurnoutConnectedToBothOutputs.java
@@ -0,0 +1,589 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Turnout;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(message = "turnoutConnectedToBothOutputs", severity = "error", key = { T })
+ *         pattern turnoutConnectedToBothOutputs(T : Turnout) {
+ *              Turnout.straight(T, Straight);
+ *              Turnout.divergent(T, Divergent);
+ *              Segment.connectedTo(T, Straight);
+ *              Segment.connectedTo(T, Divergent);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class TurnoutConnectedToBothOutputs extends BaseGeneratedEMFQuerySpecification<TurnoutConnectedToBothOutputs.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.turnoutConnectedToBothOutputs pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Turnout fT;
+    
+    private static List<String> parameterNames = makeImmutableList("T");
+    
+    private Match(final Turnout pT) {
+      this.fT = pT;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "T": return this.fT;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fT;
+          default: return null;
+      }
+    }
+    
+    public Turnout getT() {
+      return this.fT;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("T".equals(parameterName) ) {
+          this.fT = (Turnout) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setT(final Turnout pT) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fT = pT;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.turnoutConnectedToBothOutputs";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return TurnoutConnectedToBothOutputs.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fT};
+    }
+    
+    @Override
+    public TurnoutConnectedToBothOutputs.Match toImmutable() {
+      return isMutable() ? newMatch(fT) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"T\"=" + prettyPrintValue(fT));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fT);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof TurnoutConnectedToBothOutputs.Match)) {
+          TurnoutConnectedToBothOutputs.Match other = (TurnoutConnectedToBothOutputs.Match) obj;
+          return Objects.equals(fT, other.fT);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public TurnoutConnectedToBothOutputs specification() {
+      return TurnoutConnectedToBothOutputs.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static TurnoutConnectedToBothOutputs.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static TurnoutConnectedToBothOutputs.Match newMutableMatch(final Turnout pT) {
+      return new Mutable(pT);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static TurnoutConnectedToBothOutputs.Match newMatch(final Turnout pT) {
+      return new Immutable(pT);
+    }
+    
+    private static final class Mutable extends TurnoutConnectedToBothOutputs.Match {
+      Mutable(final Turnout pT) {
+        super(pT);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends TurnoutConnectedToBothOutputs.Match {
+      Immutable(final Turnout pT) {
+        super(pT);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.turnoutConnectedToBothOutputs pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(message = "turnoutConnectedToBothOutputs", severity = "error", key = { T })
+   * pattern turnoutConnectedToBothOutputs(T : Turnout) {
+   *    Turnout.straight(T, Straight);
+   *    Turnout.divergent(T, Divergent);
+   *    Segment.connectedTo(T, Straight);
+   *    Segment.connectedTo(T, Divergent);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see TurnoutConnectedToBothOutputs
+   * 
+   */
+  public static class Matcher extends BaseMatcher<TurnoutConnectedToBothOutputs.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static TurnoutConnectedToBothOutputs.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static TurnoutConnectedToBothOutputs.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_T = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(TurnoutConnectedToBothOutputs.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<TurnoutConnectedToBothOutputs.Match> getAllMatches(final Turnout pT) {
+      return rawStreamAllMatches(new Object[]{pT}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<TurnoutConnectedToBothOutputs.Match> streamAllMatches(final Turnout pT) {
+      return rawStreamAllMatches(new Object[]{pT});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<TurnoutConnectedToBothOutputs.Match> getOneArbitraryMatch(final Turnout pT) {
+      return rawGetOneArbitraryMatch(new Object[]{pT});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Turnout pT) {
+      return rawHasMatch(new Object[]{pT});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Turnout pT) {
+      return rawCountMatches(new Object[]{pT});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Turnout pT, final Consumer<? super TurnoutConnectedToBothOutputs.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pT}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public TurnoutConnectedToBothOutputs.Match newMatch(final Turnout pT) {
+      return TurnoutConnectedToBothOutputs.Match.newMatch(pT);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Turnout> rawStreamAllValuesOfT(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_T, parameters).map(Turnout.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Turnout> getAllValuesOfT() {
+      return rawStreamAllValuesOfT(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Turnout> streamAllValuesOfT() {
+      return rawStreamAllValuesOfT(emptyArray());
+    }
+    
+    @Override
+    protected TurnoutConnectedToBothOutputs.Match tupleToMatch(final Tuple t) {
+      try {
+          return TurnoutConnectedToBothOutputs.Match.newMatch((Turnout) t.get(POSITION_T));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected TurnoutConnectedToBothOutputs.Match arrayToMatch(final Object[] match) {
+      try {
+          return TurnoutConnectedToBothOutputs.Match.newMatch((Turnout) match[POSITION_T]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected TurnoutConnectedToBothOutputs.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return TurnoutConnectedToBothOutputs.Match.newMutableMatch((Turnout) match[POSITION_T]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<TurnoutConnectedToBothOutputs.Matcher> querySpecification() {
+      return TurnoutConnectedToBothOutputs.instance();
+    }
+  }
+  
+  private TurnoutConnectedToBothOutputs() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static TurnoutConnectedToBothOutputs instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected TurnoutConnectedToBothOutputs.Matcher instantiate(final ViatraQueryEngine engine) {
+    return TurnoutConnectedToBothOutputs.Matcher.on(engine);
+  }
+  
+  @Override
+  public TurnoutConnectedToBothOutputs.Matcher instantiate() {
+    return TurnoutConnectedToBothOutputs.Matcher.create();
+  }
+  
+  @Override
+  public TurnoutConnectedToBothOutputs.Match newEmptyMatch() {
+    return TurnoutConnectedToBothOutputs.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public TurnoutConnectedToBothOutputs.Match newMatch(final Object... parameters) {
+    return TurnoutConnectedToBothOutputs.Match.newMatch((modes3.Turnout) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link TurnoutConnectedToBothOutputs} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link TurnoutConnectedToBothOutputs#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final TurnoutConnectedToBothOutputs INSTANCE = new TurnoutConnectedToBothOutputs();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final TurnoutConnectedToBothOutputs.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_T = new PParameter("T", "modes3.Turnout", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_T);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.turnoutConnectedToBothOutputs";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("T");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_T = body.getOrCreateVariableByName("T");
+          PVariable var_Straight = body.getOrCreateVariableByName("Straight");
+          PVariable var_Divergent = body.getOrCreateVariableByName("Divergent");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_T, parameter_T)
+          ));
+          //    Turnout.straight(T, Straight)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout", "straight")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_0_, var_Straight);
+          //    Turnout.divergent(T, Divergent)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout", "divergent")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_1_, var_Divergent);
+          //    Segment.connectedTo(T, Straight)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment", "connectedTo")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_2_, var_Straight);
+          //    Segment.connectedTo(T, Divergent)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment", "connectedTo")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_3_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_3_, var_Divergent);
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("message", "turnoutConnectedToBothOutputs");
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("T")
+                              }));
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TurnoutOutput.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TurnoutOutput.java
new file mode 100644
index 00000000..87cccfde
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TurnoutOutput.java
@@ -0,0 +1,727 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Segment;
+import modes3.Turnout;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern turnoutOutput(T : Turnout, S : Segment) {
+ *              Turnout.straight(T, S);
+ *         } or {
+ *              Turnout.divergent(T, S);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class TurnoutOutput extends BaseGeneratedEMFQuerySpecification<TurnoutOutput.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.turnoutOutput pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Turnout fT;
+    
+    private Segment fS;
+    
+    private static List<String> parameterNames = makeImmutableList("T", "S");
+    
+    private Match(final Turnout pT, final Segment pS) {
+      this.fT = pT;
+      this.fS = pS;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "T": return this.fT;
+          case "S": return this.fS;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fT;
+          case 1: return this.fS;
+          default: return null;
+      }
+    }
+    
+    public Turnout getT() {
+      return this.fT;
+    }
+    
+    public Segment getS() {
+      return this.fS;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("T".equals(parameterName) ) {
+          this.fT = (Turnout) newValue;
+          return true;
+      }
+      if ("S".equals(parameterName) ) {
+          this.fS = (Segment) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setT(final Turnout pT) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fT = pT;
+    }
+    
+    public void setS(final Segment pS) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fS = pS;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.turnoutOutput";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return TurnoutOutput.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fT, fS};
+    }
+    
+    @Override
+    public TurnoutOutput.Match toImmutable() {
+      return isMutable() ? newMatch(fT, fS) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"T\"=" + prettyPrintValue(fT) + ", ");
+      result.append("\"S\"=" + prettyPrintValue(fS));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fT, fS);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof TurnoutOutput.Match)) {
+          TurnoutOutput.Match other = (TurnoutOutput.Match) obj;
+          return Objects.equals(fT, other.fT) && Objects.equals(fS, other.fS);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public TurnoutOutput specification() {
+      return TurnoutOutput.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static TurnoutOutput.Match newEmptyMatch() {
+      return new Mutable(null, null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static TurnoutOutput.Match newMutableMatch(final Turnout pT, final Segment pS) {
+      return new Mutable(pT, pS);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static TurnoutOutput.Match newMatch(final Turnout pT, final Segment pS) {
+      return new Immutable(pT, pS);
+    }
+    
+    private static final class Mutable extends TurnoutOutput.Match {
+      Mutable(final Turnout pT, final Segment pS) {
+        super(pT, pS);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends TurnoutOutput.Match {
+      Immutable(final Turnout pT, final Segment pS) {
+        super(pT, pS);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.turnoutOutput pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern turnoutOutput(T : Turnout, S : Segment) {
+   *    Turnout.straight(T, S);
+   * } or {
+   *    Turnout.divergent(T, S);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see TurnoutOutput
+   * 
+   */
+  public static class Matcher extends BaseMatcher<TurnoutOutput.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static TurnoutOutput.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static TurnoutOutput.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_T = 0;
+    
+    private static final int POSITION_S = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(TurnoutOutput.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<TurnoutOutput.Match> getAllMatches(final Turnout pT, final Segment pS) {
+      return rawStreamAllMatches(new Object[]{pT, pS}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<TurnoutOutput.Match> streamAllMatches(final Turnout pT, final Segment pS) {
+      return rawStreamAllMatches(new Object[]{pT, pS});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<TurnoutOutput.Match> getOneArbitraryMatch(final Turnout pT, final Segment pS) {
+      return rawGetOneArbitraryMatch(new Object[]{pT, pS});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Turnout pT, final Segment pS) {
+      return rawHasMatch(new Object[]{pT, pS});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Turnout pT, final Segment pS) {
+      return rawCountMatches(new Object[]{pT, pS});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Turnout pT, final Segment pS, final Consumer<? super TurnoutOutput.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pT, pS}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @param pS the fixed value of pattern parameter S, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public TurnoutOutput.Match newMatch(final Turnout pT, final Segment pS) {
+      return TurnoutOutput.Match.newMatch(pT, pS);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Turnout> rawStreamAllValuesOfT(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_T, parameters).map(Turnout.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Turnout> getAllValuesOfT() {
+      return rawStreamAllValuesOfT(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Turnout> streamAllValuesOfT() {
+      return rawStreamAllValuesOfT(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Turnout> streamAllValuesOfT(final TurnoutOutput.Match partialMatch) {
+      return rawStreamAllValuesOfT(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Turnout> streamAllValuesOfT(final Segment pS) {
+      return rawStreamAllValuesOfT(new Object[]{null, pS});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Turnout> getAllValuesOfT(final TurnoutOutput.Match partialMatch) {
+      return rawStreamAllValuesOfT(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Turnout> getAllValuesOfT(final Segment pS) {
+      return rawStreamAllValuesOfT(new Object[]{null, pS}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOfS(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_S, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS() {
+      return rawStreamAllValuesOfS(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS() {
+      return rawStreamAllValuesOfS(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS(final TurnoutOutput.Match partialMatch) {
+      return rawStreamAllValuesOfS(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS(final Turnout pT) {
+      return rawStreamAllValuesOfS(new Object[]{pT, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS(final TurnoutOutput.Match partialMatch) {
+      return rawStreamAllValuesOfS(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS(final Turnout pT) {
+      return rawStreamAllValuesOfS(new Object[]{pT, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected TurnoutOutput.Match tupleToMatch(final Tuple t) {
+      try {
+          return TurnoutOutput.Match.newMatch((Turnout) t.get(POSITION_T), (Segment) t.get(POSITION_S));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected TurnoutOutput.Match arrayToMatch(final Object[] match) {
+      try {
+          return TurnoutOutput.Match.newMatch((Turnout) match[POSITION_T], (Segment) match[POSITION_S]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected TurnoutOutput.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return TurnoutOutput.Match.newMutableMatch((Turnout) match[POSITION_T], (Segment) match[POSITION_S]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<TurnoutOutput.Matcher> querySpecification() {
+      return TurnoutOutput.instance();
+    }
+  }
+  
+  private TurnoutOutput() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static TurnoutOutput instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected TurnoutOutput.Matcher instantiate(final ViatraQueryEngine engine) {
+    return TurnoutOutput.Matcher.on(engine);
+  }
+  
+  @Override
+  public TurnoutOutput.Matcher instantiate() {
+    return TurnoutOutput.Matcher.create();
+  }
+  
+  @Override
+  public TurnoutOutput.Match newEmptyMatch() {
+    return TurnoutOutput.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public TurnoutOutput.Match newMatch(final Object... parameters) {
+    return TurnoutOutput.Match.newMatch((modes3.Turnout) parameters[0], (modes3.Segment) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link TurnoutOutput} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link TurnoutOutput#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final TurnoutOutput INSTANCE = new TurnoutOutput();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final TurnoutOutput.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_T = new PParameter("T", "modes3.Turnout", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_S = new PParameter("S", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_T, parameter_S);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.turnoutOutput";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("T","S");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_T = body.getOrCreateVariableByName("T");
+          PVariable var_S = body.getOrCreateVariableByName("S");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_T, parameter_T),
+             new ExportedParameter(body, var_S, parameter_S)
+          ));
+          //    Turnout.straight(T, S)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout", "straight")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_0_, var_S);
+          bodies.add(body);
+      }
+      {
+          PBody body = new PBody(this);
+          PVariable var_T = body.getOrCreateVariableByName("T");
+          PVariable var_S = body.getOrCreateVariableByName("S");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_T, parameter_T),
+             new ExportedParameter(body, var_S, parameter_S)
+          ));
+          //    Turnout.divergent(T, S)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout", "divergent")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_0_, var_S);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TurnoutOutputsAreSame.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TurnoutOutputsAreSame.java
new file mode 100644
index 00000000..ba59d45c
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/TurnoutOutputsAreSame.java
@@ -0,0 +1,572 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Turnout;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(message = "turnoutOutputsAreSame", severity = "error", key = { T })
+ *         pattern turnoutOutputsAreSame(T : Turnout) {
+ *              Turnout.straight(T, S);
+ *              Turnout.divergent(T, S);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class TurnoutOutputsAreSame extends BaseGeneratedEMFQuerySpecification<TurnoutOutputsAreSame.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.turnoutOutputsAreSame pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Turnout fT;
+    
+    private static List<String> parameterNames = makeImmutableList("T");
+    
+    private Match(final Turnout pT) {
+      this.fT = pT;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "T": return this.fT;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fT;
+          default: return null;
+      }
+    }
+    
+    public Turnout getT() {
+      return this.fT;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("T".equals(parameterName) ) {
+          this.fT = (Turnout) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setT(final Turnout pT) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fT = pT;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.turnoutOutputsAreSame";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return TurnoutOutputsAreSame.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fT};
+    }
+    
+    @Override
+    public TurnoutOutputsAreSame.Match toImmutable() {
+      return isMutable() ? newMatch(fT) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"T\"=" + prettyPrintValue(fT));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fT);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof TurnoutOutputsAreSame.Match)) {
+          TurnoutOutputsAreSame.Match other = (TurnoutOutputsAreSame.Match) obj;
+          return Objects.equals(fT, other.fT);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public TurnoutOutputsAreSame specification() {
+      return TurnoutOutputsAreSame.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static TurnoutOutputsAreSame.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static TurnoutOutputsAreSame.Match newMutableMatch(final Turnout pT) {
+      return new Mutable(pT);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static TurnoutOutputsAreSame.Match newMatch(final Turnout pT) {
+      return new Immutable(pT);
+    }
+    
+    private static final class Mutable extends TurnoutOutputsAreSame.Match {
+      Mutable(final Turnout pT) {
+        super(pT);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends TurnoutOutputsAreSame.Match {
+      Immutable(final Turnout pT) {
+        super(pT);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.turnoutOutputsAreSame pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(message = "turnoutOutputsAreSame", severity = "error", key = { T })
+   * pattern turnoutOutputsAreSame(T : Turnout) {
+   *    Turnout.straight(T, S);
+   *    Turnout.divergent(T, S);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see TurnoutOutputsAreSame
+   * 
+   */
+  public static class Matcher extends BaseMatcher<TurnoutOutputsAreSame.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static TurnoutOutputsAreSame.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static TurnoutOutputsAreSame.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_T = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(TurnoutOutputsAreSame.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<TurnoutOutputsAreSame.Match> getAllMatches(final Turnout pT) {
+      return rawStreamAllMatches(new Object[]{pT}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<TurnoutOutputsAreSame.Match> streamAllMatches(final Turnout pT) {
+      return rawStreamAllMatches(new Object[]{pT});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<TurnoutOutputsAreSame.Match> getOneArbitraryMatch(final Turnout pT) {
+      return rawGetOneArbitraryMatch(new Object[]{pT});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Turnout pT) {
+      return rawHasMatch(new Object[]{pT});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Turnout pT) {
+      return rawCountMatches(new Object[]{pT});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Turnout pT, final Consumer<? super TurnoutOutputsAreSame.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pT}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pT the fixed value of pattern parameter T, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public TurnoutOutputsAreSame.Match newMatch(final Turnout pT) {
+      return TurnoutOutputsAreSame.Match.newMatch(pT);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Turnout> rawStreamAllValuesOfT(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_T, parameters).map(Turnout.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Turnout> getAllValuesOfT() {
+      return rawStreamAllValuesOfT(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for T.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Turnout> streamAllValuesOfT() {
+      return rawStreamAllValuesOfT(emptyArray());
+    }
+    
+    @Override
+    protected TurnoutOutputsAreSame.Match tupleToMatch(final Tuple t) {
+      try {
+          return TurnoutOutputsAreSame.Match.newMatch((Turnout) t.get(POSITION_T));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected TurnoutOutputsAreSame.Match arrayToMatch(final Object[] match) {
+      try {
+          return TurnoutOutputsAreSame.Match.newMatch((Turnout) match[POSITION_T]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected TurnoutOutputsAreSame.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return TurnoutOutputsAreSame.Match.newMutableMatch((Turnout) match[POSITION_T]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<TurnoutOutputsAreSame.Matcher> querySpecification() {
+      return TurnoutOutputsAreSame.instance();
+    }
+  }
+  
+  private TurnoutOutputsAreSame() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static TurnoutOutputsAreSame instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected TurnoutOutputsAreSame.Matcher instantiate(final ViatraQueryEngine engine) {
+    return TurnoutOutputsAreSame.Matcher.on(engine);
+  }
+  
+  @Override
+  public TurnoutOutputsAreSame.Matcher instantiate() {
+    return TurnoutOutputsAreSame.Matcher.create();
+  }
+  
+  @Override
+  public TurnoutOutputsAreSame.Match newEmptyMatch() {
+    return TurnoutOutputsAreSame.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public TurnoutOutputsAreSame.Match newMatch(final Object... parameters) {
+    return TurnoutOutputsAreSame.Match.newMatch((modes3.Turnout) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link TurnoutOutputsAreSame} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link TurnoutOutputsAreSame#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final TurnoutOutputsAreSame INSTANCE = new TurnoutOutputsAreSame();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final TurnoutOutputsAreSame.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_T = new PParameter("T", "modes3.Turnout", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_T);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.turnoutOutputsAreSame";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("T");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_T = body.getOrCreateVariableByName("T");
+          PVariable var_S = body.getOrCreateVariableByName("S");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_T, parameter_T)
+          ));
+          //    Turnout.straight(T, S)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout", "straight")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_0_, var_S);
+          //    Turnout.divergent(T, S)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_T, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Turnout", "divergent")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new Equality(body, var__virtual_1_, var_S);
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("message", "turnoutOutputsAreSame");
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("T")
+                              }));
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Unreachable.java b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Unreachable.java
new file mode 100644
index 00000000..a1b76f83
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/vql-gen/modes3/queries/Unreachable.java
@@ -0,0 +1,714 @@
+/**
+ * Generated from platform:/resource/ca.mcgill.rtgmrt.example.modes3/src/modes3/queries/Modes3Queries.vql
+ */
+package modes3.queries;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import modes3.Segment;
+import modes3.queries.Reachable;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(message = "unreachable", severity = "error", key = { S1, S2 })
+ *         pattern unreachable(S1 : Segment, S2 : Segment) {
+ *              neg find reachable(S1, S2);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class Unreachable extends BaseGeneratedEMFQuerySpecification<Unreachable.Matcher> {
+  /**
+   * Pattern-specific match representation of the modes3.queries.unreachable pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Segment fS1;
+    
+    private Segment fS2;
+    
+    private static List<String> parameterNames = makeImmutableList("S1", "S2");
+    
+    private Match(final Segment pS1, final Segment pS2) {
+      this.fS1 = pS1;
+      this.fS2 = pS2;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "S1": return this.fS1;
+          case "S2": return this.fS2;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fS1;
+          case 1: return this.fS2;
+          default: return null;
+      }
+    }
+    
+    public Segment getS1() {
+      return this.fS1;
+    }
+    
+    public Segment getS2() {
+      return this.fS2;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("S1".equals(parameterName) ) {
+          this.fS1 = (Segment) newValue;
+          return true;
+      }
+      if ("S2".equals(parameterName) ) {
+          this.fS2 = (Segment) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setS1(final Segment pS1) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fS1 = pS1;
+    }
+    
+    public void setS2(final Segment pS2) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fS2 = pS2;
+    }
+    
+    @Override
+    public String patternName() {
+      return "modes3.queries.unreachable";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return Unreachable.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fS1, fS2};
+    }
+    
+    @Override
+    public Unreachable.Match toImmutable() {
+      return isMutable() ? newMatch(fS1, fS2) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"S1\"=" + prettyPrintValue(fS1) + ", ");
+      result.append("\"S2\"=" + prettyPrintValue(fS2));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fS1, fS2);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof Unreachable.Match)) {
+          Unreachable.Match other = (Unreachable.Match) obj;
+          return Objects.equals(fS1, other.fS1) && Objects.equals(fS2, other.fS2);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public Unreachable specification() {
+      return Unreachable.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static Unreachable.Match newEmptyMatch() {
+      return new Mutable(null, null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static Unreachable.Match newMutableMatch(final Segment pS1, final Segment pS2) {
+      return new Mutable(pS1, pS2);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static Unreachable.Match newMatch(final Segment pS1, final Segment pS2) {
+      return new Immutable(pS1, pS2);
+    }
+    
+    private static final class Mutable extends Unreachable.Match {
+      Mutable(final Segment pS1, final Segment pS2) {
+        super(pS1, pS2);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends Unreachable.Match {
+      Immutable(final Segment pS1, final Segment pS2) {
+        super(pS1, pS2);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the modes3.queries.unreachable pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(message = "unreachable", severity = "error", key = { S1, S2 })
+   * pattern unreachable(S1 : Segment, S2 : Segment) {
+   *    neg find reachable(S1, S2);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see Unreachable
+   * 
+   */
+  public static class Matcher extends BaseMatcher<Unreachable.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static Unreachable.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static Unreachable.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_S1 = 0;
+    
+    private static final int POSITION_S2 = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(Unreachable.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<Unreachable.Match> getAllMatches(final Segment pS1, final Segment pS2) {
+      return rawStreamAllMatches(new Object[]{pS1, pS2}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<Unreachable.Match> streamAllMatches(final Segment pS1, final Segment pS2) {
+      return rawStreamAllMatches(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<Unreachable.Match> getOneArbitraryMatch(final Segment pS1, final Segment pS2) {
+      return rawGetOneArbitraryMatch(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Segment pS1, final Segment pS2) {
+      return rawHasMatch(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Segment pS1, final Segment pS2) {
+      return rawCountMatches(new Object[]{pS1, pS2});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Segment pS1, final Segment pS2, final Consumer<? super Unreachable.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pS1, pS2}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pS1 the fixed value of pattern parameter S1, or null if not bound.
+     * @param pS2 the fixed value of pattern parameter S2, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public Unreachable.Match newMatch(final Segment pS1, final Segment pS2) {
+      return Unreachable.Match.newMatch(pS1, pS2);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOfS1(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_S1, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS1() {
+      return rawStreamAllValuesOfS1(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS1() {
+      return rawStreamAllValuesOfS1(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS1(final Unreachable.Match partialMatch) {
+      return rawStreamAllValuesOfS1(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS1(final Segment pS2) {
+      return rawStreamAllValuesOfS1(new Object[]{null, pS2});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS1(final Unreachable.Match partialMatch) {
+      return rawStreamAllValuesOfS1(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S1.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS1(final Segment pS2) {
+      return rawStreamAllValuesOfS1(new Object[]{null, pS2}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Segment> rawStreamAllValuesOfS2(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_S2, parameters).map(Segment.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS2() {
+      return rawStreamAllValuesOfS2(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS2() {
+      return rawStreamAllValuesOfS2(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS2(final Unreachable.Match partialMatch) {
+      return rawStreamAllValuesOfS2(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Segment> streamAllValuesOfS2(final Segment pS1) {
+      return rawStreamAllValuesOfS2(new Object[]{pS1, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS2(final Unreachable.Match partialMatch) {
+      return rawStreamAllValuesOfS2(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for S2.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Segment> getAllValuesOfS2(final Segment pS1) {
+      return rawStreamAllValuesOfS2(new Object[]{pS1, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected Unreachable.Match tupleToMatch(final Tuple t) {
+      try {
+          return Unreachable.Match.newMatch((Segment) t.get(POSITION_S1), (Segment) t.get(POSITION_S2));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Unreachable.Match arrayToMatch(final Object[] match) {
+      try {
+          return Unreachable.Match.newMatch((Segment) match[POSITION_S1], (Segment) match[POSITION_S2]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Unreachable.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return Unreachable.Match.newMutableMatch((Segment) match[POSITION_S1], (Segment) match[POSITION_S2]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<Unreachable.Matcher> querySpecification() {
+      return Unreachable.instance();
+    }
+  }
+  
+  private Unreachable() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static Unreachable instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected Unreachable.Matcher instantiate(final ViatraQueryEngine engine) {
+    return Unreachable.Matcher.on(engine);
+  }
+  
+  @Override
+  public Unreachable.Matcher instantiate() {
+    return Unreachable.Matcher.create();
+  }
+  
+  @Override
+  public Unreachable.Match newEmptyMatch() {
+    return Unreachable.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public Unreachable.Match newMatch(final Object... parameters) {
+    return Unreachable.Match.newMatch((modes3.Segment) parameters[0], (modes3.Segment) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link Unreachable} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link Unreachable#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final Unreachable INSTANCE = new Unreachable();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final Unreachable.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_S1 = new PParameter("S1", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_S2 = new PParameter("S2", "modes3.Segment", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.ece.mcgill.ca/wcet/modes3", "Segment")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_S1, parameter_S2);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "modes3.queries.unreachable";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("S1","S2");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_S1 = body.getOrCreateVariableByName("S1");
+          PVariable var_S2 = body.getOrCreateVariableByName("S2");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_S2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.ece.mcgill.ca/wcet/modes3", "Segment")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_S1, parameter_S1),
+             new ExportedParameter(body, var_S2, parameter_S2)
+          ));
+          //    neg find reachable(S1, S2)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var_S1, var_S2), Reachable.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("message", "unreachable");
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("S1"), 
+                              new ParameterReference("S2")
+                              }));
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.CloseTrainsObjectiveHint.xtendbin b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.CloseTrainsObjectiveHint.xtendbin
new file mode 100644
index 00000000..87975792
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.CloseTrainsObjectiveHint.xtendbin
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.EndOfSidingObjectiveHint.xtendbin b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.EndOfSidingObjectiveHint.xtendbin
new file mode 100644
index 00000000..f243e180
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.EndOfSidingObjectiveHint.xtendbin
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.MisalignedTurnoutObjectiveHint.xtendbin b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.MisalignedTurnoutObjectiveHint.xtendbin
new file mode 100644
index 00000000..cdef4dc7
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.MisalignedTurnoutObjectiveHint.xtendbin
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3ModelGenerator.xtendbin b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3ModelGenerator.xtendbin
new file mode 100644
index 00000000..759ac9e4
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3ModelGenerator.xtendbin
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3TypeScopeHint.xtendbin b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3TypeScopeHint.xtendbin
new file mode 100644
index 00000000..386baeda
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3TypeScopeHint.xtendbin
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3UnitPropagationGenerator.xtendbin b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3UnitPropagationGenerator.xtendbin
new file mode 100644
index 00000000..79059b7f
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.Modes3UnitPropagationGenerator.xtendbin
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.TrainLocationsObjectiveHint.xtendbin b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.TrainLocationsObjectiveHint.xtendbin
new file mode 100644
index 00000000..3c3a380e
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.TrainLocationsObjectiveHint.xtendbin
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.gitignore b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.gitignore
new file mode 100644
index 00000000..1a7df1d9
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/.gitignore
@@ -0,0 +1,13 @@
+/.Modes3ModelGenerator.java._trace
+/.Modes3UnitPropagationGenerator.java._trace
+/.Modes3TypeScopeHint.java._trace
+/.Modes3TypeScopeHint.xtendbin
+/.Modes3UnitPropagationGenerator.xtendbin
+/Modes3TypeScopeHint.java
+/.Modes3ModelGenerator.xtendbin
+/Modes3ModelGenerator.java
+/Modes3UnitPropagationGenerator.java
+/.CloseTrainsObjectiveHint.java._trace
+/.TrainLocationsObjectiveHint.java._trace
+/.MisalignedTurnoutObjectiveHint.java._trace
+/.EndOfSidingObjectiveHint.java._trace
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/CloseTrainsObjectiveHint.java b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/CloseTrainsObjectiveHint.java
new file mode 100644
index 00000000..babfa7e1
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/CloseTrainsObjectiveHint.java
@@ -0,0 +1,279 @@
+package modes3.run;
+
+import com.google.common.base.Objects;
+import com.google.common.collect.ImmutableList;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.Dimension;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ExtendedLinearExpressionBuilder;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ExtendedLinearExpressionBuilderFactory;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.PolyhedronExtensionOperator;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostElementMatch;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostElementMatchers;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostObjectiveHint;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import modes3.Modes3Package;
+import modes3.queries.CloseTrains_step_2;
+import modes3.queries.CloseTrains_step_3;
+import modes3.queries.CloseTrains_step_4;
+import modes3.queries.CloseTrains_step_5;
+import modes3.queries.CloseTrains_step_6;
+import modes3.queries.CloseTrains_step_7;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.xtext.xbase.lib.Extension;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+
+@SuppressWarnings("all")
+public class CloseTrainsObjectiveHint extends CostObjectiveHint {
+  private final Type segmentType;
+  
+  private final Type trainType;
+  
+  public CloseTrainsObjectiveHint(@Extension final Ecore2Logic ecore2Logic, final Ecore2Logic_Trace ecore2LogicTrace) {
+    @Extension
+    final Modes3Package Modes3Package = modes3.Modes3Package.eINSTANCE;
+    this.segmentType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getSegment());
+    this.trainType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getTrain());
+  }
+  
+  @Override
+  public boolean isExact() {
+    return true;
+  }
+  
+  @Override
+  public PolyhedronExtensionOperator createPolyhedronExtensionOperator(final Map<String, CostElementMatchers> costElementMatchers) {
+    PolyhedronExtensionOperator _xblockexpression = null;
+    {
+      final CostElementMatchers step2 = costElementMatchers.get(CloseTrains_step_2.instance().getFullyQualifiedName());
+      final CostElementMatchers step3 = costElementMatchers.get(CloseTrains_step_3.instance().getFullyQualifiedName());
+      final CostElementMatchers step4 = costElementMatchers.get(CloseTrains_step_4.instance().getFullyQualifiedName());
+      final CostElementMatchers step5 = costElementMatchers.get(CloseTrains_step_5.instance().getFullyQualifiedName());
+      final CostElementMatchers step6 = costElementMatchers.get(CloseTrains_step_6.instance().getFullyQualifiedName());
+      final CostElementMatchers step7 = costElementMatchers.get(CloseTrains_step_7.instance().getFullyQualifiedName());
+      final PolyhedronExtensionOperator _function = (ExtendedLinearExpressionBuilderFactory it) -> {
+        final ExtendedLinearExpressionBuilder objectiveBuilder = it.createBuilder();
+        ImmutableList<CostElementMatch> _matches = step2.getMatches();
+        for (final CostElementMatch m : _matches) {
+          {
+            final Dimension dimension = it.getDimension(m.getMatch());
+            objectiveBuilder.add(step2.getWeight(), dimension);
+            dimension.tightenLowerBound(Integer.valueOf(0));
+            boolean _isMulti = m.isMulti();
+            if (_isMulti) {
+              it.createBuilder().add(1, dimension).add((-1), this.trainType).build().assertEqualsTo(0);
+            } else {
+              dimension.tightenUpperBound(Integer.valueOf(1));
+              boolean _isMust = m.isMust();
+              if (_isMust) {
+                dimension.tightenLowerBound(Integer.valueOf(1));
+              }
+            }
+          }
+        }
+        final ImmutableList<CostElementMatch> step3Matches = step3.getMatches();
+        for (final CostElementMatch m_1 : step3Matches) {
+          {
+            final Dimension dimension = it.getDimension(m_1.getMatch());
+            objectiveBuilder.add(step3.getWeight(), dimension);
+            dimension.tightenLowerBound(Integer.valueOf(0));
+            boolean _isMulti = m_1.isMulti();
+            boolean _not = (!_isMulti);
+            if (_not) {
+              dimension.tightenUpperBound(Integer.valueOf(1));
+              boolean _isMust = m_1.isMust();
+              if (_isMust) {
+                dimension.tightenLowerBound(Integer.valueOf(1));
+              }
+            }
+          }
+        }
+        final Function1<CostElementMatch, IPatternMatch> _function_1 = (CostElementMatch it_1) -> {
+          return step2.projectMayMatch(it_1.getMatch(), 2);
+        };
+        Set<Map.Entry<IPatternMatch, List<CostElementMatch>>> _entrySet = IterableExtensions.<IPatternMatch, CostElementMatch>groupBy(step3Matches, _function_1).entrySet();
+        for (final Map.Entry<IPatternMatch, List<CostElementMatch>> pair : _entrySet) {
+          {
+            final ExtendedLinearExpressionBuilder multiplicityBuilder = it.createBuilder();
+            List<CostElementMatch> _value = pair.getValue();
+            for (final CostElementMatch m_2 : _value) {
+              multiplicityBuilder.add(1, m_2.getMatch());
+            }
+            multiplicityBuilder.add((-1), pair.getKey());
+            multiplicityBuilder.build().assertEqualsTo(0);
+          }
+        }
+        CloseTrainsObjectiveHint.boundLimit(it, step3Matches, 2, this.trainType, 1);
+        CloseTrainsObjectiveHint.boundLimit(it, step3Matches, 3, this.segmentType, 1);
+        final ImmutableList<CostElementMatch> step4Matches = step4.getMatches();
+        for (final CostElementMatch m_2 : step4Matches) {
+          {
+            final Dimension dimension = it.getDimension(m_2.getMatch());
+            objectiveBuilder.add(step4.getWeight(), dimension);
+            dimension.tightenLowerBound(Integer.valueOf(0));
+            boolean _isMulti = m_2.isMulti();
+            boolean _not = (!_isMulti);
+            if (_not) {
+              dimension.tightenUpperBound(Integer.valueOf(1));
+              boolean _isMust = m_2.isMust();
+              if (_isMust) {
+                dimension.tightenLowerBound(Integer.valueOf(1));
+              }
+            }
+          }
+        }
+        final Function1<CostElementMatch, IPatternMatch> _function_2 = (CostElementMatch it_1) -> {
+          return step3.projectMayMatch(it_1.getMatch(), 2, 3);
+        };
+        Set<Map.Entry<IPatternMatch, List<CostElementMatch>>> _entrySet_1 = IterableExtensions.<IPatternMatch, CostElementMatch>groupBy(step4Matches, _function_2).entrySet();
+        for (final Map.Entry<IPatternMatch, List<CostElementMatch>> pair_1 : _entrySet_1) {
+          {
+            final ExtendedLinearExpressionBuilder multiplicityBuilder = it.createBuilder();
+            List<CostElementMatch> _value = pair_1.getValue();
+            for (final CostElementMatch m_3 : _value) {
+              multiplicityBuilder.add(1, m_3.getMatch());
+            }
+            multiplicityBuilder.add((-2), pair_1.getKey());
+            multiplicityBuilder.build().tightenUpperBound(Integer.valueOf(0));
+          }
+        }
+        CloseTrainsObjectiveHint.boundLimit(it, step4Matches, 2, this.trainType, 2);
+        CloseTrainsObjectiveHint.boundLimit(it, step4Matches, 3, this.segmentType, 2);
+        CloseTrainsObjectiveHint.boundLimit(it, step4Matches, 4, this.segmentType, 2);
+        final ImmutableList<CostElementMatch> step5Matches = step5.getMatches();
+        for (final CostElementMatch m_3 : step5Matches) {
+          {
+            final Dimension dimension = it.getDimension(m_3.getMatch());
+            objectiveBuilder.add(step5.getWeight(), dimension);
+            dimension.tightenLowerBound(Integer.valueOf(0));
+            boolean _isMulti = m_3.isMulti();
+            boolean _not = (!_isMulti);
+            if (_not) {
+              dimension.tightenUpperBound(Integer.valueOf(1));
+              boolean _isMust = m_3.isMust();
+              if (_isMust) {
+                dimension.tightenLowerBound(Integer.valueOf(1));
+              }
+            }
+          }
+        }
+        final Function1<CostElementMatch, IPatternMatch> _function_3 = (CostElementMatch it_1) -> {
+          return step4.projectMayMatch(it_1.getMatch(), 2, 3, 4);
+        };
+        Set<Map.Entry<IPatternMatch, List<CostElementMatch>>> _entrySet_2 = IterableExtensions.<IPatternMatch, CostElementMatch>groupBy(step5Matches, _function_3).entrySet();
+        for (final Map.Entry<IPatternMatch, List<CostElementMatch>> pair_2 : _entrySet_2) {
+          {
+            final ExtendedLinearExpressionBuilder multiplicityBuilder = it.createBuilder();
+            List<CostElementMatch> _value = pair_2.getValue();
+            for (final CostElementMatch m_4 : _value) {
+              multiplicityBuilder.add(1, m_4.getMatch());
+            }
+            multiplicityBuilder.add((-2), pair_2.getKey());
+            multiplicityBuilder.build().tightenUpperBound(Integer.valueOf(0));
+          }
+        }
+        CloseTrainsObjectiveHint.boundLimit(it, step5Matches, 2, this.trainType, 4);
+        CloseTrainsObjectiveHint.boundLimit(it, step5Matches, 3, this.segmentType, 4);
+        CloseTrainsObjectiveHint.boundLimit(it, step5Matches, 4, this.segmentType, 4);
+        CloseTrainsObjectiveHint.boundLimit(it, step5Matches, 5, this.segmentType, 4);
+        final ImmutableList<CostElementMatch> step6Matches = step6.getMatches();
+        for (final CostElementMatch m_4 : step6Matches) {
+          {
+            final Dimension dimension = it.getDimension(m_4.getMatch());
+            objectiveBuilder.add(step6.getWeight(), dimension);
+            dimension.tightenLowerBound(Integer.valueOf(0));
+            boolean _isMulti = m_4.isMulti();
+            if (_isMulti) {
+              Object _get = m_4.getMatch().get(3);
+              Object _get_1 = m_4.getMatch().get(5);
+              boolean _equals = Objects.equal(_get, _get_1);
+              if (_equals) {
+                it.createBuilder().add(2, m_4.getMatch()).add((-1), step5.projectMayMatch(m_4.getMatch(), 2, 3, 4, 5)).build().assertEqualsTo(0);
+              } else {
+                it.createBuilder().add(1, m_4.getMatch()).add((-1), step5.projectMayMatch(m_4.getMatch(), 2, 3, 4, 5)).build().assertEqualsTo(0);
+              }
+            } else {
+              dimension.tightenUpperBound(Integer.valueOf(1));
+              boolean _isMust = m_4.isMust();
+              if (_isMust) {
+                dimension.tightenLowerBound(Integer.valueOf(1));
+              }
+            }
+          }
+        }
+        CloseTrainsObjectiveHint.boundLimit(it, step6Matches, 2, this.trainType, 2);
+        CloseTrainsObjectiveHint.boundLimit(it, step6Matches, 3, this.segmentType, 2);
+        CloseTrainsObjectiveHint.boundLimit(it, step6Matches, 4, this.segmentType, 2);
+        CloseTrainsObjectiveHint.boundLimit(it, step6Matches, 5, this.segmentType, 2);
+        final ImmutableList<CostElementMatch> step7Matches = step7.getMatches();
+        for (final CostElementMatch m_5 : step7Matches) {
+          {
+            final Dimension dimension = it.getDimension(m_5.getMatch());
+            objectiveBuilder.add(step7.getWeight(), dimension);
+            dimension.tightenLowerBound(Integer.valueOf(0));
+            boolean _isMulti = m_5.isMulti();
+            boolean _not = (!_isMulti);
+            if (_not) {
+              dimension.tightenUpperBound(Integer.valueOf(1));
+              boolean _isMust = m_5.isMust();
+              if (_isMust) {
+                dimension.tightenLowerBound(Integer.valueOf(1));
+              }
+            }
+          }
+        }
+        final Function1<CostElementMatch, IPatternMatch> _function_4 = (CostElementMatch it_1) -> {
+          return step6.projectMayMatch(it_1.getMatch(), 2, 3, 4, 5);
+        };
+        Set<Map.Entry<IPatternMatch, List<CostElementMatch>>> _entrySet_3 = IterableExtensions.<IPatternMatch, CostElementMatch>groupBy(step7Matches, _function_4).entrySet();
+        for (final Map.Entry<IPatternMatch, List<CostElementMatch>> pair_3 : _entrySet_3) {
+          {
+            final ExtendedLinearExpressionBuilder multiplicityBuilder = it.createBuilder();
+            List<CostElementMatch> _value = pair_3.getValue();
+            for (final CostElementMatch m_6 : _value) {
+              multiplicityBuilder.add(1, m_6.getMatch());
+            }
+            multiplicityBuilder.add((-1), pair_3.getKey());
+            multiplicityBuilder.build().tightenUpperBound(Integer.valueOf(0));
+          }
+        }
+        CloseTrainsObjectiveHint.boundLimit(it, step7Matches, 2, this.trainType, 2);
+        CloseTrainsObjectiveHint.boundLimit(it, step7Matches, 3, this.segmentType, 2);
+        CloseTrainsObjectiveHint.boundLimit(it, step7Matches, 4, this.segmentType, 2);
+        CloseTrainsObjectiveHint.boundLimit(it, step7Matches, 5, this.segmentType, 2);
+        CloseTrainsObjectiveHint.boundLimit(it, step7Matches, 6, this.trainType, 2);
+        this.buildWithBounds(objectiveBuilder);
+      };
+      _xblockexpression = _function;
+    }
+    return _xblockexpression;
+  }
+  
+  private static void boundLimit(@Extension final ExtendedLinearExpressionBuilderFactory factory, final Collection<CostElementMatch> matches, final int index, final Type type, final int count) {
+    final Function1<CostElementMatch, Object> _function = (CostElementMatch it) -> {
+      return it.getMatch().get(index);
+    };
+    Set<Map.Entry<Object, List<CostElementMatch>>> _entrySet = IterableExtensions.<Object, CostElementMatch>groupBy(matches, _function).entrySet();
+    for (final Map.Entry<Object, List<CostElementMatch>> pair : _entrySet) {
+      {
+        final ExtendedLinearExpressionBuilder multiplicityBuilder = factory.createBuilder();
+        List<CostElementMatch> _value = pair.getValue();
+        for (final CostElementMatch m : _value) {
+          multiplicityBuilder.add(1, m.getMatch());
+        }
+        boolean _isMulti = CostElementMatchers.isMulti(pair.getKey());
+        if (_isMulti) {
+          multiplicityBuilder.add((-count), type);
+          multiplicityBuilder.build().tightenUpperBound(Integer.valueOf(0));
+        } else {
+          multiplicityBuilder.build().tightenUpperBound(Integer.valueOf(count));
+        }
+      }
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/EndOfSidingObjectiveHint.java b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/EndOfSidingObjectiveHint.java
new file mode 100644
index 00000000..77c513e1
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/EndOfSidingObjectiveHint.java
@@ -0,0 +1,193 @@
+package modes3.run;
+
+import com.google.common.collect.ImmutableList;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.Dimension;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ExtendedLinearExpressionBuilder;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ExtendedLinearExpressionBuilderFactory;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.PolyhedronExtensionOperator;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostElementMatch;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostElementMatchers;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostObjectiveHint;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import modes3.Modes3Package;
+import modes3.queries.EndOfSiding_step_2;
+import modes3.queries.EndOfSiding_step_3;
+import modes3.queries.EndOfSiding_step_4;
+import modes3.queries.EndOfSiding_step_5;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.xtext.xbase.lib.Extension;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+
+@SuppressWarnings("all")
+public class EndOfSidingObjectiveHint extends CostObjectiveHint {
+  private final Type segmentType;
+  
+  private final Type trainType;
+  
+  public EndOfSidingObjectiveHint(@Extension final Ecore2Logic ecore2Logic, final Ecore2Logic_Trace ecore2LogicTrace) {
+    @Extension
+    final Modes3Package Modes3Package = modes3.Modes3Package.eINSTANCE;
+    this.segmentType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getSegment());
+    this.trainType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getTrain());
+  }
+  
+  @Override
+  public boolean isExact() {
+    return true;
+  }
+  
+  @Override
+  public PolyhedronExtensionOperator createPolyhedronExtensionOperator(final Map<String, CostElementMatchers> costElementMatchers) {
+    PolyhedronExtensionOperator _xblockexpression = null;
+    {
+      final CostElementMatchers step2 = costElementMatchers.get(EndOfSiding_step_2.instance().getFullyQualifiedName());
+      final CostElementMatchers step3 = costElementMatchers.get(EndOfSiding_step_3.instance().getFullyQualifiedName());
+      final CostElementMatchers step4 = costElementMatchers.get(EndOfSiding_step_4.instance().getFullyQualifiedName());
+      final CostElementMatchers step5 = costElementMatchers.get(EndOfSiding_step_5.instance().getFullyQualifiedName());
+      final PolyhedronExtensionOperator _function = (ExtendedLinearExpressionBuilderFactory it) -> {
+        final ExtendedLinearExpressionBuilder objectiveBuilder = it.createBuilder();
+        ImmutableList<CostElementMatch> _matches = step2.getMatches();
+        for (final CostElementMatch m : _matches) {
+          {
+            final Dimension dimension = it.getDimension(m.getMatch());
+            objectiveBuilder.add(step2.getWeight(), dimension);
+            dimension.tightenLowerBound(Integer.valueOf(0));
+            boolean _isMulti = m.isMulti();
+            if (_isMulti) {
+              it.createBuilder().add(1, dimension).add((-1), this.trainType).build().assertEqualsTo(0);
+            } else {
+              dimension.tightenUpperBound(Integer.valueOf(1));
+              boolean _isMust = m.isMust();
+              if (_isMust) {
+                dimension.tightenLowerBound(Integer.valueOf(1));
+              }
+            }
+          }
+        }
+        final ImmutableList<CostElementMatch> step3Matches = step3.getMatches();
+        for (final CostElementMatch m_1 : step3Matches) {
+          {
+            final Dimension dimension = it.getDimension(m_1.getMatch());
+            objectiveBuilder.add(step3.getWeight(), dimension);
+            dimension.tightenLowerBound(Integer.valueOf(0));
+            boolean _isMulti = m_1.isMulti();
+            boolean _not = (!_isMulti);
+            if (_not) {
+              dimension.tightenUpperBound(Integer.valueOf(1));
+              boolean _isMust = m_1.isMust();
+              if (_isMust) {
+                dimension.tightenLowerBound(Integer.valueOf(1));
+              }
+            }
+          }
+        }
+        final Function1<CostElementMatch, IPatternMatch> _function_1 = (CostElementMatch it_1) -> {
+          return step2.projectMayMatch(it_1.getMatch(), 2);
+        };
+        Set<Map.Entry<IPatternMatch, List<CostElementMatch>>> _entrySet = IterableExtensions.<IPatternMatch, CostElementMatch>groupBy(step3Matches, _function_1).entrySet();
+        for (final Map.Entry<IPatternMatch, List<CostElementMatch>> pair : _entrySet) {
+          {
+            final ExtendedLinearExpressionBuilder multiplicityBuilder = it.createBuilder();
+            List<CostElementMatch> _value = pair.getValue();
+            for (final CostElementMatch m_2 : _value) {
+              multiplicityBuilder.add(1, m_2.getMatch());
+            }
+            multiplicityBuilder.add((-1), pair.getKey());
+            multiplicityBuilder.build().assertEqualsTo(0);
+          }
+        }
+        EndOfSidingObjectiveHint.boundLimit(it, step3Matches, 2, this.trainType, 1);
+        EndOfSidingObjectiveHint.boundLimit(it, step3Matches, 3, this.segmentType, 1);
+        final ImmutableList<CostElementMatch> step4Matches = step4.getMatches();
+        for (final CostElementMatch m_2 : step4Matches) {
+          {
+            final Dimension dimension = it.getDimension(m_2.getMatch());
+            objectiveBuilder.add(step4.getWeight(), dimension);
+            dimension.tightenLowerBound(Integer.valueOf(0));
+            boolean _isMulti = m_2.isMulti();
+            boolean _not = (!_isMulti);
+            if (_not) {
+              dimension.tightenUpperBound(Integer.valueOf(1));
+              boolean _isMust = m_2.isMust();
+              if (_isMust) {
+                dimension.tightenLowerBound(Integer.valueOf(1));
+              }
+            }
+          }
+        }
+        final Function1<CostElementMatch, IPatternMatch> _function_2 = (CostElementMatch it_1) -> {
+          return step3.projectMayMatch(it_1.getMatch(), 2, 3);
+        };
+        Set<Map.Entry<IPatternMatch, List<CostElementMatch>>> _entrySet_1 = IterableExtensions.<IPatternMatch, CostElementMatch>groupBy(step4Matches, _function_2).entrySet();
+        for (final Map.Entry<IPatternMatch, List<CostElementMatch>> pair_1 : _entrySet_1) {
+          {
+            final ExtendedLinearExpressionBuilder multiplicityBuilder = it.createBuilder();
+            List<CostElementMatch> _value = pair_1.getValue();
+            for (final CostElementMatch m_3 : _value) {
+              multiplicityBuilder.add(1, m_3.getMatch());
+            }
+            multiplicityBuilder.add((-2), pair_1.getKey());
+            multiplicityBuilder.build().tightenUpperBound(Integer.valueOf(0));
+          }
+        }
+        EndOfSidingObjectiveHint.boundLimit(it, step4Matches, 2, this.trainType, 2);
+        EndOfSidingObjectiveHint.boundLimit(it, step4Matches, 3, this.segmentType, 2);
+        EndOfSidingObjectiveHint.boundLimit(it, step4Matches, 4, this.segmentType, 2);
+        final ImmutableList<CostElementMatch> step5Matches = step5.getMatches();
+        for (final CostElementMatch m_3 : step5Matches) {
+          {
+            final Dimension dimension = it.getDimension(m_3.getMatch());
+            objectiveBuilder.add(step5.getWeight(), dimension);
+            dimension.tightenLowerBound(Integer.valueOf(0));
+            boolean _isMulti = m_3.isMulti();
+            boolean _not = (!_isMulti);
+            if (_not) {
+              dimension.tightenUpperBound(Integer.valueOf(1));
+              boolean _isMust = m_3.isMust();
+              if (_isMust) {
+                dimension.tightenLowerBound(Integer.valueOf(1));
+              }
+            }
+            it.createBuilder().add(1, m_3.getMatch()).add((-1), step4.projectMayMatch(m_3.getMatch(), 2, 3, 4)).build().tightenUpperBound(Integer.valueOf(0));
+          }
+        }
+        EndOfSidingObjectiveHint.boundLimit(it, step5Matches, 2, this.trainType, 1);
+        EndOfSidingObjectiveHint.boundLimit(it, step5Matches, 3, this.segmentType, 2);
+        EndOfSidingObjectiveHint.boundLimit(it, step5Matches, 4, this.segmentType, 1);
+        this.buildWithBounds(objectiveBuilder);
+      };
+      _xblockexpression = _function;
+    }
+    return _xblockexpression;
+  }
+  
+  private static void boundLimit(@Extension final ExtendedLinearExpressionBuilderFactory factory, final Collection<CostElementMatch> matches, final int index, final Type type, final int count) {
+    final Function1<CostElementMatch, Object> _function = (CostElementMatch it) -> {
+      return it.getMatch().get(index);
+    };
+    Set<Map.Entry<Object, List<CostElementMatch>>> _entrySet = IterableExtensions.<Object, CostElementMatch>groupBy(matches, _function).entrySet();
+    for (final Map.Entry<Object, List<CostElementMatch>> pair : _entrySet) {
+      {
+        final ExtendedLinearExpressionBuilder multiplicityBuilder = factory.createBuilder();
+        List<CostElementMatch> _value = pair.getValue();
+        for (final CostElementMatch m : _value) {
+          multiplicityBuilder.add(1, m.getMatch());
+        }
+        boolean _isMulti = CostElementMatchers.isMulti(pair.getKey());
+        if (_isMulti) {
+          multiplicityBuilder.add((-count), type);
+          multiplicityBuilder.build().tightenUpperBound(Integer.valueOf(0));
+        } else {
+          multiplicityBuilder.build().tightenUpperBound(Integer.valueOf(count));
+        }
+      }
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/MisalignedTurnoutObjectiveHint.java b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/MisalignedTurnoutObjectiveHint.java
new file mode 100644
index 00000000..835a6559
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/MisalignedTurnoutObjectiveHint.java
@@ -0,0 +1,195 @@
+package modes3.run;
+
+import com.google.common.collect.ImmutableList;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.Dimension;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ExtendedLinearExpressionBuilder;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ExtendedLinearExpressionBuilderFactory;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.PolyhedronExtensionOperator;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostElementMatch;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostElementMatchers;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostObjectiveHint;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import modes3.Modes3Package;
+import modes3.queries.MisalignedTurnout_step_2;
+import modes3.queries.MisalignedTurnout_step_3;
+import modes3.queries.MisalignedTurnout_step_4;
+import modes3.queries.MisalignedTurnout_step_5;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.xtext.xbase.lib.Extension;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+
+@SuppressWarnings("all")
+public class MisalignedTurnoutObjectiveHint extends CostObjectiveHint {
+  private final Type segmentType;
+  
+  private final Type turnoutType;
+  
+  private final Type trainType;
+  
+  public MisalignedTurnoutObjectiveHint(@Extension final Ecore2Logic ecore2Logic, final Ecore2Logic_Trace ecore2LogicTrace) {
+    @Extension
+    final Modes3Package Modes3Package = modes3.Modes3Package.eINSTANCE;
+    this.segmentType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getSegment());
+    this.turnoutType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getTurnout());
+    this.trainType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getTrain());
+  }
+  
+  @Override
+  public boolean isExact() {
+    return true;
+  }
+  
+  @Override
+  public PolyhedronExtensionOperator createPolyhedronExtensionOperator(final Map<String, CostElementMatchers> costElementMatchers) {
+    PolyhedronExtensionOperator _xblockexpression = null;
+    {
+      final CostElementMatchers step2 = costElementMatchers.get(MisalignedTurnout_step_2.instance().getFullyQualifiedName());
+      final CostElementMatchers step3 = costElementMatchers.get(MisalignedTurnout_step_3.instance().getFullyQualifiedName());
+      final CostElementMatchers step4 = costElementMatchers.get(MisalignedTurnout_step_4.instance().getFullyQualifiedName());
+      final CostElementMatchers step5 = costElementMatchers.get(MisalignedTurnout_step_5.instance().getFullyQualifiedName());
+      final PolyhedronExtensionOperator _function = (ExtendedLinearExpressionBuilderFactory it) -> {
+        final ExtendedLinearExpressionBuilder objectiveBuilder = it.createBuilder();
+        ImmutableList<CostElementMatch> _matches = step2.getMatches();
+        for (final CostElementMatch m : _matches) {
+          {
+            final Dimension dimension = it.getDimension(m.getMatch());
+            objectiveBuilder.add(step2.getWeight(), dimension);
+            dimension.tightenLowerBound(Integer.valueOf(0));
+            boolean _isMulti = m.isMulti();
+            if (_isMulti) {
+              it.createBuilder().add(1, dimension).add((-1), this.turnoutType).build().assertEqualsTo(0);
+            } else {
+              dimension.tightenUpperBound(Integer.valueOf(1));
+              boolean _isMust = m.isMust();
+              if (_isMust) {
+                dimension.tightenLowerBound(Integer.valueOf(1));
+              }
+            }
+          }
+        }
+        final ImmutableList<CostElementMatch> step3Matches = step3.getMatches();
+        for (final CostElementMatch m_1 : step3Matches) {
+          {
+            final Dimension dimension = it.getDimension(m_1.getMatch());
+            objectiveBuilder.add(step3.getWeight(), dimension);
+            dimension.tightenLowerBound(Integer.valueOf(0));
+            boolean _isMulti = m_1.isMulti();
+            boolean _not = (!_isMulti);
+            if (_not) {
+              dimension.tightenUpperBound(Integer.valueOf(1));
+              boolean _isMust = m_1.isMust();
+              if (_isMust) {
+                dimension.tightenLowerBound(Integer.valueOf(1));
+              }
+            }
+          }
+        }
+        final Function1<CostElementMatch, IPatternMatch> _function_1 = (CostElementMatch it_1) -> {
+          return step2.projectMayMatch(it_1.getMatch(), 2);
+        };
+        Set<Map.Entry<IPatternMatch, List<CostElementMatch>>> _entrySet = IterableExtensions.<IPatternMatch, CostElementMatch>groupBy(step3Matches, _function_1).entrySet();
+        for (final Map.Entry<IPatternMatch, List<CostElementMatch>> pair : _entrySet) {
+          {
+            final ExtendedLinearExpressionBuilder multiplicityBuilder = it.createBuilder();
+            List<CostElementMatch> _value = pair.getValue();
+            for (final CostElementMatch m_2 : _value) {
+              multiplicityBuilder.add(1, m_2.getMatch());
+            }
+            multiplicityBuilder.add((-1), pair.getKey());
+            multiplicityBuilder.build().tightenUpperBound(Integer.valueOf(0));
+          }
+        }
+        MisalignedTurnoutObjectiveHint.boundLimit(it, step3Matches, 2, this.turnoutType, 1);
+        MisalignedTurnoutObjectiveHint.boundLimit(it, step3Matches, 3, this.segmentType, 2);
+        final ImmutableList<CostElementMatch> step4Matches = step4.getMatches();
+        for (final CostElementMatch m_2 : step4Matches) {
+          {
+            final Dimension dimension = it.getDimension(m_2.getMatch());
+            objectiveBuilder.add(step4.getWeight(), dimension);
+            dimension.tightenLowerBound(Integer.valueOf(0));
+            boolean _isMulti = m_2.isMulti();
+            boolean _not = (!_isMulti);
+            if (_not) {
+              dimension.tightenUpperBound(Integer.valueOf(1));
+              boolean _isMust = m_2.isMust();
+              if (_isMust) {
+                dimension.tightenLowerBound(Integer.valueOf(1));
+              }
+            }
+            it.createBuilder().add(1, m_2.getMatch()).add((-1), step3.projectMayMatch(m_2.getMatch(), 2, 3)).build().tightenUpperBound(Integer.valueOf(0));
+          }
+        }
+        MisalignedTurnoutObjectiveHint.boundLimit(it, step4Matches, 2, this.turnoutType, 1);
+        MisalignedTurnoutObjectiveHint.boundLimit(it, step4Matches, 3, this.segmentType, 2);
+        final ImmutableList<CostElementMatch> step5Matches = step5.getMatches();
+        for (final CostElementMatch m_3 : step5Matches) {
+          {
+            final Dimension dimension = it.getDimension(m_3.getMatch());
+            objectiveBuilder.add(step5.getWeight(), dimension);
+            dimension.tightenLowerBound(Integer.valueOf(0));
+            boolean _isMulti = m_3.isMulti();
+            boolean _not = (!_isMulti);
+            if (_not) {
+              dimension.tightenUpperBound(Integer.valueOf(1));
+              boolean _isMust = m_3.isMust();
+              if (_isMust) {
+                dimension.tightenLowerBound(Integer.valueOf(1));
+              }
+            }
+          }
+        }
+        final Function1<CostElementMatch, IPatternMatch> _function_2 = (CostElementMatch it_1) -> {
+          return step4.projectMayMatch(it_1.getMatch(), 2, 3);
+        };
+        Set<Map.Entry<IPatternMatch, List<CostElementMatch>>> _entrySet_1 = IterableExtensions.<IPatternMatch, CostElementMatch>groupBy(step5Matches, _function_2).entrySet();
+        for (final Map.Entry<IPatternMatch, List<CostElementMatch>> pair_1 : _entrySet_1) {
+          {
+            final ExtendedLinearExpressionBuilder multiplicityBuilder = it.createBuilder();
+            List<CostElementMatch> _value = pair_1.getValue();
+            for (final CostElementMatch m_4 : _value) {
+              multiplicityBuilder.add(1, m_4.getMatch());
+            }
+            multiplicityBuilder.add((-1), pair_1.getKey());
+            multiplicityBuilder.build().tightenUpperBound(Integer.valueOf(0));
+          }
+        }
+        MisalignedTurnoutObjectiveHint.boundLimit(it, step5Matches, 2, this.turnoutType, 1);
+        MisalignedTurnoutObjectiveHint.boundLimit(it, step5Matches, 3, this.segmentType, 2);
+        MisalignedTurnoutObjectiveHint.boundLimit(it, step5Matches, 4, this.trainType, 2);
+        this.buildWithBounds(objectiveBuilder);
+      };
+      _xblockexpression = _function;
+    }
+    return _xblockexpression;
+  }
+  
+  private static void boundLimit(@Extension final ExtendedLinearExpressionBuilderFactory factory, final Collection<CostElementMatch> matches, final int index, final Type type, final int count) {
+    final Function1<CostElementMatch, Object> _function = (CostElementMatch it) -> {
+      return it.getMatch().get(index);
+    };
+    Set<Map.Entry<Object, List<CostElementMatch>>> _entrySet = IterableExtensions.<Object, CostElementMatch>groupBy(matches, _function).entrySet();
+    for (final Map.Entry<Object, List<CostElementMatch>> pair : _entrySet) {
+      {
+        final ExtendedLinearExpressionBuilder multiplicityBuilder = factory.createBuilder();
+        List<CostElementMatch> _value = pair.getValue();
+        for (final CostElementMatch m : _value) {
+          multiplicityBuilder.add(1, m.getMatch());
+        }
+        boolean _isMulti = CostElementMatchers.isMulti(pair.getKey());
+        if (_isMulti) {
+          multiplicityBuilder.add((-count), type);
+          multiplicityBuilder.build().tightenUpperBound(Integer.valueOf(0));
+        } else {
+          multiplicityBuilder.build().tightenUpperBound(Integer.valueOf(count));
+        }
+      }
+    }
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3ModelGenerator.java b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3ModelGenerator.java
new file mode 100644
index 00000000..16db7053
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3ModelGenerator.java
@@ -0,0 +1,598 @@
+package modes3.run;
+
+import com.google.common.base.Objects;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.EReferenceMapper_RelationsOverTypes_Trace;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.Ecore2logicannotationsFactory;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.Ecore2logicannotationsPackage;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.InverseRelationAssertion;
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel;
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicModelInterpretation;
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicProblemBuilder;
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.SolutionScope;
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput;
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.TypeScopes;
+import hu.bme.mit.inf.dslreasoner.logic.model.builder.VariableContext;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Assertion;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Iff;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicValue;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TermDescription;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDefinition;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Variable;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.Annotation;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.ModelResult;
+import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore;
+import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic;
+import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2LogicConfiguration;
+import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2LogicTrace;
+import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor;
+import hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.Viatra2LogicAnnotationsPackage;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.TypeInferenceMethod;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.PolyhedralScopePropagatorConstraints;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.PolyhedralScopePropagatorSolver;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ScopePropagatorStrategy;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.BinaryElementRelationLink;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialComplexTypeInterpretation;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialRelationInterpretation;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialinterpretationPackage;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.RelationLink;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretation2Gml;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.visualisation.PartialInterpretationVisualisation;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.CostObjectiveConfiguration;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.CostObjectiveElementConfiguration;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.DebugConfiguration;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.StateCoderStrategy;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasoner;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.ViatraReasonerConfiguration;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.dse.PartialModelAsLogicInterpretation;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.ObjectiveKind;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.ObjectiveThreshold;
+import hu.bme.mit.inf.dslreasoner.visualisation.pi2graphviz.GraphvizVisualiser;
+import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Predicate;
+import modes3.Modes3Factory;
+import modes3.Modes3ModelRoot;
+import modes3.Modes3Package;
+import modes3.queries.CloseTrains_step_2;
+import modes3.queries.CloseTrains_step_3;
+import modes3.queries.CloseTrains_step_4;
+import modes3.queries.CloseTrains_step_5;
+import modes3.queries.CloseTrains_step_6;
+import modes3.queries.CloseTrains_step_7;
+import modes3.queries.EndOfSiding_step_2;
+import modes3.queries.EndOfSiding_step_3;
+import modes3.queries.EndOfSiding_step_4;
+import modes3.queries.EndOfSiding_step_5;
+import modes3.queries.MisalignedTurnout_step_2;
+import modes3.queries.MisalignedTurnout_step_3;
+import modes3.queries.MisalignedTurnout_step_4;
+import modes3.queries.MisalignedTurnout_step_5;
+import modes3.queries.Modes3Queries;
+import modes3.queries.TrainLocations_step_2;
+import modes3.queries.TrainLocations_step_3;
+import modes3.run.CloseTrainsObjectiveHint;
+import modes3.run.EndOfSidingObjectiveHint;
+import modes3.run.MisalignedTurnoutObjectiveHint;
+import modes3.run.Modes3TypeScopeHint;
+import modes3.run.Modes3UnitPropagationGenerator;
+import modes3.run.TrainLocationsObjectiveHint;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
+import org.eclipse.viatra.query.patternlanguage.emf.EMFPatternLanguageStandaloneSetup;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngineOptions;
+import org.eclipse.viatra.query.runtime.localsearch.matcher.integration.LocalSearchEMFBackendFactory;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.rete.matcher.ReteBackendFactory;
+import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor;
+import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.CollectionLiterals;
+import org.eclipse.xtext.xbase.lib.Exceptions;
+import org.eclipse.xtext.xbase.lib.ExclusiveRange;
+import org.eclipse.xtext.xbase.lib.Extension;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.InputOutput;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+import org.eclipse.xtext.xbase.lib.ObjectExtensions;
+import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
+
+@FinalFieldsConstructor
+@SuppressWarnings("all")
+public class Modes3ModelGenerator {
+  private enum MonitoringQuery {
+    closeTrains,
+    
+    trainLocations,
+    
+    endOfSiding,
+    
+    misalignedTurnout;
+  }
+  
+  private final Modes3ModelGenerator.MonitoringQuery monitoringQuery;
+  
+  private final int modelSize;
+  
+  private final Ecore2Logic ecore2Logic = new Ecore2Logic();
+  
+  private final InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic();
+  
+  private final Viatra2Logic viatra2Logic = new Viatra2Logic(this.ecore2Logic);
+  
+  private final ViatraReasoner solver = new ViatraReasoner();
+  
+  @Extension
+  private final LogicProblemBuilder _logicProblemBuilder = new LogicProblemBuilder();
+  
+  public URI generate() {
+    try {
+      URI _xblockexpression = null;
+      {
+        final EcoreMetamodelDescriptor metamodel = Modes3ModelGenerator.createMetamodelDescriptor();
+        Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();
+        final TracedOutput<LogicProblem, Ecore2Logic_Trace> metamodelLogic = this.ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);
+        final Type segment = this.ecore2Logic.TypeofEClass(metamodelLogic.getTrace(), Modes3Package.eINSTANCE.getSegment());
+        final RelationDeclaration connectedTo = this.ecore2Logic.relationOfReference(metamodelLogic.getTrace(), 
+          Modes3Package.eINSTANCE.getSegment_ConnectedTo());
+        final RelationDeclaration connectedToIndicator = ((EReferenceMapper_RelationsOverTypes_Trace) metamodelLogic.getTrace().referenceMapperTrace).indicators.get(
+          Modes3Package.eINSTANCE.getSegment_ConnectedTo());
+        StringConcatenation _builder = new StringConcatenation();
+        _builder.append("oppositeReference ");
+        String _name = connectedTo.getName();
+        _builder.append(_name);
+        _builder.append(" ");
+        String _name_1 = connectedTo.getName();
+        _builder.append(_name_1);
+        final Function1<VariableContext, TermDescription> _function = (VariableContext it) -> {
+          Iff _xblockexpression_1 = null;
+          {
+            StringConcatenation _builder_1 = new StringConcatenation();
+            _builder_1.append("src");
+            final Variable src = it.addVar(_builder_1, segment);
+            StringConcatenation _builder_2 = new StringConcatenation();
+            _builder_2.append("trg");
+            final Variable trg = it.addVar(_builder_2, segment);
+            SymbolicValue _call = this._logicProblemBuilder.call(connectedToIndicator, src, trg);
+            SymbolicValue _call_1 = this._logicProblemBuilder.call(connectedToIndicator, trg, src);
+            _xblockexpression_1 = this._logicProblemBuilder.operator_spaceship(_call, _call_1);
+          }
+          return _xblockexpression_1;
+        };
+        final Assertion inverseAssertion = this._logicProblemBuilder.Assertion(_builder, 
+          this._logicProblemBuilder.Forall(_function));
+        EList<Assertion> _assertions = metamodelLogic.getOutput().getAssertions();
+        _assertions.add(inverseAssertion);
+        InverseRelationAssertion _createInverseRelationAssertion = Ecore2logicannotationsFactory.eINSTANCE.createInverseRelationAssertion();
+        final Procedure1<InverseRelationAssertion> _function_1 = (InverseRelationAssertion it) -> {
+          it.setTarget(inverseAssertion);
+          it.setInverseA(connectedTo);
+          it.setInverseB(connectedTo);
+        };
+        final InverseRelationAssertion inverseAnnotation = ObjectExtensions.<InverseRelationAssertion>operator_doubleArrow(_createInverseRelationAssertion, _function_1);
+        EList<Annotation> _annotations = metamodelLogic.getOutput().getAnnotations();
+        _annotations.add(inverseAnnotation);
+        final List<EObject> initialModel = Modes3ModelGenerator.loadInitialModel();
+        final TracedOutput<LogicProblem, Ecore2Logic_Trace> initialModelLogic = this.instanceModel2Logic.transform(metamodelLogic, initialModel);
+        final ViatraQuerySetDescriptor queries = this.loadQueries();
+        Viatra2LogicConfiguration _viatra2LogicConfiguration = new Viatra2LogicConfiguration();
+        final TracedOutput<LogicProblem, Viatra2LogicTrace> logic = this.viatra2Logic.transformQueries(queries, initialModelLogic, _viatra2LogicConfiguration);
+        ViatraReasonerConfiguration _viatraReasonerConfiguration = new ViatraReasonerConfiguration();
+        final Procedure1<ViatraReasonerConfiguration> _function_2 = (ViatraReasonerConfiguration it) -> {
+          it.runtimeLimit = 3600;
+          final Procedure1<TypeScopes> _function_3 = (TypeScopes it_1) -> {
+            it_1.minNewElements = this.modelSize;
+            it_1.maxNewElements = this.modelSize;
+            final Procedure1<Map<Type, Integer>> _function_4 = (Map<Type, Integer> it_2) -> {
+            };
+            ObjectExtensions.<Map<Type, Integer>>operator_doubleArrow(
+              it_1.minNewElementsByType, _function_4);
+            final Procedure1<Map<Type, Integer>> _function_5 = (Map<Type, Integer> it_2) -> {
+              it_2.put(this.ecore2Logic.TypeofEClass(metamodelLogic.getTrace(), Modes3Package.eINSTANCE.getTrain()), Integer.valueOf((this.modelSize / 5)));
+              it_2.put(this.ecore2Logic.TypeofEClass(metamodelLogic.getTrace(), Modes3Package.eINSTANCE.getTurnout()), Integer.valueOf((this.modelSize / 5)));
+              it_2.put(this.ecore2Logic.TypeofEClass(metamodelLogic.getTrace(), Modes3Package.eINSTANCE.getSimpleSegment()), Integer.valueOf(((3 * this.modelSize) / 5)));
+            };
+            ObjectExtensions.<Map<Type, Integer>>operator_doubleArrow(
+              it_1.maxNewElementsByType, _function_5);
+          };
+          ObjectExtensions.<TypeScopes>operator_doubleArrow(
+            it.typeScopes, _function_3);
+          final Procedure1<SolutionScope> _function_4 = (SolutionScope it_1) -> {
+            it_1.numberOfRequiredSolutions = 1;
+          };
+          ObjectExtensions.<SolutionScope>operator_doubleArrow(
+            it.solutionScope, _function_4);
+          CostObjectiveConfiguration _objective = this.getObjective(this.ecore2Logic, metamodelLogic.getTrace());
+          it.costObjectives.add(_objective);
+          it.scopeWeight = 6;
+          it.nameNewElements = false;
+          it.typeInferenceMethod = TypeInferenceMethod.PreliminaryAnalysis;
+          it.stateCoderStrategy = StateCoderStrategy.PairwiseNeighbourhood;
+          ScopePropagatorStrategy.Polyhedral _polyhedral = new ScopePropagatorStrategy.Polyhedral(
+            PolyhedralScopePropagatorConstraints.Relational, PolyhedralScopePropagatorSolver.Clp);
+          it.scopePropagatorStrategy = _polyhedral;
+          Ecore2Logic_Trace _trace = metamodelLogic.getTrace();
+          Modes3TypeScopeHint _modes3TypeScopeHint = new Modes3TypeScopeHint(this.ecore2Logic, _trace);
+          it.hints.add(_modes3TypeScopeHint);
+          Ecore2Logic_Trace _trace_1 = metamodelLogic.getTrace();
+          Modes3UnitPropagationGenerator _modes3UnitPropagationGenerator = new Modes3UnitPropagationGenerator(this.ecore2Logic, _trace_1);
+          it.unitPropagationPatternGenerators.add(_modes3UnitPropagationGenerator);
+          final Procedure1<DebugConfiguration> _function_5 = (DebugConfiguration it_1) -> {
+            GraphvizVisualiser _graphvizVisualiser = new GraphvizVisualiser();
+            it_1.partialInterpretatioVisualiser = _graphvizVisualiser;
+          };
+          ObjectExtensions.<DebugConfiguration>operator_doubleArrow(
+            it.debugConfiguration, _function_5);
+          it.documentationLevel = DocumentationLevel.NORMAL;
+        };
+        final ViatraReasonerConfiguration config = ObjectExtensions.<ViatraReasonerConfiguration>operator_doubleArrow(_viatraReasonerConfiguration, _function_2);
+        final FileSystemWorkspace workspace = new FileSystemWorkspace("output/", "");
+        workspace.writeModel(logic.getOutput(), "problem.logicproblem");
+        final LogicResult solution = this.solver.solve(logic.getOutput(), config, workspace);
+        URI _xifexpression = null;
+        if ((solution instanceof ModelResult)) {
+          InputOutput.<String>println("Saving generated solutions");
+          final Logic2Ecore logic2Ecore = new Logic2Ecore(this.ecore2Logic);
+          final List<? extends LogicModelInterpretation> interpretations = this.solver.getInterpretations(((ModelResult)solution));
+          int _size = interpretations.size();
+          ExclusiveRange _doubleDotLessThan = new ExclusiveRange(0, _size, true);
+          for (final Integer representationIndex : _doubleDotLessThan) {
+            {
+              final LogicModelInterpretation interpretation = interpretations.get((representationIndex).intValue());
+              final int representationNumber = ((representationIndex).intValue() + 1);
+              if ((interpretation instanceof PartialModelAsLogicInterpretation)) {
+                final PartialInterpretation representation = ((PartialModelAsLogicInterpretation)interpretation).getPartialInterpretation();
+                StringConcatenation _builder_1 = new StringConcatenation();
+                _builder_1.append("solution");
+                _builder_1.append(representationNumber);
+                _builder_1.append(".partialinterpretation");
+                workspace.writeModel(representation, _builder_1.toString());
+                final PartialInterpretation2Gml partialInterpretation2GML = new PartialInterpretation2Gml();
+                final String gml = partialInterpretation2GML.transform(representation);
+                StringConcatenation _builder_2 = new StringConcatenation();
+                _builder_2.append("solution");
+                _builder_2.append(representationNumber);
+                _builder_2.append(".gml");
+                workspace.writeText(_builder_2.toString(), gml);
+                final EObject model = logic2Ecore.transformInterpretation(interpretation, metamodelLogic.getTrace());
+                final TreeIterator<EObject> iterator = model.eAllContents();
+                int id = 0;
+                while (iterator.hasNext()) {
+                  {
+                    final EObject obj = iterator.next();
+                    final Function1<EAttribute, Boolean> _function_3 = (EAttribute it) -> {
+                      String _name_2 = it.getName();
+                      return Boolean.valueOf(Objects.equal(_name_2, "id"));
+                    };
+                    final EAttribute idFeature = IterableExtensions.<EAttribute>findFirst(obj.eClass().getEAllAttributes(), _function_3);
+                    if ((idFeature != null)) {
+                      obj.eSet(idFeature, Integer.valueOf(id));
+                      id++;
+                    }
+                  }
+                }
+                StringConcatenation _builder_3 = new StringConcatenation();
+                _builder_3.append("solution");
+                _builder_3.append(representationNumber);
+                _builder_3.append(".modes3");
+                workspace.writeModel(model, _builder_3.toString());
+                int _size_1 = representation.getNewElements().size();
+                boolean _lessThan = (_size_1 < 160);
+                if (_lessThan) {
+                  final Function1<Type, Boolean> _function_3 = (Type it) -> {
+                    String _name_2 = it.getName();
+                    return Boolean.valueOf(Objects.equal(_name_2, "Modes3ModelRoot class DefinedPart"));
+                  };
+                  Type _findFirst = IterableExtensions.<Type>findFirst(representation.getProblem().getTypes(), _function_3);
+                  final TypeDefinition rootType = ((TypeDefinition) _findFirst);
+                  final Function1<PartialComplexTypeInterpretation, Boolean> _function_4 = (PartialComplexTypeInterpretation it) -> {
+                    String _name_2 = it.getInterpretationOf().getName();
+                    return Boolean.valueOf(Objects.equal(_name_2, "Modes3ModelRoot class"));
+                  };
+                  final PartialComplexTypeInterpretation rootIntepretation = IterableExtensions.<PartialComplexTypeInterpretation>findFirst(Iterables.<PartialComplexTypeInterpretation>filter(representation.getPartialtypeinterpratation(), 
+                    PartialComplexTypeInterpretation.class), _function_4);
+                  rootIntepretation.getElements().removeAll(rootType.getElements());
+                  representation.getProblem().getElements().removeAll(rootType.getElements());
+                  EList<PartialRelationInterpretation> _partialrelationinterpretation = representation.getPartialrelationinterpretation();
+                  for (final PartialRelationInterpretation relationInterpretation : _partialrelationinterpretation) {
+                    final Predicate<RelationLink> _function_5 = (RelationLink link) -> {
+                      boolean _xifexpression_1 = false;
+                      if ((link instanceof BinaryElementRelationLink)) {
+                        _xifexpression_1 = (rootType.getElements().contains(((BinaryElementRelationLink)link).getParam1()) || 
+                          rootType.getElements().contains(((BinaryElementRelationLink)link).getParam2()));
+                      } else {
+                        _xifexpression_1 = false;
+                      }
+                      return _xifexpression_1;
+                    };
+                    relationInterpretation.getRelationlinks().removeIf(_function_5);
+                  }
+                  rootType.getElements().clear();
+                  final GraphvizVisualiser visualiser = new GraphvizVisualiser();
+                  final PartialInterpretationVisualisation visualisation = visualiser.visualiseConcretization(representation);
+                  StringConcatenation _builder_4 = new StringConcatenation();
+                  _builder_4.append("solution");
+                  _builder_4.append(representationNumber);
+                  _builder_4.append(".png");
+                  visualisation.writeToFile(workspace, _builder_4.toString());
+                }
+              } else {
+                StringConcatenation _builder_5 = new StringConcatenation();
+                _builder_5.append("solution");
+                _builder_5.append(representationNumber);
+                _builder_5.append(".txt");
+                workspace.writeText(_builder_5.toString(), interpretation.toString());
+              }
+            }
+          }
+        } else {
+          URI _xblockexpression_1 = null;
+          {
+            InputOutput.<String>println("Failed to solve problem");
+            final LogicProblem partial = logic.getOutput();
+            _xblockexpression_1 = workspace.writeModel(partial, "solution.partialinterpretation");
+          }
+          _xifexpression = _xblockexpression_1;
+        }
+        _xblockexpression = _xifexpression;
+      }
+      return _xblockexpression;
+    } catch (Throwable _e) {
+      throw Exceptions.sneakyThrow(_e);
+    }
+  }
+  
+  public static EcoreMetamodelDescriptor createMetamodelDescriptor() {
+    EcoreMetamodelDescriptor _xblockexpression = null;
+    {
+      final ImmutableList<EClass> eClasses = ImmutableList.<EClass>copyOf(Iterables.<EClass>filter(Modes3Package.eINSTANCE.getEClassifiers(), EClass.class));
+      Set<EClass> _emptySet = CollectionLiterals.<EClass>emptySet();
+      List<EEnum> _emptyList = CollectionLiterals.<EEnum>emptyList();
+      List<EEnumLiteral> _emptyList_1 = CollectionLiterals.<EEnumLiteral>emptyList();
+      final Function1<EClass, EList<EReference>> _function = (EClass it) -> {
+        return it.getEReferences();
+      };
+      ImmutableList<EReference> _copyOf = ImmutableList.<EReference>copyOf(IterableExtensions.<EClass, EReference>flatMap(eClasses, _function));
+      List<EAttribute> _emptyList_2 = CollectionLiterals.<EAttribute>emptyList();
+      _xblockexpression = new EcoreMetamodelDescriptor(eClasses, _emptySet, 
+        false, _emptyList, _emptyList_1, _copyOf, _emptyList_2);
+    }
+    return _xblockexpression;
+  }
+  
+  public static List<EObject> loadInitialModel() {
+    Modes3ModelRoot _createModes3ModelRoot = Modes3Factory.eINSTANCE.createModes3ModelRoot();
+    return Collections.<EObject>unmodifiableList(CollectionLiterals.<EObject>newArrayList(_createModes3ModelRoot));
+  }
+  
+  public ViatraQuerySetDescriptor loadQueries() {
+    ViatraQuerySetDescriptor _xblockexpression = null;
+    {
+      final ImmutableList.Builder<IQuerySpecification<?>> patternsBuilder = ImmutableList.<IQuerySpecification<?>>builder();
+      patternsBuilder.addAll(Modes3Queries.instance().getSpecifications());
+      final ImmutableList<IQuerySpecification<?>> patterns = patternsBuilder.build();
+      final Function1<IQuerySpecification<?>, Boolean> _function = (IQuerySpecification<?> pattern) -> {
+        final Function1<PAnnotation, Boolean> _function_1 = (PAnnotation it) -> {
+          String _name = it.getName();
+          return Boolean.valueOf(Objects.equal(_name, "Constraint"));
+        };
+        return Boolean.valueOf(IterableExtensions.<PAnnotation>exists(pattern.getAllAnnotations(), _function_1));
+      };
+      final ImmutableSet<IQuerySpecification<?>> validationPatterns = ImmutableSet.<IQuerySpecification<?>>copyOf(IterableExtensions.<IQuerySpecification<?>>filter(patterns, _function));
+      Map<IQuerySpecification<?>, EStructuralFeature> _emptyMap = CollectionLiterals.<IQuerySpecification<?>, EStructuralFeature>emptyMap();
+      _xblockexpression = new ViatraQuerySetDescriptor(patterns, validationPatterns, _emptyMap);
+    }
+    return _xblockexpression;
+  }
+  
+  public CostObjectiveConfiguration getObjective(final Ecore2Logic ecore2Logic, final Ecore2Logic_Trace ecore2LogicTrace) {
+    CostObjectiveConfiguration _costObjectiveConfiguration = new CostObjectiveConfiguration();
+    final Procedure1<CostObjectiveConfiguration> _function = (CostObjectiveConfiguration it) -> {
+      final Modes3ModelGenerator.MonitoringQuery monitoringQuery = this.monitoringQuery;
+      if (monitoringQuery != null) {
+        switch (monitoringQuery) {
+          case closeTrains:
+            CostObjectiveElementConfiguration _costObjectiveElementConfiguration = new CostObjectiveElementConfiguration();
+            final Procedure1<CostObjectiveElementConfiguration> _function_1 = (CostObjectiveElementConfiguration it_1) -> {
+              it_1.patternQualifiedName = CloseTrains_step_2.instance().getFullyQualifiedName();
+              it_1.weight = ((14 + 53) + 11);
+            };
+            CostObjectiveElementConfiguration _doubleArrow = ObjectExtensions.<CostObjectiveElementConfiguration>operator_doubleArrow(_costObjectiveElementConfiguration, _function_1);
+            it.elements.add(_doubleArrow);
+            CostObjectiveElementConfiguration _costObjectiveElementConfiguration_1 = new CostObjectiveElementConfiguration();
+            final Procedure1<CostObjectiveElementConfiguration> _function_2 = (CostObjectiveElementConfiguration it_1) -> {
+              it_1.patternQualifiedName = CloseTrains_step_3.instance().getFullyQualifiedName();
+              it_1.weight = (21 + 14);
+            };
+            CostObjectiveElementConfiguration _doubleArrow_1 = ObjectExtensions.<CostObjectiveElementConfiguration>operator_doubleArrow(_costObjectiveElementConfiguration_1, _function_2);
+            it.elements.add(_doubleArrow_1);
+            CostObjectiveElementConfiguration _costObjectiveElementConfiguration_2 = new CostObjectiveElementConfiguration();
+            final Procedure1<CostObjectiveElementConfiguration> _function_3 = (CostObjectiveElementConfiguration it_1) -> {
+              it_1.patternQualifiedName = CloseTrains_step_4.instance().getFullyQualifiedName();
+              it_1.weight = (((14 + 44) + 14) + 9);
+            };
+            CostObjectiveElementConfiguration _doubleArrow_2 = ObjectExtensions.<CostObjectiveElementConfiguration>operator_doubleArrow(_costObjectiveElementConfiguration_2, _function_3);
+            it.elements.add(_doubleArrow_2);
+            CostObjectiveElementConfiguration _costObjectiveElementConfiguration_3 = new CostObjectiveElementConfiguration();
+            final Procedure1<CostObjectiveElementConfiguration> _function_4 = (CostObjectiveElementConfiguration it_1) -> {
+              it_1.patternQualifiedName = CloseTrains_step_5.instance().getFullyQualifiedName();
+              it_1.weight = ((14 + 41) + 11);
+            };
+            CostObjectiveElementConfiguration _doubleArrow_3 = ObjectExtensions.<CostObjectiveElementConfiguration>operator_doubleArrow(_costObjectiveElementConfiguration_3, _function_4);
+            it.elements.add(_doubleArrow_3);
+            CostObjectiveElementConfiguration _costObjectiveElementConfiguration_4 = new CostObjectiveElementConfiguration();
+            final Procedure1<CostObjectiveElementConfiguration> _function_5 = (CostObjectiveElementConfiguration it_1) -> {
+              it_1.patternQualifiedName = CloseTrains_step_6.instance().getFullyQualifiedName();
+              it_1.weight = 27;
+            };
+            CostObjectiveElementConfiguration _doubleArrow_4 = ObjectExtensions.<CostObjectiveElementConfiguration>operator_doubleArrow(_costObjectiveElementConfiguration_4, _function_5);
+            it.elements.add(_doubleArrow_4);
+            CostObjectiveElementConfiguration _costObjectiveElementConfiguration_5 = new CostObjectiveElementConfiguration();
+            final Procedure1<CostObjectiveElementConfiguration> _function_6 = (CostObjectiveElementConfiguration it_1) -> {
+              it_1.patternQualifiedName = CloseTrains_step_7.instance().getFullyQualifiedName();
+              it_1.weight = 48;
+            };
+            CostObjectiveElementConfiguration _doubleArrow_5 = ObjectExtensions.<CostObjectiveElementConfiguration>operator_doubleArrow(_costObjectiveElementConfiguration_5, _function_6);
+            it.elements.add(_doubleArrow_5);
+            CloseTrainsObjectiveHint _closeTrainsObjectiveHint = new CloseTrainsObjectiveHint(ecore2Logic, ecore2LogicTrace);
+            it.hint = _closeTrainsObjectiveHint;
+            break;
+          case trainLocations:
+            CostObjectiveElementConfiguration _costObjectiveElementConfiguration_6 = new CostObjectiveElementConfiguration();
+            final Procedure1<CostObjectiveElementConfiguration> _function_7 = (CostObjectiveElementConfiguration it_1) -> {
+              it_1.patternQualifiedName = TrainLocations_step_2.instance().getFullyQualifiedName();
+              it_1.weight = ((14 + 53) + 11);
+            };
+            CostObjectiveElementConfiguration _doubleArrow_6 = ObjectExtensions.<CostObjectiveElementConfiguration>operator_doubleArrow(_costObjectiveElementConfiguration_6, _function_7);
+            it.elements.add(_doubleArrow_6);
+            CostObjectiveElementConfiguration _costObjectiveElementConfiguration_7 = new CostObjectiveElementConfiguration();
+            final Procedure1<CostObjectiveElementConfiguration> _function_8 = (CostObjectiveElementConfiguration it_1) -> {
+              it_1.patternQualifiedName = TrainLocations_step_3.instance().getFullyQualifiedName();
+              it_1.weight = 48;
+            };
+            CostObjectiveElementConfiguration _doubleArrow_7 = ObjectExtensions.<CostObjectiveElementConfiguration>operator_doubleArrow(_costObjectiveElementConfiguration_7, _function_8);
+            it.elements.add(_doubleArrow_7);
+            TrainLocationsObjectiveHint _trainLocationsObjectiveHint = new TrainLocationsObjectiveHint(ecore2Logic, ecore2LogicTrace);
+            it.hint = _trainLocationsObjectiveHint;
+            break;
+          case misalignedTurnout:
+            CostObjectiveElementConfiguration _costObjectiveElementConfiguration_8 = new CostObjectiveElementConfiguration();
+            final Procedure1<CostObjectiveElementConfiguration> _function_9 = (CostObjectiveElementConfiguration it_1) -> {
+              it_1.patternQualifiedName = MisalignedTurnout_step_2.instance().getFullyQualifiedName();
+              it_1.weight = ((14 + 53) + 11);
+            };
+            CostObjectiveElementConfiguration _doubleArrow_8 = ObjectExtensions.<CostObjectiveElementConfiguration>operator_doubleArrow(_costObjectiveElementConfiguration_8, _function_9);
+            it.elements.add(_doubleArrow_8);
+            CostObjectiveElementConfiguration _costObjectiveElementConfiguration_9 = new CostObjectiveElementConfiguration();
+            final Procedure1<CostObjectiveElementConfiguration> _function_10 = (CostObjectiveElementConfiguration it_1) -> {
+              it_1.patternQualifiedName = MisalignedTurnout_step_3.instance().getFullyQualifiedName();
+              it_1.weight = 108;
+            };
+            CostObjectiveElementConfiguration _doubleArrow_9 = ObjectExtensions.<CostObjectiveElementConfiguration>operator_doubleArrow(_costObjectiveElementConfiguration_9, _function_10);
+            it.elements.add(_doubleArrow_9);
+            CostObjectiveElementConfiguration _costObjectiveElementConfiguration_10 = new CostObjectiveElementConfiguration();
+            final Procedure1<CostObjectiveElementConfiguration> _function_11 = (CostObjectiveElementConfiguration it_1) -> {
+              it_1.patternQualifiedName = MisalignedTurnout_step_4.instance().getFullyQualifiedName();
+              it_1.weight = 27;
+            };
+            CostObjectiveElementConfiguration _doubleArrow_10 = ObjectExtensions.<CostObjectiveElementConfiguration>operator_doubleArrow(_costObjectiveElementConfiguration_10, _function_11);
+            it.elements.add(_doubleArrow_10);
+            CostObjectiveElementConfiguration _costObjectiveElementConfiguration_11 = new CostObjectiveElementConfiguration();
+            final Procedure1<CostObjectiveElementConfiguration> _function_12 = (CostObjectiveElementConfiguration it_1) -> {
+              it_1.patternQualifiedName = MisalignedTurnout_step_5.instance().getFullyQualifiedName();
+              it_1.weight = 48;
+            };
+            CostObjectiveElementConfiguration _doubleArrow_11 = ObjectExtensions.<CostObjectiveElementConfiguration>operator_doubleArrow(_costObjectiveElementConfiguration_11, _function_12);
+            it.elements.add(_doubleArrow_11);
+            MisalignedTurnoutObjectiveHint _misalignedTurnoutObjectiveHint = new MisalignedTurnoutObjectiveHint(ecore2Logic, ecore2LogicTrace);
+            it.hint = _misalignedTurnoutObjectiveHint;
+            break;
+          case endOfSiding:
+            CostObjectiveElementConfiguration _costObjectiveElementConfiguration_12 = new CostObjectiveElementConfiguration();
+            final Procedure1<CostObjectiveElementConfiguration> _function_13 = (CostObjectiveElementConfiguration it_1) -> {
+              it_1.patternQualifiedName = EndOfSiding_step_2.instance().getFullyQualifiedName();
+              it_1.weight = ((14 + 53) + 11);
+            };
+            CostObjectiveElementConfiguration _doubleArrow_12 = ObjectExtensions.<CostObjectiveElementConfiguration>operator_doubleArrow(_costObjectiveElementConfiguration_12, _function_13);
+            it.elements.add(_doubleArrow_12);
+            CostObjectiveElementConfiguration _costObjectiveElementConfiguration_13 = new CostObjectiveElementConfiguration();
+            final Procedure1<CostObjectiveElementConfiguration> _function_14 = (CostObjectiveElementConfiguration it_1) -> {
+              it_1.patternQualifiedName = EndOfSiding_step_3.instance().getFullyQualifiedName();
+              it_1.weight = (21 + 14);
+            };
+            CostObjectiveElementConfiguration _doubleArrow_13 = ObjectExtensions.<CostObjectiveElementConfiguration>operator_doubleArrow(_costObjectiveElementConfiguration_13, _function_14);
+            it.elements.add(_doubleArrow_13);
+            CostObjectiveElementConfiguration _costObjectiveElementConfiguration_14 = new CostObjectiveElementConfiguration();
+            final Procedure1<CostObjectiveElementConfiguration> _function_15 = (CostObjectiveElementConfiguration it_1) -> {
+              it_1.patternQualifiedName = EndOfSiding_step_4.instance().getFullyQualifiedName();
+              it_1.weight = (((((((14 + 35) + 21) + 15) + 14) + 21) + 15) + 11);
+            };
+            CostObjectiveElementConfiguration _doubleArrow_14 = ObjectExtensions.<CostObjectiveElementConfiguration>operator_doubleArrow(_costObjectiveElementConfiguration_14, _function_15);
+            it.elements.add(_doubleArrow_14);
+            CostObjectiveElementConfiguration _costObjectiveElementConfiguration_15 = new CostObjectiveElementConfiguration();
+            final Procedure1<CostObjectiveElementConfiguration> _function_16 = (CostObjectiveElementConfiguration it_1) -> {
+              it_1.patternQualifiedName = EndOfSiding_step_5.instance().getFullyQualifiedName();
+              it_1.weight = 48;
+            };
+            CostObjectiveElementConfiguration _doubleArrow_15 = ObjectExtensions.<CostObjectiveElementConfiguration>operator_doubleArrow(_costObjectiveElementConfiguration_15, _function_16);
+            it.elements.add(_doubleArrow_15);
+            EndOfSidingObjectiveHint _endOfSidingObjectiveHint = new EndOfSidingObjectiveHint(ecore2Logic, ecore2LogicTrace);
+            it.hint = _endOfSidingObjectiveHint;
+            break;
+          default:
+            throw new IllegalArgumentException(("Unknown monitoring query: " + this.monitoringQuery));
+        }
+      } else {
+        throw new IllegalArgumentException(("Unknown monitoring query: " + this.monitoringQuery));
+      }
+      it.kind = ObjectiveKind.HIGHER_IS_BETTER;
+      it.threshold = ObjectiveThreshold.NO_THRESHOLD;
+      it.findExtremum = true;
+    };
+    return ObjectExtensions.<CostObjectiveConfiguration>operator_doubleArrow(_costObjectiveConfiguration, _function);
+  }
+  
+  public static Object init() {
+    Object _xblockexpression = null;
+    {
+      EMFPatternLanguageStandaloneSetup.doSetup();
+      ViatraQueryEngineOptions.setSystemDefaultBackends(ReteBackendFactory.INSTANCE, ReteBackendFactory.INSTANCE, 
+        LocalSearchEMFBackendFactory.INSTANCE);
+      LogiclanguagePackage.eINSTANCE.getClass();
+      LogicproblemPackage.eINSTANCE.getClass();
+      PartialinterpretationPackage.eINSTANCE.getClass();
+      Ecore2logicannotationsPackage.eINSTANCE.getClass();
+      Viatra2LogicAnnotationsPackage.eINSTANCE.getClass();
+      Map<String, Object> _extensionToFactoryMap = Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap();
+      XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();
+      _xblockexpression = _extensionToFactoryMap.put("*", _xMIResourceFactoryImpl);
+    }
+    return _xblockexpression;
+  }
+  
+  public static void main(final String[] args) {
+    int _length = args.length;
+    boolean _notEquals = (_length != 2);
+    if (_notEquals) {
+      System.err.println("Usage: <query> <model size>");
+    }
+    final Modes3ModelGenerator.MonitoringQuery monitoringQuery = Modes3ModelGenerator.MonitoringQuery.valueOf(args[0]);
+    final int modelSize = Integer.parseInt(args[1]);
+    Modes3ModelGenerator.init();
+    final Modes3ModelGenerator generator = new Modes3ModelGenerator(monitoringQuery, modelSize);
+    generator.generate();
+  }
+  
+  public Modes3ModelGenerator(final Modes3ModelGenerator.MonitoringQuery monitoringQuery, final int modelSize) {
+    super();
+    this.monitoringQuery = monitoringQuery;
+    this.modelSize = modelSize;
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3TypeScopeHint.java b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3TypeScopeHint.java
new file mode 100644
index 00000000..adb69760
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3TypeScopeHint.java
@@ -0,0 +1,133 @@
+package modes3.run;
+
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.Modality;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearBoundedExpression;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeConstraintHint;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.LinearTypeExpressionBuilderFactory;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.RelationConstraintUpdater;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretationlanguage.partialinterpretation.PartialInterpretation;
+import java.util.Iterator;
+import java.util.Map;
+import modes3.Modes3Package;
+import modes3.queries.Adjacent;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery;
+import org.eclipse.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.xbase.lib.Extension;
+
+@SuppressWarnings("all")
+public class Modes3TypeScopeHint implements LinearTypeConstraintHint {
+  private static final String TURNOUT_NEIGHBOR_COUNT = "turnoutNeighborCount";
+  
+  private final Type segmentType;
+  
+  private final Type turnoutType;
+  
+  public Modes3TypeScopeHint(@Extension final Ecore2Logic ecore2Logic, final Ecore2Logic_Trace ecore2LogicTrace) {
+    @Extension
+    final Modes3Package Modes3Package = modes3.Modes3Package.eINSTANCE;
+    this.segmentType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getSegment());
+    this.turnoutType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getTurnout());
+  }
+  
+  @Override
+  public CharSequence getAdditionalPatterns(@Extension final PatternGenerator patternGenerator, final Map<String, PQuery> fqnToPQuery) {
+    StringConcatenation _builder = new StringConcatenation();
+    _builder.append("\t");
+    _builder.append("pattern ");
+    _builder.append(Modes3TypeScopeHint.TURNOUT_NEIGHBOR_COUNT, "\t");
+    _builder.append("_helper(problem: LogicProblem, interpretation: PartialInterpretation, source: DefinedElement, target: DefinedElement) {");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t\t");
+    _builder.append("find interpretation(problem, interpretation);");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("find mustExist(problem, interpretation, source);");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("find mustExist(problem, interpretation, target);");
+    _builder.newLine();
+    _builder.append("\t\t");
+    CharSequence _referInstanceOf = patternGenerator.getTypeIndexer().referInstanceOf(this.turnoutType, Modality.MUST, "source");
+    _builder.append(_referInstanceOf, "\t\t");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t\t");
+    CharSequence _referInstanceOf_1 = patternGenerator.getTypeIndexer().referInstanceOf(this.segmentType, Modality.MUST, "target");
+    _builder.append(_referInstanceOf_1, "\t\t");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t\t");
+    CharSequence _referPattern = patternGenerator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "source", "target" }, Modality.MUST, true, false);
+    _builder.append(_referPattern, "\t\t");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t");
+    _builder.append("}");
+    _builder.newLine();
+    _builder.newLine();
+    _builder.append("\t");
+    _builder.append("pattern ");
+    _builder.append(Modes3TypeScopeHint.TURNOUT_NEIGHBOR_COUNT, "\t");
+    _builder.append("(problem: LogicProblem, interpretation: PartialInterpretation, element: DefinedElement, N) {");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t\t");
+    _builder.append("find interpretation(problem, interpretation);");
+    _builder.newLine();
+    _builder.append("\t\t");
+    _builder.append("find mustExist(problem, interpretation, element);");
+    _builder.newLine();
+    _builder.append("\t\t");
+    CharSequence _referInstanceOf_2 = patternGenerator.getTypeIndexer().referInstanceOf(this.turnoutType, Modality.MUST, "element");
+    _builder.append(_referInstanceOf_2, "\t\t");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t\t");
+    _builder.append("N == count find ");
+    _builder.append(Modes3TypeScopeHint.TURNOUT_NEIGHBOR_COUNT, "\t\t");
+    _builder.append("_helper(problem, interpretation, element, _);");
+    _builder.newLineIfNotEmpty();
+    _builder.append("\t");
+    _builder.append("}");
+    _builder.newLine();
+    return _builder;
+  }
+  
+  @Override
+  public RelationConstraintUpdater createConstraintUpdater(final LinearTypeExpressionBuilderFactory builderFactory) {
+    final ViatraQueryMatcher<? extends IPatternMatch> turnoutNeighborCountMatcher = builderFactory.createMatcher(Modes3TypeScopeHint.TURNOUT_NEIGHBOR_COUNT);
+    final LinearBoundedExpression newNeighbors = builderFactory.createBuilder().add(1, this.segmentType).build();
+    final RelationConstraintUpdater _function = (PartialInterpretation partialInterpretation) -> {
+      final int requiredNeighbbors = Modes3TypeScopeHint.getRemainingCount(turnoutNeighborCountMatcher, partialInterpretation, 3);
+      newNeighbors.tightenLowerBound(Integer.valueOf(requiredNeighbbors));
+    };
+    return _function;
+  }
+  
+  private static <T extends IPatternMatch> int getRemainingCount(final ViatraQueryMatcher<T> matcher, final PartialInterpretation partialInterpretation, final int capacity) {
+    int _xblockexpression = (int) 0;
+    {
+      final T partialMatch = matcher.newEmptyMatch();
+      partialMatch.set(0, partialInterpretation.getProblem());
+      partialMatch.set(1, partialInterpretation);
+      final Iterator<T> iterator = matcher.streamAllMatches(partialMatch).iterator();
+      int max = 0;
+      while (iterator.hasNext()) {
+        {
+          final T match = iterator.next();
+          Object _get = match.get(3);
+          final int n = ((Integer) _get).intValue();
+          if ((n < capacity)) {
+            final int required = (capacity - n);
+            if ((max < required)) {
+              max = required;
+            }
+          }
+        }
+      }
+      _xblockexpression = max;
+    }
+    return _xblockexpression;
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3UnitPropagationGenerator.java b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3UnitPropagationGenerator.java
new file mode 100644
index 00000000..5c5f82c5
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/Modes3UnitPropagationGenerator.java
@@ -0,0 +1,1174 @@
+package modes3.run;
+
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.Modality;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.PatternGenerator;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.patterns.UnitPropagationPatternGenerator;
+import java.util.Collections;
+import java.util.Map;
+import modes3.Modes3Package;
+import modes3.queries.Adjacent;
+import modes3.queries.Output;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery;
+import org.eclipse.xtend2.lib.StringConcatenationClient;
+import org.eclipse.xtext.xbase.lib.CollectionLiterals;
+import org.eclipse.xtext.xbase.lib.Extension;
+import org.eclipse.xtext.xbase.lib.Pair;
+
+@SuppressWarnings("all")
+public class Modes3UnitPropagationGenerator implements UnitPropagationPatternGenerator {
+  private static final String MUST_NOT_CONNECTED_TO = "mustNotConnectedTo";
+  
+  private static final String MUST_NOT_STRAIGHT = "mustNotStraight";
+  
+  private static final String MUST_NOT_DIVERGENT = "mustNotDivergent";
+  
+  private static final String MUST_CONNECTED_TO = "mustConnectedTo";
+  
+  private static final String MUST_STRAIGHT = "mustStraight";
+  
+  private static final String MUST_DIVERGENT = "mustDivergent";
+  
+  private final Type segmentType;
+  
+  private final Type simpleSegmentType;
+  
+  private final Type turnoutType;
+  
+  private final Relation connectedToRelation;
+  
+  private final Relation straightRelation;
+  
+  private final Relation divergentRelation;
+  
+  public Modes3UnitPropagationGenerator(@Extension final Ecore2Logic ecore2Logic, final Ecore2Logic_Trace ecore2LogicTrace) {
+    @Extension
+    final Modes3Package Modes3Package = modes3.Modes3Package.eINSTANCE;
+    this.segmentType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getSegment());
+    this.simpleSegmentType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getSimpleSegment());
+    this.turnoutType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getTurnout());
+    this.connectedToRelation = ecore2Logic.relationOfReference(ecore2LogicTrace, Modes3Package.getSegment_ConnectedTo());
+    this.straightRelation = ecore2Logic.relationOfReference(ecore2LogicTrace, Modes3Package.getTurnout_Straight());
+    this.divergentRelation = ecore2Logic.relationOfReference(ecore2LogicTrace, Modes3Package.getTurnout_Divergent());
+  }
+  
+  @Override
+  public Map<Relation, String> getMustPatterns() {
+    Pair<Relation, String> _mappedTo = Pair.<Relation, String>of(this.connectedToRelation, Modes3UnitPropagationGenerator.MUST_CONNECTED_TO);
+    Pair<Relation, String> _mappedTo_1 = Pair.<Relation, String>of(this.straightRelation, Modes3UnitPropagationGenerator.MUST_STRAIGHT);
+    Pair<Relation, String> _mappedTo_2 = Pair.<Relation, String>of(this.divergentRelation, Modes3UnitPropagationGenerator.MUST_DIVERGENT);
+    return Collections.<Relation, String>unmodifiableMap(CollectionLiterals.<Relation, String>newHashMap(_mappedTo, _mappedTo_1, _mappedTo_2));
+  }
+  
+  @Override
+  public Map<Relation, String> getMustNotPatterns() {
+    Pair<Relation, String> _mappedTo = Pair.<Relation, String>of(this.connectedToRelation, Modes3UnitPropagationGenerator.MUST_NOT_CONNECTED_TO);
+    Pair<Relation, String> _mappedTo_1 = Pair.<Relation, String>of(this.straightRelation, Modes3UnitPropagationGenerator.MUST_NOT_STRAIGHT);
+    Pair<Relation, String> _mappedTo_2 = Pair.<Relation, String>of(this.divergentRelation, Modes3UnitPropagationGenerator.MUST_NOT_DIVERGENT);
+    return Collections.<Relation, String>unmodifiableMap(CollectionLiterals.<Relation, String>newHashMap(_mappedTo, _mappedTo_1, _mappedTo_2));
+  }
+  
+  @Override
+  public StringConcatenationClient getAdditionalPatterns(@Extension final PatternGenerator generator, final Map<String, PQuery> fqnToPQuery) {
+    StringConcatenationClient _xblockexpression = null;
+    {
+      StringConcatenationClient _client = new StringConcatenationClient() {
+        @Override
+        protected void appendTo(StringConcatenationClient.TargetStringConcatenation _builder) {
+          _builder.append("problem: LogicProblem, interpretation: PartialInterpretation,");
+          _builder.newLine();
+          _builder.append("source: DefinedElement, target: DefinedElement");
+          _builder.newLine();
+        }
+      };
+      final StringConcatenationClient parameters = _client;
+      StringConcatenationClient _client_1 = new StringConcatenationClient() {
+        @Override
+        protected void appendTo(StringConcatenationClient.TargetStringConcatenation _builder) {
+          _builder.append("find interpretation(problem, interpretation);");
+          _builder.newLine();
+          _builder.append("find mustExist(problem, interpretation, source);");
+          _builder.newLine();
+          _builder.append("find mustExist(problem, interpretation, target);");
+          _builder.newLine();
+        }
+      };
+      final StringConcatenationClient commonMustParameterConstraints = _client_1;
+      StringConcatenationClient _client_2 = new StringConcatenationClient() {
+        @Override
+        protected void appendTo(StringConcatenationClient.TargetStringConcatenation _builder) {
+          _builder.append("find interpretation(problem, interpretation);");
+          _builder.newLine();
+          _builder.append("find mayExist(problem, interpretation, source);");
+          _builder.newLine();
+          _builder.append("find mayExist(problem, interpretation, target);");
+          _builder.newLine();
+        }
+      };
+      final StringConcatenationClient commonMayParameterConstraints = _client_2;
+      StringConcatenationClient _client_3 = new StringConcatenationClient() {
+        @Override
+        protected void appendTo(StringConcatenationClient.TargetStringConcatenation _builder) {
+          _builder.append("pattern mayInput(");
+          _builder.append(parameters);
+          _builder.append(") {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append(commonMayParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referPattern = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "target", "source" }, Modality.MAY, true, false);
+          _builder.append(_referPattern, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "target", "source", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_1 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "target", "source", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_1, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern multipleMayInput(problem: LogicProblem, interpretation: PartialInterpretation,");
+          _builder.newLine();
+          _builder.append("\t\t\t");
+          _builder.append("target: DefinedElement) {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find interpretation(problem, interpretation);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, target);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find mayInput(problem, interpretaton, source1, target);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find mayInput(problem, interpretaton, source2, target);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("neg find mustEquivalent(problem, interpretation, source1, source2);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern multipleMayStraight(problem: LogicProblem, interpretation: PartialInterpretation,");
+          _builder.newLine();
+          _builder.append("\t\t\t");
+          _builder.append("source: DefinedElement) {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find interpretation(problem, interpretation);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, source);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_1 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_1, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_2 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "target1", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_2, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_3 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "target2", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_3, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg find mustEquivalent(problem, interpretation, target1, target2);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern multipleMayDivergent(problem: LogicProblem, interpretation: PartialInterpretation,");
+          _builder.newLine();
+          _builder.append("\t\t\t");
+          _builder.append("source: DefinedElement) {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find interpretation(problem, interpretation);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, source);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_2 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_2, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_4 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "target1", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_4, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_5 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "target2", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_5, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg find mustEquivalent(problem, interpretation, target1, target2);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern ");
+          _builder.append(Modes3UnitPropagationGenerator.MUST_CONNECTED_TO);
+          _builder.append("(");
+          _builder.append(parameters);
+          _builder.append(") {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append(commonMustParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_3 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_3, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find mayInput(problem, interpretaton, source, target);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("neg find multipleMayInput(problem, interpretaton, target);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referRelation_6 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_6, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_7 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "source", "target", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_7, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_8 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_8, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_9 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_9, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern ");
+          _builder.append(Modes3UnitPropagationGenerator.MUST_STRAIGHT);
+          _builder.append("(");
+          _builder.append(parameters);
+          _builder.append(") {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append(commonMustParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_10 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "_", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_10, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg find multipleMayStraight(problem, interpretation, source);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referRelation_11 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_11, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_12 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "target", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_12, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append(commonMustParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_4 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_4, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find mayInput(problem, interpretaton, source, target);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("neg find multipleMayInput(problem, interpretaton, target);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_13 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_13, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_14 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_14, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_15 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "target", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_15, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_16 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_16, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern ");
+          _builder.append(Modes3UnitPropagationGenerator.MUST_DIVERGENT);
+          _builder.append("(");
+          _builder.append(parameters);
+          _builder.append(") {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append(commonMustParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_17 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "_", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_17, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg find multipleMayDivergent(problem, interpretation, source);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referRelation_18 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_18, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_19 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "target", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_19, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append(commonMustParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_5 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_5, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find mayInput(problem, interpretaton, source, target);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("neg find multipleMayInput(problem, interpretaton, target);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_20 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_20, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_21 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_21, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_22 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "target", Modality.MAY, fqnToPQuery);
+          _builder.append(_referRelation_22, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("neg ");
+          CharSequence _referRelation_23 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "source", "target", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_23, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern turnoutOutput_must_to_true_by_straight(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement, S : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append(commonMayParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_6 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_6, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_7 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_7, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("T == source;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("S == target;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern turnoutOutput_must_to_true_by_divergent(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement, S : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append(commonMayParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_8 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_8, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_9 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_9, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("T == source;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("S == target;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern output_must_to_true_by_connectedTo(");
+          _builder.append(parameters);
+          _builder.append(", S1 : DefinedElement, S2 : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append(commonMayParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_10 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_10, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_11 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_11, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("S1 == source;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("S2 == target;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern output_must_to_true_by_straight(");
+          _builder.append(parameters);
+          _builder.append(", S1 : DefinedElement, S2 : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find turnoutOutput_must_to_true_by_straight(problem, interpretation, source, target, S1, S2);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern output_must_to_true_by_divergent(");
+          _builder.append(parameters);
+          _builder.append(", S1 : DefinedElement, S2 : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find turnoutOutput_must_to_true_by_divergent(problem, interpretation, source, target, S1, S2);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern adjacent_must_to_true_by_connectedTo(");
+          _builder.append(parameters);
+          _builder.append(", S1 : DefinedElement, S2 : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find output_must_to_true_by_connectedTo(problem, interpretation, source, target, S1, S2);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern adjacent_must_to_true_by_straight(");
+          _builder.append(parameters);
+          _builder.append(", S1 : DefinedElement, S2 : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find output_must_to_true_by_straight(problem, interpretation, source, target, S1, S2);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find turnoutOutput_must_to_true_by_straight(problem, interpretation, source, target, S2, S1);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern adjacent_must_to_true_by_divergent(");
+          _builder.append(parameters);
+          _builder.append(", S1 : DefinedElement, S2 : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find output_must_to_true_by_divergent(problem, interpretation, source, target, S1, S2);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find turnoutOutput_must_to_true_by_divergent(problem, interpretation, source, target, S2, S1);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern connectedToReflexive_must_to_true_by_connectedTo(");
+          _builder.append(parameters);
+          _builder.append(", S : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, source);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_12 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "source");
+          _builder.append(_referInstanceOf_12, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("S == source;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("S == target;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern outputReflexive_must_to_true_by_straight(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find turnoutOutput_must_to_true_by_straight(problem, interpretation, source, target, T, T);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern outputReflexive_must_to_true_by_divergent(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find turnoutOutput_must_to_true_by_divergent(problem, interpretation, source, target, T, T);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern turnoutOutputsAreSame_must_to_true_by_straight(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append(commonMayParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_13 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_13, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_14 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_14, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("T == source;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("S == target;");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referRelation_24 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "T", "S", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_24, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern turnoutOutputsAreSame_must_to_true_by_divergent(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append(commonMayParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_15 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_15, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_16 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_16, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("T == source;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("S == target;");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referRelation_25 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "T", "S", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_25, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern tooManyInputsOfSegment_must_to_true_by_connectedTo(");
+          _builder.append(parameters);
+          _builder.append(", S : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, S);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_17 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.simpleSegmentType, Modality.MUST, "S");
+          _builder.append(_referInstanceOf_17, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find output_must_to_true_by_connectedTo(problem, interpretation, source, target, I1, S);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referPattern_1 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Output.instance().getFullyQualifiedName()), new String[] { "I2", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_1, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referPattern_2 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Output.instance().getFullyQualifiedName()), new String[] { "I3", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_2, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("I1 != I2;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I1 != I3;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I2 != I3;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern tooManyInputsOfSegment_must_to_true_by_straight(");
+          _builder.append(parameters);
+          _builder.append(", S : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, S);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_18 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.simpleSegmentType, Modality.MUST, "S");
+          _builder.append(_referInstanceOf_18, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find output_must_to_true_by_straight(problem, interpretation, source, target, I1, S);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referPattern_3 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Output.instance().getFullyQualifiedName()), new String[] { "I2", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_3, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referPattern_4 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Output.instance().getFullyQualifiedName()), new String[] { "I3", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_4, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("I1 != I2;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I1 != I3;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I2 != I3;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern tooManyInputsOfSegment_must_to_true_by_divergent(");
+          _builder.append(parameters);
+          _builder.append(", S : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, S);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_19 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.simpleSegmentType, Modality.MUST, "S");
+          _builder.append(_referInstanceOf_19, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find output_must_to_true_by_divergent(problem, interpretation, source, target, I1, S);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referPattern_5 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Output.instance().getFullyQualifiedName()), new String[] { "I2", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_5, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referPattern_6 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Output.instance().getFullyQualifiedName()), new String[] { "I3", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_6, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("I1 != I2;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I1 != I3;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I2 != I3;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern turnoutConnectedToBothOutputs_must_to_true_by_connectedTo(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append(commonMayParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, Straight);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, Divergent);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_20 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_20, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_21 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_21, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_22 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "Straight");
+          _builder.append(_referInstanceOf_22, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_23 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "Divergent");
+          _builder.append(_referInstanceOf_23, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_26 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "T", "Straight", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_26, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_27 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "T", "Divergent", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_27, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("T == source;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("Straight == target;");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referRelation_28 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "T", "Divergent", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_28, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append(commonMayParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, Straight);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, Divergent);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_24 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_24, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_25 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_25, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_26 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "Straight");
+          _builder.append(_referInstanceOf_26, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_27 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "Divergent");
+          _builder.append(_referInstanceOf_27, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_29 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "T", "Straight", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_29, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_30 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "T", "Divergent", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_30, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_31 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "T", "Straight", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_31, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("T == source;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("Straight == target;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern turnoutConnectedToBothOutputs_must_to_true_by_straight(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append(commonMayParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, Straight);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, Divergent);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_28 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_28, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_29 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_29, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_30 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "Straight");
+          _builder.append(_referInstanceOf_30, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_31 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "Divergent");
+          _builder.append(_referInstanceOf_31, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("T == source;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("Straight == target;");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referRelation_32 = generator.referRelation(Modes3UnitPropagationGenerator.this.divergentRelation, "T", "Divergent", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_32, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_33 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "T", "Straight", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_33, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_34 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "T", "Divergent", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_34, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern turnoutConnectedToBothOutputs_must_to_true_by_divergent(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append(commonMayParameterConstraints, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, Straight);");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, Divergent);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_32 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MAY, "source");
+          _builder.append(_referInstanceOf_32, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_33 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MAY, "target");
+          _builder.append(_referInstanceOf_33, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_34 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "Straight");
+          _builder.append(_referInstanceOf_34, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_35 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.segmentType, Modality.MUST, "Divergent");
+          _builder.append(_referInstanceOf_35, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_35 = generator.referRelation(Modes3UnitPropagationGenerator.this.straightRelation, "T", "Straight", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_35, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("T == source;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("Divergent == target;");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referRelation_36 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "T", "Straight", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_36, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referRelation_37 = generator.referRelation(Modes3UnitPropagationGenerator.this.connectedToRelation, "T", "Divergent", Modality.MUST, fqnToPQuery);
+          _builder.append(_referRelation_37, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern tooManyInputsOfTurnout_must_to_true_by_connectedTo(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, S);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_36 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "S");
+          _builder.append(_referInstanceOf_36, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find adjacent_must_to_true_by_connectedTo(problem, interpretation, source, target, I1, S);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referPattern_7 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "I2", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_7, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referPattern_8 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "I3", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_8, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referPattern_9 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "I4", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_9, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("I1 != I2;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I1 != I3;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I1 != I4;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I2 != I3;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I2 != I4;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I3 != I4;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern tooManyInputsOfTurnout_must_to_true_by_straight(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, S);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_37 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "S");
+          _builder.append(_referInstanceOf_37, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find adjacent_must_to_true_by_straight(problem, interpretation, source, target, I1, S);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referPattern_10 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "I2", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_10, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referPattern_11 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "I3", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_11, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referPattern_12 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "I4", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_12, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("I1 != I2;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I1 != I3;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I1 != I4;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I2 != I3;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I2 != I4;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I3 != I4;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern tooManyInputsOfTurnout_must_to_true_by_divergent(");
+          _builder.append(parameters);
+          _builder.append(", T : DefinedElement) {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find mustExist(problem, interpretation, S);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referInstanceOf_38 = generator.getTypeIndexer().referInstanceOf(Modes3UnitPropagationGenerator.this.turnoutType, Modality.MUST, "S");
+          _builder.append(_referInstanceOf_38, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find adjacent_must_to_true_by_divergent(problem, interpretation, source, target, I1, S);");
+          _builder.newLine();
+          _builder.append("\t");
+          CharSequence _referPattern_13 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "I2", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_13, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referPattern_14 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "I3", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_14, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          CharSequence _referPattern_15 = generator.getRelationDefinitionIndexer().referPattern(fqnToPQuery.get(Adjacent.instance().getFullyQualifiedName()), new String[] { "I4", "S" }, Modality.MUST, true, false);
+          _builder.append(_referPattern_15, "\t");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("I1 != I2;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I1 != I3;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I1 != I4;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I2 != I3;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I2 != I4;");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("I3 != I4;");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern ");
+          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_CONNECTED_TO);
+          _builder.append("_helper(");
+          _builder.append(parameters);
+          _builder.append(") {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find connectedToReflexive_must_to_true_by_connectedTo(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find tooManyInputsOfSegment_must_to_true_by_connectedTo(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find turnoutConnectedToBothOutputs_must_to_true_by_connectedTo(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find tooManyInputsOfTurnout_must_to_true_by_connectedTo(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern ");
+          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_CONNECTED_TO);
+          _builder.append("(");
+          _builder.append(parameters);
+          _builder.append(") {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find ");
+          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_CONNECTED_TO, "\t");
+          _builder.append("_helper(problem, interpretation, source, target);");
+          _builder.newLineIfNotEmpty();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find ");
+          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_CONNECTED_TO, "\t");
+          _builder.append("_helper(problem, interpretation, target, source);");
+          _builder.newLineIfNotEmpty();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern ");
+          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_STRAIGHT);
+          _builder.append("(");
+          _builder.append(parameters);
+          _builder.append(") {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find outputReflexive_must_to_true_by_straight(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find turnoutOutputsAreSame_must_to_true_by_straight(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find tooManyInputsOfSegment_must_to_true_by_straight(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find turnoutConnectedToBothOutputs_must_to_true_by_straight(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find tooManyInputsOfTurnout_must_to_true_by_straight(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+          _builder.newLine();
+          _builder.append("pattern ");
+          _builder.append(Modes3UnitPropagationGenerator.MUST_NOT_DIVERGENT);
+          _builder.append("(");
+          _builder.append(parameters);
+          _builder.append(") {");
+          _builder.newLineIfNotEmpty();
+          _builder.append("\t");
+          _builder.append("find outputReflexive_must_to_true_by_divergent(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find turnoutOutputsAreSame_must_to_true_by_divergent(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find tooManyInputsOfSegment_must_to_true_by_divergent(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find turnoutConnectedToBothOutputs_must_to_true_by_divergent(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("} or {");
+          _builder.newLine();
+          _builder.append("\t");
+          _builder.append("find tooManyInputsOfTurnout_must_to_true_by_divergent(problem, interpretation, source, target, _);");
+          _builder.newLine();
+          _builder.append("}");
+          _builder.newLine();
+        }
+      };
+      _xblockexpression = _client_3;
+    }
+    return _xblockexpression;
+  }
+}
diff --git a/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/TrainLocationsObjectiveHint.java b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/TrainLocationsObjectiveHint.java
new file mode 100644
index 00000000..570f9deb
--- /dev/null
+++ b/Domains/ca.mcgill.rtgmrt.example.modes3/xtend-gen/modes3/run/TrainLocationsObjectiveHint.java
@@ -0,0 +1,117 @@
+package modes3.run;
+
+import com.google.common.collect.ImmutableList;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;
+import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.Dimension;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ExtendedLinearExpressionBuilder;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.ExtendedLinearExpressionBuilderFactory;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra.cardinality.PolyhedronExtensionOperator;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostElementMatch;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostElementMatchers;
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CostObjectiveHint;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import modes3.Modes3Package;
+import modes3.queries.TrainLocations_step_2;
+import modes3.queries.TrainLocations_step_3;
+import org.eclipse.xtext.xbase.lib.Extension;
+import org.eclipse.xtext.xbase.lib.Functions.Function1;
+import org.eclipse.xtext.xbase.lib.IterableExtensions;
+
+@SuppressWarnings("all")
+public class TrainLocationsObjectiveHint extends CostObjectiveHint {
+  private final Type segmentType;
+  
+  private final Type trainType;
+  
+  public TrainLocationsObjectiveHint(@Extension final Ecore2Logic ecore2Logic, final Ecore2Logic_Trace ecore2LogicTrace) {
+    @Extension
+    final Modes3Package Modes3Package = modes3.Modes3Package.eINSTANCE;
+    this.segmentType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getSegment());
+    this.trainType = ecore2Logic.TypeofEClass(ecore2LogicTrace, Modes3Package.getTrain());
+  }
+  
+  @Override
+  public boolean isExact() {
+    return true;
+  }
+  
+  @Override
+  public PolyhedronExtensionOperator createPolyhedronExtensionOperator(final Map<String, CostElementMatchers> costElementMatchers) {
+    PolyhedronExtensionOperator _xblockexpression = null;
+    {
+      final CostElementMatchers step2 = costElementMatchers.get(TrainLocations_step_2.instance().getFullyQualifiedName());
+      final CostElementMatchers step3 = costElementMatchers.get(TrainLocations_step_3.instance().getFullyQualifiedName());
+      final PolyhedronExtensionOperator _function = (ExtendedLinearExpressionBuilderFactory it) -> {
+        final ExtendedLinearExpressionBuilder objectiveBuilder = it.createBuilder();
+        ImmutableList<CostElementMatch> _matches = step2.getMatches();
+        for (final CostElementMatch m : _matches) {
+          {
+            final Dimension dimension = it.getDimension(m.getMatch());
+            objectiveBuilder.add(step2.getWeight(), dimension);
+            dimension.tightenLowerBound(Integer.valueOf(0));
+            boolean _isMulti = m.isMulti();
+            if (_isMulti) {
+              it.createBuilder().add(1, dimension).add((-1), this.trainType).build().assertEqualsTo(0);
+            } else {
+              dimension.tightenUpperBound(Integer.valueOf(1));
+              boolean _isMust = m.isMust();
+              if (_isMust) {
+                dimension.tightenLowerBound(Integer.valueOf(1));
+              }
+            }
+          }
+        }
+        final ImmutableList<CostElementMatch> step3Matches = step3.getMatches();
+        for (final CostElementMatch m_1 : step3Matches) {
+          {
+            final Dimension dimension = it.getDimension(m_1.getMatch());
+            objectiveBuilder.add(step3.getWeight(), dimension);
+            dimension.tightenLowerBound(Integer.valueOf(0));
+            boolean _isMulti = m_1.isMulti();
+            boolean _not = (!_isMulti);
+            if (_not) {
+              dimension.tightenUpperBound(Integer.valueOf(1));
+              boolean _isMust = m_1.isMust();
+              if (_isMust) {
+                dimension.tightenLowerBound(Integer.valueOf(1));
+              }
+            }
+          }
+        }
+        TrainLocationsObjectiveHint.boundLimit(it, step3Matches, 2, this.trainType, 1);
+        TrainLocationsObjectiveHint.boundLimit(it, step3Matches, 3, this.segmentType, 1);
+        this.buildWithBounds(objectiveBuilder);
+      };
+      _xblockexpression = _function;
+    }
+    return _xblockexpression;
+  }
+  
+  private static void boundLimit(@Extension final ExtendedLinearExpressionBuilderFactory factory, final Collection<CostElementMatch> matches, final int index, final Type type, final int count) {
+    final Function1<CostElementMatch, Object> _function = (CostElementMatch it) -> {
+      return it.getMatch().get(index);
+    };
+    Set<Map.Entry<Object, List<CostElementMatch>>> _entrySet = IterableExtensions.<Object, CostElementMatch>groupBy(matches, _function).entrySet();
+    for (final Map.Entry<Object, List<CostElementMatch>> pair : _entrySet) {
+      {
+        final ExtendedLinearExpressionBuilder multiplicityBuilder = factory.createBuilder();
+        List<CostElementMatch> _value = pair.getValue();
+        for (final CostElementMatch m : _value) {
+          multiplicityBuilder.add(1, m.getMatch());
+        }
+        boolean _isMulti = CostElementMatchers.isMulti(pair.getKey());
+        if (_isMulti) {
+          multiplicityBuilder.add((-count), type);
+          multiplicityBuilder.build().tightenUpperBound(Integer.valueOf(0));
+        } else {
+          multiplicityBuilder.build().tightenUpperBound(Integer.valueOf(count));
+        }
+      }
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF
index 5fb85170..cc71bd06 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime,
  org.eclipse.viatra.query.runtime,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.emfstore.common,
  com.google.guava,
  org.eclipse.xtext.xbase.lib,
  org.eclipse.xtend.lib,
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
index 52338993..1e7d444f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/.gitignore
@@ -42,3 +42,11 @@
 /.Opposite.java._trace
 /.OppositeDifferentClass.java._trace
 /.PatternContent.java._trace
+/ContentInNotLive.java
+/DirectSupertype.java
+/Live.java
+/LoopInInheritence.java
+/NonSymmetricOpposite.java
+/Opposite.java
+/OppositeDifferentClass.java
+/PatternContent.java
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Dir.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Dir.java
new file mode 100644
index 00000000..83195aea
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Dir.java
@@ -0,0 +1,543 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/FileSystem.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.alloyexamples;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern dir(d: Dir) {
+ *              Dir(d);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class Dir extends BaseGeneratedEMFQuerySpecification<Dir.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.dir pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir fD;
+    
+    private static List<String> parameterNames = makeImmutableList("d");
+    
+    private Match(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      this.fD = pD;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "d": return this.fD;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fD;
+          default: return null;
+      }
+    }
+    
+    public hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir getD() {
+      return this.fD;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("d".equals(parameterName) ) {
+          this.fD = (hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setD(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fD = pD;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.dir";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return Dir.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fD};
+    }
+    
+    @Override
+    public Dir.Match toImmutable() {
+      return isMutable() ? newMatch(fD) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"d\"=" + prettyPrintValue(fD));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fD);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof Dir.Match)) {
+          Dir.Match other = (Dir.Match) obj;
+          return Objects.equals(fD, other.fD);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public Dir specification() {
+      return Dir.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static Dir.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pD the fixed value of pattern parameter d, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static Dir.Match newMutableMatch(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      return new Mutable(pD);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pD the fixed value of pattern parameter d, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static Dir.Match newMatch(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      return new Immutable(pD);
+    }
+    
+    private static final class Mutable extends Dir.Match {
+      Mutable(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+        super(pD);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends Dir.Match {
+      Immutable(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+        super(pD);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.dir pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern dir(d: Dir) {
+   *    Dir(d);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see Dir
+   * 
+   */
+  public static class Matcher extends BaseMatcher<Dir.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static Dir.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static Dir.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_D = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(Dir.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pD the fixed value of pattern parameter d, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<Dir.Match> getAllMatches(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      return rawStreamAllMatches(new Object[]{pD}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pD the fixed value of pattern parameter d, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<Dir.Match> streamAllMatches(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      return rawStreamAllMatches(new Object[]{pD});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pD the fixed value of pattern parameter d, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<Dir.Match> getOneArbitraryMatch(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      return rawGetOneArbitraryMatch(new Object[]{pD});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pD the fixed value of pattern parameter d, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      return rawHasMatch(new Object[]{pD});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pD the fixed value of pattern parameter d, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      return rawCountMatches(new Object[]{pD});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pD the fixed value of pattern parameter d, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD, final Consumer<? super Dir.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pD}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pD the fixed value of pattern parameter d, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public Dir.Match newMatch(final hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir pD) {
+      return Dir.Match.newMatch(pD);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for d.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir> rawStreamAllValuesOfd(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_D, parameters).map(hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for d.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir> getAllValuesOfd() {
+      return rawStreamAllValuesOfd(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for d.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir> streamAllValuesOfd() {
+      return rawStreamAllValuesOfd(emptyArray());
+    }
+    
+    @Override
+    protected Dir.Match tupleToMatch(final Tuple t) {
+      try {
+          return Dir.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir) t.get(POSITION_D));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Dir.Match arrayToMatch(final Object[] match) {
+      try {
+          return Dir.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir) match[POSITION_D]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Dir.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return Dir.Match.newMutableMatch((hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir) match[POSITION_D]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<Dir.Matcher> querySpecification() {
+      return Dir.instance();
+    }
+  }
+  
+  private Dir() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static Dir instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected Dir.Matcher instantiate(final ViatraQueryEngine engine) {
+    return Dir.Matcher.on(engine);
+  }
+  
+  @Override
+  public Dir.Matcher instantiate() {
+    return Dir.Matcher.create();
+  }
+  
+  @Override
+  public Dir.Match newEmptyMatch() {
+    return Dir.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public Dir.Match newMatch(final Object... parameters) {
+    return Dir.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link Dir} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link Dir#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final Dir INSTANCE = new Dir();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final Dir.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_d = new PParameter("d", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.Dir", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "Dir")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_d);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.dir";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("d");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_d = body.getOrCreateVariableByName("d");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_d), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_d, parameter_d)
+          ));
+          //    Dir(d)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_d), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "Dir")));
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/RootIsNotDir.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/RootIsNotDir.java
new file mode 100644
index 00000000..e2d9c175
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/RootIsNotDir.java
@@ -0,0 +1,570 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/FileSystem.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.alloyexamples;
+
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Dir;
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FileSystem;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(key={fs}, severity="error", message="error")
+ *         pattern rootIsNotDir(fs: FileSystem) {
+ *              FileSystem.root(fs, root);
+ *              neg find dir(root);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class RootIsNotDir extends BaseGeneratedEMFQuerySpecification<RootIsNotDir.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.rootIsNotDir pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private FileSystem fFs;
+    
+    private static List<String> parameterNames = makeImmutableList("fs");
+    
+    private Match(final FileSystem pFs) {
+      this.fFs = pFs;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "fs": return this.fFs;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fFs;
+          default: return null;
+      }
+    }
+    
+    public FileSystem getFs() {
+      return this.fFs;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("fs".equals(parameterName) ) {
+          this.fFs = (FileSystem) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setFs(final FileSystem pFs) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fFs = pFs;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.rootIsNotDir";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return RootIsNotDir.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fFs};
+    }
+    
+    @Override
+    public RootIsNotDir.Match toImmutable() {
+      return isMutable() ? newMatch(fFs) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"fs\"=" + prettyPrintValue(fFs));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fFs);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof RootIsNotDir.Match)) {
+          RootIsNotDir.Match other = (RootIsNotDir.Match) obj;
+          return Objects.equals(fFs, other.fFs);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public RootIsNotDir specification() {
+      return RootIsNotDir.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static RootIsNotDir.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pFs the fixed value of pattern parameter fs, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static RootIsNotDir.Match newMutableMatch(final FileSystem pFs) {
+      return new Mutable(pFs);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pFs the fixed value of pattern parameter fs, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static RootIsNotDir.Match newMatch(final FileSystem pFs) {
+      return new Immutable(pFs);
+    }
+    
+    private static final class Mutable extends RootIsNotDir.Match {
+      Mutable(final FileSystem pFs) {
+        super(pFs);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends RootIsNotDir.Match {
+      Immutable(final FileSystem pFs) {
+        super(pFs);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.rootIsNotDir pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(key={fs}, severity="error", message="error")
+   * pattern rootIsNotDir(fs: FileSystem) {
+   *    FileSystem.root(fs, root);
+   *    neg find dir(root);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see RootIsNotDir
+   * 
+   */
+  public static class Matcher extends BaseMatcher<RootIsNotDir.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static RootIsNotDir.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static RootIsNotDir.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_FS = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(RootIsNotDir.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pFs the fixed value of pattern parameter fs, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<RootIsNotDir.Match> getAllMatches(final FileSystem pFs) {
+      return rawStreamAllMatches(new Object[]{pFs}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pFs the fixed value of pattern parameter fs, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<RootIsNotDir.Match> streamAllMatches(final FileSystem pFs) {
+      return rawStreamAllMatches(new Object[]{pFs});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pFs the fixed value of pattern parameter fs, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<RootIsNotDir.Match> getOneArbitraryMatch(final FileSystem pFs) {
+      return rawGetOneArbitraryMatch(new Object[]{pFs});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pFs the fixed value of pattern parameter fs, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final FileSystem pFs) {
+      return rawHasMatch(new Object[]{pFs});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pFs the fixed value of pattern parameter fs, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final FileSystem pFs) {
+      return rawCountMatches(new Object[]{pFs});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pFs the fixed value of pattern parameter fs, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final FileSystem pFs, final Consumer<? super RootIsNotDir.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pFs}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pFs the fixed value of pattern parameter fs, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public RootIsNotDir.Match newMatch(final FileSystem pFs) {
+      return RootIsNotDir.Match.newMatch(pFs);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for fs.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<FileSystem> rawStreamAllValuesOffs(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_FS, parameters).map(FileSystem.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for fs.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<FileSystem> getAllValuesOffs() {
+      return rawStreamAllValuesOffs(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for fs.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<FileSystem> streamAllValuesOffs() {
+      return rawStreamAllValuesOffs(emptyArray());
+    }
+    
+    @Override
+    protected RootIsNotDir.Match tupleToMatch(final Tuple t) {
+      try {
+          return RootIsNotDir.Match.newMatch((FileSystem) t.get(POSITION_FS));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected RootIsNotDir.Match arrayToMatch(final Object[] match) {
+      try {
+          return RootIsNotDir.Match.newMatch((FileSystem) match[POSITION_FS]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected RootIsNotDir.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return RootIsNotDir.Match.newMutableMatch((FileSystem) match[POSITION_FS]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<RootIsNotDir.Matcher> querySpecification() {
+      return RootIsNotDir.instance();
+    }
+  }
+  
+  private RootIsNotDir() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static RootIsNotDir instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected RootIsNotDir.Matcher instantiate(final ViatraQueryEngine engine) {
+    return RootIsNotDir.Matcher.on(engine);
+  }
+  
+  @Override
+  public RootIsNotDir.Matcher instantiate() {
+    return RootIsNotDir.Matcher.create();
+  }
+  
+  @Override
+  public RootIsNotDir.Match newEmptyMatch() {
+    return RootIsNotDir.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public RootIsNotDir.Match newMatch(final Object... parameters) {
+    return RootIsNotDir.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FileSystem) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link RootIsNotDir} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link RootIsNotDir#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final RootIsNotDir INSTANCE = new RootIsNotDir();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final RootIsNotDir.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_fs = new PParameter("fs", "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Filesystem.FileSystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("FS", "FileSystem")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_fs);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.rootIsNotDir";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("fs");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_fs = body.getOrCreateVariableByName("fs");
+          PVariable var_root = body.getOrCreateVariableByName("root");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_fs), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FileSystem")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_fs, parameter_fs)
+          ));
+          //    FileSystem.root(fs, root)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_fs), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FileSystem")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_fs, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("FS", "FileSystem", "root")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("FS", "FSObject")));
+          new Equality(body, var__virtual_0_, var_root);
+          //    neg find dir(root)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var_root), Dir.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("fs")
+                              }));
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("message", "error");
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Unsat_loopInInheritance.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Unsat_loopInInheritance.java
new file mode 100644
index 00000000..83bd0f66
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Unsat_loopInInheritance.java
@@ -0,0 +1,566 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Ecore.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.alloyexamples;
+
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.LoopInInheritence;
+import hu.bme.mit.inf.dslreasoner.domains.alloyexamples.Unsat_subpackage;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(key={p}, severity="error", message="error")
+ *         pattern unsat_loopInInheritance(p: EPackage) {
+ *              neg find unsat_subpackage(_, p);
+ *              neg find loopInInheritence(_);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class Unsat_loopInInheritance extends BaseGeneratedEMFQuerySpecification<Unsat_loopInInheritance.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_loopInInheritance pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private EPackage fP;
+    
+    private static List<String> parameterNames = makeImmutableList("p");
+    
+    private Match(final EPackage pP) {
+      this.fP = pP;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "p": return this.fP;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fP;
+          default: return null;
+      }
+    }
+    
+    public EPackage getP() {
+      return this.fP;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("p".equals(parameterName) ) {
+          this.fP = (EPackage) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setP(final EPackage pP) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fP = pP;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_loopInInheritance";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return Unsat_loopInInheritance.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fP};
+    }
+    
+    @Override
+    public Unsat_loopInInheritance.Match toImmutable() {
+      return isMutable() ? newMatch(fP) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"p\"=" + prettyPrintValue(fP));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fP);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof Unsat_loopInInheritance.Match)) {
+          Unsat_loopInInheritance.Match other = (Unsat_loopInInheritance.Match) obj;
+          return Objects.equals(fP, other.fP);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public Unsat_loopInInheritance specification() {
+      return Unsat_loopInInheritance.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static Unsat_loopInInheritance.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pP the fixed value of pattern parameter p, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static Unsat_loopInInheritance.Match newMutableMatch(final EPackage pP) {
+      return new Mutable(pP);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pP the fixed value of pattern parameter p, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static Unsat_loopInInheritance.Match newMatch(final EPackage pP) {
+      return new Immutable(pP);
+    }
+    
+    private static final class Mutable extends Unsat_loopInInheritance.Match {
+      Mutable(final EPackage pP) {
+        super(pP);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends Unsat_loopInInheritance.Match {
+      Immutable(final EPackage pP) {
+        super(pP);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_loopInInheritance pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(key={p}, severity="error", message="error")
+   * pattern unsat_loopInInheritance(p: EPackage) {
+   *    neg find unsat_subpackage(_, p);
+   *    neg find loopInInheritence(_);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see Unsat_loopInInheritance
+   * 
+   */
+  public static class Matcher extends BaseMatcher<Unsat_loopInInheritance.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static Unsat_loopInInheritance.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static Unsat_loopInInheritance.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_P = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(Unsat_loopInInheritance.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pP the fixed value of pattern parameter p, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<Unsat_loopInInheritance.Match> getAllMatches(final EPackage pP) {
+      return rawStreamAllMatches(new Object[]{pP}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pP the fixed value of pattern parameter p, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<Unsat_loopInInheritance.Match> streamAllMatches(final EPackage pP) {
+      return rawStreamAllMatches(new Object[]{pP});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pP the fixed value of pattern parameter p, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<Unsat_loopInInheritance.Match> getOneArbitraryMatch(final EPackage pP) {
+      return rawGetOneArbitraryMatch(new Object[]{pP});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pP the fixed value of pattern parameter p, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final EPackage pP) {
+      return rawHasMatch(new Object[]{pP});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pP the fixed value of pattern parameter p, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final EPackage pP) {
+      return rawCountMatches(new Object[]{pP});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pP the fixed value of pattern parameter p, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final EPackage pP, final Consumer<? super Unsat_loopInInheritance.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pP}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pP the fixed value of pattern parameter p, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public Unsat_loopInInheritance.Match newMatch(final EPackage pP) {
+      return Unsat_loopInInheritance.Match.newMatch(pP);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for p.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<EPackage> rawStreamAllValuesOfp(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_P, parameters).map(EPackage.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for p.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EPackage> getAllValuesOfp() {
+      return rawStreamAllValuesOfp(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for p.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<EPackage> streamAllValuesOfp() {
+      return rawStreamAllValuesOfp(emptyArray());
+    }
+    
+    @Override
+    protected Unsat_loopInInheritance.Match tupleToMatch(final Tuple t) {
+      try {
+          return Unsat_loopInInheritance.Match.newMatch((EPackage) t.get(POSITION_P));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Unsat_loopInInheritance.Match arrayToMatch(final Object[] match) {
+      try {
+          return Unsat_loopInInheritance.Match.newMatch((EPackage) match[POSITION_P]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Unsat_loopInInheritance.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return Unsat_loopInInheritance.Match.newMutableMatch((EPackage) match[POSITION_P]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<Unsat_loopInInheritance.Matcher> querySpecification() {
+      return Unsat_loopInInheritance.instance();
+    }
+  }
+  
+  private Unsat_loopInInheritance() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static Unsat_loopInInheritance instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected Unsat_loopInInheritance.Matcher instantiate(final ViatraQueryEngine engine) {
+    return Unsat_loopInInheritance.Matcher.on(engine);
+  }
+  
+  @Override
+  public Unsat_loopInInheritance.Matcher instantiate() {
+    return Unsat_loopInInheritance.Matcher.create();
+  }
+  
+  @Override
+  public Unsat_loopInInheritance.Match newEmptyMatch() {
+    return Unsat_loopInInheritance.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public Unsat_loopInInheritance.Match newMatch(final Object... parameters) {
+    return Unsat_loopInInheritance.Match.newMatch((org.eclipse.emf.ecore.EPackage) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link Unsat_loopInInheritance} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link Unsat_loopInInheritance#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final Unsat_loopInInheritance INSTANCE = new Unsat_loopInInheritance();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final Unsat_loopInInheritance.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_p = new PParameter("p", "org.eclipse.emf.ecore.EPackage", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EPackage")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_p);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_loopInInheritance";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("p");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_p = body.getOrCreateVariableByName("p");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_p), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EPackage")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_p, parameter_p)
+          ));
+          //    neg find unsat_subpackage(_, p)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var___0_, var_p), Unsat_subpackage.instance().getInternalQueryRepresentation());
+          //    neg find loopInInheritence(_)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var___1_), LoopInInheritence.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("p")
+                              }));
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("message", "error");
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Unsat_subpackage.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Unsat_subpackage.java
new file mode 100644
index 00000000..a9c8aed8
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Unsat_subpackage.java
@@ -0,0 +1,704 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/patterns/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Ecore.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.alloyexamples;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern unsat_subpackage(a: EPackage, b: EPackage) {
+ *              EPackage.eSubpackages(a, b);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class Unsat_subpackage extends BaseGeneratedEMFQuerySpecification<Unsat_subpackage.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_subpackage pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private EPackage fA;
+    
+    private EPackage fB;
+    
+    private static List<String> parameterNames = makeImmutableList("a", "b");
+    
+    private Match(final EPackage pA, final EPackage pB) {
+      this.fA = pA;
+      this.fB = pB;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "a": return this.fA;
+          case "b": return this.fB;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fA;
+          case 1: return this.fB;
+          default: return null;
+      }
+    }
+    
+    public EPackage getA() {
+      return this.fA;
+    }
+    
+    public EPackage getB() {
+      return this.fB;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("a".equals(parameterName) ) {
+          this.fA = (EPackage) newValue;
+          return true;
+      }
+      if ("b".equals(parameterName) ) {
+          this.fB = (EPackage) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setA(final EPackage pA) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fA = pA;
+    }
+    
+    public void setB(final EPackage pB) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fB = pB;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_subpackage";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return Unsat_subpackage.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fA, fB};
+    }
+    
+    @Override
+    public Unsat_subpackage.Match toImmutable() {
+      return isMutable() ? newMatch(fA, fB) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"a\"=" + prettyPrintValue(fA) + ", ");
+      result.append("\"b\"=" + prettyPrintValue(fB));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fA, fB);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof Unsat_subpackage.Match)) {
+          Unsat_subpackage.Match other = (Unsat_subpackage.Match) obj;
+          return Objects.equals(fA, other.fA) && Objects.equals(fB, other.fB);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public Unsat_subpackage specification() {
+      return Unsat_subpackage.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static Unsat_subpackage.Match newEmptyMatch() {
+      return new Mutable(null, null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static Unsat_subpackage.Match newMutableMatch(final EPackage pA, final EPackage pB) {
+      return new Mutable(pA, pB);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static Unsat_subpackage.Match newMatch(final EPackage pA, final EPackage pB) {
+      return new Immutable(pA, pB);
+    }
+    
+    private static final class Mutable extends Unsat_subpackage.Match {
+      Mutable(final EPackage pA, final EPackage pB) {
+        super(pA, pB);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends Unsat_subpackage.Match {
+      Immutable(final EPackage pA, final EPackage pB) {
+        super(pA, pB);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_subpackage pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern unsat_subpackage(a: EPackage, b: EPackage) {
+   *    EPackage.eSubpackages(a, b);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see Unsat_subpackage
+   * 
+   */
+  public static class Matcher extends BaseMatcher<Unsat_subpackage.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static Unsat_subpackage.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static Unsat_subpackage.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_A = 0;
+    
+    private static final int POSITION_B = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(Unsat_subpackage.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<Unsat_subpackage.Match> getAllMatches(final EPackage pA, final EPackage pB) {
+      return rawStreamAllMatches(new Object[]{pA, pB}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<Unsat_subpackage.Match> streamAllMatches(final EPackage pA, final EPackage pB) {
+      return rawStreamAllMatches(new Object[]{pA, pB});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<Unsat_subpackage.Match> getOneArbitraryMatch(final EPackage pA, final EPackage pB) {
+      return rawGetOneArbitraryMatch(new Object[]{pA, pB});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final EPackage pA, final EPackage pB) {
+      return rawHasMatch(new Object[]{pA, pB});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final EPackage pA, final EPackage pB) {
+      return rawCountMatches(new Object[]{pA, pB});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final EPackage pA, final EPackage pB, final Consumer<? super Unsat_subpackage.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pA, pB}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pA the fixed value of pattern parameter a, or null if not bound.
+     * @param pB the fixed value of pattern parameter b, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public Unsat_subpackage.Match newMatch(final EPackage pA, final EPackage pB) {
+      return Unsat_subpackage.Match.newMatch(pA, pB);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<EPackage> rawStreamAllValuesOfa(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_A, parameters).map(EPackage.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EPackage> getAllValuesOfa() {
+      return rawStreamAllValuesOfa(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<EPackage> streamAllValuesOfa() {
+      return rawStreamAllValuesOfa(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<EPackage> streamAllValuesOfa(final Unsat_subpackage.Match partialMatch) {
+      return rawStreamAllValuesOfa(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<EPackage> streamAllValuesOfa(final EPackage pB) {
+      return rawStreamAllValuesOfa(new Object[]{null, pB});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EPackage> getAllValuesOfa(final Unsat_subpackage.Match partialMatch) {
+      return rawStreamAllValuesOfa(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for a.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EPackage> getAllValuesOfa(final EPackage pB) {
+      return rawStreamAllValuesOfa(new Object[]{null, pB}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<EPackage> rawStreamAllValuesOfb(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_B, parameters).map(EPackage.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EPackage> getAllValuesOfb() {
+      return rawStreamAllValuesOfb(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<EPackage> streamAllValuesOfb() {
+      return rawStreamAllValuesOfb(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<EPackage> streamAllValuesOfb(final Unsat_subpackage.Match partialMatch) {
+      return rawStreamAllValuesOfb(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<EPackage> streamAllValuesOfb(final EPackage pA) {
+      return rawStreamAllValuesOfb(new Object[]{pA, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EPackage> getAllValuesOfb(final Unsat_subpackage.Match partialMatch) {
+      return rawStreamAllValuesOfb(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for b.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<EPackage> getAllValuesOfb(final EPackage pA) {
+      return rawStreamAllValuesOfb(new Object[]{pA, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected Unsat_subpackage.Match tupleToMatch(final Tuple t) {
+      try {
+          return Unsat_subpackage.Match.newMatch((EPackage) t.get(POSITION_A), (EPackage) t.get(POSITION_B));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Unsat_subpackage.Match arrayToMatch(final Object[] match) {
+      try {
+          return Unsat_subpackage.Match.newMatch((EPackage) match[POSITION_A], (EPackage) match[POSITION_B]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Unsat_subpackage.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return Unsat_subpackage.Match.newMutableMatch((EPackage) match[POSITION_A], (EPackage) match[POSITION_B]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<Unsat_subpackage.Matcher> querySpecification() {
+      return Unsat_subpackage.instance();
+    }
+  }
+  
+  private Unsat_subpackage() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static Unsat_subpackage instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected Unsat_subpackage.Matcher instantiate(final ViatraQueryEngine engine) {
+    return Unsat_subpackage.Matcher.on(engine);
+  }
+  
+  @Override
+  public Unsat_subpackage.Matcher instantiate() {
+    return Unsat_subpackage.Matcher.create();
+  }
+  
+  @Override
+  public Unsat_subpackage.Match newEmptyMatch() {
+    return Unsat_subpackage.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public Unsat_subpackage.Match newMatch(final Object... parameters) {
+    return Unsat_subpackage.Match.newMatch((org.eclipse.emf.ecore.EPackage) parameters[0], (org.eclipse.emf.ecore.EPackage) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link Unsat_subpackage} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link Unsat_subpackage#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final Unsat_subpackage INSTANCE = new Unsat_subpackage();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final Unsat_subpackage.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_a = new PParameter("a", "org.eclipse.emf.ecore.EPackage", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EPackage")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_b = new PParameter("b", "org.eclipse.emf.ecore.EPackage", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EPackage")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_a, parameter_b);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.alloyexamples.unsat_subpackage";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("a","b");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_a = body.getOrCreateVariableByName("a");
+          PVariable var_b = body.getOrCreateVariableByName("b");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EPackage")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_b), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EPackage")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_a, parameter_a),
+             new ExportedParameter(body, var_b, parameter_b)
+          ));
+          //    EPackage.eSubpackages(a, b)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EPackage")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_a, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.eclipse.org/emf/2002/Ecore", "EPackage", "eSubpackages")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EPackage")));
+          new Equality(body, var__virtual_0_, var_b);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/internal/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/internal/.gitignore
new file mode 100644
index 00000000..995169ff
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/internal/.gitignore
@@ -0,0 +1,4 @@
+/.EcoreAll.java._trace
+/.SubpackageOrSelf.java._trace
+/.Subpackage.java._trace
+/.TopLevelPackageWithLoop.java._trace
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/.classpath b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/.classpath
new file mode 100644
index 00000000..faa51b1d
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/.classpath
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+        <classpathentry kind="src" path="ecore-gen"/>
+        <classpathentry kind="src" path="xtend-gen"/>
+        <classpathentry kind="src" path="src"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+                <attributes>
+                        <attribute name="module" value="true"/>
+                </attributes>
+        </classpathentry>
+        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+        <classpathentry kind="src" path="src-gen"/>
+        <classpathentry kind="con" path="uk.ac.kcl.inf.mdeoptimiser.languages.ui.Mopt.MDEO_CONTAINER/dsl"/>
+        <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/.gitignore
new file mode 100644
index 00000000..2affc42f
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/.gitignore
@@ -0,0 +1,7 @@
+/bin/
+/xtend-gen/
+/problem.lp
+/solution.txt
+/model/cps_fixup.henshin
+/model/problem.xmi
+/mdeo-results
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/.project b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/.project
new file mode 100644
index 00000000..41867b27
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/.project
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+        <name>hu.bme.mit.inf.dslreasoner.domains.cps</name>
+        <comment></comment>
+        <projects>
+        </projects>
+        <buildSpec>
+                <buildCommand>
+                        <name>org.eclipse.viatra.query.tooling.ui.projectbuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.jdt.core.javabuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.pde.ManifestBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+                <buildCommand>
+                        <name>org.eclipse.pde.SchemaBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
+        </buildSpec>
+        <natures>
+                <nature>org.eclipse.jdt.core.javanature</nature>
+                <nature>org.eclipse.pde.PluginNature</nature>
+                <nature>org.eclipse.viatra.query.projectnature</nature>
+                <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+        </natures>
+</projectDescription>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/.settings/org.eclipse.core.resources.prefs b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000..6d3062d3
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding//model/cps.henshin=UTF-8
+encoding//model/cps.henshin_diagram=UTF-8
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/META-INF/MANIFEST.MF b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..275a988a
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/META-INF/MANIFEST.MF
@@ -0,0 +1,30 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: hu.bme.mit.inf.dslreasoner.domains.cps;singleton:=true
+Bundle-Version: 0.1.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: hu.bme.mit.inf.dslreasoner.domains.cps,
+ hu.bme.mit.inf.dslreasoner.domains.cps.impl,
+ hu.bme.mit.inf.dslreasoner.domains.cps.queries,
+ hu.bme.mit.inf.dslreasoner.domains.cps.util
+Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime,
+ org.eclipse.viatra.query.runtime,
+ org.eclipse.viatra.query.runtime.rete,
+ org.eclipse.viatra.query.runtime.localsearch,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.core.runtime,
+ org.eclipse.xtend.lib;bundle-version="2.16.0",
+ org.eclipse.xtend.lib.macro;bundle-version="2.16.0",
+ hu.bme.mit.inf.dslreasoner.application;bundle-version="1.0.0",
+ org.eclipse.viatra.dse,
+ org.eclipse.viatra.dse.genetic,
+ hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner;bundle-version="1.0.0",
+ org.eclipse.emf.ecore.xmi;bundle-version="2.15.0"
+Import-Package: org.apache.log4j
+Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.domains.cps
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/README.md b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/README.md
new file mode 100644
index 00000000..986663fd
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/README.md
@@ -0,0 +1,7 @@
+# Cyber Physical System case study for VIATRA Solver
+
+## Modifications to the metamodel
+
+* Removed the `State` enumeration and the `ApplicationInstance.state` attribute, as we are only optimizing static configurations of applications instead of deployment strategies.
+* Added `ApplicationInstance.requirement` as an opposite reference of `Requirement.instances` with multiplicity `[1..1]` to ensure that each `ApplicationInstance` satisfies exactly one `Requirement`.
+* Marked `HostInstance.availableMemory`, `availableHdd`, `totalMemory`, `totalHdd` as derived. The values of `availableMemory` and `availableHdd` can be computed from `totalMemory`, `totalHdd` and the `ResourceRequirement`s associated with the `ApplicationInstances` allocated to the `HostInstance`, while `totalMemory` and `totalHdd` are always equal to `HostType.defaultMemory` and `defaultHdd`.
\ No newline at end of file
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/build.properties b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/build.properties
new file mode 100644
index 00000000..37a7e53b
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/build.properties
@@ -0,0 +1,9 @@
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = ecore-gen/,\
+           src-gen/
+output.. = bin/
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/ApplicationInstance.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/ApplicationInstance.java
new file mode 100644
index 00000000..dc9426f2
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/ApplicationInstance.java
@@ -0,0 +1,110 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Application Instance</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance#getRequirement <em>Requirement</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance#getType <em>Type</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance#getAllocatedTo <em>Allocated To</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getApplicationInstance()
+ * @model
+ * @generated
+ */
+public interface ApplicationInstance extends EObject {
+        /**
+         * Returns the value of the '<em><b>Requirement</b></em>' reference.
+         * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getInstances <em>Instances</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Requirement</em>' reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Requirement</em>' reference.
+         * @see #setRequirement(Requirement)
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getApplicationInstance_Requirement()
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getInstances
+         * @model opposite="instances"
+         * @generated
+         */
+        Requirement getRequirement();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance#getRequirement <em>Requirement</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Requirement</em>' reference.
+         * @see #getRequirement()
+         * @generated
+         */
+        void setRequirement(Requirement value);
+
+        /**
+         * Returns the value of the '<em><b>Type</b></em>' container reference.
+         * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType#getInstances <em>Instances</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Type</em>' container reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Type</em>' container reference.
+         * @see #setType(ApplicationType)
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getApplicationInstance_Type()
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType#getInstances
+         * @model opposite="instances" required="true" transient="false"
+         * @generated
+         */
+        ApplicationType getType();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance#getType <em>Type</em>}' container reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Type</em>' container reference.
+         * @see #getType()
+         * @generated
+         */
+        void setType(ApplicationType value);
+
+        /**
+         * Returns the value of the '<em><b>Allocated To</b></em>' reference.
+         * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance#getApplications <em>Applications</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Allocated To</em>' reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Allocated To</em>' reference.
+         * @see #setAllocatedTo(HostInstance)
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getApplicationInstance_AllocatedTo()
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance#getApplications
+         * @model opposite="applications" required="true"
+         * @generated
+         */
+        HostInstance getAllocatedTo();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance#getAllocatedTo <em>Allocated To</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Allocated To</em>' reference.
+         * @see #getAllocatedTo()
+         * @generated
+         */
+        void setAllocatedTo(HostInstance value);
+
+} // ApplicationInstance
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/ApplicationType.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/ApplicationType.java
new file mode 100644
index 00000000..f44287ae
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/ApplicationType.java
@@ -0,0 +1,61 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Application Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType#getInstances <em>Instances</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType#getRequirements <em>Requirements</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getApplicationType()
+ * @model
+ * @generated
+ */
+public interface ApplicationType extends EObject {
+        /**
+         * Returns the value of the '<em><b>Instances</b></em>' containment reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance}.
+         * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance#getType <em>Type</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Instances</em>' containment reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Instances</em>' containment reference list.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getApplicationType_Instances()
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance#getType
+         * @model opposite="type" containment="true"
+         * @generated
+         */
+        EList<ApplicationInstance> getInstances();
+
+        /**
+         * Returns the value of the '<em><b>Requirements</b></em>' containment reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement}.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Requirements</em>' containment reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Requirements</em>' containment reference list.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getApplicationType_Requirements()
+         * @model containment="true"
+         * @generated
+         */
+        EList<ResourceRequirement> getRequirements();
+
+} // ApplicationType
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/CpsFactory.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/CpsFactory.java
new file mode 100644
index 00000000..93a5fc95
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/CpsFactory.java
@@ -0,0 +1,105 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage
+ * @generated
+ */
+public interface CpsFactory extends EFactory {
+        /**
+         * The singleton instance of the factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        CpsFactory eINSTANCE = hu.bme.mit.inf.dslreasoner.domains.cps.impl.CpsFactoryImpl.init();
+
+        /**
+         * Returns a new object of class '<em>Cyber Physical System</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Cyber Physical System</em>'.
+         * @generated
+         */
+        CyberPhysicalSystem createCyberPhysicalSystem();
+
+        /**
+         * Returns a new object of class '<em>Application Type</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Application Type</em>'.
+         * @generated
+         */
+        ApplicationType createApplicationType();
+
+        /**
+         * Returns a new object of class '<em>Host Type</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Host Type</em>'.
+         * @generated
+         */
+        HostType createHostType();
+
+        /**
+         * Returns a new object of class '<em>Request</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Request</em>'.
+         * @generated
+         */
+        Request createRequest();
+
+        /**
+         * Returns a new object of class '<em>Requirement</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Requirement</em>'.
+         * @generated
+         */
+        Requirement createRequirement();
+
+        /**
+         * Returns a new object of class '<em>Application Instance</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Application Instance</em>'.
+         * @generated
+         */
+        ApplicationInstance createApplicationInstance();
+
+        /**
+         * Returns a new object of class '<em>Resource Requirement</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Resource Requirement</em>'.
+         * @generated
+         */
+        ResourceRequirement createResourceRequirement();
+
+        /**
+         * Returns a new object of class '<em>Host Instance</em>'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return a new object of class '<em>Host Instance</em>'.
+         * @generated
+         */
+        HostInstance createHostInstance();
+
+        /**
+         * Returns the package supported by this factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the package supported by this factory.
+         * @generated
+         */
+        CpsPackage getCpsPackage();
+
+} //CpsFactory
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/CpsPackage.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/CpsPackage.java
new file mode 100644
index 00000000..b0c69786
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/CpsPackage.java
@@ -0,0 +1,1084 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface CpsPackage extends EPackage {
+        /**
+         * The package name.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        String eNAME = "cps";
+
+        /**
+         * The package namespace URI.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        String eNS_URI = "http://www.example.org/cps";
+
+        /**
+         * The package namespace name.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        String eNS_PREFIX = "cps";
+
+        /**
+         * The singleton instance of the package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        CpsPackage eINSTANCE = hu.bme.mit.inf.dslreasoner.domains.cps.impl.CpsPackageImpl.init();
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.CyberPhysicalSystemImpl <em>Cyber Physical System</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.CyberPhysicalSystemImpl
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.CpsPackageImpl#getCyberPhysicalSystem()
+         * @generated
+         */
+        int CYBER_PHYSICAL_SYSTEM = 0;
+
+        /**
+         * The feature id for the '<em><b>Requests</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CYBER_PHYSICAL_SYSTEM__REQUESTS = 0;
+
+        /**
+         * The feature id for the '<em><b>Application Types</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CYBER_PHYSICAL_SYSTEM__APPLICATION_TYPES = 1;
+
+        /**
+         * The feature id for the '<em><b>Host Types</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CYBER_PHYSICAL_SYSTEM__HOST_TYPES = 2;
+
+        /**
+         * The number of structural features of the '<em>Cyber Physical System</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CYBER_PHYSICAL_SYSTEM_FEATURE_COUNT = 3;
+
+        /**
+         * The number of operations of the '<em>Cyber Physical System</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int CYBER_PHYSICAL_SYSTEM_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.ApplicationTypeImpl <em>Application Type</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.ApplicationTypeImpl
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.CpsPackageImpl#getApplicationType()
+         * @generated
+         */
+        int APPLICATION_TYPE = 1;
+
+        /**
+         * The feature id for the '<em><b>Instances</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int APPLICATION_TYPE__INSTANCES = 0;
+
+        /**
+         * The feature id for the '<em><b>Requirements</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int APPLICATION_TYPE__REQUIREMENTS = 1;
+
+        /**
+         * The number of structural features of the '<em>Application Type</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int APPLICATION_TYPE_FEATURE_COUNT = 2;
+
+        /**
+         * The number of operations of the '<em>Application Type</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int APPLICATION_TYPE_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.HostTypeImpl <em>Host Type</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.HostTypeImpl
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.CpsPackageImpl#getHostType()
+         * @generated
+         */
+        int HOST_TYPE = 2;
+
+        /**
+         * The feature id for the '<em><b>Default Memory</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int HOST_TYPE__DEFAULT_MEMORY = 0;
+
+        /**
+         * The feature id for the '<em><b>Default Hdd</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int HOST_TYPE__DEFAULT_HDD = 1;
+
+        /**
+         * The feature id for the '<em><b>Instances</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int HOST_TYPE__INSTANCES = 2;
+
+        /**
+         * The feature id for the '<em><b>Cost</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int HOST_TYPE__COST = 3;
+
+        /**
+         * The number of structural features of the '<em>Host Type</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int HOST_TYPE_FEATURE_COUNT = 4;
+
+        /**
+         * The number of operations of the '<em>Host Type</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int HOST_TYPE_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.RequestImpl <em>Request</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.RequestImpl
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.CpsPackageImpl#getRequest()
+         * @generated
+         */
+        int REQUEST = 3;
+
+        /**
+         * The feature id for the '<em><b>Requirements</b></em>' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REQUEST__REQUIREMENTS = 0;
+
+        /**
+         * The number of structural features of the '<em>Request</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REQUEST_FEATURE_COUNT = 1;
+
+        /**
+         * The number of operations of the '<em>Request</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REQUEST_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.RequirementImpl <em>Requirement</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.RequirementImpl
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.CpsPackageImpl#getRequirement()
+         * @generated
+         */
+        int REQUIREMENT = 4;
+
+        /**
+         * The feature id for the '<em><b>Request</b></em>' container reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REQUIREMENT__REQUEST = 0;
+
+        /**
+         * The feature id for the '<em><b>Count</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REQUIREMENT__COUNT = 1;
+
+        /**
+         * The feature id for the '<em><b>Type</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REQUIREMENT__TYPE = 2;
+
+        /**
+         * The feature id for the '<em><b>Instances</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REQUIREMENT__INSTANCES = 3;
+
+        /**
+         * The number of structural features of the '<em>Requirement</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REQUIREMENT_FEATURE_COUNT = 4;
+
+        /**
+         * The number of operations of the '<em>Requirement</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int REQUIREMENT_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.ApplicationInstanceImpl <em>Application Instance</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.ApplicationInstanceImpl
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.CpsPackageImpl#getApplicationInstance()
+         * @generated
+         */
+        int APPLICATION_INSTANCE = 5;
+
+        /**
+         * The feature id for the '<em><b>Requirement</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int APPLICATION_INSTANCE__REQUIREMENT = 0;
+
+        /**
+         * The feature id for the '<em><b>Type</b></em>' container reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int APPLICATION_INSTANCE__TYPE = 1;
+
+        /**
+         * The feature id for the '<em><b>Allocated To</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int APPLICATION_INSTANCE__ALLOCATED_TO = 2;
+
+        /**
+         * The number of structural features of the '<em>Application Instance</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int APPLICATION_INSTANCE_FEATURE_COUNT = 3;
+
+        /**
+         * The number of operations of the '<em>Application Instance</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int APPLICATION_INSTANCE_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.ResourceRequirementImpl <em>Resource Requirement</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.ResourceRequirementImpl
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.CpsPackageImpl#getResourceRequirement()
+         * @generated
+         */
+        int RESOURCE_REQUIREMENT = 6;
+
+        /**
+         * The feature id for the '<em><b>Required Memory</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int RESOURCE_REQUIREMENT__REQUIRED_MEMORY = 0;
+
+        /**
+         * The feature id for the '<em><b>Required Hdd</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int RESOURCE_REQUIREMENT__REQUIRED_HDD = 1;
+
+        /**
+         * The feature id for the '<em><b>Host Type</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int RESOURCE_REQUIREMENT__HOST_TYPE = 2;
+
+        /**
+         * The number of structural features of the '<em>Resource Requirement</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int RESOURCE_REQUIREMENT_FEATURE_COUNT = 3;
+
+        /**
+         * The number of operations of the '<em>Resource Requirement</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int RESOURCE_REQUIREMENT_OPERATION_COUNT = 0;
+
+        /**
+         * The meta object id for the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.HostInstanceImpl <em>Host Instance</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.HostInstanceImpl
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.CpsPackageImpl#getHostInstance()
+         * @generated
+         */
+        int HOST_INSTANCE = 7;
+
+        /**
+         * The feature id for the '<em><b>Type</b></em>' container reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int HOST_INSTANCE__TYPE = 0;
+
+        /**
+         * The feature id for the '<em><b>Applications</b></em>' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int HOST_INSTANCE__APPLICATIONS = 1;
+
+        /**
+         * The number of structural features of the '<em>Host Instance</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int HOST_INSTANCE_FEATURE_COUNT = 2;
+
+        /**
+         * The number of operations of the '<em>Host Instance</em>' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int HOST_INSTANCE_OPERATION_COUNT = 0;
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem <em>Cyber Physical System</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Cyber Physical System</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem
+         * @generated
+         */
+        EClass getCyberPhysicalSystem();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem#getRequests <em>Requests</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Requests</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem#getRequests()
+         * @see #getCyberPhysicalSystem()
+         * @generated
+         */
+        EReference getCyberPhysicalSystem_Requests();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem#getApplicationTypes <em>Application Types</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Application Types</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem#getApplicationTypes()
+         * @see #getCyberPhysicalSystem()
+         * @generated
+         */
+        EReference getCyberPhysicalSystem_ApplicationTypes();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem#getHostTypes <em>Host Types</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Host Types</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem#getHostTypes()
+         * @see #getCyberPhysicalSystem()
+         * @generated
+         */
+        EReference getCyberPhysicalSystem_HostTypes();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType <em>Application Type</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Application Type</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType
+         * @generated
+         */
+        EClass getApplicationType();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType#getInstances <em>Instances</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Instances</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType#getInstances()
+         * @see #getApplicationType()
+         * @generated
+         */
+        EReference getApplicationType_Instances();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType#getRequirements <em>Requirements</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Requirements</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType#getRequirements()
+         * @see #getApplicationType()
+         * @generated
+         */
+        EReference getApplicationType_Requirements();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostType <em>Host Type</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Host Type</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.HostType
+         * @generated
+         */
+        EClass getHostType();
+
+        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostType#getDefaultMemory <em>Default Memory</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Default Memory</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.HostType#getDefaultMemory()
+         * @see #getHostType()
+         * @generated
+         */
+        EAttribute getHostType_DefaultMemory();
+
+        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostType#getDefaultHdd <em>Default Hdd</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Default Hdd</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.HostType#getDefaultHdd()
+         * @see #getHostType()
+         * @generated
+         */
+        EAttribute getHostType_DefaultHdd();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostType#getInstances <em>Instances</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Instances</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.HostType#getInstances()
+         * @see #getHostType()
+         * @generated
+         */
+        EReference getHostType_Instances();
+
+        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostType#getCost <em>Cost</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Cost</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.HostType#getCost()
+         * @see #getHostType()
+         * @generated
+         */
+        EAttribute getHostType_Cost();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.cps.Request <em>Request</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Request</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.Request
+         * @generated
+         */
+        EClass getRequest();
+
+        /**
+         * Returns the meta object for the containment reference list '{@link hu.bme.mit.inf.dslreasoner.domains.cps.Request#getRequirements <em>Requirements</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the containment reference list '<em>Requirements</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.Request#getRequirements()
+         * @see #getRequest()
+         * @generated
+         */
+        EReference getRequest_Requirements();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.cps.Requirement <em>Requirement</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Requirement</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.Requirement
+         * @generated
+         */
+        EClass getRequirement();
+
+        /**
+         * Returns the meta object for the container reference '{@link hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getRequest <em>Request</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the container reference '<em>Request</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getRequest()
+         * @see #getRequirement()
+         * @generated
+         */
+        EReference getRequirement_Request();
+
+        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getCount <em>Count</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Count</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getCount()
+         * @see #getRequirement()
+         * @generated
+         */
+        EAttribute getRequirement_Count();
+
+        /**
+         * Returns the meta object for the reference '{@link hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getType <em>Type</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference '<em>Type</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getType()
+         * @see #getRequirement()
+         * @generated
+         */
+        EReference getRequirement_Type();
+
+        /**
+         * Returns the meta object for the reference list '{@link hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getInstances <em>Instances</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference list '<em>Instances</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getInstances()
+         * @see #getRequirement()
+         * @generated
+         */
+        EReference getRequirement_Instances();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance <em>Application Instance</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Application Instance</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance
+         * @generated
+         */
+        EClass getApplicationInstance();
+
+        /**
+         * Returns the meta object for the reference '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance#getRequirement <em>Requirement</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference '<em>Requirement</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance#getRequirement()
+         * @see #getApplicationInstance()
+         * @generated
+         */
+        EReference getApplicationInstance_Requirement();
+
+        /**
+         * Returns the meta object for the container reference '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance#getType <em>Type</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the container reference '<em>Type</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance#getType()
+         * @see #getApplicationInstance()
+         * @generated
+         */
+        EReference getApplicationInstance_Type();
+
+        /**
+         * Returns the meta object for the reference '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance#getAllocatedTo <em>Allocated To</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference '<em>Allocated To</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance#getAllocatedTo()
+         * @see #getApplicationInstance()
+         * @generated
+         */
+        EReference getApplicationInstance_AllocatedTo();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement <em>Resource Requirement</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Resource Requirement</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement
+         * @generated
+         */
+        EClass getResourceRequirement();
+
+        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement#getRequiredMemory <em>Required Memory</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Required Memory</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement#getRequiredMemory()
+         * @see #getResourceRequirement()
+         * @generated
+         */
+        EAttribute getResourceRequirement_RequiredMemory();
+
+        /**
+         * Returns the meta object for the attribute '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement#getRequiredHdd <em>Required Hdd</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Required Hdd</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement#getRequiredHdd()
+         * @see #getResourceRequirement()
+         * @generated
+         */
+        EAttribute getResourceRequirement_RequiredHdd();
+
+        /**
+         * Returns the meta object for the reference '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement#getHostType <em>Host Type</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference '<em>Host Type</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement#getHostType()
+         * @see #getResourceRequirement()
+         * @generated
+         */
+        EReference getResourceRequirement_HostType();
+
+        /**
+         * Returns the meta object for class '{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance <em>Host Instance</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for class '<em>Host Instance</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance
+         * @generated
+         */
+        EClass getHostInstance();
+
+        /**
+         * Returns the meta object for the container reference '{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance#getType <em>Type</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the container reference '<em>Type</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance#getType()
+         * @see #getHostInstance()
+         * @generated
+         */
+        EReference getHostInstance_Type();
+
+        /**
+         * Returns the meta object for the reference list '{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance#getApplications <em>Applications</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the reference list '<em>Applications</em>'.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance#getApplications()
+         * @see #getHostInstance()
+         * @generated
+         */
+        EReference getHostInstance_Applications();
+
+        /**
+         * Returns the factory that creates the instances of the model.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the factory that creates the instances of the model.
+         * @generated
+         */
+        CpsFactory getCpsFactory();
+
+        /**
+         * <!-- begin-user-doc -->
+         * Defines literals for the meta objects that represent
+         * <ul>
+         *   <li>each class,</li>
+         *   <li>each feature of each class,</li>
+         *   <li>each operation of each class,</li>
+         *   <li>each enum,</li>
+         *   <li>and each data type</li>
+         * </ul>
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        interface Literals {
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.CyberPhysicalSystemImpl <em>Cyber Physical System</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.CyberPhysicalSystemImpl
+                 * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.CpsPackageImpl#getCyberPhysicalSystem()
+                 * @generated
+                 */
+                EClass CYBER_PHYSICAL_SYSTEM = eINSTANCE.getCyberPhysicalSystem();
+
+                /**
+                 * The meta object literal for the '<em><b>Requests</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference CYBER_PHYSICAL_SYSTEM__REQUESTS = eINSTANCE.getCyberPhysicalSystem_Requests();
+
+                /**
+                 * The meta object literal for the '<em><b>Application Types</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference CYBER_PHYSICAL_SYSTEM__APPLICATION_TYPES = eINSTANCE.getCyberPhysicalSystem_ApplicationTypes();
+
+                /**
+                 * The meta object literal for the '<em><b>Host Types</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference CYBER_PHYSICAL_SYSTEM__HOST_TYPES = eINSTANCE.getCyberPhysicalSystem_HostTypes();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.ApplicationTypeImpl <em>Application Type</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.ApplicationTypeImpl
+                 * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.CpsPackageImpl#getApplicationType()
+                 * @generated
+                 */
+                EClass APPLICATION_TYPE = eINSTANCE.getApplicationType();
+
+                /**
+                 * The meta object literal for the '<em><b>Instances</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference APPLICATION_TYPE__INSTANCES = eINSTANCE.getApplicationType_Instances();
+
+                /**
+                 * The meta object literal for the '<em><b>Requirements</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference APPLICATION_TYPE__REQUIREMENTS = eINSTANCE.getApplicationType_Requirements();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.HostTypeImpl <em>Host Type</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.HostTypeImpl
+                 * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.CpsPackageImpl#getHostType()
+                 * @generated
+                 */
+                EClass HOST_TYPE = eINSTANCE.getHostType();
+
+                /**
+                 * The meta object literal for the '<em><b>Default Memory</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute HOST_TYPE__DEFAULT_MEMORY = eINSTANCE.getHostType_DefaultMemory();
+
+                /**
+                 * The meta object literal for the '<em><b>Default Hdd</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute HOST_TYPE__DEFAULT_HDD = eINSTANCE.getHostType_DefaultHdd();
+
+                /**
+                 * The meta object literal for the '<em><b>Instances</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference HOST_TYPE__INSTANCES = eINSTANCE.getHostType_Instances();
+
+                /**
+                 * The meta object literal for the '<em><b>Cost</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute HOST_TYPE__COST = eINSTANCE.getHostType_Cost();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.RequestImpl <em>Request</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.RequestImpl
+                 * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.CpsPackageImpl#getRequest()
+                 * @generated
+                 */
+                EClass REQUEST = eINSTANCE.getRequest();
+
+                /**
+                 * The meta object literal for the '<em><b>Requirements</b></em>' containment reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference REQUEST__REQUIREMENTS = eINSTANCE.getRequest_Requirements();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.RequirementImpl <em>Requirement</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.RequirementImpl
+                 * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.CpsPackageImpl#getRequirement()
+                 * @generated
+                 */
+                EClass REQUIREMENT = eINSTANCE.getRequirement();
+
+                /**
+                 * The meta object literal for the '<em><b>Request</b></em>' container reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference REQUIREMENT__REQUEST = eINSTANCE.getRequirement_Request();
+
+                /**
+                 * The meta object literal for the '<em><b>Count</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute REQUIREMENT__COUNT = eINSTANCE.getRequirement_Count();
+
+                /**
+                 * The meta object literal for the '<em><b>Type</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference REQUIREMENT__TYPE = eINSTANCE.getRequirement_Type();
+
+                /**
+                 * The meta object literal for the '<em><b>Instances</b></em>' reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference REQUIREMENT__INSTANCES = eINSTANCE.getRequirement_Instances();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.ApplicationInstanceImpl <em>Application Instance</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.ApplicationInstanceImpl
+                 * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.CpsPackageImpl#getApplicationInstance()
+                 * @generated
+                 */
+                EClass APPLICATION_INSTANCE = eINSTANCE.getApplicationInstance();
+
+                /**
+                 * The meta object literal for the '<em><b>Requirement</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference APPLICATION_INSTANCE__REQUIREMENT = eINSTANCE.getApplicationInstance_Requirement();
+
+                /**
+                 * The meta object literal for the '<em><b>Type</b></em>' container reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference APPLICATION_INSTANCE__TYPE = eINSTANCE.getApplicationInstance_Type();
+
+                /**
+                 * The meta object literal for the '<em><b>Allocated To</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference APPLICATION_INSTANCE__ALLOCATED_TO = eINSTANCE.getApplicationInstance_AllocatedTo();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.ResourceRequirementImpl <em>Resource Requirement</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.ResourceRequirementImpl
+                 * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.CpsPackageImpl#getResourceRequirement()
+                 * @generated
+                 */
+                EClass RESOURCE_REQUIREMENT = eINSTANCE.getResourceRequirement();
+
+                /**
+                 * The meta object literal for the '<em><b>Required Memory</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute RESOURCE_REQUIREMENT__REQUIRED_MEMORY = eINSTANCE.getResourceRequirement_RequiredMemory();
+
+                /**
+                 * The meta object literal for the '<em><b>Required Hdd</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute RESOURCE_REQUIREMENT__REQUIRED_HDD = eINSTANCE.getResourceRequirement_RequiredHdd();
+
+                /**
+                 * The meta object literal for the '<em><b>Host Type</b></em>' reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference RESOURCE_REQUIREMENT__HOST_TYPE = eINSTANCE.getResourceRequirement_HostType();
+
+                /**
+                 * The meta object literal for the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.HostInstanceImpl <em>Host Instance</em>}' class.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.HostInstanceImpl
+                 * @see hu.bme.mit.inf.dslreasoner.domains.cps.impl.CpsPackageImpl#getHostInstance()
+                 * @generated
+                 */
+                EClass HOST_INSTANCE = eINSTANCE.getHostInstance();
+
+                /**
+                 * The meta object literal for the '<em><b>Type</b></em>' container reference feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference HOST_INSTANCE__TYPE = eINSTANCE.getHostInstance_Type();
+
+                /**
+                 * The meta object literal for the '<em><b>Applications</b></em>' reference list feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EReference HOST_INSTANCE__APPLICATIONS = eINSTANCE.getHostInstance_Applications();
+
+        }
+
+} //CpsPackage
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/CyberPhysicalSystem.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/CyberPhysicalSystem.java
new file mode 100644
index 00000000..fbf4ce0d
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/CyberPhysicalSystem.java
@@ -0,0 +1,76 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Cyber Physical System</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem#getRequests <em>Requests</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem#getApplicationTypes <em>Application Types</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem#getHostTypes <em>Host Types</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getCyberPhysicalSystem()
+ * @model
+ * @generated
+ */
+public interface CyberPhysicalSystem extends EObject {
+        /**
+         * Returns the value of the '<em><b>Requests</b></em>' containment reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.domains.cps.Request}.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Requests</em>' containment reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Requests</em>' containment reference list.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getCyberPhysicalSystem_Requests()
+         * @model containment="true"
+         * @generated
+         */
+        EList<Request> getRequests();
+
+        /**
+         * Returns the value of the '<em><b>Application Types</b></em>' containment reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType}.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Application Types</em>' containment reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Application Types</em>' containment reference list.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getCyberPhysicalSystem_ApplicationTypes()
+         * @model containment="true"
+         * @generated
+         */
+        EList<ApplicationType> getApplicationTypes();
+
+        /**
+         * Returns the value of the '<em><b>Host Types</b></em>' containment reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.domains.cps.HostType}.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Host Types</em>' containment reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Host Types</em>' containment reference list.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getCyberPhysicalSystem_HostTypes()
+         * @model containment="true"
+         * @generated
+         */
+        EList<HostType> getHostTypes();
+
+} // CyberPhysicalSystem
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/HostInstance.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/HostInstance.java
new file mode 100644
index 00000000..b4721842
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/HostInstance.java
@@ -0,0 +1,73 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Host Instance</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance#getType <em>Type</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance#getApplications <em>Applications</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getHostInstance()
+ * @model
+ * @generated
+ */
+public interface HostInstance extends EObject {
+        /**
+         * Returns the value of the '<em><b>Type</b></em>' container reference.
+         * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostType#getInstances <em>Instances</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Type</em>' container reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Type</em>' container reference.
+         * @see #setType(HostType)
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getHostInstance_Type()
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.HostType#getInstances
+         * @model opposite="instances" required="true" transient="false"
+         * @generated
+         */
+        HostType getType();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance#getType <em>Type</em>}' container reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Type</em>' container reference.
+         * @see #getType()
+         * @generated
+         */
+        void setType(HostType value);
+
+        /**
+         * Returns the value of the '<em><b>Applications</b></em>' reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance}.
+         * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance#getAllocatedTo <em>Allocated To</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Applications</em>' reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Applications</em>' reference list.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getHostInstance_Applications()
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance#getAllocatedTo
+         * @model opposite="allocatedTo"
+         * @generated
+         */
+        EList<ApplicationInstance> getApplications();
+
+} // HostInstance
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/HostType.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/HostType.java
new file mode 100644
index 00000000..45201930
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/HostType.java
@@ -0,0 +1,125 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Host Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostType#getDefaultMemory <em>Default Memory</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostType#getDefaultHdd <em>Default Hdd</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostType#getInstances <em>Instances</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostType#getCost <em>Cost</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getHostType()
+ * @model
+ * @generated
+ */
+public interface HostType extends EObject {
+        /**
+         * Returns the value of the '<em><b>Default Memory</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Default Memory</em>' attribute isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Default Memory</em>' attribute.
+         * @see #setDefaultMemory(int)
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getHostType_DefaultMemory()
+         * @model required="true"
+         * @generated
+         */
+        int getDefaultMemory();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostType#getDefaultMemory <em>Default Memory</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Default Memory</em>' attribute.
+         * @see #getDefaultMemory()
+         * @generated
+         */
+        void setDefaultMemory(int value);
+
+        /**
+         * Returns the value of the '<em><b>Default Hdd</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Default Hdd</em>' attribute isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Default Hdd</em>' attribute.
+         * @see #setDefaultHdd(int)
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getHostType_DefaultHdd()
+         * @model required="true"
+         * @generated
+         */
+        int getDefaultHdd();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostType#getDefaultHdd <em>Default Hdd</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Default Hdd</em>' attribute.
+         * @see #getDefaultHdd()
+         * @generated
+         */
+        void setDefaultHdd(int value);
+
+        /**
+         * Returns the value of the '<em><b>Instances</b></em>' containment reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance}.
+         * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance#getType <em>Type</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Instances</em>' containment reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Instances</em>' containment reference list.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getHostType_Instances()
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance#getType
+         * @model opposite="type" containment="true"
+         * @generated
+         */
+        EList<HostInstance> getInstances();
+
+        /**
+         * Returns the value of the '<em><b>Cost</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Cost</em>' attribute isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Cost</em>' attribute.
+         * @see #setCost(int)
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getHostType_Cost()
+         * @model required="true"
+         * @generated
+         */
+        int getCost();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostType#getCost <em>Cost</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Cost</em>' attribute.
+         * @see #getCost()
+         * @generated
+         */
+        void setCost(int value);
+
+} // HostType
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/Request.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/Request.java
new file mode 100644
index 00000000..261562a0
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/Request.java
@@ -0,0 +1,44 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Request</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.Request#getRequirements <em>Requirements</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getRequest()
+ * @model
+ * @generated
+ */
+public interface Request extends EObject {
+        /**
+         * Returns the value of the '<em><b>Requirements</b></em>' containment reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.domains.cps.Requirement}.
+         * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getRequest <em>Request</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Requirements</em>' containment reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Requirements</em>' containment reference list.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getRequest_Requirements()
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getRequest
+         * @model opposite="request" containment="true"
+         * @generated
+         */
+        EList<Requirement> getRequirements();
+
+} // Request
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/Requirement.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/Requirement.java
new file mode 100644
index 00000000..a1d494e4
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/Requirement.java
@@ -0,0 +1,127 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Requirement</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getRequest <em>Request</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getCount <em>Count</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getType <em>Type</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getInstances <em>Instances</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getRequirement()
+ * @model
+ * @generated
+ */
+public interface Requirement extends EObject {
+        /**
+         * Returns the value of the '<em><b>Request</b></em>' container reference.
+         * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.domains.cps.Request#getRequirements <em>Requirements</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Request</em>' container reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Request</em>' container reference.
+         * @see #setRequest(Request)
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getRequirement_Request()
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.Request#getRequirements
+         * @model opposite="requirements" required="true" transient="false"
+         * @generated
+         */
+        Request getRequest();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getRequest <em>Request</em>}' container reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Request</em>' container reference.
+         * @see #getRequest()
+         * @generated
+         */
+        void setRequest(Request value);
+
+        /**
+         * Returns the value of the '<em><b>Count</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Count</em>' attribute isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Count</em>' attribute.
+         * @see #setCount(int)
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getRequirement_Count()
+         * @model required="true"
+         * @generated
+         */
+        int getCount();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getCount <em>Count</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Count</em>' attribute.
+         * @see #getCount()
+         * @generated
+         */
+        void setCount(int value);
+
+        /**
+         * Returns the value of the '<em><b>Type</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Type</em>' reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Type</em>' reference.
+         * @see #setType(ApplicationType)
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getRequirement_Type()
+         * @model
+         * @generated
+         */
+        ApplicationType getType();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.Requirement#getType <em>Type</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Type</em>' reference.
+         * @see #getType()
+         * @generated
+         */
+        void setType(ApplicationType value);
+
+        /**
+         * Returns the value of the '<em><b>Instances</b></em>' reference list.
+         * The list contents are of type {@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance}.
+         * It is bidirectional and its opposite is '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance#getRequirement <em>Requirement</em>}'.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Instances</em>' reference list isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Instances</em>' reference list.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getRequirement_Instances()
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance#getRequirement
+         * @model opposite="requirement"
+         * @generated
+         */
+        EList<ApplicationInstance> getInstances();
+
+} // Requirement
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/ResourceRequirement.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/ResourceRequirement.java
new file mode 100644
index 00000000..a99cc12e
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/ResourceRequirement.java
@@ -0,0 +1,104 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Resource Requirement</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement#getRequiredMemory <em>Required Memory</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement#getRequiredHdd <em>Required Hdd</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement#getHostType <em>Host Type</em>}</li>
+ * </ul>
+ *
+ * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getResourceRequirement()
+ * @model
+ * @generated
+ */
+public interface ResourceRequirement extends EObject {
+        /**
+         * Returns the value of the '<em><b>Required Memory</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Required Memory</em>' attribute isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Required Memory</em>' attribute.
+         * @see #setRequiredMemory(int)
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getResourceRequirement_RequiredMemory()
+         * @model required="true"
+         * @generated
+         */
+        int getRequiredMemory();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement#getRequiredMemory <em>Required Memory</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Required Memory</em>' attribute.
+         * @see #getRequiredMemory()
+         * @generated
+         */
+        void setRequiredMemory(int value);
+
+        /**
+         * Returns the value of the '<em><b>Required Hdd</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Required Hdd</em>' attribute isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Required Hdd</em>' attribute.
+         * @see #setRequiredHdd(int)
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getResourceRequirement_RequiredHdd()
+         * @model required="true"
+         * @generated
+         */
+        int getRequiredHdd();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement#getRequiredHdd <em>Required Hdd</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Required Hdd</em>' attribute.
+         * @see #getRequiredHdd()
+         * @generated
+         */
+        void setRequiredHdd(int value);
+
+        /**
+         * Returns the value of the '<em><b>Host Type</b></em>' reference.
+         * <!-- begin-user-doc -->
+         * <p>
+         * If the meaning of the '<em>Host Type</em>' reference isn't clear,
+         * there really should be more of a description here...
+         * </p>
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Host Type</em>' reference.
+         * @see #setHostType(HostType)
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#getResourceRequirement_HostType()
+         * @model required="true"
+         * @generated
+         */
+        HostType getHostType();
+
+        /**
+         * Sets the value of the '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement#getHostType <em>Host Type</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Host Type</em>' reference.
+         * @see #getHostType()
+         * @generated
+         */
+        void setHostType(HostType value);
+
+} // ResourceRequirement
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/ApplicationInstanceImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/ApplicationInstanceImpl.java
new file mode 100644
index 00000000..cea2d6f4
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/ApplicationInstanceImpl.java
@@ -0,0 +1,405 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.impl;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType;
+import hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage;
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.Requirement;
+
+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.emf.ecore.util.EcoreUtil;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Application Instance</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.ApplicationInstanceImpl#getRequirement <em>Requirement</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.ApplicationInstanceImpl#getType <em>Type</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.ApplicationInstanceImpl#getAllocatedTo <em>Allocated To</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ApplicationInstanceImpl extends MinimalEObjectImpl.Container implements ApplicationInstance {
+        /**
+         * The cached value of the '{@link #getRequirement() <em>Requirement</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRequirement()
+         * @generated
+         * @ordered
+         */
+        protected Requirement requirement;
+
+        /**
+         * The cached value of the '{@link #getAllocatedTo() <em>Allocated To</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getAllocatedTo()
+         * @generated
+         * @ordered
+         */
+        protected HostInstance allocatedTo;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ApplicationInstanceImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CpsPackage.Literals.APPLICATION_INSTANCE;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Requirement getRequirement() {
+                if (requirement != null && requirement.eIsProxy()) {
+                        InternalEObject oldRequirement = (InternalEObject) requirement;
+                        requirement = (Requirement) eResolveProxy(oldRequirement);
+                        if (requirement != oldRequirement) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+                                                        CpsPackage.APPLICATION_INSTANCE__REQUIREMENT, oldRequirement, requirement));
+                        }
+                }
+                return requirement;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Requirement basicGetRequirement() {
+                return requirement;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetRequirement(Requirement newRequirement, NotificationChain msgs) {
+                Requirement oldRequirement = requirement;
+                requirement = newRequirement;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+                                        CpsPackage.APPLICATION_INSTANCE__REQUIREMENT, oldRequirement, newRequirement);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setRequirement(Requirement newRequirement) {
+                if (newRequirement != requirement) {
+                        NotificationChain msgs = null;
+                        if (requirement != null)
+                                msgs = ((InternalEObject) requirement).eInverseRemove(this, CpsPackage.REQUIREMENT__INSTANCES,
+                                                Requirement.class, msgs);
+                        if (newRequirement != null)
+                                msgs = ((InternalEObject) newRequirement).eInverseAdd(this, CpsPackage.REQUIREMENT__INSTANCES,
+                                                Requirement.class, msgs);
+                        msgs = basicSetRequirement(newRequirement, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CpsPackage.APPLICATION_INSTANCE__REQUIREMENT,
+                                        newRequirement, newRequirement));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public ApplicationType getType() {
+                if (eContainerFeatureID() != CpsPackage.APPLICATION_INSTANCE__TYPE)
+                        return null;
+                return (ApplicationType) eInternalContainer();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetType(ApplicationType newType, NotificationChain msgs) {
+                msgs = eBasicSetContainer((InternalEObject) newType, CpsPackage.APPLICATION_INSTANCE__TYPE, msgs);
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setType(ApplicationType newType) {
+                if (newType != eInternalContainer()
+                                || (eContainerFeatureID() != CpsPackage.APPLICATION_INSTANCE__TYPE && newType != null)) {
+                        if (EcoreUtil.isAncestor(this, newType))
+                                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+                        NotificationChain msgs = null;
+                        if (eInternalContainer() != null)
+                                msgs = eBasicRemoveFromContainer(msgs);
+                        if (newType != null)
+                                msgs = ((InternalEObject) newType).eInverseAdd(this, CpsPackage.APPLICATION_TYPE__INSTANCES,
+                                                ApplicationType.class, msgs);
+                        msgs = basicSetType(newType, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CpsPackage.APPLICATION_INSTANCE__TYPE, newType,
+                                        newType));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public HostInstance getAllocatedTo() {
+                if (allocatedTo != null && allocatedTo.eIsProxy()) {
+                        InternalEObject oldAllocatedTo = (InternalEObject) allocatedTo;
+                        allocatedTo = (HostInstance) eResolveProxy(oldAllocatedTo);
+                        if (allocatedTo != oldAllocatedTo) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+                                                        CpsPackage.APPLICATION_INSTANCE__ALLOCATED_TO, oldAllocatedTo, allocatedTo));
+                        }
+                }
+                return allocatedTo;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public HostInstance basicGetAllocatedTo() {
+                return allocatedTo;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetAllocatedTo(HostInstance newAllocatedTo, NotificationChain msgs) {
+                HostInstance oldAllocatedTo = allocatedTo;
+                allocatedTo = newAllocatedTo;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+                                        CpsPackage.APPLICATION_INSTANCE__ALLOCATED_TO, oldAllocatedTo, newAllocatedTo);
+                        if (msgs == null)
+                                msgs = notification;
+                        else
+                                msgs.add(notification);
+                }
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setAllocatedTo(HostInstance newAllocatedTo) {
+                if (newAllocatedTo != allocatedTo) {
+                        NotificationChain msgs = null;
+                        if (allocatedTo != null)
+                                msgs = ((InternalEObject) allocatedTo).eInverseRemove(this, CpsPackage.HOST_INSTANCE__APPLICATIONS,
+                                                HostInstance.class, msgs);
+                        if (newAllocatedTo != null)
+                                msgs = ((InternalEObject) newAllocatedTo).eInverseAdd(this, CpsPackage.HOST_INSTANCE__APPLICATIONS,
+                                                HostInstance.class, msgs);
+                        msgs = basicSetAllocatedTo(newAllocatedTo, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CpsPackage.APPLICATION_INSTANCE__ALLOCATED_TO,
+                                        newAllocatedTo, newAllocatedTo));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case CpsPackage.APPLICATION_INSTANCE__REQUIREMENT:
+                        if (requirement != null)
+                                msgs = ((InternalEObject) requirement).eInverseRemove(this, CpsPackage.REQUIREMENT__INSTANCES,
+                                                Requirement.class, msgs);
+                        return basicSetRequirement((Requirement) otherEnd, msgs);
+                case CpsPackage.APPLICATION_INSTANCE__TYPE:
+                        if (eInternalContainer() != null)
+                                msgs = eBasicRemoveFromContainer(msgs);
+                        return basicSetType((ApplicationType) otherEnd, msgs);
+                case CpsPackage.APPLICATION_INSTANCE__ALLOCATED_TO:
+                        if (allocatedTo != null)
+                                msgs = ((InternalEObject) allocatedTo).eInverseRemove(this, CpsPackage.HOST_INSTANCE__APPLICATIONS,
+                                                HostInstance.class, msgs);
+                        return basicSetAllocatedTo((HostInstance) otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case CpsPackage.APPLICATION_INSTANCE__REQUIREMENT:
+                        return basicSetRequirement(null, msgs);
+                case CpsPackage.APPLICATION_INSTANCE__TYPE:
+                        return basicSetType(null, msgs);
+                case CpsPackage.APPLICATION_INSTANCE__ALLOCATED_TO:
+                        return basicSetAllocatedTo(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+                switch (eContainerFeatureID()) {
+                case CpsPackage.APPLICATION_INSTANCE__TYPE:
+                        return eInternalContainer().eInverseRemove(this, CpsPackage.APPLICATION_TYPE__INSTANCES,
+                                        ApplicationType.class, msgs);
+                }
+                return super.eBasicRemoveFromContainerFeature(msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case CpsPackage.APPLICATION_INSTANCE__REQUIREMENT:
+                        if (resolve)
+                                return getRequirement();
+                        return basicGetRequirement();
+                case CpsPackage.APPLICATION_INSTANCE__TYPE:
+                        return getType();
+                case CpsPackage.APPLICATION_INSTANCE__ALLOCATED_TO:
+                        if (resolve)
+                                return getAllocatedTo();
+                        return basicGetAllocatedTo();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                case CpsPackage.APPLICATION_INSTANCE__REQUIREMENT:
+                        setRequirement((Requirement) newValue);
+                        return;
+                case CpsPackage.APPLICATION_INSTANCE__TYPE:
+                        setType((ApplicationType) newValue);
+                        return;
+                case CpsPackage.APPLICATION_INSTANCE__ALLOCATED_TO:
+                        setAllocatedTo((HostInstance) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case CpsPackage.APPLICATION_INSTANCE__REQUIREMENT:
+                        setRequirement((Requirement) null);
+                        return;
+                case CpsPackage.APPLICATION_INSTANCE__TYPE:
+                        setType((ApplicationType) null);
+                        return;
+                case CpsPackage.APPLICATION_INSTANCE__ALLOCATED_TO:
+                        setAllocatedTo((HostInstance) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case CpsPackage.APPLICATION_INSTANCE__REQUIREMENT:
+                        return requirement != null;
+                case CpsPackage.APPLICATION_INSTANCE__TYPE:
+                        return getType() != null;
+                case CpsPackage.APPLICATION_INSTANCE__ALLOCATED_TO:
+                        return allocatedTo != null;
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //ApplicationInstanceImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/ApplicationTypeImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/ApplicationTypeImpl.java
new file mode 100644
index 00000000..f8793e30
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/ApplicationTypeImpl.java
@@ -0,0 +1,209 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.impl;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType;
+import hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage;
+import hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement;
+
+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.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Application Type</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.ApplicationTypeImpl#getInstances <em>Instances</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.ApplicationTypeImpl#getRequirements <em>Requirements</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ApplicationTypeImpl extends MinimalEObjectImpl.Container implements ApplicationType {
+        /**
+         * The cached value of the '{@link #getInstances() <em>Instances</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getInstances()
+         * @generated
+         * @ordered
+         */
+        protected EList<ApplicationInstance> instances;
+
+        /**
+         * The cached value of the '{@link #getRequirements() <em>Requirements</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRequirements()
+         * @generated
+         * @ordered
+         */
+        protected EList<ResourceRequirement> requirements;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ApplicationTypeImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CpsPackage.Literals.APPLICATION_TYPE;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<ApplicationInstance> getInstances() {
+                if (instances == null) {
+                        instances = new EObjectContainmentWithInverseEList<ApplicationInstance>(ApplicationInstance.class, this,
+                                        CpsPackage.APPLICATION_TYPE__INSTANCES, CpsPackage.APPLICATION_INSTANCE__TYPE);
+                }
+                return instances;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<ResourceRequirement> getRequirements() {
+                if (requirements == null) {
+                        requirements = new EObjectContainmentEList<ResourceRequirement>(ResourceRequirement.class, this,
+                                        CpsPackage.APPLICATION_TYPE__REQUIREMENTS);
+                }
+                return requirements;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case CpsPackage.APPLICATION_TYPE__INSTANCES:
+                        return ((InternalEList<InternalEObject>) (InternalEList<?>) getInstances()).basicAdd(otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case CpsPackage.APPLICATION_TYPE__INSTANCES:
+                        return ((InternalEList<?>) getInstances()).basicRemove(otherEnd, msgs);
+                case CpsPackage.APPLICATION_TYPE__REQUIREMENTS:
+                        return ((InternalEList<?>) getRequirements()).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 CpsPackage.APPLICATION_TYPE__INSTANCES:
+                        return getInstances();
+                case CpsPackage.APPLICATION_TYPE__REQUIREMENTS:
+                        return getRequirements();
+                }
+                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 CpsPackage.APPLICATION_TYPE__INSTANCES:
+                        getInstances().clear();
+                        getInstances().addAll((Collection<? extends ApplicationInstance>) newValue);
+                        return;
+                case CpsPackage.APPLICATION_TYPE__REQUIREMENTS:
+                        getRequirements().clear();
+                        getRequirements().addAll((Collection<? extends ResourceRequirement>) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case CpsPackage.APPLICATION_TYPE__INSTANCES:
+                        getInstances().clear();
+                        return;
+                case CpsPackage.APPLICATION_TYPE__REQUIREMENTS:
+                        getRequirements().clear();
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case CpsPackage.APPLICATION_TYPE__INSTANCES:
+                        return instances != null && !instances.isEmpty();
+                case CpsPackage.APPLICATION_TYPE__REQUIREMENTS:
+                        return requirements != null && !requirements.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //ApplicationTypeImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/CpsFactoryImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/CpsFactoryImpl.java
new file mode 100644
index 00000000..110f5abb
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/CpsFactoryImpl.java
@@ -0,0 +1,188 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.impl;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.*;
+
+import org.eclipse.emf.ecore.EClass;
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class CpsFactoryImpl extends EFactoryImpl implements CpsFactory {
+        /**
+         * Creates the default factory implementation.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public static CpsFactory init() {
+                try {
+                        CpsFactory theCpsFactory = (CpsFactory) EPackage.Registry.INSTANCE.getEFactory(CpsPackage.eNS_URI);
+                        if (theCpsFactory != null) {
+                                return theCpsFactory;
+                        }
+                } catch (Exception exception) {
+                        EcorePlugin.INSTANCE.log(exception);
+                }
+                return new CpsFactoryImpl();
+        }
+
+        /**
+         * Creates an instance of the factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public CpsFactoryImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EObject create(EClass eClass) {
+                switch (eClass.getClassifierID()) {
+                case CpsPackage.CYBER_PHYSICAL_SYSTEM:
+                        return createCyberPhysicalSystem();
+                case CpsPackage.APPLICATION_TYPE:
+                        return createApplicationType();
+                case CpsPackage.HOST_TYPE:
+                        return createHostType();
+                case CpsPackage.REQUEST:
+                        return createRequest();
+                case CpsPackage.REQUIREMENT:
+                        return createRequirement();
+                case CpsPackage.APPLICATION_INSTANCE:
+                        return createApplicationInstance();
+                case CpsPackage.RESOURCE_REQUIREMENT:
+                        return createResourceRequirement();
+                case CpsPackage.HOST_INSTANCE:
+                        return createHostInstance();
+                default:
+                        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+                }
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public CyberPhysicalSystem createCyberPhysicalSystem() {
+                CyberPhysicalSystemImpl cyberPhysicalSystem = new CyberPhysicalSystemImpl();
+                return cyberPhysicalSystem;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public ApplicationType createApplicationType() {
+                ApplicationTypeImpl applicationType = new ApplicationTypeImpl();
+                return applicationType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public HostType createHostType() {
+                HostTypeImpl hostType = new HostTypeImpl();
+                return hostType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Request createRequest() {
+                RequestImpl request = new RequestImpl();
+                return request;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Requirement createRequirement() {
+                RequirementImpl requirement = new RequirementImpl();
+                return requirement;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public ApplicationInstance createApplicationInstance() {
+                ApplicationInstanceImpl applicationInstance = new ApplicationInstanceImpl();
+                return applicationInstance;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public ResourceRequirement createResourceRequirement() {
+                ResourceRequirementImpl resourceRequirement = new ResourceRequirementImpl();
+                return resourceRequirement;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public HostInstance createHostInstance() {
+                HostInstanceImpl hostInstance = new HostInstanceImpl();
+                return hostInstance;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public CpsPackage getCpsPackage() {
+                return (CpsPackage) getEPackage();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @deprecated
+         * @generated
+         */
+        @Deprecated
+        public static CpsPackage getPackage() {
+                return CpsPackage.eINSTANCE;
+        }
+
+} //CpsFactoryImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/CpsPackageImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/CpsPackageImpl.java
new file mode 100644
index 00000000..e29ccccd
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/CpsPackageImpl.java
@@ -0,0 +1,643 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.impl;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType;
+import hu.bme.mit.inf.dslreasoner.domains.cps.CpsFactory;
+import hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage;
+import hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem;
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostType;
+import hu.bme.mit.inf.dslreasoner.domains.cps.Request;
+import hu.bme.mit.inf.dslreasoner.domains.cps.Requirement;
+import hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class CpsPackageImpl extends EPackageImpl implements CpsPackage {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass cyberPhysicalSystemEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass applicationTypeEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass hostTypeEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass requestEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass requirementEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass applicationInstanceEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass resourceRequirementEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass hostInstanceEClass = 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 hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage#eNS_URI
+         * @see #init()
+         * @generated
+         */
+        private CpsPackageImpl() {
+                super(eNS_URI, CpsFactory.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 CpsPackage#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 CpsPackage init() {
+                if (isInited)
+                        return (CpsPackage) EPackage.Registry.INSTANCE.getEPackage(CpsPackage.eNS_URI);
+
+                // Obtain or create and register package
+                Object registeredCpsPackage = EPackage.Registry.INSTANCE.get(eNS_URI);
+                CpsPackageImpl theCpsPackage = registeredCpsPackage instanceof CpsPackageImpl
+                                ? (CpsPackageImpl) registeredCpsPackage
+                                : new CpsPackageImpl();
+
+                isInited = true;
+
+                // Create package meta-data objects
+                theCpsPackage.createPackageContents();
+
+                // Initialize created meta-data
+                theCpsPackage.initializePackageContents();
+
+                // Mark meta-data to indicate it can't be changed
+                theCpsPackage.freeze();
+
+                // Update the registry and return the package
+                EPackage.Registry.INSTANCE.put(CpsPackage.eNS_URI, theCpsPackage);
+                return theCpsPackage;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getCyberPhysicalSystem() {
+                return cyberPhysicalSystemEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getCyberPhysicalSystem_Requests() {
+                return (EReference) cyberPhysicalSystemEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getCyberPhysicalSystem_ApplicationTypes() {
+                return (EReference) cyberPhysicalSystemEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getCyberPhysicalSystem_HostTypes() {
+                return (EReference) cyberPhysicalSystemEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getApplicationType() {
+                return applicationTypeEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getApplicationType_Instances() {
+                return (EReference) applicationTypeEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getApplicationType_Requirements() {
+                return (EReference) applicationTypeEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getHostType() {
+                return hostTypeEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EAttribute getHostType_DefaultMemory() {
+                return (EAttribute) hostTypeEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EAttribute getHostType_DefaultHdd() {
+                return (EAttribute) hostTypeEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getHostType_Instances() {
+                return (EReference) hostTypeEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EAttribute getHostType_Cost() {
+                return (EAttribute) hostTypeEClass.getEStructuralFeatures().get(3);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getRequest() {
+                return requestEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getRequest_Requirements() {
+                return (EReference) requestEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getRequirement() {
+                return requirementEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getRequirement_Request() {
+                return (EReference) requirementEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EAttribute getRequirement_Count() {
+                return (EAttribute) requirementEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getRequirement_Type() {
+                return (EReference) requirementEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getRequirement_Instances() {
+                return (EReference) requirementEClass.getEStructuralFeatures().get(3);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getApplicationInstance() {
+                return applicationInstanceEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getApplicationInstance_Requirement() {
+                return (EReference) applicationInstanceEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getApplicationInstance_Type() {
+                return (EReference) applicationInstanceEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getApplicationInstance_AllocatedTo() {
+                return (EReference) applicationInstanceEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getResourceRequirement() {
+                return resourceRequirementEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EAttribute getResourceRequirement_RequiredMemory() {
+                return (EAttribute) resourceRequirementEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EAttribute getResourceRequirement_RequiredHdd() {
+                return (EAttribute) resourceRequirementEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getResourceRequirement_HostType() {
+                return (EReference) resourceRequirementEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getHostInstance() {
+                return hostInstanceEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getHostInstance_Type() {
+                return (EReference) hostInstanceEClass.getEStructuralFeatures().get(0);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EReference getHostInstance_Applications() {
+                return (EReference) hostInstanceEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public CpsFactory getCpsFactory() {
+                return (CpsFactory) 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
+                cyberPhysicalSystemEClass = createEClass(CYBER_PHYSICAL_SYSTEM);
+                createEReference(cyberPhysicalSystemEClass, CYBER_PHYSICAL_SYSTEM__REQUESTS);
+                createEReference(cyberPhysicalSystemEClass, CYBER_PHYSICAL_SYSTEM__APPLICATION_TYPES);
+                createEReference(cyberPhysicalSystemEClass, CYBER_PHYSICAL_SYSTEM__HOST_TYPES);
+
+                applicationTypeEClass = createEClass(APPLICATION_TYPE);
+                createEReference(applicationTypeEClass, APPLICATION_TYPE__INSTANCES);
+                createEReference(applicationTypeEClass, APPLICATION_TYPE__REQUIREMENTS);
+
+                hostTypeEClass = createEClass(HOST_TYPE);
+                createEAttribute(hostTypeEClass, HOST_TYPE__DEFAULT_MEMORY);
+                createEAttribute(hostTypeEClass, HOST_TYPE__DEFAULT_HDD);
+                createEReference(hostTypeEClass, HOST_TYPE__INSTANCES);
+                createEAttribute(hostTypeEClass, HOST_TYPE__COST);
+
+                requestEClass = createEClass(REQUEST);
+                createEReference(requestEClass, REQUEST__REQUIREMENTS);
+
+                requirementEClass = createEClass(REQUIREMENT);
+                createEReference(requirementEClass, REQUIREMENT__REQUEST);
+                createEAttribute(requirementEClass, REQUIREMENT__COUNT);
+                createEReference(requirementEClass, REQUIREMENT__TYPE);
+                createEReference(requirementEClass, REQUIREMENT__INSTANCES);
+
+                applicationInstanceEClass = createEClass(APPLICATION_INSTANCE);
+                createEReference(applicationInstanceEClass, APPLICATION_INSTANCE__REQUIREMENT);
+                createEReference(applicationInstanceEClass, APPLICATION_INSTANCE__TYPE);
+                createEReference(applicationInstanceEClass, APPLICATION_INSTANCE__ALLOCATED_TO);
+
+                resourceRequirementEClass = createEClass(RESOURCE_REQUIREMENT);
+                createEAttribute(resourceRequirementEClass, RESOURCE_REQUIREMENT__REQUIRED_MEMORY);
+                createEAttribute(resourceRequirementEClass, RESOURCE_REQUIREMENT__REQUIRED_HDD);
+                createEReference(resourceRequirementEClass, RESOURCE_REQUIREMENT__HOST_TYPE);
+
+                hostInstanceEClass = createEClass(HOST_INSTANCE);
+                createEReference(hostInstanceEClass, HOST_INSTANCE__TYPE);
+                createEReference(hostInstanceEClass, HOST_INSTANCE__APPLICATIONS);
+        }
+
+        /**
+         * <!-- 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
+
+                // Initialize classes, features, and operations; add parameters
+                initEClass(cyberPhysicalSystemEClass, CyberPhysicalSystem.class, "CyberPhysicalSystem", !IS_ABSTRACT,
+                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getCyberPhysicalSystem_Requests(), this.getRequest(), null, "requests", null, 0, -1,
+                                CyberPhysicalSystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+                                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getCyberPhysicalSystem_ApplicationTypes(), this.getApplicationType(), null, "applicationTypes",
+                                null, 0, -1, CyberPhysicalSystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+                                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getCyberPhysicalSystem_HostTypes(), this.getHostType(), null, "hostTypes", null, 0, -1,
+                                CyberPhysicalSystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+                                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(applicationTypeEClass, ApplicationType.class, "ApplicationType", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getApplicationType_Instances(), this.getApplicationInstance(),
+                                this.getApplicationInstance_Type(), "instances", null, 0, -1, ApplicationType.class, !IS_TRANSIENT,
+                                !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+                                IS_ORDERED);
+                initEReference(getApplicationType_Requirements(), this.getResourceRequirement(), null, "requirements", null, 0,
+                                -1, ApplicationType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+                                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(hostTypeEClass, HostType.class, "HostType", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getHostType_DefaultMemory(), ecorePackage.getEInt(), "defaultMemory", null, 1, 1, HostType.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getHostType_DefaultHdd(), ecorePackage.getEInt(), "defaultHdd", null, 1, 1, HostType.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getHostType_Instances(), this.getHostInstance(), this.getHostInstance_Type(), "instances", null,
+                                0, -1, HostType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getHostType_Cost(), ecorePackage.getEInt(), "cost", null, 1, 1, HostType.class, !IS_TRANSIENT,
+                                !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(requestEClass, Request.class, "Request", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getRequest_Requirements(), this.getRequirement(), this.getRequirement_Request(), "requirements",
+                                null, 0, -1, Request.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+                                !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(requirementEClass, Requirement.class, "Requirement", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getRequirement_Request(), this.getRequest(), this.getRequest_Requirements(), "request", null, 1,
+                                1, Requirement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getRequirement_Count(), ecorePackage.getEInt(), "count", null, 1, 1, Requirement.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getRequirement_Type(), this.getApplicationType(), null, "type", null, 0, 1, Requirement.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getRequirement_Instances(), this.getApplicationInstance(),
+                                this.getApplicationInstance_Requirement(), "instances", null, 0, -1, Requirement.class, !IS_TRANSIENT,
+                                !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+                                IS_ORDERED);
+
+                initEClass(applicationInstanceEClass, ApplicationInstance.class, "ApplicationInstance", !IS_ABSTRACT,
+                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getApplicationInstance_Requirement(), this.getRequirement(), this.getRequirement_Instances(),
+                                "requirement", null, 0, 1, ApplicationInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+                                !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getApplicationInstance_Type(), this.getApplicationType(), this.getApplicationType_Instances(),
+                                "type", null, 1, 1, ApplicationInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+                                !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getApplicationInstance_AllocatedTo(), this.getHostInstance(),
+                                this.getHostInstance_Applications(), "allocatedTo", null, 1, 1, ApplicationInstance.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(resourceRequirementEClass, ResourceRequirement.class, "ResourceRequirement", !IS_ABSTRACT,
+                                !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getResourceRequirement_RequiredMemory(), ecorePackage.getEInt(), "requiredMemory", null, 1, 1,
+                                ResourceRequirement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getResourceRequirement_RequiredHdd(), ecorePackage.getEInt(), "requiredHdd", null, 1, 1,
+                                ResourceRequirement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getResourceRequirement_HostType(), this.getHostType(), null, "hostType", null, 1, 1,
+                                ResourceRequirement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+                                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                initEClass(hostInstanceEClass, HostInstance.class, "HostInstance", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getHostInstance_Type(), this.getHostType(), this.getHostType_Instances(), "type", null, 1, 1,
+                                HostInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getHostInstance_Applications(), this.getApplicationInstance(),
+                                this.getApplicationInstance_AllocatedTo(), "applications", null, 0, -1, HostInstance.class,
+                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+                // Create resource
+                createResource(eNS_URI);
+        }
+
+} //CpsPackageImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/CyberPhysicalSystemImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/CyberPhysicalSystemImpl.java
new file mode 100644
index 00000000..3ba111af
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/CyberPhysicalSystemImpl.java
@@ -0,0 +1,232 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.impl;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType;
+import hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage;
+import hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem;
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostType;
+import hu.bme.mit.inf.dslreasoner.domains.cps.Request;
+
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Cyber Physical System</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.CyberPhysicalSystemImpl#getRequests <em>Requests</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.CyberPhysicalSystemImpl#getApplicationTypes <em>Application Types</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.CyberPhysicalSystemImpl#getHostTypes <em>Host Types</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CyberPhysicalSystemImpl extends MinimalEObjectImpl.Container implements CyberPhysicalSystem {
+        /**
+         * The cached value of the '{@link #getRequests() <em>Requests</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRequests()
+         * @generated
+         * @ordered
+         */
+        protected EList<Request> requests;
+
+        /**
+         * The cached value of the '{@link #getApplicationTypes() <em>Application Types</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getApplicationTypes()
+         * @generated
+         * @ordered
+         */
+        protected EList<ApplicationType> applicationTypes;
+
+        /**
+         * The cached value of the '{@link #getHostTypes() <em>Host Types</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getHostTypes()
+         * @generated
+         * @ordered
+         */
+        protected EList<HostType> hostTypes;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected CyberPhysicalSystemImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CpsPackage.Literals.CYBER_PHYSICAL_SYSTEM;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<Request> getRequests() {
+                if (requests == null) {
+                        requests = new EObjectContainmentEList<Request>(Request.class, this,
+                                        CpsPackage.CYBER_PHYSICAL_SYSTEM__REQUESTS);
+                }
+                return requests;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<ApplicationType> getApplicationTypes() {
+                if (applicationTypes == null) {
+                        applicationTypes = new EObjectContainmentEList<ApplicationType>(ApplicationType.class, this,
+                                        CpsPackage.CYBER_PHYSICAL_SYSTEM__APPLICATION_TYPES);
+                }
+                return applicationTypes;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<HostType> getHostTypes() {
+                if (hostTypes == null) {
+                        hostTypes = new EObjectContainmentEList<HostType>(HostType.class, this,
+                                        CpsPackage.CYBER_PHYSICAL_SYSTEM__HOST_TYPES);
+                }
+                return hostTypes;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case CpsPackage.CYBER_PHYSICAL_SYSTEM__REQUESTS:
+                        return ((InternalEList<?>) getRequests()).basicRemove(otherEnd, msgs);
+                case CpsPackage.CYBER_PHYSICAL_SYSTEM__APPLICATION_TYPES:
+                        return ((InternalEList<?>) getApplicationTypes()).basicRemove(otherEnd, msgs);
+                case CpsPackage.CYBER_PHYSICAL_SYSTEM__HOST_TYPES:
+                        return ((InternalEList<?>) getHostTypes()).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 CpsPackage.CYBER_PHYSICAL_SYSTEM__REQUESTS:
+                        return getRequests();
+                case CpsPackage.CYBER_PHYSICAL_SYSTEM__APPLICATION_TYPES:
+                        return getApplicationTypes();
+                case CpsPackage.CYBER_PHYSICAL_SYSTEM__HOST_TYPES:
+                        return getHostTypes();
+                }
+                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 CpsPackage.CYBER_PHYSICAL_SYSTEM__REQUESTS:
+                        getRequests().clear();
+                        getRequests().addAll((Collection<? extends Request>) newValue);
+                        return;
+                case CpsPackage.CYBER_PHYSICAL_SYSTEM__APPLICATION_TYPES:
+                        getApplicationTypes().clear();
+                        getApplicationTypes().addAll((Collection<? extends ApplicationType>) newValue);
+                        return;
+                case CpsPackage.CYBER_PHYSICAL_SYSTEM__HOST_TYPES:
+                        getHostTypes().clear();
+                        getHostTypes().addAll((Collection<? extends HostType>) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case CpsPackage.CYBER_PHYSICAL_SYSTEM__REQUESTS:
+                        getRequests().clear();
+                        return;
+                case CpsPackage.CYBER_PHYSICAL_SYSTEM__APPLICATION_TYPES:
+                        getApplicationTypes().clear();
+                        return;
+                case CpsPackage.CYBER_PHYSICAL_SYSTEM__HOST_TYPES:
+                        getHostTypes().clear();
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case CpsPackage.CYBER_PHYSICAL_SYSTEM__REQUESTS:
+                        return requests != null && !requests.isEmpty();
+                case CpsPackage.CYBER_PHYSICAL_SYSTEM__APPLICATION_TYPES:
+                        return applicationTypes != null && !applicationTypes.isEmpty();
+                case CpsPackage.CYBER_PHYSICAL_SYSTEM__HOST_TYPES:
+                        return hostTypes != null && !hostTypes.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //CyberPhysicalSystemImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/HostInstanceImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/HostInstanceImpl.java
new file mode 100644
index 00000000..551f2ed6
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/HostInstanceImpl.java
@@ -0,0 +1,250 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.impl;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage;
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostType;
+
+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.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Host Instance</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.HostInstanceImpl#getType <em>Type</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.HostInstanceImpl#getApplications <em>Applications</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class HostInstanceImpl extends MinimalEObjectImpl.Container implements HostInstance {
+        /**
+         * The cached value of the '{@link #getApplications() <em>Applications</em>}' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getApplications()
+         * @generated
+         * @ordered
+         */
+        protected EList<ApplicationInstance> applications;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected HostInstanceImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CpsPackage.Literals.HOST_INSTANCE;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public HostType getType() {
+                if (eContainerFeatureID() != CpsPackage.HOST_INSTANCE__TYPE)
+                        return null;
+                return (HostType) eInternalContainer();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetType(HostType newType, NotificationChain msgs) {
+                msgs = eBasicSetContainer((InternalEObject) newType, CpsPackage.HOST_INSTANCE__TYPE, msgs);
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setType(HostType newType) {
+                if (newType != eInternalContainer()
+                                || (eContainerFeatureID() != CpsPackage.HOST_INSTANCE__TYPE && newType != null)) {
+                        if (EcoreUtil.isAncestor(this, newType))
+                                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+                        NotificationChain msgs = null;
+                        if (eInternalContainer() != null)
+                                msgs = eBasicRemoveFromContainer(msgs);
+                        if (newType != null)
+                                msgs = ((InternalEObject) newType).eInverseAdd(this, CpsPackage.HOST_TYPE__INSTANCES, HostType.class,
+                                                msgs);
+                        msgs = basicSetType(newType, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CpsPackage.HOST_INSTANCE__TYPE, newType, newType));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<ApplicationInstance> getApplications() {
+                if (applications == null) {
+                        applications = new EObjectWithInverseResolvingEList<ApplicationInstance>(ApplicationInstance.class, this,
+                                        CpsPackage.HOST_INSTANCE__APPLICATIONS, CpsPackage.APPLICATION_INSTANCE__ALLOCATED_TO);
+                }
+                return applications;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case CpsPackage.HOST_INSTANCE__TYPE:
+                        if (eInternalContainer() != null)
+                                msgs = eBasicRemoveFromContainer(msgs);
+                        return basicSetType((HostType) otherEnd, msgs);
+                case CpsPackage.HOST_INSTANCE__APPLICATIONS:
+                        return ((InternalEList<InternalEObject>) (InternalEList<?>) getApplications()).basicAdd(otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case CpsPackage.HOST_INSTANCE__TYPE:
+                        return basicSetType(null, msgs);
+                case CpsPackage.HOST_INSTANCE__APPLICATIONS:
+                        return ((InternalEList<?>) getApplications()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+                switch (eContainerFeatureID()) {
+                case CpsPackage.HOST_INSTANCE__TYPE:
+                        return eInternalContainer().eInverseRemove(this, CpsPackage.HOST_TYPE__INSTANCES, HostType.class, msgs);
+                }
+                return super.eBasicRemoveFromContainerFeature(msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case CpsPackage.HOST_INSTANCE__TYPE:
+                        return getType();
+                case CpsPackage.HOST_INSTANCE__APPLICATIONS:
+                        return getApplications();
+                }
+                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 CpsPackage.HOST_INSTANCE__TYPE:
+                        setType((HostType) newValue);
+                        return;
+                case CpsPackage.HOST_INSTANCE__APPLICATIONS:
+                        getApplications().clear();
+                        getApplications().addAll((Collection<? extends ApplicationInstance>) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case CpsPackage.HOST_INSTANCE__TYPE:
+                        setType((HostType) null);
+                        return;
+                case CpsPackage.HOST_INSTANCE__APPLICATIONS:
+                        getApplications().clear();
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case CpsPackage.HOST_INSTANCE__TYPE:
+                        return getType() != null;
+                case CpsPackage.HOST_INSTANCE__APPLICATIONS:
+                        return applications != null && !applications.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //HostInstanceImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/HostTypeImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/HostTypeImpl.java
new file mode 100644
index 00000000..c3d5b3dc
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/HostTypeImpl.java
@@ -0,0 +1,356 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.impl;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage;
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostType;
+
+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.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Host Type</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.HostTypeImpl#getDefaultMemory <em>Default Memory</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.HostTypeImpl#getDefaultHdd <em>Default Hdd</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.HostTypeImpl#getInstances <em>Instances</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.HostTypeImpl#getCost <em>Cost</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class HostTypeImpl extends MinimalEObjectImpl.Container implements HostType {
+        /**
+         * The default value of the '{@link #getDefaultMemory() <em>Default Memory</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getDefaultMemory()
+         * @generated
+         * @ordered
+         */
+        protected static final int DEFAULT_MEMORY_EDEFAULT = 0;
+
+        /**
+         * The cached value of the '{@link #getDefaultMemory() <em>Default Memory</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getDefaultMemory()
+         * @generated
+         * @ordered
+         */
+        protected int defaultMemory = DEFAULT_MEMORY_EDEFAULT;
+
+        /**
+         * The default value of the '{@link #getDefaultHdd() <em>Default Hdd</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getDefaultHdd()
+         * @generated
+         * @ordered
+         */
+        protected static final int DEFAULT_HDD_EDEFAULT = 0;
+
+        /**
+         * The cached value of the '{@link #getDefaultHdd() <em>Default Hdd</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getDefaultHdd()
+         * @generated
+         * @ordered
+         */
+        protected int defaultHdd = DEFAULT_HDD_EDEFAULT;
+
+        /**
+         * The cached value of the '{@link #getInstances() <em>Instances</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getInstances()
+         * @generated
+         * @ordered
+         */
+        protected EList<HostInstance> instances;
+
+        /**
+         * The default value of the '{@link #getCost() <em>Cost</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getCost()
+         * @generated
+         * @ordered
+         */
+        protected static final int COST_EDEFAULT = 0;
+
+        /**
+         * The cached value of the '{@link #getCost() <em>Cost</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getCost()
+         * @generated
+         * @ordered
+         */
+        protected int cost = COST_EDEFAULT;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected HostTypeImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CpsPackage.Literals.HOST_TYPE;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public int getDefaultMemory() {
+                return defaultMemory;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setDefaultMemory(int newDefaultMemory) {
+                int oldDefaultMemory = defaultMemory;
+                defaultMemory = newDefaultMemory;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CpsPackage.HOST_TYPE__DEFAULT_MEMORY,
+                                        oldDefaultMemory, defaultMemory));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public int getDefaultHdd() {
+                return defaultHdd;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setDefaultHdd(int newDefaultHdd) {
+                int oldDefaultHdd = defaultHdd;
+                defaultHdd = newDefaultHdd;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CpsPackage.HOST_TYPE__DEFAULT_HDD, oldDefaultHdd,
+                                        defaultHdd));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<HostInstance> getInstances() {
+                if (instances == null) {
+                        instances = new EObjectContainmentWithInverseEList<HostInstance>(HostInstance.class, this,
+                                        CpsPackage.HOST_TYPE__INSTANCES, CpsPackage.HOST_INSTANCE__TYPE);
+                }
+                return instances;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public int getCost() {
+                return cost;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setCost(int newCost) {
+                int oldCost = cost;
+                cost = newCost;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CpsPackage.HOST_TYPE__COST, oldCost, cost));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case CpsPackage.HOST_TYPE__INSTANCES:
+                        return ((InternalEList<InternalEObject>) (InternalEList<?>) getInstances()).basicAdd(otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case CpsPackage.HOST_TYPE__INSTANCES:
+                        return ((InternalEList<?>) getInstances()).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 CpsPackage.HOST_TYPE__DEFAULT_MEMORY:
+                        return getDefaultMemory();
+                case CpsPackage.HOST_TYPE__DEFAULT_HDD:
+                        return getDefaultHdd();
+                case CpsPackage.HOST_TYPE__INSTANCES:
+                        return getInstances();
+                case CpsPackage.HOST_TYPE__COST:
+                        return getCost();
+                }
+                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 CpsPackage.HOST_TYPE__DEFAULT_MEMORY:
+                        setDefaultMemory((Integer) newValue);
+                        return;
+                case CpsPackage.HOST_TYPE__DEFAULT_HDD:
+                        setDefaultHdd((Integer) newValue);
+                        return;
+                case CpsPackage.HOST_TYPE__INSTANCES:
+                        getInstances().clear();
+                        getInstances().addAll((Collection<? extends HostInstance>) newValue);
+                        return;
+                case CpsPackage.HOST_TYPE__COST:
+                        setCost((Integer) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case CpsPackage.HOST_TYPE__DEFAULT_MEMORY:
+                        setDefaultMemory(DEFAULT_MEMORY_EDEFAULT);
+                        return;
+                case CpsPackage.HOST_TYPE__DEFAULT_HDD:
+                        setDefaultHdd(DEFAULT_HDD_EDEFAULT);
+                        return;
+                case CpsPackage.HOST_TYPE__INSTANCES:
+                        getInstances().clear();
+                        return;
+                case CpsPackage.HOST_TYPE__COST:
+                        setCost(COST_EDEFAULT);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case CpsPackage.HOST_TYPE__DEFAULT_MEMORY:
+                        return defaultMemory != DEFAULT_MEMORY_EDEFAULT;
+                case CpsPackage.HOST_TYPE__DEFAULT_HDD:
+                        return defaultHdd != DEFAULT_HDD_EDEFAULT;
+                case CpsPackage.HOST_TYPE__INSTANCES:
+                        return instances != null && !instances.isEmpty();
+                case CpsPackage.HOST_TYPE__COST:
+                        return cost != COST_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(" (defaultMemory: ");
+                result.append(defaultMemory);
+                result.append(", defaultHdd: ");
+                result.append(defaultHdd);
+                result.append(", cost: ");
+                result.append(cost);
+                result.append(')');
+                return result.toString();
+        }
+
+} //HostTypeImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/RequestImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/RequestImpl.java
new file mode 100644
index 00000000..72b4c732
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/RequestImpl.java
@@ -0,0 +1,169 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.impl;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage;
+import hu.bme.mit.inf.dslreasoner.domains.cps.Request;
+import hu.bme.mit.inf.dslreasoner.domains.cps.Requirement;
+
+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.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Request</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.RequestImpl#getRequirements <em>Requirements</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class RequestImpl extends MinimalEObjectImpl.Container implements Request {
+        /**
+         * The cached value of the '{@link #getRequirements() <em>Requirements</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRequirements()
+         * @generated
+         * @ordered
+         */
+        protected EList<Requirement> requirements;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected RequestImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CpsPackage.Literals.REQUEST;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<Requirement> getRequirements() {
+                if (requirements == null) {
+                        requirements = new EObjectContainmentWithInverseEList<Requirement>(Requirement.class, this,
+                                        CpsPackage.REQUEST__REQUIREMENTS, CpsPackage.REQUIREMENT__REQUEST);
+                }
+                return requirements;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case CpsPackage.REQUEST__REQUIREMENTS:
+                        return ((InternalEList<InternalEObject>) (InternalEList<?>) getRequirements()).basicAdd(otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case CpsPackage.REQUEST__REQUIREMENTS:
+                        return ((InternalEList<?>) getRequirements()).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 CpsPackage.REQUEST__REQUIREMENTS:
+                        return getRequirements();
+                }
+                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 CpsPackage.REQUEST__REQUIREMENTS:
+                        getRequirements().clear();
+                        getRequirements().addAll((Collection<? extends Requirement>) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case CpsPackage.REQUEST__REQUIREMENTS:
+                        getRequirements().clear();
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case CpsPackage.REQUEST__REQUIREMENTS:
+                        return requirements != null && !requirements.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+
+} //RequestImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/RequirementImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/RequirementImpl.java
new file mode 100644
index 00000000..79dc4f62
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/RequirementImpl.java
@@ -0,0 +1,387 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.impl;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType;
+import hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage;
+import hu.bme.mit.inf.dslreasoner.domains.cps.Request;
+import hu.bme.mit.inf.dslreasoner.domains.cps.Requirement;
+
+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.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Requirement</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.RequirementImpl#getRequest <em>Request</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.RequirementImpl#getCount <em>Count</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.RequirementImpl#getType <em>Type</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.RequirementImpl#getInstances <em>Instances</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class RequirementImpl extends MinimalEObjectImpl.Container implements Requirement {
+        /**
+         * The default value of the '{@link #getCount() <em>Count</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getCount()
+         * @generated
+         * @ordered
+         */
+        protected static final int COUNT_EDEFAULT = 0;
+
+        /**
+         * The cached value of the '{@link #getCount() <em>Count</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getCount()
+         * @generated
+         * @ordered
+         */
+        protected int count = COUNT_EDEFAULT;
+
+        /**
+         * The cached value of the '{@link #getType() <em>Type</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getType()
+         * @generated
+         * @ordered
+         */
+        protected ApplicationType type;
+
+        /**
+         * The cached value of the '{@link #getInstances() <em>Instances</em>}' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getInstances()
+         * @generated
+         * @ordered
+         */
+        protected EList<ApplicationInstance> instances;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected RequirementImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CpsPackage.Literals.REQUIREMENT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Request getRequest() {
+                if (eContainerFeatureID() != CpsPackage.REQUIREMENT__REQUEST)
+                        return null;
+                return (Request) eInternalContainer();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetRequest(Request newRequest, NotificationChain msgs) {
+                msgs = eBasicSetContainer((InternalEObject) newRequest, CpsPackage.REQUIREMENT__REQUEST, msgs);
+                return msgs;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setRequest(Request newRequest) {
+                if (newRequest != eInternalContainer()
+                                || (eContainerFeatureID() != CpsPackage.REQUIREMENT__REQUEST && newRequest != null)) {
+                        if (EcoreUtil.isAncestor(this, newRequest))
+                                throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+                        NotificationChain msgs = null;
+                        if (eInternalContainer() != null)
+                                msgs = eBasicRemoveFromContainer(msgs);
+                        if (newRequest != null)
+                                msgs = ((InternalEObject) newRequest).eInverseAdd(this, CpsPackage.REQUEST__REQUIREMENTS, Request.class,
+                                                msgs);
+                        msgs = basicSetRequest(newRequest, msgs);
+                        if (msgs != null)
+                                msgs.dispatch();
+                } else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CpsPackage.REQUIREMENT__REQUEST, newRequest,
+                                        newRequest));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public int getCount() {
+                return count;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setCount(int newCount) {
+                int oldCount = count;
+                count = newCount;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CpsPackage.REQUIREMENT__COUNT, oldCount, count));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public ApplicationType getType() {
+                if (type != null && type.eIsProxy()) {
+                        InternalEObject oldType = (InternalEObject) type;
+                        type = (ApplicationType) eResolveProxy(oldType);
+                        if (type != oldType) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, CpsPackage.REQUIREMENT__TYPE, oldType,
+                                                        type));
+                        }
+                }
+                return type;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ApplicationType basicGetType() {
+                return type;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setType(ApplicationType newType) {
+                ApplicationType oldType = type;
+                type = newType;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CpsPackage.REQUIREMENT__TYPE, oldType, type));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EList<ApplicationInstance> getInstances() {
+                if (instances == null) {
+                        instances = new EObjectWithInverseResolvingEList<ApplicationInstance>(ApplicationInstance.class, this,
+                                        CpsPackage.REQUIREMENT__INSTANCES, CpsPackage.APPLICATION_INSTANCE__REQUIREMENT);
+                }
+                return instances;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case CpsPackage.REQUIREMENT__REQUEST:
+                        if (eInternalContainer() != null)
+                                msgs = eBasicRemoveFromContainer(msgs);
+                        return basicSetRequest((Request) otherEnd, msgs);
+                case CpsPackage.REQUIREMENT__INSTANCES:
+                        return ((InternalEList<InternalEObject>) (InternalEList<?>) getInstances()).basicAdd(otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                case CpsPackage.REQUIREMENT__REQUEST:
+                        return basicSetRequest(null, msgs);
+                case CpsPackage.REQUIREMENT__INSTANCES:
+                        return ((InternalEList<?>) getInstances()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+                switch (eContainerFeatureID()) {
+                case CpsPackage.REQUIREMENT__REQUEST:
+                        return eInternalContainer().eInverseRemove(this, CpsPackage.REQUEST__REQUIREMENTS, Request.class, msgs);
+                }
+                return super.eBasicRemoveFromContainerFeature(msgs);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case CpsPackage.REQUIREMENT__REQUEST:
+                        return getRequest();
+                case CpsPackage.REQUIREMENT__COUNT:
+                        return getCount();
+                case CpsPackage.REQUIREMENT__TYPE:
+                        if (resolve)
+                                return getType();
+                        return basicGetType();
+                case CpsPackage.REQUIREMENT__INSTANCES:
+                        return getInstances();
+                }
+                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 CpsPackage.REQUIREMENT__REQUEST:
+                        setRequest((Request) newValue);
+                        return;
+                case CpsPackage.REQUIREMENT__COUNT:
+                        setCount((Integer) newValue);
+                        return;
+                case CpsPackage.REQUIREMENT__TYPE:
+                        setType((ApplicationType) newValue);
+                        return;
+                case CpsPackage.REQUIREMENT__INSTANCES:
+                        getInstances().clear();
+                        getInstances().addAll((Collection<? extends ApplicationInstance>) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case CpsPackage.REQUIREMENT__REQUEST:
+                        setRequest((Request) null);
+                        return;
+                case CpsPackage.REQUIREMENT__COUNT:
+                        setCount(COUNT_EDEFAULT);
+                        return;
+                case CpsPackage.REQUIREMENT__TYPE:
+                        setType((ApplicationType) null);
+                        return;
+                case CpsPackage.REQUIREMENT__INSTANCES:
+                        getInstances().clear();
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case CpsPackage.REQUIREMENT__REQUEST:
+                        return getRequest() != null;
+                case CpsPackage.REQUIREMENT__COUNT:
+                        return count != COUNT_EDEFAULT;
+                case CpsPackage.REQUIREMENT__TYPE:
+                        return type != null;
+                case CpsPackage.REQUIREMENT__INSTANCES:
+                        return instances != null && !instances.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(" (count: ");
+                result.append(count);
+                result.append(')');
+                return result.toString();
+        }
+
+} //RequirementImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/ResourceRequirementImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/ResourceRequirementImpl.java
new file mode 100644
index 00000000..f4deb575
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/impl/ResourceRequirementImpl.java
@@ -0,0 +1,291 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.impl;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage;
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostType;
+import hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement;
+
+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;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Resource Requirement</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.ResourceRequirementImpl#getRequiredMemory <em>Required Memory</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.ResourceRequirementImpl#getRequiredHdd <em>Required Hdd</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.cps.impl.ResourceRequirementImpl#getHostType <em>Host Type</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ResourceRequirementImpl extends MinimalEObjectImpl.Container implements ResourceRequirement {
+        /**
+         * The default value of the '{@link #getRequiredMemory() <em>Required Memory</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRequiredMemory()
+         * @generated
+         * @ordered
+         */
+        protected static final int REQUIRED_MEMORY_EDEFAULT = 0;
+
+        /**
+         * The cached value of the '{@link #getRequiredMemory() <em>Required Memory</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRequiredMemory()
+         * @generated
+         * @ordered
+         */
+        protected int requiredMemory = REQUIRED_MEMORY_EDEFAULT;
+
+        /**
+         * The default value of the '{@link #getRequiredHdd() <em>Required Hdd</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRequiredHdd()
+         * @generated
+         * @ordered
+         */
+        protected static final int REQUIRED_HDD_EDEFAULT = 0;
+
+        /**
+         * The cached value of the '{@link #getRequiredHdd() <em>Required Hdd</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRequiredHdd()
+         * @generated
+         * @ordered
+         */
+        protected int requiredHdd = REQUIRED_HDD_EDEFAULT;
+
+        /**
+         * The cached value of the '{@link #getHostType() <em>Host Type</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getHostType()
+         * @generated
+         * @ordered
+         */
+        protected HostType hostType;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ResourceRequirementImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return CpsPackage.Literals.RESOURCE_REQUIREMENT;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public int getRequiredMemory() {
+                return requiredMemory;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setRequiredMemory(int newRequiredMemory) {
+                int oldRequiredMemory = requiredMemory;
+                requiredMemory = newRequiredMemory;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CpsPackage.RESOURCE_REQUIREMENT__REQUIRED_MEMORY,
+                                        oldRequiredMemory, requiredMemory));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public int getRequiredHdd() {
+                return requiredHdd;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setRequiredHdd(int newRequiredHdd) {
+                int oldRequiredHdd = requiredHdd;
+                requiredHdd = newRequiredHdd;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CpsPackage.RESOURCE_REQUIREMENT__REQUIRED_HDD,
+                                        oldRequiredHdd, requiredHdd));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public HostType getHostType() {
+                if (hostType != null && hostType.eIsProxy()) {
+                        InternalEObject oldHostType = (InternalEObject) hostType;
+                        hostType = (HostType) eResolveProxy(oldHostType);
+                        if (hostType != oldHostType) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+                                                        CpsPackage.RESOURCE_REQUIREMENT__HOST_TYPE, oldHostType, hostType));
+                        }
+                }
+                return hostType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public HostType basicGetHostType() {
+                return hostType;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setHostType(HostType newHostType) {
+                HostType oldHostType = hostType;
+                hostType = newHostType;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, CpsPackage.RESOURCE_REQUIREMENT__HOST_TYPE,
+                                        oldHostType, hostType));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                case CpsPackage.RESOURCE_REQUIREMENT__REQUIRED_MEMORY:
+                        return getRequiredMemory();
+                case CpsPackage.RESOURCE_REQUIREMENT__REQUIRED_HDD:
+                        return getRequiredHdd();
+                case CpsPackage.RESOURCE_REQUIREMENT__HOST_TYPE:
+                        if (resolve)
+                                return getHostType();
+                        return basicGetHostType();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                case CpsPackage.RESOURCE_REQUIREMENT__REQUIRED_MEMORY:
+                        setRequiredMemory((Integer) newValue);
+                        return;
+                case CpsPackage.RESOURCE_REQUIREMENT__REQUIRED_HDD:
+                        setRequiredHdd((Integer) newValue);
+                        return;
+                case CpsPackage.RESOURCE_REQUIREMENT__HOST_TYPE:
+                        setHostType((HostType) newValue);
+                        return;
+                }
+                super.eSet(featureID, newValue);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                case CpsPackage.RESOURCE_REQUIREMENT__REQUIRED_MEMORY:
+                        setRequiredMemory(REQUIRED_MEMORY_EDEFAULT);
+                        return;
+                case CpsPackage.RESOURCE_REQUIREMENT__REQUIRED_HDD:
+                        setRequiredHdd(REQUIRED_HDD_EDEFAULT);
+                        return;
+                case CpsPackage.RESOURCE_REQUIREMENT__HOST_TYPE:
+                        setHostType((HostType) null);
+                        return;
+                }
+                super.eUnset(featureID);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                case CpsPackage.RESOURCE_REQUIREMENT__REQUIRED_MEMORY:
+                        return requiredMemory != REQUIRED_MEMORY_EDEFAULT;
+                case CpsPackage.RESOURCE_REQUIREMENT__REQUIRED_HDD:
+                        return requiredHdd != REQUIRED_HDD_EDEFAULT;
+                case CpsPackage.RESOURCE_REQUIREMENT__HOST_TYPE:
+                        return hostType != 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(" (requiredMemory: ");
+                result.append(requiredMemory);
+                result.append(", requiredHdd: ");
+                result.append(requiredHdd);
+                result.append(')');
+                return result.toString();
+        }
+
+} //ResourceRequirementImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/util/CpsAdapterFactory.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/util/CpsAdapterFactory.java
new file mode 100644
index 00000000..83e984a6
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/util/CpsAdapterFactory.java
@@ -0,0 +1,252 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.util;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.*;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage
+ * @generated
+ */
+public class CpsAdapterFactory extends AdapterFactoryImpl {
+        /**
+         * The cached model package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected static CpsPackage modelPackage;
+
+        /**
+         * Creates an instance of the adapter factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public CpsAdapterFactory() {
+                if (modelPackage == null) {
+                        modelPackage = CpsPackage.eINSTANCE;
+                }
+        }
+
+        /**
+         * Returns whether this factory is applicable for the type of the object.
+         * <!-- begin-user-doc -->
+         * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+         * <!-- end-user-doc -->
+         * @return whether this factory is applicable for the type of the object.
+         * @generated
+         */
+        @Override
+        public boolean isFactoryForType(Object object) {
+                if (object == modelPackage) {
+                        return true;
+                }
+                if (object instanceof EObject) {
+                        return ((EObject) object).eClass().getEPackage() == modelPackage;
+                }
+                return false;
+        }
+
+        /**
+         * The switch that delegates to the <code>createXXX</code> methods.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected CpsSwitch<Adapter> modelSwitch = new CpsSwitch<Adapter>() {
+                @Override
+                public Adapter caseCyberPhysicalSystem(CyberPhysicalSystem object) {
+                        return createCyberPhysicalSystemAdapter();
+                }
+
+                @Override
+                public Adapter caseApplicationType(ApplicationType object) {
+                        return createApplicationTypeAdapter();
+                }
+
+                @Override
+                public Adapter caseHostType(HostType object) {
+                        return createHostTypeAdapter();
+                }
+
+                @Override
+                public Adapter caseRequest(Request object) {
+                        return createRequestAdapter();
+                }
+
+                @Override
+                public Adapter caseRequirement(Requirement object) {
+                        return createRequirementAdapter();
+                }
+
+                @Override
+                public Adapter caseApplicationInstance(ApplicationInstance object) {
+                        return createApplicationInstanceAdapter();
+                }
+
+                @Override
+                public Adapter caseResourceRequirement(ResourceRequirement object) {
+                        return createResourceRequirementAdapter();
+                }
+
+                @Override
+                public Adapter caseHostInstance(HostInstance object) {
+                        return createHostInstanceAdapter();
+                }
+
+                @Override
+                public Adapter defaultCase(EObject object) {
+                        return createEObjectAdapter();
+                }
+        };
+
+        /**
+         * Creates an adapter for the <code>target</code>.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param target the object to adapt.
+         * @return the adapter for the <code>target</code>.
+         * @generated
+         */
+        @Override
+        public Adapter createAdapter(Notifier target) {
+                return modelSwitch.doSwitch((EObject) target);
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem <em>Cyber Physical System</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem
+         * @generated
+         */
+        public Adapter createCyberPhysicalSystemAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType <em>Application Type</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType
+         * @generated
+         */
+        public Adapter createApplicationTypeAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostType <em>Host Type</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.HostType
+         * @generated
+         */
+        public Adapter createHostTypeAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.cps.Request <em>Request</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.Request
+         * @generated
+         */
+        public Adapter createRequestAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.cps.Requirement <em>Requirement</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.Requirement
+         * @generated
+         */
+        public Adapter createRequirementAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance <em>Application Instance</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance
+         * @generated
+         */
+        public Adapter createApplicationInstanceAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement <em>Resource Requirement</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement
+         * @generated
+         */
+        public Adapter createResourceRequirementAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for an object of class '{@link hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance <em>Host Instance</em>}'.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null so that we can easily ignore cases;
+         * it's useful to ignore a case when inheritance will catch all the cases anyway.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @see hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance
+         * @generated
+         */
+        public Adapter createHostInstanceAdapter() {
+                return null;
+        }
+
+        /**
+         * Creates a new adapter for the default case.
+         * <!-- begin-user-doc -->
+         * This default implementation returns null.
+         * <!-- end-user-doc -->
+         * @return the new adapter.
+         * @generated
+         */
+        public Adapter createEObjectAdapter() {
+                return null;
+        }
+
+} //CpsAdapterFactory
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/util/CpsSwitch.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/util/CpsSwitch.java
new file mode 100644
index 00000000..28b630a9
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/cps/util/CpsSwitch.java
@@ -0,0 +1,266 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.util;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.*;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage
+ * @generated
+ */
+public class CpsSwitch<T> extends Switch<T> {
+        /**
+         * The cached model package
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected static CpsPackage modelPackage;
+
+        /**
+         * Creates an instance of the switch.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public CpsSwitch() {
+                if (modelPackage == null) {
+                        modelPackage = CpsPackage.eINSTANCE;
+                }
+        }
+
+        /**
+         * Checks whether this is a switch for the given package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param ePackage the package in question.
+         * @return whether this is a switch for the given package.
+         * @generated
+         */
+        @Override
+        protected boolean isSwitchFor(EPackage ePackage) {
+                return ePackage == modelPackage;
+        }
+
+        /**
+         * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the first non-null result returned by a <code>caseXXX</code> call.
+         * @generated
+         */
+        @Override
+        protected T doSwitch(int classifierID, EObject theEObject) {
+                switch (classifierID) {
+                case CpsPackage.CYBER_PHYSICAL_SYSTEM: {
+                        CyberPhysicalSystem cyberPhysicalSystem = (CyberPhysicalSystem) theEObject;
+                        T result = caseCyberPhysicalSystem(cyberPhysicalSystem);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case CpsPackage.APPLICATION_TYPE: {
+                        ApplicationType applicationType = (ApplicationType) theEObject;
+                        T result = caseApplicationType(applicationType);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case CpsPackage.HOST_TYPE: {
+                        HostType hostType = (HostType) theEObject;
+                        T result = caseHostType(hostType);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case CpsPackage.REQUEST: {
+                        Request request = (Request) theEObject;
+                        T result = caseRequest(request);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case CpsPackage.REQUIREMENT: {
+                        Requirement requirement = (Requirement) theEObject;
+                        T result = caseRequirement(requirement);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case CpsPackage.APPLICATION_INSTANCE: {
+                        ApplicationInstance applicationInstance = (ApplicationInstance) theEObject;
+                        T result = caseApplicationInstance(applicationInstance);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case CpsPackage.RESOURCE_REQUIREMENT: {
+                        ResourceRequirement resourceRequirement = (ResourceRequirement) theEObject;
+                        T result = caseResourceRequirement(resourceRequirement);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                case CpsPackage.HOST_INSTANCE: {
+                        HostInstance hostInstance = (HostInstance) theEObject;
+                        T result = caseHostInstance(hostInstance);
+                        if (result == null)
+                                result = defaultCase(theEObject);
+                        return result;
+                }
+                default:
+                        return defaultCase(theEObject);
+                }
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Cyber Physical System</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Cyber Physical System</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseCyberPhysicalSystem(CyberPhysicalSystem object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Application Type</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Application Type</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseApplicationType(ApplicationType object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Host Type</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Host Type</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseHostType(HostType object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Request</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Request</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseRequest(Request object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Requirement</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Requirement</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseRequirement(Requirement object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Application Instance</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Application Instance</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseApplicationInstance(ApplicationInstance object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Resource Requirement</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Resource Requirement</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseResourceRequirement(ResourceRequirement object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>Host Instance</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>Host Instance</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+         * @generated
+         */
+        public T caseHostInstance(HostInstance object) {
+                return null;
+        }
+
+        /**
+         * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+         * <!-- begin-user-doc -->
+         * This implementation returns null;
+         * returning a non-null result will terminate the switch, but this is the last case anyway.
+         * <!-- end-user-doc -->
+         * @param object the target of the switch.
+         * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+         * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+         * @generated
+         */
+        @Override
+        public T defaultCase(EObject object) {
+                return null;
+        }
+
+} //CpsSwitch
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/model/cps.ecore b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/model/cps.ecore
new file mode 100644
index 00000000..0f52d8ee
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/model/cps.ecore
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="cps" nsURI="http://www.example.org/cps" nsPrefix="cps">
+  <eClassifiers xsi:type="ecore:EClass" name="CyberPhysicalSystem">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="requests" upperBound="-1"
+        eType="#//Request" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="applicationTypes" upperBound="-1"
+        eType="#//ApplicationType" containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="hostTypes" upperBound="-1"
+        eType="#//HostType" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ApplicationType">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="instances" upperBound="-1"
+        eType="#//ApplicationInstance" containment="true" eOpposite="#//ApplicationInstance/type"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="requirements" upperBound="-1"
+        eType="#//ResourceRequirement" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="HostType">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultMemory" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultHdd" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="instances" upperBound="-1"
+        eType="#//HostInstance" containment="true" eOpposite="#//HostInstance/type"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cost" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Request">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="requirements" upperBound="-1"
+        eType="#//Requirement" containment="true" eOpposite="#//Requirement/request"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Requirement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="request" lowerBound="1"
+        eType="#//Request" eOpposite="#//Request/requirements"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="count" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//ApplicationType"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="instances" upperBound="-1"
+        eType="#//ApplicationInstance" eOpposite="#//ApplicationInstance/requirement"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ApplicationInstance">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="requirement" eType="#//Requirement"
+        eOpposite="#//Requirement/instances"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" lowerBound="1" eType="#//ApplicationType"
+        eOpposite="#//ApplicationType/instances"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="allocatedTo" lowerBound="1"
+        eType="#//HostInstance" eOpposite="#//HostInstance/applications"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="ResourceRequirement">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiredMemory" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiredHdd" lowerBound="1"
+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="hostType" lowerBound="1"
+        eType="#//HostType"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="HostInstance">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="type" lowerBound="1" eType="#//HostType"
+        eOpposite="#//HostType/instances"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="applications" upperBound="-1"
+        eType="#//ApplicationInstance" eOpposite="#//ApplicationInstance/allocatedTo"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/model/cps.genmodel b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/model/cps.genmodel
new file mode 100644
index 00000000..09ed2e0c
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/model/cps.genmodel
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
+    modelDirectory="/hu.bme.mit.inf.dslreasoner.domains.cps/ecore-gen"
+    creationIcons="false" editDirectory="/hu.bme.mit.inf.dslreasoner.domains.cps.edit/src-gen"
+    editorDirectory="/hu.bme.mit.inf.dslreasoner.domains.cps.editor/src-gen" modelPluginID="hu.bme.mit.inf.dslreasoner.domains.cps"
+    modelName="Cps" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0"
+    copyrightFields="false" operationReflection="true" importOrganizing="true">
+  <foreignModel>cps.ecore</foreignModel>
+  <testsDirectory xsi:nil="true"/>
+  <genPackages prefix="Cps" basePackage="hu.bme.mit.inf.dslreasoner.domains" disposableProviderFactory="true"
+      ecorePackage="cps.ecore#/">
+    <genClasses ecoreClass="cps.ecore#//CyberPhysicalSystem">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cps.ecore#//CyberPhysicalSystem/requests"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cps.ecore#//CyberPhysicalSystem/applicationTypes"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cps.ecore#//CyberPhysicalSystem/hostTypes"/>
+    </genClasses>
+    <genClasses ecoreClass="cps.ecore#//ApplicationType">
+      <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference cps.ecore#//ApplicationType/instances"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference cps.ecore#//ApplicationType/requirements"/>
+    </genClasses>
+    <genClasses ecoreClass="cps.ecore#//HostType">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cps.ecore#//HostType/defaultMemory"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cps.ecore#//HostType/defaultHdd"/>
+      <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference cps.ecore#//HostType/instances"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cps.ecore#//HostType/cost"/>
+    </genClasses>
+    <genClasses ecoreClass="cps.ecore#//Request">
+      <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference cps.ecore#//Request/requirements"/>
+    </genClasses>
+    <genClasses ecoreClass="cps.ecore#//Requirement">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cps.ecore#//Requirement/request"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cps.ecore#//Requirement/count"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cps.ecore#//Requirement/type"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cps.ecore#//Requirement/instances"/>
+    </genClasses>
+    <genClasses ecoreClass="cps.ecore#//ApplicationInstance">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cps.ecore#//ApplicationInstance/requirement"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cps.ecore#//ApplicationInstance/type"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cps.ecore#//ApplicationInstance/allocatedTo"/>
+    </genClasses>
+    <genClasses ecoreClass="cps.ecore#//ResourceRequirement">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cps.ecore#//ResourceRequirement/requiredMemory"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute cps.ecore#//ResourceRequirement/requiredHdd"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cps.ecore#//ResourceRequirement/hostType"/>
+    </genClasses>
+    <genClasses ecoreClass="cps.ecore#//HostInstance">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cps.ecore#//HostInstance/type"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference cps.ecore#//HostInstance/applications"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/model/cps.henshin b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/model/cps.henshin
new file mode 100644
index 00000000..a4f4f576
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/model/cps.henshin
@@ -0,0 +1,498 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<henshin:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:henshin="http://www.eclipse.org/emf/2011/Henshin" xmi:id="_rUcIgHyxEemI79hpD-o6pA">
+  <imports href="cps.ecore#/"/>
+  <units xsi:type="henshin:Rule" xmi:id="_ttviMHyxEemI79hpD-o6pA" name="createAppInstance">
+    <lhs xmi:id="_tuVYEHyxEemI79hpD-o6pA" name="Lhs">
+      <nodes xmi:id="_8OoYwHyxEemI79hpD-o6pA" name="req" outgoing="_APd7gHyzEemI79hpD-o6pA">
+        <type href="cps.ecore#//Requirement"/>
+      </nodes>
+      <nodes xmi:id="__cBFUHyyEemI79hpD-o6pA" incoming="_APd7gHyzEemI79hpD-o6pA">
+        <type href="cps.ecore#//ApplicationType"/>
+      </nodes>
+      <edges xmi:id="_APd7gHyzEemI79hpD-o6pA" source="_8OoYwHyxEemI79hpD-o6pA" target="__cBFUHyyEemI79hpD-o6pA">
+        <type href="cps.ecore#//Requirement/type"/>
+      </edges>
+    </lhs>
+    <rhs xmi:id="_txSlcHyxEemI79hpD-o6pA" name="Rhs">
+      <nodes xmi:id="_8OufYHyxEemI79hpD-o6pA" name="req" outgoing="_6YaokHyyEemI79hpD-o6pA _APd7gXyzEemI79hpD-o6pA">
+        <type href="cps.ecore#//Requirement"/>
+      </nodes>
+      <nodes xmi:id="_KIXvwHyyEemI79hpD-o6pA" incoming="_6YaokHyyEemI79hpD-o6pA _AoFP0HyzEemI79hpD-o6pA">
+        <type href="cps.ecore#//ApplicationInstance"/>
+      </nodes>
+      <nodes xmi:id="__cBFUXyyEemI79hpD-o6pA" incoming="_APd7gXyzEemI79hpD-o6pA" outgoing="_AoFP0HyzEemI79hpD-o6pA">
+        <type href="cps.ecore#//ApplicationType"/>
+      </nodes>
+      <edges xmi:id="_6YaokHyyEemI79hpD-o6pA" source="_8OufYHyxEemI79hpD-o6pA" target="_KIXvwHyyEemI79hpD-o6pA">
+        <type href="cps.ecore#//Requirement/instances"/>
+      </edges>
+      <edges xmi:id="_APd7gXyzEemI79hpD-o6pA" source="_8OufYHyxEemI79hpD-o6pA" target="__cBFUXyyEemI79hpD-o6pA">
+        <type href="cps.ecore#//Requirement/type"/>
+      </edges>
+      <edges xmi:id="_AoFP0HyzEemI79hpD-o6pA" source="__cBFUXyyEemI79hpD-o6pA" target="_KIXvwHyyEemI79hpD-o6pA">
+        <type href="cps.ecore#//ApplicationType/instances"/>
+      </edges>
+    </rhs>
+    <mappings xmi:id="_8OufYXyxEemI79hpD-o6pA" origin="_8OoYwHyxEemI79hpD-o6pA" image="_8OufYHyxEemI79hpD-o6pA"/>
+    <mappings xmi:id="__cBsYHyyEemI79hpD-o6pA" origin="__cBFUHyyEemI79hpD-o6pA" image="__cBFUXyyEemI79hpD-o6pA"/>
+  </units>
+  <units xsi:type="henshin:Rule" xmi:id="_M36NQHy0EemI79hpD-o6pA" name="createHostInstance">
+    <lhs xmi:id="_M4D-QHy0EemI79hpD-o6pA" name="Lhs">
+      <nodes xmi:id="_ZpwIEHy0EemI79hpD-o6pA">
+        <type href="cps.ecore#//HostType"/>
+      </nodes>
+    </lhs>
+    <rhs xmi:id="_M4HBkHy0EemI79hpD-o6pA" name="Rhs">
+      <nodes xmi:id="_Zp2OsHy0EemI79hpD-o6pA" outgoing="_faZ4EHy0EemI79hpD-o6pA">
+        <type href="cps.ecore#//HostType"/>
+      </nodes>
+      <nodes xmi:id="_bFDBYHy0EemI79hpD-o6pA" incoming="_faZ4EHy0EemI79hpD-o6pA">
+        <type href="cps.ecore#//HostInstance"/>
+      </nodes>
+      <edges xmi:id="_faZ4EHy0EemI79hpD-o6pA" source="_Zp2OsHy0EemI79hpD-o6pA" target="_bFDBYHy0EemI79hpD-o6pA">
+        <type href="cps.ecore#//HostType/instances"/>
+      </edges>
+    </rhs>
+    <mappings xmi:id="_Zp2OsXy0EemI79hpD-o6pA" origin="_ZpwIEHy0EemI79hpD-o6pA" image="_Zp2OsHy0EemI79hpD-o6pA"/>
+  </units>
+  <units xsi:type="henshin:Rule" xmi:id="_2yQIQHy0EemI79hpD-o6pA" name="deleteHostInstance">
+    <lhs xmi:id="_2yTLkHy0EemI79hpD-o6pA" name="Lhs">
+      <nodes xmi:id="_5jfg0Hy0EemI79hpD-o6pA" outgoing="_7KrhEHy0EemI79hpD-o6pA">
+        <type href="cps.ecore#//HostType"/>
+      </nodes>
+      <nodes xmi:id="_6FqZwHy0EemI79hpD-o6pA" incoming="_7KrhEHy0EemI79hpD-o6pA">
+        <type href="cps.ecore#//HostInstance"/>
+      </nodes>
+      <edges xmi:id="_7KrhEHy0EemI79hpD-o6pA" source="_5jfg0Hy0EemI79hpD-o6pA" target="_6FqZwHy0EemI79hpD-o6pA">
+        <type href="cps.ecore#//HostType/instances"/>
+      </edges>
+      <formula xsi:type="henshin:Not" xmi:id="__tHxgHy0EemI79hpD-o6pA">
+        <child xsi:type="henshin:NestedCondition" xmi:id="__tIYkHy0EemI79hpD-o6pA">
+          <conclusion xmi:id="__tIYkXy0EemI79hpD-o6pA">
+            <nodes xmi:id="_8lTsAHy0EemI79hpD-o6pA" outgoing="__HvMgHy0EemI79hpD-o6pA">
+              <type href="cps.ecore#//ApplicationInstance"/>
+            </nodes>
+            <nodes xmi:id="__tI_oHy0EemI79hpD-o6pA" incoming="__HvMgHy0EemI79hpD-o6pA _AuDqEHy1EemI79hpD-o6pA">
+              <type href="cps.ecore#//HostInstance"/>
+            </nodes>
+            <nodes xmi:id="_AuDDAHy1EemI79hpD-o6pA" outgoing="_AuDqEHy1EemI79hpD-o6pA">
+              <type href="cps.ecore#//HostType"/>
+            </nodes>
+            <edges xmi:id="__HvMgHy0EemI79hpD-o6pA" source="_8lTsAHy0EemI79hpD-o6pA" target="__tI_oHy0EemI79hpD-o6pA">
+              <type href="cps.ecore#//ApplicationInstance/allocatedTo"/>
+            </edges>
+            <edges xmi:id="_AuDqEHy1EemI79hpD-o6pA" source="_AuDDAHy1EemI79hpD-o6pA" target="__tI_oHy0EemI79hpD-o6pA">
+              <type href="cps.ecore#//HostType/instances"/>
+            </edges>
+          </conclusion>
+          <mappings xmi:id="__tI_oXy0EemI79hpD-o6pA" origin="_6FqZwHy0EemI79hpD-o6pA" image="__tI_oHy0EemI79hpD-o6pA"/>
+          <mappings xmi:id="_AuDDAXy1EemI79hpD-o6pA" origin="_5jfg0Hy0EemI79hpD-o6pA" image="_AuDDAHy1EemI79hpD-o6pA"/>
+        </child>
+      </formula>
+    </lhs>
+    <rhs xmi:id="_2yUZsHy0EemI79hpD-o6pA" name="Rhs">
+      <nodes xmi:id="_5jfg0Xy0EemI79hpD-o6pA">
+        <type href="cps.ecore#//HostType"/>
+      </nodes>
+    </rhs>
+    <mappings xmi:id="_5jfg0ny0EemI79hpD-o6pA" origin="_5jfg0Hy0EemI79hpD-o6pA" image="_5jfg0Xy0EemI79hpD-o6pA"/>
+  </units>
+  <units xsi:type="henshin:Rule" xmi:id="_W9WPYHy4EemI79hpD-o6pA" name="allocate">
+    <lhs xmi:id="_W9ag0Hy4EemI79hpD-o6pA" name="Lhs">
+      <nodes xmi:id="_QzQ2QHy5EemI79hpD-o6pA" outgoing="_hW5nsHy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//Requirement"/>
+      </nodes>
+      <nodes xmi:id="_U88ocHy5EemI79hpD-o6pA" outgoing="_epK2IHy5EemI79hpD-o6pA _f_l2gHy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//ApplicationType"/>
+      </nodes>
+      <nodes xmi:id="_WEdqIHy5EemI79hpD-o6pA" incoming="_f_l2gHy5EemI79hpD-o6pA _hW5nsHy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//ApplicationInstance"/>
+      </nodes>
+      <nodes xmi:id="_XGRscHy5EemI79hpD-o6pA" incoming="_fGY9oHy5EemI79hpD-o6pA" outgoing="_fggGwHy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//HostType"/>
+      </nodes>
+      <nodes xmi:id="_XfSpYHy5EemI79hpD-o6pA" incoming="_fggGwHy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//HostInstance"/>
+      </nodes>
+      <nodes xmi:id="_YuZg0Hy5EemI79hpD-o6pA" incoming="_epK2IHy5EemI79hpD-o6pA" outgoing="_fGY9oHy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//ResourceRequirement"/>
+      </nodes>
+      <edges xmi:id="_epK2IHy5EemI79hpD-o6pA" source="_U88ocHy5EemI79hpD-o6pA" target="_YuZg0Hy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//ApplicationType/requirements"/>
+      </edges>
+      <edges xmi:id="_fGY9oHy5EemI79hpD-o6pA" source="_YuZg0Hy5EemI79hpD-o6pA" target="_XGRscHy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//ResourceRequirement/hostType"/>
+      </edges>
+      <edges xmi:id="_fggGwHy5EemI79hpD-o6pA" source="_XGRscHy5EemI79hpD-o6pA" target="_XfSpYHy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//HostType/instances"/>
+      </edges>
+      <edges xmi:id="_f_l2gHy5EemI79hpD-o6pA" source="_U88ocHy5EemI79hpD-o6pA" target="_WEdqIHy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//ApplicationType/instances"/>
+      </edges>
+      <edges xmi:id="_hW5nsHy5EemI79hpD-o6pA" source="_QzQ2QHy5EemI79hpD-o6pA" target="_WEdqIHy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//Requirement/instances"/>
+      </edges>
+      <formula xsi:type="henshin:And" xmi:id="_JNyfMH8VEemiUoPdWqOlQg">
+        <left xsi:type="henshin:Not" xmi:id="_GpwcMX8VEemiUoPdWqOlQg">
+          <child xsi:type="henshin:NestedCondition" xmi:id="_GpwcMn8VEemiUoPdWqOlQg">
+            <conclusion xmi:id="_GpwcM38VEemiUoPdWqOlQg" name="2">
+              <nodes xmi:id="_GpwcNH8VEemiUoPdWqOlQg" outgoing="_GpxDQn8VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//Requirement"/>
+              </nodes>
+              <nodes xmi:id="_GpxDQH8VEemiUoPdWqOlQg" incoming="_GpxDQn8VEemiUoPdWqOlQg _GpxDSH8VEemiUoPdWqOlQg" outgoing="_LOADcH8VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//ApplicationInstance"/>
+              </nodes>
+              <nodes xmi:id="_GpxDQ38VEemiUoPdWqOlQg" outgoing="_GpxDR38VEemiUoPdWqOlQg _GpxDSH8VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//ApplicationType"/>
+              </nodes>
+              <nodes xmi:id="_GpxDRX8VEemiUoPdWqOlQg" incoming="_GpxDR38VEemiUoPdWqOlQg" outgoing="_GpxqUH8VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//ResourceRequirement"/>
+              </nodes>
+              <nodes xmi:id="_GpxDSX8VEemiUoPdWqOlQg" incoming="_GpxqUH8VEemiUoPdWqOlQg" outgoing="_GpxqU38VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//HostType"/>
+              </nodes>
+              <nodes xmi:id="_GpxqUX8VEemiUoPdWqOlQg" incoming="_GpxqU38VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//HostInstance"/>
+              </nodes>
+              <nodes xmi:id="_DK7k4H8VEemiUoPdWqOlQg" description="" incoming="_LOADcH8VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//HostInstance"/>
+              </nodes>
+              <edges xmi:id="_GpxDQn8VEemiUoPdWqOlQg" source="_GpwcNH8VEemiUoPdWqOlQg" target="_GpxDQH8VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//Requirement/instances"/>
+              </edges>
+              <edges xmi:id="_GpxDR38VEemiUoPdWqOlQg" source="_GpxDQ38VEemiUoPdWqOlQg" target="_GpxDRX8VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//ApplicationType/requirements"/>
+              </edges>
+              <edges xmi:id="_GpxDSH8VEemiUoPdWqOlQg" source="_GpxDQ38VEemiUoPdWqOlQg" target="_GpxDQH8VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//ApplicationType/instances"/>
+              </edges>
+              <edges xmi:id="_GpxqUH8VEemiUoPdWqOlQg" source="_GpxDRX8VEemiUoPdWqOlQg" target="_GpxDSX8VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//ResourceRequirement/hostType"/>
+              </edges>
+              <edges xmi:id="_GpxqU38VEemiUoPdWqOlQg" source="_GpxDSX8VEemiUoPdWqOlQg" target="_GpxqUX8VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//HostType/instances"/>
+              </edges>
+              <edges xmi:id="_LOADcH8VEemiUoPdWqOlQg" source="_GpxDQH8VEemiUoPdWqOlQg" target="_DK7k4H8VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//ApplicationInstance/allocatedTo"/>
+              </edges>
+            </conclusion>
+            <mappings xmi:id="_GpwcNX8VEemiUoPdWqOlQg" origin="_QzQ2QHy5EemI79hpD-o6pA" image="_GpwcNH8VEemiUoPdWqOlQg"/>
+            <mappings xmi:id="_GpxDQX8VEemiUoPdWqOlQg" origin="_WEdqIHy5EemI79hpD-o6pA" image="_GpxDQH8VEemiUoPdWqOlQg"/>
+            <mappings xmi:id="_GpxDRH8VEemiUoPdWqOlQg" origin="_U88ocHy5EemI79hpD-o6pA" image="_GpxDQ38VEemiUoPdWqOlQg"/>
+            <mappings xmi:id="_GpxDRn8VEemiUoPdWqOlQg" origin="_YuZg0Hy5EemI79hpD-o6pA" image="_GpxDRX8VEemiUoPdWqOlQg"/>
+            <mappings xmi:id="_GpxDSn8VEemiUoPdWqOlQg" origin="_XGRscHy5EemI79hpD-o6pA" image="_GpxDSX8VEemiUoPdWqOlQg"/>
+            <mappings xmi:id="_GpxqUn8VEemiUoPdWqOlQg" origin="_XfSpYHy5EemI79hpD-o6pA" image="_GpxqUX8VEemiUoPdWqOlQg"/>
+          </child>
+        </left>
+        <right xsi:type="henshin:Not" xmi:id="_JNyfMX8VEemiUoPdWqOlQg">
+          <child xsi:type="henshin:NestedCondition" xmi:id="_JNzGQH8VEemiUoPdWqOlQg">
+            <conclusion xmi:id="_JNzGQX8VEemiUoPdWqOlQg" name="1">
+              <nodes xmi:id="_JNzGQn8VEemiUoPdWqOlQg" outgoing="_JNztUH8VEemiUoPdWqOlQg _mLtagHy5EemI79hpD-o6pA">
+                <type href="cps.ecore#//Requirement"/>
+              </nodes>
+              <nodes xmi:id="_JNzGRH8VEemiUoPdWqOlQg" incoming="_JNztUH8VEemiUoPdWqOlQg _JN0UY38VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//ApplicationInstance"/>
+              </nodes>
+              <nodes xmi:id="_iu3gMHy5EemI79hpD-o6pA" incoming="_mLtagHy5EemI79hpD-o6pA" outgoing="_l0ud4Hy5EemI79hpD-o6pA">
+                <type href="cps.ecore#//ApplicationInstance"/>
+              </nodes>
+              <nodes xmi:id="_JNztVH8VEemiUoPdWqOlQg" outgoing="_JN0UYn8VEemiUoPdWqOlQg _JN0UY38VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//ApplicationType"/>
+              </nodes>
+              <nodes xmi:id="_JN0UYH8VEemiUoPdWqOlQg" incoming="_JN0UYn8VEemiUoPdWqOlQg" outgoing="_JN07cn8VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//ResourceRequirement"/>
+              </nodes>
+              <nodes xmi:id="_JN07cH8VEemiUoPdWqOlQg" incoming="_JN07cn8VEemiUoPdWqOlQg" outgoing="_JN1igX8VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//HostType"/>
+              </nodes>
+              <nodes xmi:id="_JN07c38VEemiUoPdWqOlQg" incoming="_JN1igX8VEemiUoPdWqOlQg _l0ud4Hy5EemI79hpD-o6pA">
+                <type href="cps.ecore#//HostInstance"/>
+              </nodes>
+              <edges xmi:id="_JNztUH8VEemiUoPdWqOlQg" source="_JNzGQn8VEemiUoPdWqOlQg" target="_JNzGRH8VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//Requirement/instances"/>
+              </edges>
+              <edges xmi:id="_JN0UYn8VEemiUoPdWqOlQg" source="_JNztVH8VEemiUoPdWqOlQg" target="_JN0UYH8VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//ApplicationType/requirements"/>
+              </edges>
+              <edges xmi:id="_JN0UY38VEemiUoPdWqOlQg" source="_JNztVH8VEemiUoPdWqOlQg" target="_JNzGRH8VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//ApplicationType/instances"/>
+              </edges>
+              <edges xmi:id="_JN07cn8VEemiUoPdWqOlQg" source="_JN0UYH8VEemiUoPdWqOlQg" target="_JN07cH8VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//ResourceRequirement/hostType"/>
+              </edges>
+              <edges xmi:id="_JN1igX8VEemiUoPdWqOlQg" source="_JN07cH8VEemiUoPdWqOlQg" target="_JN07c38VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//HostType/instances"/>
+              </edges>
+              <edges xmi:id="_mLtagHy5EemI79hpD-o6pA" source="_JNzGQn8VEemiUoPdWqOlQg" target="_iu3gMHy5EemI79hpD-o6pA">
+                <type href="cps.ecore#//Requirement/instances"/>
+              </edges>
+              <edges xmi:id="_l0ud4Hy5EemI79hpD-o6pA" source="_iu3gMHy5EemI79hpD-o6pA" target="_JN07c38VEemiUoPdWqOlQg">
+                <type href="cps.ecore#//ApplicationInstance/allocatedTo"/>
+              </edges>
+            </conclusion>
+            <mappings xmi:id="_JNzGQ38VEemiUoPdWqOlQg" origin="_QzQ2QHy5EemI79hpD-o6pA" image="_JNzGQn8VEemiUoPdWqOlQg"/>
+            <mappings xmi:id="_JNzGRX8VEemiUoPdWqOlQg" origin="_WEdqIHy5EemI79hpD-o6pA" image="_JNzGRH8VEemiUoPdWqOlQg"/>
+            <mappings xmi:id="_JNztVX8VEemiUoPdWqOlQg" origin="_U88ocHy5EemI79hpD-o6pA" image="_JNztVH8VEemiUoPdWqOlQg"/>
+            <mappings xmi:id="_JN0UYX8VEemiUoPdWqOlQg" origin="_YuZg0Hy5EemI79hpD-o6pA" image="_JN0UYH8VEemiUoPdWqOlQg"/>
+            <mappings xmi:id="_JN07cX8VEemiUoPdWqOlQg" origin="_XGRscHy5EemI79hpD-o6pA" image="_JN07cH8VEemiUoPdWqOlQg"/>
+            <mappings xmi:id="_JN1igH8VEemiUoPdWqOlQg" origin="_XfSpYHy5EemI79hpD-o6pA" image="_JN07c38VEemiUoPdWqOlQg"/>
+          </child>
+        </right>
+      </formula>
+    </lhs>
+    <rhs xmi:id="_W9bH4Hy4EemI79hpD-o6pA" name="Rhs">
+      <nodes xmi:id="_QzT5kHy5EemI79hpD-o6pA" outgoing="_hW5nsXy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//Requirement"/>
+      </nodes>
+      <nodes xmi:id="_U89PgHy5EemI79hpD-o6pA" outgoing="_epK2IXy5EemI79hpD-o6pA _f_l2gXy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//ApplicationType"/>
+      </nodes>
+      <nodes xmi:id="_WEdqIXy5EemI79hpD-o6pA" incoming="_f_l2gXy5EemI79hpD-o6pA _hW5nsXy5EemI79hpD-o6pA" outgoing="_gh0Z0Hy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//ApplicationInstance"/>
+      </nodes>
+      <nodes xmi:id="_XGRscXy5EemI79hpD-o6pA" incoming="_fGY9oXy5EemI79hpD-o6pA" outgoing="_fggGwXy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//HostType"/>
+      </nodes>
+      <nodes xmi:id="_XfSpYXy5EemI79hpD-o6pA" incoming="_fggGwXy5EemI79hpD-o6pA _gh0Z0Hy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//HostInstance"/>
+      </nodes>
+      <nodes xmi:id="_YuZg0Xy5EemI79hpD-o6pA" incoming="_epK2IXy5EemI79hpD-o6pA" outgoing="_fGY9oXy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//ResourceRequirement"/>
+      </nodes>
+      <edges xmi:id="_epK2IXy5EemI79hpD-o6pA" source="_U89PgHy5EemI79hpD-o6pA" target="_YuZg0Xy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//ApplicationType/requirements"/>
+      </edges>
+      <edges xmi:id="_fGY9oXy5EemI79hpD-o6pA" source="_YuZg0Xy5EemI79hpD-o6pA" target="_XGRscXy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//ResourceRequirement/hostType"/>
+      </edges>
+      <edges xmi:id="_fggGwXy5EemI79hpD-o6pA" source="_XGRscXy5EemI79hpD-o6pA" target="_XfSpYXy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//HostType/instances"/>
+      </edges>
+      <edges xmi:id="_f_l2gXy5EemI79hpD-o6pA" source="_U89PgHy5EemI79hpD-o6pA" target="_WEdqIXy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//ApplicationType/instances"/>
+      </edges>
+      <edges xmi:id="_gh0Z0Hy5EemI79hpD-o6pA" source="_WEdqIXy5EemI79hpD-o6pA" target="_XfSpYXy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//ApplicationInstance/allocatedTo"/>
+      </edges>
+      <edges xmi:id="_hW5nsXy5EemI79hpD-o6pA" source="_QzT5kHy5EemI79hpD-o6pA" target="_WEdqIXy5EemI79hpD-o6pA">
+        <type href="cps.ecore#//Requirement/instances"/>
+      </edges>
+    </rhs>
+    <mappings xmi:id="_QzUgoHy5EemI79hpD-o6pA" origin="_QzQ2QHy5EemI79hpD-o6pA" image="_QzT5kHy5EemI79hpD-o6pA"/>
+    <mappings xmi:id="_U89PgXy5EemI79hpD-o6pA" origin="_U88ocHy5EemI79hpD-o6pA" image="_U89PgHy5EemI79hpD-o6pA"/>
+    <mappings xmi:id="_WEdqIny5EemI79hpD-o6pA" origin="_WEdqIHy5EemI79hpD-o6pA" image="_WEdqIXy5EemI79hpD-o6pA"/>
+    <mappings xmi:id="_XGRscny5EemI79hpD-o6pA" origin="_XGRscHy5EemI79hpD-o6pA" image="_XGRscXy5EemI79hpD-o6pA"/>
+    <mappings xmi:id="_XfSpYny5EemI79hpD-o6pA" origin="_XfSpYHy5EemI79hpD-o6pA" image="_XfSpYXy5EemI79hpD-o6pA"/>
+    <mappings xmi:id="_YuZg0ny5EemI79hpD-o6pA" origin="_YuZg0Hy5EemI79hpD-o6pA" image="_YuZg0Xy5EemI79hpD-o6pA"/>
+  </units>
+  <units xsi:type="henshin:Rule" xmi:id="_1VgrMHy5EemI79hpD-o6pA" name="unallocate">
+    <lhs xmi:id="_1Vk8oHy5EemI79hpD-o6pA" name="Lhs">
+      <nodes xmi:id="_OdtesHy6EemI79hpD-o6pA" outgoing="_UpBxcHy6EemI79hpD-o6pA">
+        <type href="cps.ecore#//ApplicationInstance"/>
+      </nodes>
+      <nodes xmi:id="_PGadcHy6EemI79hpD-o6pA" incoming="_UpBxcHy6EemI79hpD-o6pA">
+        <type href="cps.ecore#//HostInstance"/>
+      </nodes>
+      <edges xmi:id="_UpBxcHy6EemI79hpD-o6pA" source="_OdtesHy6EemI79hpD-o6pA" target="_PGadcHy6EemI79hpD-o6pA">
+        <type href="cps.ecore#//ApplicationInstance/allocatedTo"/>
+      </edges>
+    </lhs>
+    <rhs xmi:id="_1VmKwHy5EemI79hpD-o6pA" name="Rhs">
+      <nodes xmi:id="_OdwiAHy6EemI79hpD-o6pA">
+        <type href="cps.ecore#//ApplicationInstance"/>
+      </nodes>
+      <nodes xmi:id="_PGadcXy6EemI79hpD-o6pA">
+        <type href="cps.ecore#//HostInstance"/>
+      </nodes>
+    </rhs>
+    <mappings xmi:id="_OdwiAXy6EemI79hpD-o6pA" origin="_OdtesHy6EemI79hpD-o6pA" image="_OdwiAHy6EemI79hpD-o6pA"/>
+    <mappings xmi:id="_PGadcny6EemI79hpD-o6pA" origin="_PGadcHy6EemI79hpD-o6pA" image="_PGadcXy6EemI79hpD-o6pA"/>
+  </units>
+  <units xsi:type="henshin:Rule" xmi:id="_4lbl0H8UEemiUoPdWqOlQg" name="reallocate">
+    <lhs xmi:id="_4lkvwH8UEemiUoPdWqOlQg" name="Lhs">
+      <nodes xmi:id="_VfKxQH8VEemiUoPdWqOlQg" outgoing="_uW8jIH8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//Requirement"/>
+      </nodes>
+      <nodes xmi:id="_WJkZIH8VEemiUoPdWqOlQg" outgoing="_4SqlYH8VEemiUoPdWqOlQg _44kHwH8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//ApplicationType"/>
+      </nodes>
+      <nodes xmi:id="_Yz9i0H8VEemiUoPdWqOlQg" incoming="_5r5CIH8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//HostInstance"/>
+      </nodes>
+      <nodes xmi:id="_cTchcH8VEemiUoPdWqOlQg" incoming="_uW8jIH8VEemiUoPdWqOlQg _4SqlYH8VEemiUoPdWqOlQg" outgoing="_3NH5oH8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//ApplicationInstance"/>
+      </nodes>
+      <nodes xmi:id="_fYauUH8VEemiUoPdWqOlQg" incoming="_44kHwH8VEemiUoPdWqOlQg" outgoing="_5Rch0H8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//ResourceRequirement"/>
+      </nodes>
+      <nodes xmi:id="_kl-_YH8VEemiUoPdWqOlQg" incoming="_5Rch0H8VEemiUoPdWqOlQg" outgoing="_5r5CIH8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//HostType"/>
+      </nodes>
+      <nodes xmi:id="_wZrP4H8VEemiUoPdWqOlQg" incoming="_3NH5oH8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//HostInstance"/>
+      </nodes>
+      <edges xmi:id="_uW8jIH8VEemiUoPdWqOlQg" source="_VfKxQH8VEemiUoPdWqOlQg" target="_cTchcH8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//Requirement/instances"/>
+      </edges>
+      <edges xmi:id="_4SqlYH8VEemiUoPdWqOlQg" source="_WJkZIH8VEemiUoPdWqOlQg" target="_cTchcH8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//ApplicationType/instances"/>
+      </edges>
+      <edges xmi:id="_44kHwH8VEemiUoPdWqOlQg" source="_WJkZIH8VEemiUoPdWqOlQg" target="_fYauUH8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//ApplicationType/requirements"/>
+      </edges>
+      <edges xmi:id="_5Rch0H8VEemiUoPdWqOlQg" source="_fYauUH8VEemiUoPdWqOlQg" target="_kl-_YH8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//ResourceRequirement/hostType"/>
+      </edges>
+      <edges xmi:id="_5r5CIH8VEemiUoPdWqOlQg" source="_kl-_YH8VEemiUoPdWqOlQg" target="_Yz9i0H8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//HostType/instances"/>
+      </edges>
+      <edges xmi:id="_3NH5oH8VEemiUoPdWqOlQg" source="_cTchcH8VEemiUoPdWqOlQg" target="_wZrP4H8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//ApplicationInstance/allocatedTo"/>
+      </edges>
+      <formula xsi:type="henshin:Not" xmi:id="_9Q-5gH8VEemiUoPdWqOlQg">
+        <child xsi:type="henshin:NestedCondition" xmi:id="_9Q-5gX8VEemiUoPdWqOlQg">
+          <conclusion xmi:id="_9Q-5gn8VEemiUoPdWqOlQg">
+            <nodes xmi:id="_9Q-5g38VEemiUoPdWqOlQg" outgoing="_9Q-5h38VEemiUoPdWqOlQg _ulPd0H8VEemiUoPdWqOlQg">
+              <type href="cps.ecore#//Requirement"/>
+            </nodes>
+            <nodes xmi:id="_9Q-5hX8VEemiUoPdWqOlQg" incoming="_9Q-5h38VEemiUoPdWqOlQg _9Q-5jX8VEemiUoPdWqOlQg" outgoing="_9Q-5mH8VEemiUoPdWqOlQg">
+              <type href="cps.ecore#//ApplicationInstance"/>
+            </nodes>
+            <nodes xmi:id="_Xr-AAH8VEemiUoPdWqOlQg" incoming="_ulPd0H8VEemiUoPdWqOlQg" outgoing="_-vrFEH8VEemiUoPdWqOlQg">
+              <type href="cps.ecore#//ApplicationInstance"/>
+            </nodes>
+            <nodes xmi:id="_9Q-5i38VEemiUoPdWqOlQg" outgoing="_9Q-5jX8VEemiUoPdWqOlQg _9Q-5kH8VEemiUoPdWqOlQg">
+              <type href="cps.ecore#//ApplicationType"/>
+            </nodes>
+            <nodes xmi:id="_9Q-5jn8VEemiUoPdWqOlQg" incoming="_9Q-5kH8VEemiUoPdWqOlQg" outgoing="_9Q-5mX8VEemiUoPdWqOlQg">
+              <type href="cps.ecore#//ResourceRequirement"/>
+            </nodes>
+            <nodes xmi:id="_9Q-5kX8VEemiUoPdWqOlQg" incoming="_9Q-5lX8VEemiUoPdWqOlQg _-vrFEH8VEemiUoPdWqOlQg">
+              <type href="cps.ecore#//HostInstance"/>
+            </nodes>
+            <nodes xmi:id="_9Q-5k38VEemiUoPdWqOlQg" incoming="_9Q-5mX8VEemiUoPdWqOlQg" outgoing="_9Q-5lX8VEemiUoPdWqOlQg">
+              <type href="cps.ecore#//HostType"/>
+            </nodes>
+            <nodes xmi:id="_9Q-5ln8VEemiUoPdWqOlQg" incoming="_9Q-5mH8VEemiUoPdWqOlQg">
+              <type href="cps.ecore#//HostInstance"/>
+            </nodes>
+            <edges xmi:id="_9Q-5h38VEemiUoPdWqOlQg" source="_9Q-5g38VEemiUoPdWqOlQg" target="_9Q-5hX8VEemiUoPdWqOlQg">
+              <type href="cps.ecore#//Requirement/instances"/>
+            </edges>
+            <edges xmi:id="_9Q-5jX8VEemiUoPdWqOlQg" source="_9Q-5i38VEemiUoPdWqOlQg" target="_9Q-5hX8VEemiUoPdWqOlQg">
+              <type href="cps.ecore#//ApplicationType/instances"/>
+            </edges>
+            <edges xmi:id="_9Q-5kH8VEemiUoPdWqOlQg" source="_9Q-5i38VEemiUoPdWqOlQg" target="_9Q-5jn8VEemiUoPdWqOlQg">
+              <type href="cps.ecore#//ApplicationType/requirements"/>
+            </edges>
+            <edges xmi:id="_9Q-5lX8VEemiUoPdWqOlQg" source="_9Q-5k38VEemiUoPdWqOlQg" target="_9Q-5kX8VEemiUoPdWqOlQg">
+              <type href="cps.ecore#//HostType/instances"/>
+            </edges>
+            <edges xmi:id="_9Q-5mH8VEemiUoPdWqOlQg" source="_9Q-5hX8VEemiUoPdWqOlQg" target="_9Q-5ln8VEemiUoPdWqOlQg">
+              <type href="cps.ecore#//ApplicationInstance/allocatedTo"/>
+            </edges>
+            <edges xmi:id="_9Q-5mX8VEemiUoPdWqOlQg" source="_9Q-5jn8VEemiUoPdWqOlQg" target="_9Q-5k38VEemiUoPdWqOlQg">
+              <type href="cps.ecore#//ResourceRequirement/hostType"/>
+            </edges>
+            <edges xmi:id="_ulPd0H8VEemiUoPdWqOlQg" source="_9Q-5g38VEemiUoPdWqOlQg" target="_Xr-AAH8VEemiUoPdWqOlQg">
+              <type href="cps.ecore#//Requirement/instances"/>
+            </edges>
+            <edges xmi:id="_-vrFEH8VEemiUoPdWqOlQg" source="_Xr-AAH8VEemiUoPdWqOlQg" target="_9Q-5kX8VEemiUoPdWqOlQg">
+              <type href="cps.ecore#//ApplicationInstance/allocatedTo"/>
+            </edges>
+          </conclusion>
+          <mappings xmi:id="_9Q-5hH8VEemiUoPdWqOlQg" origin="_VfKxQH8VEemiUoPdWqOlQg" image="_9Q-5g38VEemiUoPdWqOlQg"/>
+          <mappings xmi:id="_9Q-5hn8VEemiUoPdWqOlQg" origin="_cTchcH8VEemiUoPdWqOlQg" image="_9Q-5hX8VEemiUoPdWqOlQg"/>
+          <mappings xmi:id="_9Q-5jH8VEemiUoPdWqOlQg" origin="_WJkZIH8VEemiUoPdWqOlQg" image="_9Q-5i38VEemiUoPdWqOlQg"/>
+          <mappings xmi:id="_9Q-5j38VEemiUoPdWqOlQg" origin="_fYauUH8VEemiUoPdWqOlQg" image="_9Q-5jn8VEemiUoPdWqOlQg"/>
+          <mappings xmi:id="_9Q-5kn8VEemiUoPdWqOlQg" origin="_Yz9i0H8VEemiUoPdWqOlQg" image="_9Q-5kX8VEemiUoPdWqOlQg"/>
+          <mappings xmi:id="_9Q-5lH8VEemiUoPdWqOlQg" origin="_kl-_YH8VEemiUoPdWqOlQg" image="_9Q-5k38VEemiUoPdWqOlQg"/>
+          <mappings xmi:id="_9Q-5l38VEemiUoPdWqOlQg" origin="_wZrP4H8VEemiUoPdWqOlQg" image="_9Q-5ln8VEemiUoPdWqOlQg"/>
+        </child>
+      </formula>
+    </lhs>
+    <rhs xmi:id="_4lnMAH8UEemiUoPdWqOlQg" name="Rhs">
+      <nodes xmi:id="_VfNNgH8VEemiUoPdWqOlQg" outgoing="_uW9KMH8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//Requirement"/>
+      </nodes>
+      <nodes xmi:id="_WJkZIX8VEemiUoPdWqOlQg" outgoing="_4SqlYX8VEemiUoPdWqOlQg _44kHwX8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//ApplicationType"/>
+      </nodes>
+      <nodes xmi:id="_Y0DCYH8VEemiUoPdWqOlQg" incoming="_5r5CIX8VEemiUoPdWqOlQg __Te8wH8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//HostInstance"/>
+      </nodes>
+      <nodes xmi:id="_cTchcX8VEemiUoPdWqOlQg" incoming="_uW9KMH8VEemiUoPdWqOlQg _4SqlYX8VEemiUoPdWqOlQg" outgoing="__Te8wH8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//ApplicationInstance"/>
+      </nodes>
+      <nodes xmi:id="_fYbVYH8VEemiUoPdWqOlQg" incoming="_44kHwX8VEemiUoPdWqOlQg" outgoing="_5Rch0X8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//ResourceRequirement"/>
+      </nodes>
+      <nodes xmi:id="_kl-_YX8VEemiUoPdWqOlQg" incoming="_5Rch0X8VEemiUoPdWqOlQg" outgoing="_5r5CIX8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//HostType"/>
+      </nodes>
+      <nodes xmi:id="_6wB_sH8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//HostInstance"/>
+      </nodes>
+      <edges xmi:id="_uW9KMH8VEemiUoPdWqOlQg" source="_VfNNgH8VEemiUoPdWqOlQg" target="_cTchcX8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//Requirement/instances"/>
+      </edges>
+      <edges xmi:id="_4SqlYX8VEemiUoPdWqOlQg" source="_WJkZIX8VEemiUoPdWqOlQg" target="_cTchcX8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//ApplicationType/instances"/>
+      </edges>
+      <edges xmi:id="_44kHwX8VEemiUoPdWqOlQg" source="_WJkZIX8VEemiUoPdWqOlQg" target="_fYbVYH8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//ApplicationType/requirements"/>
+      </edges>
+      <edges xmi:id="_5Rch0X8VEemiUoPdWqOlQg" source="_fYbVYH8VEemiUoPdWqOlQg" target="_kl-_YX8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//ResourceRequirement/hostType"/>
+      </edges>
+      <edges xmi:id="_5r5CIX8VEemiUoPdWqOlQg" source="_kl-_YX8VEemiUoPdWqOlQg" target="_Y0DCYH8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//HostType/instances"/>
+      </edges>
+      <edges xmi:id="__Te8wH8VEemiUoPdWqOlQg" source="_cTchcX8VEemiUoPdWqOlQg" target="_Y0DCYH8VEemiUoPdWqOlQg">
+        <type href="cps.ecore#//ApplicationInstance/allocatedTo"/>
+      </edges>
+    </rhs>
+    <mappings xmi:id="_VfNNgX8VEemiUoPdWqOlQg" origin="_VfKxQH8VEemiUoPdWqOlQg" image="_VfNNgH8VEemiUoPdWqOlQg"/>
+    <mappings xmi:id="_WJkZIn8VEemiUoPdWqOlQg" origin="_WJkZIH8VEemiUoPdWqOlQg" image="_WJkZIX8VEemiUoPdWqOlQg"/>
+    <mappings xmi:id="_Y0DCYX8VEemiUoPdWqOlQg" origin="_Yz9i0H8VEemiUoPdWqOlQg" image="_Y0DCYH8VEemiUoPdWqOlQg"/>
+    <mappings xmi:id="_cTchcn8VEemiUoPdWqOlQg" origin="_cTchcH8VEemiUoPdWqOlQg" image="_cTchcX8VEemiUoPdWqOlQg"/>
+    <mappings xmi:id="_fYbVYX8VEemiUoPdWqOlQg" origin="_fYauUH8VEemiUoPdWqOlQg" image="_fYbVYH8VEemiUoPdWqOlQg"/>
+    <mappings xmi:id="_kl_mcH8VEemiUoPdWqOlQg" origin="_kl-_YH8VEemiUoPdWqOlQg" image="_kl-_YX8VEemiUoPdWqOlQg"/>
+    <mappings xmi:id="_6wB_sX8VEemiUoPdWqOlQg" origin="_wZrP4H8VEemiUoPdWqOlQg" image="_6wB_sH8VEemiUoPdWqOlQg"/>
+  </units>
+  <units xsi:type="henshin:Rule" xmi:id="_7SLYkH8XEemiUoPdWqOlQg" name="deleteAppInstance">
+    <lhs xmi:id="_7SQREH8XEemiUoPdWqOlQg" name="Lhs">
+      <nodes xmi:id="_AUFMMH8YEemiUoPdWqOlQg" outgoing="_IR7MgH8YEemiUoPdWqOlQg _InEWEH8YEemiUoPdWqOlQg">
+        <type href="cps.ecore#//Requirement"/>
+      </nodes>
+      <nodes xmi:id="_A8eo8H8YEemiUoPdWqOlQg" incoming="_InEWEH8YEemiUoPdWqOlQg" outgoing="_H6p8AH8YEemiUoPdWqOlQg">
+        <type href="cps.ecore#//ApplicationType"/>
+      </nodes>
+      <nodes xmi:id="_Dova4H8YEemiUoPdWqOlQg" incoming="_H6p8AH8YEemiUoPdWqOlQg _IR7MgH8YEemiUoPdWqOlQg">
+        <type href="cps.ecore#//ApplicationInstance"/>
+      </nodes>
+      <edges xmi:id="_H6p8AH8YEemiUoPdWqOlQg" source="_A8eo8H8YEemiUoPdWqOlQg" target="_Dova4H8YEemiUoPdWqOlQg">
+        <type href="cps.ecore#//ApplicationType/instances"/>
+      </edges>
+      <edges xmi:id="_IR7MgH8YEemiUoPdWqOlQg" source="_AUFMMH8YEemiUoPdWqOlQg" target="_Dova4H8YEemiUoPdWqOlQg">
+        <type href="cps.ecore#//Requirement/instances"/>
+      </edges>
+      <edges xmi:id="_InEWEH8YEemiUoPdWqOlQg" source="_AUFMMH8YEemiUoPdWqOlQg" target="_A8eo8H8YEemiUoPdWqOlQg">
+        <type href="cps.ecore#//Requirement/type"/>
+      </edges>
+    </lhs>
+    <rhs xmi:id="_7SQ4IH8XEemiUoPdWqOlQg" name="Rhs">
+      <nodes xmi:id="_AUFMMX8YEemiUoPdWqOlQg" outgoing="_InEWEX8YEemiUoPdWqOlQg">
+        <type href="cps.ecore#//Requirement"/>
+      </nodes>
+      <nodes xmi:id="_A8eo8X8YEemiUoPdWqOlQg" incoming="_InEWEX8YEemiUoPdWqOlQg">
+        <type href="cps.ecore#//ApplicationType"/>
+      </nodes>
+      <edges xmi:id="_InEWEX8YEemiUoPdWqOlQg" source="_AUFMMX8YEemiUoPdWqOlQg" target="_A8eo8X8YEemiUoPdWqOlQg">
+        <type href="cps.ecore#//Requirement/type"/>
+      </edges>
+    </rhs>
+    <mappings xmi:id="_AUFMMn8YEemiUoPdWqOlQg" origin="_AUFMMH8YEemiUoPdWqOlQg" image="_AUFMMX8YEemiUoPdWqOlQg"/>
+    <mappings xmi:id="_A8eo8n8YEemiUoPdWqOlQg" origin="_A8eo8H8YEemiUoPdWqOlQg" image="_A8eo8X8YEemiUoPdWqOlQg"/>
+  </units>
+</henshin:Module>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/model/cps.henshin_diagram b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/model/cps.henshin_diagram
new file mode 100644
index 00000000..985ff350
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/model/cps.henshin_diagram
@@ -0,0 +1,699 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:henshin="http://www.eclipse.org/emf/2011/Henshin" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_rVAwQHyxEemI79hpD-o6pA" type="Henshin" name="cps.henshin_diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_0PszUHyxEemI79hpD-o6pA" type="2001" fontName="Noto Sans" italic="true" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5CPVQHyxEemI79hpD-o6pA" source="defaultAction">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5CP8UHyxEemI79hpD-o6pA" key="value" value="preserve"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_0PszUnyxEemI79hpD-o6pA" type="5001"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_0PtaYHyxEemI79hpD-o6pA" type="7001">
+      <children xmi:type="notation:Shape" xmi:id="_8Ow7oHyxEemI79hpD-o6pA" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_8OxisXyxEemI79hpD-o6pA" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_8OxisnyxEemI79hpD-o6pA" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_8OyJwHyxEemI79hpD-o6pA" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_8OyJwXyxEemI79hpD-o6pA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_8OyJwnyxEemI79hpD-o6pA"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_8OoYwHyxEemI79hpD-o6pA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8OxisHyxEemI79hpD-o6pA" x="28" y="27"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_KIaMAHyyEemI79hpD-o6pA" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_KIaMAnyyEemI79hpD-o6pA" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_KIaMA3yyEemI79hpD-o6pA" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_KIaMBHyyEemI79hpD-o6pA" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_KIaMBXyyEemI79hpD-o6pA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_KIaMBnyyEemI79hpD-o6pA"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_KIXvwHyyEemI79hpD-o6pA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KIaMAXyyEemI79hpD-o6pA" x="248" y="169"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="__cDhkHyyEemI79hpD-o6pA" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="__cEIoXyyEemI79hpD-o6pA" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="__cEIonyyEemI79hpD-o6pA" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="__cEIo3yyEemI79hpD-o6pA" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="__cEIpHyyEemI79hpD-o6pA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="__cEIpXyyEemI79hpD-o6pA"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#__cBFUHyyEemI79hpD-o6pA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__cEIoHyyEemI79hpD-o6pA" x="259" y="17"/>
+      </children>
+    </children>
+    <element xmi:type="henshin:Rule" href="cps.henshin#_ttviMHyxEemI79hpD-o6pA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0PszUXyxEemI79hpD-o6pA" x="22" y="22" width="407" height="284"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_M4A68Hy0EemI79hpD-o6pA" type="2001" fontName="Noto Sans" italic="true" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Zp21wHy0EemI79hpD-o6pA" source="defaultAction">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Zp21wXy0EemI79hpD-o6pA" key="value" value="preserve"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_M4BiAHy0EemI79hpD-o6pA" type="5001"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_M4CJEHy0EemI79hpD-o6pA" type="7001">
+      <children xmi:type="notation:Shape" xmi:id="_Zp4q8Hy0EemI79hpD-o6pA" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_Zp4q8ny0EemI79hpD-o6pA" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Zp4q83y0EemI79hpD-o6pA" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Zp4q9Hy0EemI79hpD-o6pA" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_Zp4q9Xy0EemI79hpD-o6pA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_Zp4q9ny0EemI79hpD-o6pA"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_ZpwIEHy0EemI79hpD-o6pA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Zp4q8Xy0EemI79hpD-o6pA" x="55" y="8"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_bFEPgHy0EemI79hpD-o6pA" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_bFEPgny0EemI79hpD-o6pA" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_bFEPg3y0EemI79hpD-o6pA" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_bFEPhHy0EemI79hpD-o6pA" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_bFEPhXy0EemI79hpD-o6pA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_bFEPhny0EemI79hpD-o6pA"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_bFDBYHy0EemI79hpD-o6pA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bFEPgXy0EemI79hpD-o6pA" x="47" y="102"/>
+      </children>
+    </children>
+    <element xmi:type="henshin:Rule" href="cps.henshin#_M36NQHy0EemI79hpD-o6pA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_M4A68Xy0EemI79hpD-o6pA" x="22" y="327" width="191" height="199"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_2ySkgHy0EemI79hpD-o6pA" type="2001" fontName="Noto Sans" italic="true" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5jgH4Hy0EemI79hpD-o6pA" source="defaultAction">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5jgH4Xy0EemI79hpD-o6pA" key="value" value="preserve"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_2ySkgny0EemI79hpD-o6pA" type="5001"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_2ySkg3y0EemI79hpD-o6pA" type="7001">
+      <children xmi:type="notation:Shape" xmi:id="_5jh9EHy0EemI79hpD-o6pA" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_5jikIHy0EemI79hpD-o6pA" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_5jikIXy0EemI79hpD-o6pA" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_5jikIny0EemI79hpD-o6pA" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_5jikI3y0EemI79hpD-o6pA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_5jikJHy0EemI79hpD-o6pA"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_5jfg0Hy0EemI79hpD-o6pA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5jh9EXy0EemI79hpD-o6pA" x="46" y="17"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_6FsO8Hy0EemI79hpD-o6pA" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_6Fs2AHy0EemI79hpD-o6pA" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_6Fs2AXy0EemI79hpD-o6pA" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_6Fs2Any0EemI79hpD-o6pA" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_6Fs2A3y0EemI79hpD-o6pA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_6Fs2BHy0EemI79hpD-o6pA"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_6FqZwHy0EemI79hpD-o6pA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6FsO8Xy0EemI79hpD-o6pA" x="47" y="102"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_8lWIQHy0EemI79hpD-o6pA" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_8lWIQny0EemI79hpD-o6pA" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_8lWIQ3y0EemI79hpD-o6pA" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_8lWvUHy0EemI79hpD-o6pA" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_8lWvUXy0EemI79hpD-o6pA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_8lWvUny0EemI79hpD-o6pA"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_8lTsAHy0EemI79hpD-o6pA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8lWIQXy0EemI79hpD-o6pA" x="202" y="102"/>
+      </children>
+    </children>
+    <element xmi:type="henshin:Rule" href="cps.henshin#_2yQIQHy0EemI79hpD-o6pA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2ySkgXy0EemI79hpD-o6pA" x="236" y="327" width="345" height="199"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_W9ZSsHy4EemI79hpD-o6pA" type="2001" fontName="Noto Sans" italic="true" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QzUgoXy5EemI79hpD-o6pA" source="defaultAction">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QzUgony5EemI79hpD-o6pA" key="value" value="preserve"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_W9ZSsny4EemI79hpD-o6pA" type="5001"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_W9ZSs3y4EemI79hpD-o6pA" type="7001">
+      <children xmi:type="notation:Shape" xmi:id="_QzVuwHy5EemI79hpD-o6pA" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_QzVuwny5EemI79hpD-o6pA" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_QzVuw3y5EemI79hpD-o6pA" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_QzVuxHy5EemI79hpD-o6pA" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_QzVuxXy5EemI79hpD-o6pA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_QzVuxny5EemI79hpD-o6pA"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_QzQ2QHy5EemI79hpD-o6pA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QzVuwXy5EemI79hpD-o6pA" x="16" y="162"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_U8_rwHy5EemI79hpD-o6pA" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_U9AS0Hy5EemI79hpD-o6pA" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_U9AS0Xy5EemI79hpD-o6pA" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_U9AS0ny5EemI79hpD-o6pA" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_U9AS03y5EemI79hpD-o6pA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_U9AS1Hy5EemI79hpD-o6pA"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_U88ocHy5EemI79hpD-o6pA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_U8_rwXy5EemI79hpD-o6pA" x="177" y="11"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_WEe4QHy5EemI79hpD-o6pA" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_WEe4Qny5EemI79hpD-o6pA" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_WEe4Q3y5EemI79hpD-o6pA" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_WEe4RHy5EemI79hpD-o6pA" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_WEe4RXy5EemI79hpD-o6pA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_WEe4Rny5EemI79hpD-o6pA"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_WEdqIHy5EemI79hpD-o6pA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WEe4QXy5EemI79hpD-o6pA" x="166" y="117"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_XGUIsHy5EemI79hpD-o6pA" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_XGUIsny5EemI79hpD-o6pA" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_XGUvwHy5EemI79hpD-o6pA" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_XGUvwXy5EemI79hpD-o6pA" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_XGUvwny5EemI79hpD-o6pA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_XGUvw3y5EemI79hpD-o6pA"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_XGRscHy5EemI79hpD-o6pA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XGUIsXy5EemI79hpD-o6pA" x="527" y="11"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_XfT3gHy5EemI79hpD-o6pA" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_XfT3gny5EemI79hpD-o6pA" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_XfT3g3y5EemI79hpD-o6pA" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_XfT3hHy5EemI79hpD-o6pA" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_XfT3hXy5EemI79hpD-o6pA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_XfT3hny5EemI79hpD-o6pA"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_XfSpYHy5EemI79hpD-o6pA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XfT3gXy5EemI79hpD-o6pA" x="527" y="162"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_YuaH4Hy5EemI79hpD-o6pA" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_YuaH4ny5EemI79hpD-o6pA" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_YuaH43y5EemI79hpD-o6pA" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_YuaH5Hy5EemI79hpD-o6pA" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_YuaH5Xy5EemI79hpD-o6pA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_YuaH5ny5EemI79hpD-o6pA"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_YuZg0Hy5EemI79hpD-o6pA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YuaH4Xy5EemI79hpD-o6pA" x="337" y="11"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iu5VYHy5EemI79hpD-o6pA" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_iu5VYny5EemI79hpD-o6pA" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_iu5VY3y5EemI79hpD-o6pA" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_iu5VZHy5EemI79hpD-o6pA" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_iu5VZXy5EemI79hpD-o6pA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_iu5VZny5EemI79hpD-o6pA"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_iu3gMHy5EemI79hpD-o6pA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iu5VYXy5EemI79hpD-o6pA" x="166" y="214"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_DK8L8H8VEemiUoPdWqOlQg" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_DK8zAH8VEemiUoPdWqOlQg" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_DK8zAX8VEemiUoPdWqOlQg" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_DK8zAn8VEemiUoPdWqOlQg" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_DK8zA38VEemiUoPdWqOlQg"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_DK8zBH8VEemiUoPdWqOlQg"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_DK7k4H8VEemiUoPdWqOlQg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DK8L8X8VEemiUoPdWqOlQg" x="15" y="11"/>
+      </children>
+    </children>
+    <element xmi:type="henshin:Rule" href="cps.henshin#_W9WPYHy4EemI79hpD-o6pA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W9ZSsXy4EemI79hpD-o6pA" x="22" y="549" width="637" height="322"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_1VkVkHy5EemI79hpD-o6pA" type="2001" fontName="Noto Sans" italic="true" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OdwiAny6EemI79hpD-o6pA" source="defaultAction">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OdwiA3y6EemI79hpD-o6pA" key="value" value="preserve"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_1VkVkny5EemI79hpD-o6pA" type="5001"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_1VkVk3y5EemI79hpD-o6pA" type="7001">
+      <children xmi:type="notation:Shape" xmi:id="_OdxwIHy6EemI79hpD-o6pA" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_OdxwIny6EemI79hpD-o6pA" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_OdxwI3y6EemI79hpD-o6pA" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_OdxwJHy6EemI79hpD-o6pA" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_OdxwJXy6EemI79hpD-o6pA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_OdxwJny6EemI79hpD-o6pA"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_OdtesHy6EemI79hpD-o6pA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OdxwIXy6EemI79hpD-o6pA" x="21" y="12"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_PGbrkHy6EemI79hpD-o6pA" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_PGcSoHy6EemI79hpD-o6pA" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_PGcSoXy6EemI79hpD-o6pA" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_PGcSony6EemI79hpD-o6pA" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_PGcSo3y6EemI79hpD-o6pA"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_PGcSpHy6EemI79hpD-o6pA"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_PGadcHy6EemI79hpD-o6pA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PGbrkXy6EemI79hpD-o6pA" x="39" y="163"/>
+      </children>
+    </children>
+    <element xmi:type="henshin:Rule" href="cps.henshin#_1VgrMHy5EemI79hpD-o6pA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1VkVkXy5EemI79hpD-o6pA" x="684" y="549" width="177" height="259"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_4li6kH8UEemiUoPdWqOlQg" type="2001" fontName="Noto Sans" italic="true" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VfNNgn8VEemiUoPdWqOlQg" source="defaultAction">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_VfNNg38VEemiUoPdWqOlQg" key="value" value="preserve"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_4ljhoH8UEemiUoPdWqOlQg" type="5001"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_4ljhoX8UEemiUoPdWqOlQg" type="7001">
+      <children xmi:type="notation:Shape" xmi:id="_VfOboH8VEemiUoPdWqOlQg" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_VfPCsH8VEemiUoPdWqOlQg" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_VfPCsX8VEemiUoPdWqOlQg" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_VfPCsn8VEemiUoPdWqOlQg" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_VfPCs38VEemiUoPdWqOlQg"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_VfPCtH8VEemiUoPdWqOlQg"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_VfKxQH8VEemiUoPdWqOlQg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VfOboX8VEemiUoPdWqOlQg" x="19" y="196"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_WJm1YH8VEemiUoPdWqOlQg" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_WJnccH8VEemiUoPdWqOlQg" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_WJnccX8VEemiUoPdWqOlQg" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_WJnccn8VEemiUoPdWqOlQg" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_WJncc38VEemiUoPdWqOlQg"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_WJncdH8VEemiUoPdWqOlQg"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_WJkZIH8VEemiUoPdWqOlQg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WJm1YX8VEemiUoPdWqOlQg" x="172" y="16"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_Xr_OIH8VEemiUoPdWqOlQg" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_Xr_OIn8VEemiUoPdWqOlQg" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Xr_OI38VEemiUoPdWqOlQg" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Xr_OJH8VEemiUoPdWqOlQg" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_Xr_OJX8VEemiUoPdWqOlQg"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_Xr_OJn8VEemiUoPdWqOlQg"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_Xr-AAH8VEemiUoPdWqOlQg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xr_OIX8VEemiUoPdWqOlQg" x="161" y="263"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_Y0FeoH8VEemiUoPdWqOlQg" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_Y0GFsX8VEemiUoPdWqOlQg" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Y0GFsn8VEemiUoPdWqOlQg" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_Y0GFs38VEemiUoPdWqOlQg" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_Y0GFtH8VEemiUoPdWqOlQg"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_Y0GFtX8VEemiUoPdWqOlQg"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_Yz9i0H8VEemiUoPdWqOlQg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y0GFsH8VEemiUoPdWqOlQg" x="533" y="196"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_cTdIgH8VEemiUoPdWqOlQg" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_cTdIgn8VEemiUoPdWqOlQg" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_cTdIg38VEemiUoPdWqOlQg" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_cTdIhH8VEemiUoPdWqOlQg" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_cTdIhX8VEemiUoPdWqOlQg"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_cTdIhn8VEemiUoPdWqOlQg"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_cTchcH8VEemiUoPdWqOlQg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cTdIgX8VEemiUoPdWqOlQg" x="161" y="133"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_fYb8cH8VEemiUoPdWqOlQg" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_fYb8cn8VEemiUoPdWqOlQg" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_fYb8c38VEemiUoPdWqOlQg" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_fYb8dH8VEemiUoPdWqOlQg" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_fYb8dX8VEemiUoPdWqOlQg"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_fYb8dn8VEemiUoPdWqOlQg"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_fYauUH8VEemiUoPdWqOlQg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fYb8cX8VEemiUoPdWqOlQg" x="347" y="16"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_kmA0kH8VEemiUoPdWqOlQg" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_kmA0kn8VEemiUoPdWqOlQg" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_kmA0k38VEemiUoPdWqOlQg" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_kmA0lH8VEemiUoPdWqOlQg" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_kmA0lX8VEemiUoPdWqOlQg"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_kmA0ln8VEemiUoPdWqOlQg"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_kl-_YH8VEemiUoPdWqOlQg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kmA0kX8VEemiUoPdWqOlQg" x="540" y="16"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_wZseAH8VEemiUoPdWqOlQg" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_wZseAn8VEemiUoPdWqOlQg" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_wZseA38VEemiUoPdWqOlQg" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_wZseBH8VEemiUoPdWqOlQg" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_wZseBX8VEemiUoPdWqOlQg"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_wZseBn8VEemiUoPdWqOlQg"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_wZrP4H8VEemiUoPdWqOlQg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wZseAX8VEemiUoPdWqOlQg" x="18" y="16"/>
+      </children>
+    </children>
+    <element xmi:type="henshin:Rule" href="cps.henshin#_4lbl0H8UEemiUoPdWqOlQg"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4li6kX8UEemiUoPdWqOlQg" x="22" y="894" width="637" height="360"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_7SPC8H8XEemiUoPdWqOlQg" type="2001" fontName="Noto Sans" italic="true" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AUFzQH8YEemiUoPdWqOlQg" source="defaultAction">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AUFzQX8YEemiUoPdWqOlQg" key="value" value="preserve"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_7SPqAH8XEemiUoPdWqOlQg" type="5001"/>
+    <children xmi:type="notation:DecorationNode" xmi:id="_7SPqAX8XEemiUoPdWqOlQg" type="7001">
+      <children xmi:type="notation:Shape" xmi:id="_AUGaUH8YEemiUoPdWqOlQg" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_AUGaUn8YEemiUoPdWqOlQg" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_AUGaU38YEemiUoPdWqOlQg" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_AUGaVH8YEemiUoPdWqOlQg" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_AUGaVX8YEemiUoPdWqOlQg"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_AUGaVn8YEemiUoPdWqOlQg"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_AUFMMH8YEemiUoPdWqOlQg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AUGaUX8YEemiUoPdWqOlQg" x="28" y="19"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_A8fQAH8YEemiUoPdWqOlQg" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_A8fQAn8YEemiUoPdWqOlQg" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_A8fQA38YEemiUoPdWqOlQg" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_A8fQBH8YEemiUoPdWqOlQg" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_A8fQBX8YEemiUoPdWqOlQg"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_A8fQBn8YEemiUoPdWqOlQg"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_A8eo8H8YEemiUoPdWqOlQg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_A8fQAX8YEemiUoPdWqOlQg" x="238" y="19"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_DowB8H8YEemiUoPdWqOlQg" type="3001" fontName="Noto Sans">
+        <children xmi:type="notation:DecorationNode" xmi:id="_DowB8n8YEemiUoPdWqOlQg" type="5002"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_DowB838YEemiUoPdWqOlQg" type="5003"/>
+        <children xmi:type="notation:DecorationNode" xmi:id="_DowB9H8YEemiUoPdWqOlQg" type="7002">
+          <styles xmi:type="notation:SortingStyle" xmi:id="_DowB9X8YEemiUoPdWqOlQg"/>
+          <styles xmi:type="notation:FilteringStyle" xmi:id="_DowB9n8YEemiUoPdWqOlQg"/>
+        </children>
+        <element xmi:type="henshin:Node" href="cps.henshin#_Dova4H8YEemiUoPdWqOlQg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DowB8X8YEemiUoPdWqOlQg" x="227" y="171"/>
+      </children>
+    </children>
+    <element xmi:type="henshin:Rule" href="cps.henshin#_7SLYkH8XEemiUoPdWqOlQg"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7SPC8X8XEemiUoPdWqOlQg" x="453" y="22" width="376" height="284"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_rVAwQXyxEemI79hpD-o6pA"/>
+  <element xmi:type="henshin:Module" href="cps.henshin#_rUcIgHyxEemI79hpD-o6pA"/>
+  <edges xmi:type="notation:Connector" xmi:id="_6Yb2sHyyEemI79hpD-o6pA" type="4001" source="_8Ow7oHyxEemI79hpD-o6pA" target="_KIaMAHyyEemI79hpD-o6pA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_6Yb2s3yyEemI79hpD-o6pA" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_6Yb2tHyyEemI79hpD-o6pA" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_6Yb2tXyyEemI79hpD-o6pA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_6Yb2tnyyEemI79hpD-o6pA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_6Yb2sXyyEemI79hpD-o6pA" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_6YaokHyyEemI79hpD-o6pA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6Yb2snyyEemI79hpD-o6pA" points="[49, -7, -165, 20]$[190, -30, -24, -3]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6YdE0HyyEemI79hpD-o6pA" id="(0.20512820512820512,0.41304347826086957)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_APeikHyzEemI79hpD-o6pA" type="4001" source="_8Ow7oHyxEemI79hpD-o6pA" target="__cDhkHyyEemI79hpD-o6pA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_APeik3yzEemI79hpD-o6pA" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_APeilHyzEemI79hpD-o6pA" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_APeilXyzEemI79hpD-o6pA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_APeilnyzEemI79hpD-o6pA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_APeikXyzEemI79hpD-o6pA" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_APd7gHyzEemI79hpD-o6pA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_APeiknyzEemI79hpD-o6pA" points="[14, -1, -203, 1]$[215, -25, -2, -23]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_APfwsHyzEemI79hpD-o6pA" id="(0.8571428571428571,0.17391304347826086)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_AoHFAHyzEemI79hpD-o6pA" type="4001" source="__cDhkHyyEemI79hpD-o6pA" target="_KIaMAHyyEemI79hpD-o6pA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_AoHsEHyzEemI79hpD-o6pA" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AoHsEXyzEemI79hpD-o6pA" x="20" y="37"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AoHsEnyzEemI79hpD-o6pA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AoHsE3yzEemI79hpD-o6pA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_AoHFAXyzEemI79hpD-o6pA" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_AoFP0HyzEemI79hpD-o6pA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AoHFAnyzEemI79hpD-o6pA" points="[-2, 23, 10, -119]$[-9, 136, 3, -6]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_AoMkkHyzEemI79hpD-o6pA" id="(0.5897435897435898,0.13043478260869565)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_fabGMHy0EemI79hpD-o6pA" type="4001" source="_Zp4q8Hy0EemI79hpD-o6pA" target="_bFEPgHy0EemI79hpD-o6pA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_fabtQHy0EemI79hpD-o6pA" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_fabtQXy0EemI79hpD-o6pA" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_fabtQny0EemI79hpD-o6pA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_facUUHy0EemI79hpD-o6pA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_fabGMXy0EemI79hpD-o6pA" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_faZ4EHy0EemI79hpD-o6pA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fabGMny0EemI79hpD-o6pA" points="[-1, 23, 0, -56]$[-2, 71, -1, -8]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_faglwHy0EemI79hpD-o6pA" id="(0.49382716049382713,0.17391304347826086)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_7KsvMHy0EemI79hpD-o6pA" type="4001" source="_5jh9EHy0EemI79hpD-o6pA" target="_6FsO8Hy0EemI79hpD-o6pA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_7KtWQHy0EemI79hpD-o6pA" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_7KtWQXy0EemI79hpD-o6pA" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_7KtWQny0EemI79hpD-o6pA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_7KtWQ3y0EemI79hpD-o6pA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_7KsvMXy0EemI79hpD-o6pA" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_7KrhEHy0EemI79hpD-o6pA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7KsvMny0EemI79hpD-o6pA" points="[3, 23, -5, -62]$[11, 62, 3, -23]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="__HxBsHy0EemI79hpD-o6pA" type="4001" source="_8lWIQHy0EemI79hpD-o6pA" target="_6FsO8Hy0EemI79hpD-o6pA">
+    <children xmi:type="notation:DecorationNode" xmi:id="__HxBs3y0EemI79hpD-o6pA" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="__HxBtHy0EemI79hpD-o6pA" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="__HxowHy0EemI79hpD-o6pA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="__HxowXy0EemI79hpD-o6pA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="__HxBsXy0EemI79hpD-o6pA" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#__HvMgHy0EemI79hpD-o6pA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__HxBsny0EemI79hpD-o6pA" points="[-24, -5, 115, -1]$[-98, -5, 41, -1]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__H0sEHy0EemI79hpD-o6pA" id="(0.20512820512820512,0.5869565217391305)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_epK2Iny5EemI79hpD-o6pA" type="4001" source="_U8_rwHy5EemI79hpD-o6pA" target="_YuaH4Hy5EemI79hpD-o6pA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_epK2JXy5EemI79hpD-o6pA" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_epK2Jny5EemI79hpD-o6pA" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_epK2J3y5EemI79hpD-o6pA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_epK2KHy5EemI79hpD-o6pA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_epK2I3y5EemI79hpD-o6pA" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_epK2IHy5EemI79hpD-o6pA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_epK2JHy5EemI79hpD-o6pA" points="[15, -1, -82, 0]$[79, -3, -18, -2]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_epMEQHy5EemI79hpD-o6pA" id="(0.84375,0.43478260869565216)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_epMEQXy5EemI79hpD-o6pA" id="(0.13740458015267176,0.41304347826086957)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_fGay0Hy5EemI79hpD-o6pA" type="4001" source="_YuaH4Hy5EemI79hpD-o6pA" target="_XGUIsHy5EemI79hpD-o6pA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_fGay03y5EemI79hpD-o6pA" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_fGay1Hy5EemI79hpD-o6pA" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_fGbZ4Hy5EemI79hpD-o6pA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_fGbZ4Xy5EemI79hpD-o6pA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_fGay0Xy5EemI79hpD-o6pA" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_fGY9oHy5EemI79hpD-o6pA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fGay0ny5EemI79hpD-o6pA" points="[13, 1, -92, -3]$[106, -19, 1, -23]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fGfEQHy5EemI79hpD-o6pA" id="(0.9007633587786259,0.41304347826086957)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_fghU4Hy5EemI79hpD-o6pA" type="4001" source="_XGUIsHy5EemI79hpD-o6pA" target="_XfT3gHy5EemI79hpD-o6pA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_fgh78Hy5EemI79hpD-o6pA" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_fgh78Xy5EemI79hpD-o6pA" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_fgh78ny5EemI79hpD-o6pA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_fgh783y5EemI79hpD-o6pA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_fghU4Xy5EemI79hpD-o6pA" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_fggGwHy5EemI79hpD-o6pA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fghU4ny5EemI79hpD-o6pA" points="[8, 23, 1, -116]$[8, 116, 1, -23]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_f_l2gny5EemI79hpD-o6pA" type="4001" source="_U8_rwHy5EemI79hpD-o6pA" target="_WEe4QHy5EemI79hpD-o6pA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_f_mdkHy5EemI79hpD-o6pA" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_f_mdkXy5EemI79hpD-o6pA" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_f_mdkny5EemI79hpD-o6pA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_f_mdk3y5EemI79hpD-o6pA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_f_l2g3y5EemI79hpD-o6pA" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_f_l2gHy5EemI79hpD-o6pA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_f_l2hHy5EemI79hpD-o6pA" points="[2, 23, 0, -69]$[3, 83, 1, -9]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_f_nrsHy5EemI79hpD-o6pA" id="(0.5213675213675214,0.1956521739130435)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_gh1n8Hy5EemI79hpD-o6pA" type="4001" source="_WEe4QHy5EemI79hpD-o6pA" target="_XfT3gHy5EemI79hpD-o6pA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_gh2PAny5EemI79hpD-o6pA" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_gh2PA3y5EemI79hpD-o6pA" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_gh2PBHy5EemI79hpD-o6pA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_gh2PBXy5EemI79hpD-o6pA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_gh2PAHy5EemI79hpD-o6pA" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_gh0Z0Hy5EemI79hpD-o6pA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gh2PAXy5EemI79hpD-o6pA" points="[15, 2, -284, -45]$[299, 70, 0, 23]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gh55YHy5EemI79hpD-o6pA" id="(0.8717948717948718,0.1956521739130435)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_hW6OwHy5EemI79hpD-o6pA" type="4001" source="_QzVuwHy5EemI79hpD-o6pA" target="_WEe4QHy5EemI79hpD-o6pA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_hW6Ow3y5EemI79hpD-o6pA" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hW6OxHy5EemI79hpD-o6pA" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_hW6OxXy5EemI79hpD-o6pA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_hW6Oxny5EemI79hpD-o6pA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_hW6OwXy5EemI79hpD-o6pA" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_hW5nsHy5EemI79hpD-o6pA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hW6Owny5EemI79hpD-o6pA" points="[1, -5, -81, 0]$[71, -6, -11, -1]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hW7c4Hy5EemI79hpD-o6pA" id="(0.9873417721518988,0.6739130434782609)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hW7c4Xy5EemI79hpD-o6pA" id="(0.09401709401709402,0.41304347826086957)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_l0vE8Hy5EemI79hpD-o6pA" type="4001" source="_iu5VYHy5EemI79hpD-o6pA" target="_XfT3gHy5EemI79hpD-o6pA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_l0vE83y5EemI79hpD-o6pA" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_l0vE9Hy5EemI79hpD-o6pA" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_l0vE9Xy5EemI79hpD-o6pA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_l0vE9ny5EemI79hpD-o6pA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_l0vE8Xy5EemI79hpD-o6pA" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_l0ud4Hy5EemI79hpD-o6pA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_l0vE8ny5EemI79hpD-o6pA" points="[28, -5, -282, 43]$[309, -44, -1, 4]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l0w6IHy5EemI79hpD-o6pA" id="(0.7606837606837606,0.5652173913043478)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_l0w6IXy5EemI79hpD-o6pA" id="(0.4691358024691358,0.9130434782608695)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_mLuBkHy5EemI79hpD-o6pA" type="4001" source="_QzVuwHy5EemI79hpD-o6pA" target="_iu5VYHy5EemI79hpD-o6pA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_mLuBk3y5EemI79hpD-o6pA" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_mLuBlHy5EemI79hpD-o6pA" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_mLuBlXy5EemI79hpD-o6pA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_mLuBlny5EemI79hpD-o6pA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_mLuBkXy5EemI79hpD-o6pA" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_mLtagHy5EemI79hpD-o6pA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_mLuBkny5EemI79hpD-o6pA" points="[28, 23, -111, -91]$[110, 123, -29, 9]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_mLuooHy5EemI79hpD-o6pA" id="(0.24786324786324787,0.717391304347826)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_UpCYgHy6EemI79hpD-o6pA" type="4001" source="_OdxwIHy6EemI79hpD-o6pA" target="_PGbrkHy6EemI79hpD-o6pA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_UpCYg3y6EemI79hpD-o6pA" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_UpCYhHy6EemI79hpD-o6pA" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_UpCYhXy6EemI79hpD-o6pA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_UpCYhny6EemI79hpD-o6pA" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_UpCYgXy6EemI79hpD-o6pA" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_UpBxcHy6EemI79hpD-o6pA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UpCYgny6EemI79hpD-o6pA" points="[4, 23, 0, -114]$[6, 128, 2, -9]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_UpDmoHy6EemI79hpD-o6pA" id="(0.5432098765432098,0.1956521739130435)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_LOAqgH8VEemiUoPdWqOlQg" type="4001" source="_WEe4QHy5EemI79hpD-o6pA" target="_DK8L8H8VEemiUoPdWqOlQg">
+    <children xmi:type="notation:DecorationNode" xmi:id="_LOAqg38VEemiUoPdWqOlQg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_LOAqhH8VEemiUoPdWqOlQg" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_LOAqhX8VEemiUoPdWqOlQg" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_LOAqhn8VEemiUoPdWqOlQg" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_LOAqgX8VEemiUoPdWqOlQg" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_LOADcH8VEemiUoPdWqOlQg"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LOAqgn8VEemiUoPdWqOlQg" points="[27, -7, -120, 30]$[134, -46, -13, -9]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LOCfsH8VEemiUoPdWqOlQg" id="(0.6666666666666666,0.15217391304347827)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LOCfsX8VEemiUoPdWqOlQg" id="(0.25925925925925924,0.1956521739130435)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_uW-YUH8VEemiUoPdWqOlQg" type="4001" source="_VfOboH8VEemiUoPdWqOlQg" target="_cTdIgH8VEemiUoPdWqOlQg">
+    <children xmi:type="notation:DecorationNode" xmi:id="_uW-_YH8VEemiUoPdWqOlQg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_uW-_YX8VEemiUoPdWqOlQg" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_uW-_Yn8VEemiUoPdWqOlQg" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_uW-_Y38VEemiUoPdWqOlQg" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_uW-YUX8VEemiUoPdWqOlQg" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_uW8jIH8VEemiUoPdWqOlQg"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uW-YUn8VEemiUoPdWqOlQg" points="[36, -23, -86, 55]$[108, -86, -14, -8]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uXCCsH8VEemiUoPdWqOlQg" id="(0.28205128205128205,0.17391304347826086)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_ulQE4H8VEemiUoPdWqOlQg" type="4001" source="_VfOboH8VEemiUoPdWqOlQg" target="_Xr_OIH8VEemiUoPdWqOlQg">
+    <children xmi:type="notation:DecorationNode" xmi:id="_ulQr8H8VEemiUoPdWqOlQg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_ulQr8X8VEemiUoPdWqOlQg" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_ulQr8n8VEemiUoPdWqOlQg" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_ulQr838VEemiUoPdWqOlQg" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_ulQE4X8VEemiUoPdWqOlQg" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_ulPd0H8VEemiUoPdWqOlQg"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ulQE4n8VEemiUoPdWqOlQg" points="[40, 19, -76, -39]$[89, 50, -27, -8]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ulTvQH8VEemiUoPdWqOlQg" id="(0.23076923076923078,0.30434782608695654)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_3NJHwH8VEemiUoPdWqOlQg" type="4001" source="_cTdIgH8VEemiUoPdWqOlQg" target="_wZseAH8VEemiUoPdWqOlQg">
+    <children xmi:type="notation:DecorationNode" xmi:id="_3NJHw38VEemiUoPdWqOlQg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3NJHxH8VEemiUoPdWqOlQg" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_3NJHxX8VEemiUoPdWqOlQg" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_3NJHxn8VEemiUoPdWqOlQg" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_3NJHwX8VEemiUoPdWqOlQg" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_3NH5oH8VEemiUoPdWqOlQg"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3NJHwn8VEemiUoPdWqOlQg" points="[-6, -4, 131, 94]$[-141, -121, -4, -23]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3NK88H8VEemiUoPdWqOlQg" id="(0.2905982905982906,0.08695652173913043)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_4SrMcH8VEemiUoPdWqOlQg" type="4001" source="_WJm1YH8VEemiUoPdWqOlQg" target="_cTdIgH8VEemiUoPdWqOlQg">
+    <children xmi:type="notation:DecorationNode" xmi:id="_4SrMc38VEemiUoPdWqOlQg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_4SrMdH8VEemiUoPdWqOlQg" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_4SrMdX8VEemiUoPdWqOlQg" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_4SrMdn8VEemiUoPdWqOlQg" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_4SrMcX8VEemiUoPdWqOlQg" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_4SqlYH8VEemiUoPdWqOlQg"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4SrMcn8VEemiUoPdWqOlQg" points="[5, 23, 6, -94]$[5, 94, 6, -23]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_44ku0H8VEemiUoPdWqOlQg" type="4001" source="_WJm1YH8VEemiUoPdWqOlQg" target="_fYb8cH8VEemiUoPdWqOlQg">
+    <children xmi:type="notation:DecorationNode" xmi:id="_44ku038VEemiUoPdWqOlQg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_44ku1H8VEemiUoPdWqOlQg" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_44ku1X8VEemiUoPdWqOlQg" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_44ku1n8VEemiUoPdWqOlQg" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_44ku0X8VEemiUoPdWqOlQg" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_44kHwH8VEemiUoPdWqOlQg"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_44ku0n8VEemiUoPdWqOlQg" points="[11, -1, -144, 2]$[90, -1, -65, 2]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_44l88H8VEemiUoPdWqOlQg" id="(0.8854166666666666,0.5652173913043478)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_5ReXAH8VEemiUoPdWqOlQg" type="4001" source="_fYb8cH8VEemiUoPdWqOlQg" target="_kmA0kH8VEemiUoPdWqOlQg">
+    <children xmi:type="notation:DecorationNode" xmi:id="_5ReXA38VEemiUoPdWqOlQg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_5ReXBH8VEemiUoPdWqOlQg" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_5ReXBX8VEemiUoPdWqOlQg" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_5ReXBn8VEemiUoPdWqOlQg" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_5ReXAX8VEemiUoPdWqOlQg" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_5Rch0H8VEemiUoPdWqOlQg"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5ReXAn8VEemiUoPdWqOlQg" points="[17, -2, -95, 1]$[79, -11, -33, -8]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_5RgMMH8VEemiUoPdWqOlQg" id="(0.8702290076335878,0.5652173913043478)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_5r5pMH8VEemiUoPdWqOlQg" type="4001" source="_kmA0kH8VEemiUoPdWqOlQg" target="_Y0FeoH8VEemiUoPdWqOlQg">
+    <children xmi:type="notation:DecorationNode" xmi:id="_5r5pM38VEemiUoPdWqOlQg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_5r5pNH8VEemiUoPdWqOlQg" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_5r5pNX8VEemiUoPdWqOlQg" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_5r5pNn8VEemiUoPdWqOlQg" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_5r5pMX8VEemiUoPdWqOlQg" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_5r5CIH8VEemiUoPdWqOlQg"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5r5pMn8VEemiUoPdWqOlQg" points="[-3, 23, -3, -157]$[-3, 157, -3, -23]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_-vsTMH8VEemiUoPdWqOlQg" type="4001" source="_Xr_OIH8VEemiUoPdWqOlQg" target="_Y0FeoH8VEemiUoPdWqOlQg">
+    <children xmi:type="notation:DecorationNode" xmi:id="_-vsTM38VEemiUoPdWqOlQg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_-vsTNH8VEemiUoPdWqOlQg" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_-vsTNX8VEemiUoPdWqOlQg" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_-vsTNn8VEemiUoPdWqOlQg" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_-vsTMX8VEemiUoPdWqOlQg" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_-vrFEH8VEemiUoPdWqOlQg"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-vsTMn8VEemiUoPdWqOlQg" points="[59, -14, -295, 53]$[346, -90, -8, -23]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="__Tfj0H8VEemiUoPdWqOlQg" type="4001" source="_cTdIgH8VEemiUoPdWqOlQg" target="_Y0FeoH8VEemiUoPdWqOlQg">
+    <children xmi:type="notation:DecorationNode" xmi:id="__Tfj038VEemiUoPdWqOlQg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="__Tfj1H8VEemiUoPdWqOlQg" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="__Tfj1X8VEemiUoPdWqOlQg" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="__Tfj1n8VEemiUoPdWqOlQg" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="__Tfj0X8VEemiUoPdWqOlQg" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#__Te8wH8VEemiUoPdWqOlQg"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__Tfj0n8VEemiUoPdWqOlQg" points="[11, 2, -295, -62]$[266, 56, -40, -8]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__TiAEH8VEemiUoPdWqOlQg" id="(0.905982905982906,0.4782608695652174)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_H6qjEH8YEemiUoPdWqOlQg" type="4001" source="_A8fQAH8YEemiUoPdWqOlQg" target="_DowB8H8YEemiUoPdWqOlQg">
+    <children xmi:type="notation:DecorationNode" xmi:id="_H6qjE38YEemiUoPdWqOlQg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_H6qjFH8YEemiUoPdWqOlQg" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_H6qjFX8YEemiUoPdWqOlQg" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_H6qjFn8YEemiUoPdWqOlQg" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_H6qjEX8YEemiUoPdWqOlQg" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_H6p8AH8YEemiUoPdWqOlQg"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_H6qjEn8YEemiUoPdWqOlQg" points="[-3, 23, -2, -129]$[-3, 175, -2, 23]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_IR7MgX8YEemiUoPdWqOlQg" type="4001" source="_AUGaUH8YEemiUoPdWqOlQg" target="_DowB8H8YEemiUoPdWqOlQg">
+    <children xmi:type="notation:DecorationNode" xmi:id="_IR7zkH8YEemiUoPdWqOlQg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_IR7zkX8YEemiUoPdWqOlQg" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_IR7zkn8YEemiUoPdWqOlQg" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_IR7zk38YEemiUoPdWqOlQg" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_IR7Mgn8YEemiUoPdWqOlQg" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_IR7MgH8YEemiUoPdWqOlQg"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IR7Mg38YEemiUoPdWqOlQg" points="[29, 23, -155, -122]$[160, 140, -24, -5]"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IR8aoH8YEemiUoPdWqOlQg" id="(0.20512820512820512,0.34782608695652173)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_InE9IH8YEemiUoPdWqOlQg" type="4001" source="_AUGaUH8YEemiUoPdWqOlQg" target="_A8fQAH8YEemiUoPdWqOlQg">
+    <children xmi:type="notation:DecorationNode" xmi:id="_InE9I38YEemiUoPdWqOlQg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_InE9JH8YEemiUoPdWqOlQg" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_InE9JX8YEemiUoPdWqOlQg" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_InE9Jn8YEemiUoPdWqOlQg" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_InE9IX8YEemiUoPdWqOlQg" fontName="Noto Sans"/>
+    <element xmi:type="henshin:Edge" href="cps.henshin#_InEWEH8YEemiUoPdWqOlQg"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_InE9In8YEemiUoPdWqOlQg" points="[16, 8, -179, 9]$[188, 22, -7, 23]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_InGLQH8YEemiUoPdWqOlQg" id="(0.7974683544303798,0.5217391304347826)"/>
+  </edges>
+</notation:Diagram>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/plugin.properties b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/plugin.properties
new file mode 100644
index 00000000..aa7cf04c
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/plugin.properties
@@ -0,0 +1,4 @@
+#
+
+pluginName = hu.bme.mit.inf.dslreasoner.domains.cps
+providerName = www.example.org
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/plugin.xml b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/plugin.xml
new file mode 100644
index 00000000..5a0fee8d
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/plugin.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?><?eclipse version="3.0"?><!--
+--><plugin>
+  <extension point="org.eclipse.emf.ecore.generated_package">
+    <!-- @generated cps -->
+    <package class="hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage" genModel="model/cps.genmodel" uri="http://www.example.org/cps"/>
+  </extension>
+  <extension id="hu.bme.mit.inf.dslreasoner.domains.cps.queries.CpsQueries" point="org.eclipse.viatra.query.runtime.queryspecification">
+    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.domains.cps.queries.CpsQueries" id="hu.bme.mit.inf.dslreasoner.domains.cps.queries.CpsQueries">
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.cps.queries.resourceRequirement"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.cps.queries.allocationWithoutResourceRequirement"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.cps.queries.notEnoughAvailableMemory"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.cps.queries.notEnoughAvailableHdd"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.cps.queries.instanceDoesNotSatisfyRequirement"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.cps.queries.requirementNotSatisfied"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.cps.queries.redundantInstancesOnSameHost"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.cps.queries.averageFreeMemoryMetric"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.cps.queries.averageFreeHddMetric"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.cps.queries.costMetric"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.cps.queries.cpsCost"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.cps.queries.allocate"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.cps.queries.unallocateAppInstance"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.cps.queries.createHostInstance"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.cps.queries.removeHostInstance"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.cps.queries.guidanceObjective"/>
+    </group>
+  </extension>
+</plugin>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/representations.aird b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/representations.aird
new file mode 100644
index 00000000..dbaf9f8c
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/representations.aird
@@ -0,0 +1,600 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">
+  <viewpoint:DAnalysis uid="_hQ-pEHpMEem6LP4EDiey6Q" selectedViews="_jsELcHpMEem6LP4EDiey6Q" version="14.1.0.201810161215">
+    <semanticResources>model/cps.ecore</semanticResources>
+    <semanticResources>http://www.eclipse.org/emf/2002/Ecore</semanticResources>
+    <semanticResources>model/cps.genmodel</semanticResources>
+    <semanticResources>src/hu/bme/mit/inf/dslreasoner/domains/cps/dse/RuleBasedCpsMain.xtend</semanticResources>
+    <semanticResources>src/hu/bme/mit/inf/dslreasoner/domains/cps/dse/RuleBasedCpsSolver.xtend</semanticResources>
+    <semanticResources>src/hu/bme/mit/inf/dslreasoner/domains/cps/generator/CpsGenerator.xtend</semanticResources>
+    <semanticResources>src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql</semanticResources>
+    <semanticResources>src/hu/bme/mit/inf/dslreasoner/domains/cps/dse/CpsStateCoder.xtend</semanticResources>
+    <ownedViews xmi:type="viewpoint:DView" uid="_jsELcHpMEem6LP4EDiey6Q">
+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_kBjTQHpMEem6LP4EDiey6Q" name="cps class diagram" repPath="#_kAPrsHpMEem6LP4EDiey6Q">
+        <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+        <target xmi:type="ecore:EPackage" href="model/cps.ecore#/"/>
+      </ownedRepresentationDescriptors>
+    </ownedViews>
+  </viewpoint:DAnalysis>
+  <diagram:DSemanticDiagram uid="_kAPrsHpMEem6LP4EDiey6Q" name="cps class diagram">
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_kBb-gHpMEem6LP4EDiey6Q" source="DANNOTATION_CUSTOMIZATION_KEY">
+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_kBclkHpMEem6LP4EDiey6Q">
+        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_kku40HpMEem6LP4EDiey6Q" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">
+          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <labelFormat>bold</labelFormat>
+          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_kk538HpMEem6LP4EDiey6Q" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_kk538XpMEem6LP4EDiey6Q" showIcon="false" labelExpression="service:render">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </centerLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_kk538npMEem6LP4EDiey6Q" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_kk_-kHpMEem6LP4EDiey6Q" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_kk_-kXpMEem6LP4EDiey6Q" showIcon="false" labelExpression="service:render">
+            <labelFormat>bold</labelFormat>
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </centerLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_kk_-knpMEem6LP4EDiey6Q" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_klBzwHpMEem6LP4EDiey6Q" sourceArrow="InputArrow" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_klBzwXpMEem6LP4EDiey6Q" showIcon="false" labelExpression="service:renderEOpposite">
+            <labelFormat>bold</labelFormat>
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </beginLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_klBzwnpMEem6LP4EDiey6Q" showIcon="false" labelExpression="service:render">
+            <labelFormat>bold</labelFormat>
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_klDo8HpMEem6LP4EDiey6Q" sourceArrow="FillDiamond" routingStyle="manhattan">
+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          <beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_klDo8XpMEem6LP4EDiey6Q" showIcon="false" labelExpression="service:renderEOpposite">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </beginLabelStyleDescription>
+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_klDo8npMEem6LP4EDiey6Q" showIcon="false" labelExpression="service:render">
+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+          </endLabelStyleDescription>
+        </computedStyleDescriptions>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_kCIiEHpMEem6LP4EDiey6Q" source="GMF_DIAGRAMS">
+      <data xmi:type="notation:Diagram" xmi:id="_kCIiEXpMEem6LP4EDiey6Q" type="Sirius" element="_kAPrsHpMEem6LP4EDiey6Q" measurementUnit="Pixel">
+        <children xmi:type="notation:Node" xmi:id="_klH6YHpMEem6LP4EDiey6Q" type="2003" element="_kkaIsHpMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_klIhcHpMEem6LP4EDiey6Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_klKWoHpMEem6LP4EDiey6Q" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_klKWoXpMEem6LP4EDiey6Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_klKWonpMEem6LP4EDiey6Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_klH6YXpMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klH6YnpMEem6LP4EDiey6Q" x="200" y="960"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_klK9sHpMEem6LP4EDiey6Q" type="2003" element="_kkeaIHpMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_klK9s3pMEem6LP4EDiey6Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_klK9tHpMEem6LP4EDiey6Q" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_klK9tXpMEem6LP4EDiey6Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_klK9tnpMEem6LP4EDiey6Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_klK9sXpMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klK9snpMEem6LP4EDiey6Q" x="200" y="480"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_klK9t3pMEem6LP4EDiey6Q" type="2003" element="_kkfoQXpMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_klLkwHpMEem6LP4EDiey6Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_klLkwXpMEem6LP4EDiey6Q" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_klOoEHpMEem6LP4EDiey6Q" type="3010" element="_kktqsHpMEem6LP4EDiey6Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_klOoEXpMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_klOoEnpMEem6LP4EDiey6Q"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_klPPIHpMEem6LP4EDiey6Q" type="3010" element="_kkxVEHpMEem6LP4EDiey6Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_klPPIXpMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_klPPInpMEem6LP4EDiey6Q"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_klPPI3pMEem6LP4EDiey6Q" type="3010" element="_kkxVEnpMEem6LP4EDiey6Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_klPPJHpMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_klPPJXpMEem6LP4EDiey6Q"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_klLkwnpMEem6LP4EDiey6Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_klLkw3pMEem6LP4EDiey6Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_klK9uHpMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klK9uXpMEem6LP4EDiey6Q" x="140" y="160"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_klLkxHpMEem6LP4EDiey6Q" type="2003" element="_kkhdcHpMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_klML0HpMEem6LP4EDiey6Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_klML0XpMEem6LP4EDiey6Q" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_klML0npMEem6LP4EDiey6Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_klML03pMEem6LP4EDiey6Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_klLkxXpMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klLkxnpMEem6LP4EDiey6Q" x="380" y="800"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_klML1HpMEem6LP4EDiey6Q" type="2003" element="_kkirkHpMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_klML13pMEem6LP4EDiey6Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_klML2HpMEem6LP4EDiey6Q" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_klP2MHpMEem6LP4EDiey6Q" type="3010" element="_kkyjMHpMEem6LP4EDiey6Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_klP2MXpMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_klP2MnpMEem6LP4EDiey6Q"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_klML2XpMEem6LP4EDiey6Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_klML2npMEem6LP4EDiey6Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_klML1XpMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klML1npMEem6LP4EDiey6Q" x="380" y="640"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_klML23pMEem6LP4EDiey6Q" type="2003" element="_kkjSoXpMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_klMy4HpMEem6LP4EDiey6Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_klMy4XpMEem6LP4EDiey6Q" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_klMy4npMEem6LP4EDiey6Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_klMy43pMEem6LP4EDiey6Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_klML3HpMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klML3XpMEem6LP4EDiey6Q" x="400" y="320"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_klMy5HpMEem6LP4EDiey6Q" type="2003" element="_kkkgwHpMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_klNZ8HpMEem6LP4EDiey6Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_klNZ8XpMEem6LP4EDiey6Q" type="7004">
+            <children xmi:type="notation:Node" xmi:id="_klP2M3pMEem6LP4EDiey6Q" type="3010" element="_kkzKQHpMEem6LP4EDiey6Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_klP2NHpMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_klP2NXpMEem6LP4EDiey6Q"/>
+            </children>
+            <children xmi:type="notation:Node" xmi:id="_klP2NnpMEem6LP4EDiey6Q" type="3010" element="_kkzxUXpMEem6LP4EDiey6Q">
+              <styles xmi:type="notation:FontStyle" xmi:id="_klP2N3pMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8" bold="true"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_klP2OHpMEem6LP4EDiey6Q"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_klNZ8npMEem6LP4EDiey6Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_klNZ83pMEem6LP4EDiey6Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_klMy5XpMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klMy5npMEem6LP4EDiey6Q" x="180" y="320"/>
+        </children>
+        <children xmi:type="notation:Node" xmi:id="_klOBAHpMEem6LP4EDiey6Q" type="2003" element="_kklH0HpMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_klOBA3pMEem6LP4EDiey6Q" type="5007"/>
+          <children xmi:type="notation:Node" xmi:id="_klOBBHpMEem6LP4EDiey6Q" type="7004">
+            <styles xmi:type="notation:SortingStyle" xmi:id="_klOBBXpMEem6LP4EDiey6Q"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_klOBBnpMEem6LP4EDiey6Q"/>
+          </children>
+          <styles xmi:type="notation:ShapeStyle" xmi:id="_klOBAXpMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klOBAnpMEem6LP4EDiey6Q" x="400"/>
+        </children>
+        <styles xmi:type="notation:DiagramStyle" xmi:id="_kCIiEnpMEem6LP4EDiey6Q"/>
+        <edges xmi:type="notation:Edge" xmi:id="_klTgkHpMEem6LP4EDiey6Q" type="4001" element="_kk4p0HpMEem6LP4EDiey6Q" source="_klH6YHpMEem6LP4EDiey6Q" target="_klLkxHpMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_klUusHpMEem6LP4EDiey6Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klUusXpMEem6LP4EDiey6Q" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_klVVwHpMEem6LP4EDiey6Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klVVwXpMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_klVVwnpMEem6LP4EDiey6Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klVVw3pMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_klTgkXpMEem6LP4EDiey6Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_klTgknpMEem6LP4EDiey6Q" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_klTgk3pMEem6LP4EDiey6Q" points="[0, -50, -181, 110]$[181, -110, 0, 50]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_klcqgHpMEem6LP4EDiey6Q" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_klcqgXpMEem6LP4EDiey6Q" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_kldRkHpMEem6LP4EDiey6Q" type="4001" element="_kk8UMHpMEem6LP4EDiey6Q" source="_klH6YHpMEem6LP4EDiey6Q" target="_klK9sHpMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_kldRlHpMEem6LP4EDiey6Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kldRlXpMEem6LP4EDiey6Q" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_kldRlnpMEem6LP4EDiey6Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kldRl3pMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_kldRmHpMEem6LP4EDiey6Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kldRmXpMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_kldRkXpMEem6LP4EDiey6Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_kldRknpMEem6LP4EDiey6Q" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kldRk3pMEem6LP4EDiey6Q" points="[0, -50, 0, 430]$[0, -430, 0, 50]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kld4oHpMEem6LP4EDiey6Q" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kld4oXpMEem6LP4EDiey6Q" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_kld4onpMEem6LP4EDiey6Q" type="4001" element="_kk87RnpMEem6LP4EDiey6Q" source="_klH6YHpMEem6LP4EDiey6Q" target="_klK9t3pMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_kld4pnpMEem6LP4EDiey6Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kld4p3pMEem6LP4EDiey6Q" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_kld4qHpMEem6LP4EDiey6Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kld4qXpMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_klefsHpMEem6LP4EDiey6Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klefsXpMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_kld4o3pMEem6LP4EDiey6Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_kld4pHpMEem6LP4EDiey6Q" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kld4pXpMEem6LP4EDiey6Q" points="[0, -50, 49, 750]$[-180, -111, -131, 689]$[-196, -591, -147, 209]$[-196, -690, -147, 110]$[-49, -750, 0, 50]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_klefsnpMEem6LP4EDiey6Q" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_klefs3pMEem6LP4EDiey6Q" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_kleftHpMEem6LP4EDiey6Q" type="4001" element="_kk9iVnpMEem6LP4EDiey6Q" source="_klK9sHpMEem6LP4EDiey6Q" target="_klMy5HpMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_klefuHpMEem6LP4EDiey6Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klefuXpMEem6LP4EDiey6Q" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_klefunpMEem6LP4EDiey6Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klefu3pMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_klefvHpMEem6LP4EDiey6Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klefvXpMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_kleftXpMEem6LP4EDiey6Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_kleftnpMEem6LP4EDiey6Q" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kleft3pMEem6LP4EDiey6Q" points="[0, -50, 0, 110]$[0, -110, 0, 50]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_klfGwHpMEem6LP4EDiey6Q" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_klfGwXpMEem6LP4EDiey6Q" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_klfGwnpMEem6LP4EDiey6Q" type="4001" element="_kk-wcHpMEem6LP4EDiey6Q" source="_klML1HpMEem6LP4EDiey6Q" target="_klK9sHpMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_klfGxnpMEem6LP4EDiey6Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klfGx3pMEem6LP4EDiey6Q" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_klfGyHpMEem6LP4EDiey6Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klfGyXpMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_klfGynpMEem6LP4EDiey6Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klfGy3pMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_klfGw3pMEem6LP4EDiey6Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_klfGxHpMEem6LP4EDiey6Q" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_klfGxXpMEem6LP4EDiey6Q" points="[0, 0, 181, 60]$[-181, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_klft0HpMEem6LP4EDiey6Q" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_klft0XpMEem6LP4EDiey6Q" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_klft0npMEem6LP4EDiey6Q" type="4001" element="_kk_Xg3pMEem6LP4EDiey6Q" source="_klMy5HpMEem6LP4EDiey6Q" target="_klK9t3pMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_klft1npMEem6LP4EDiey6Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klft13pMEem6LP4EDiey6Q" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_klft2HpMEem6LP4EDiey6Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klft2XpMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_klft2npMEem6LP4EDiey6Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klft23pMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_klft03pMEem6LP4EDiey6Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_klft1HpMEem6LP4EDiey6Q" fontColor="7490599" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_klft1XpMEem6LP4EDiey6Q" points="[0, -50, 49, 110]$[-49, -110, 0, 50]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_klgU4HpMEem6LP4EDiey6Q" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_klgU4XpMEem6LP4EDiey6Q" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_klgU4npMEem6LP4EDiey6Q" type="4001" element="_klBMsHpMEem6LP4EDiey6Q" source="_klML23pMEem6LP4EDiey6Q" target="_klOBAHpMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_klgU5npMEem6LP4EDiey6Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klgU53pMEem6LP4EDiey6Q" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_klgU6HpMEem6LP4EDiey6Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klgU6XpMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_klgU6npMEem6LP4EDiey6Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klgU63pMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_klgU43pMEem6LP4EDiey6Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_klgU5HpMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8" bold="true"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_klgU5XpMEem6LP4EDiey6Q" points="[0, -50, 0, 270]$[0, -270, 0, 50]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_klg78HpMEem6LP4EDiey6Q" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_klg78XpMEem6LP4EDiey6Q" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_klg78npMEem6LP4EDiey6Q" type="4001" element="_klDB4HpMEem6LP4EDiey6Q" source="_klK9t3pMEem6LP4EDiey6Q" target="_klOBAHpMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_klg79npMEem6LP4EDiey6Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klg793pMEem6LP4EDiey6Q" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_klg7-HpMEem6LP4EDiey6Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klg7-XpMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_klg7-npMEem6LP4EDiey6Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klg7-3pMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_klg783pMEem6LP4EDiey6Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_klg79HpMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_klg79XpMEem6LP4EDiey6Q" points="[0, -50, -247, 110]$[247, -110, 0, 50]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_klhjAHpMEem6LP4EDiey6Q" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_klhjAXpMEem6LP4EDiey6Q" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_klhjAnpMEem6LP4EDiey6Q" type="4001" element="_klDo-XpMEem6LP4EDiey6Q" source="_klLkxHpMEem6LP4EDiey6Q" target="_klML1HpMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_klhjBnpMEem6LP4EDiey6Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klhjB3pMEem6LP4EDiey6Q" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_klhjCHpMEem6LP4EDiey6Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klhjCXpMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_klhjCnpMEem6LP4EDiey6Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klhjC3pMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_klhjA3pMEem6LP4EDiey6Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_klhjBHpMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_klhjBXpMEem6LP4EDiey6Q" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kliKEHpMEem6LP4EDiey6Q" id="(0.5,0.0)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kliKEXpMEem6LP4EDiey6Q" id="(0.5,1.0)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_kliKEnpMEem6LP4EDiey6Q" type="4001" element="_klEQBnpMEem6LP4EDiey6Q" source="_klK9sHpMEem6LP4EDiey6Q" target="_klML23pMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_kliKFnpMEem6LP4EDiey6Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kliKF3pMEem6LP4EDiey6Q" x="-5" y="-73"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_kliKGHpMEem6LP4EDiey6Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kliKGXpMEem6LP4EDiey6Q" x="18" y="18"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_kliKGnpMEem6LP4EDiey6Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kliKG3pMEem6LP4EDiey6Q" x="-1" y="-45"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_kliKE3pMEem6LP4EDiey6Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_kliKFHpMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kliKFXpMEem6LP4EDiey6Q" points="[59, 1, -143, 161]$[141, 1, -61, 161]$[141, -111, -61, 49]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_klixIHpMEem6LP4EDiey6Q" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_klixIXpMEem6LP4EDiey6Q" id="(0.5,0.5)"/>
+        </edges>
+        <edges xmi:type="notation:Edge" xmi:id="_klixInpMEem6LP4EDiey6Q" type="4001" element="_klFeIHpMEem6LP4EDiey6Q" source="_klML1HpMEem6LP4EDiey6Q" target="_klML23pMEem6LP4EDiey6Q">
+          <children xmi:type="notation:Node" xmi:id="_klixJnpMEem6LP4EDiey6Q" type="6001">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klixJ3pMEem6LP4EDiey6Q" y="-10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_klixKHpMEem6LP4EDiey6Q" type="6002">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klixKXpMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <children xmi:type="notation:Node" xmi:id="_klixKnpMEem6LP4EDiey6Q" type="6003">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_klixK3pMEem6LP4EDiey6Q" y="10"/>
+          </children>
+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_klixI3pMEem6LP4EDiey6Q" routing="Rectilinear"/>
+          <styles xmi:type="notation:FontStyle" xmi:id="_klixJHpMEem6LP4EDiey6Q" fontName="Noto Sans" fontHeight="8"/>
+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_klixJXpMEem6LP4EDiey6Q" points="[0, -50, -17, 270]$[17, -270, 0, 50]"/>
+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_klixLHpMEem6LP4EDiey6Q" id="(0.5,0.5)"/>
+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_kljYMHpMEem6LP4EDiey6Q" id="(0.5,0.5)"/>
+        </edges>
+      </data>
+    </ownedAnnotationEntries>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_kkaIsHpMEem6LP4EDiey6Q" name="CyberPhysicalSystem" tooltipText="" outgoingEdges="_kk4p0HpMEem6LP4EDiey6Q _kk8UMHpMEem6LP4EDiey6Q _kk87RnpMEem6LP4EDiey6Q" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cps.ecore#//CyberPhysicalSystem"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cps.ecore#//CyberPhysicalSystem"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_kkdMAHpMEem6LP4EDiey6Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_kkeaIHpMEem6LP4EDiey6Q" name="ApplicationType" tooltipText="" outgoingEdges="_kk9iVnpMEem6LP4EDiey6Q _klEQBnpMEem6LP4EDiey6Q" incomingEdges="_kk8UMHpMEem6LP4EDiey6Q _kk-wcHpMEem6LP4EDiey6Q" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cps.ecore#//ApplicationType"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cps.ecore#//ApplicationType"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_kkfBMHpMEem6LP4EDiey6Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_kkfoQXpMEem6LP4EDiey6Q" name="HostType" tooltipText="" outgoingEdges="_klDB4HpMEem6LP4EDiey6Q" incomingEdges="_kk87RnpMEem6LP4EDiey6Q _kk_Xg3pMEem6LP4EDiey6Q" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cps.ecore#//HostType"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cps.ecore#//HostType"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_kkgPUHpMEem6LP4EDiey6Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_kktqsHpMEem6LP4EDiey6Q" name="defaultMemory : EInt" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="model/cps.ecore#//HostType/defaultMemory"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="model/cps.ecore#//HostType/defaultMemory"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_kkwG8HpMEem6LP4EDiey6Q" labelAlignment="LEFT" description="_kku40HpMEem6LP4EDiey6Q">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_kkxVEHpMEem6LP4EDiey6Q" name="defaultHdd : EInt" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="model/cps.ecore#//HostType/defaultHdd"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="model/cps.ecore#//HostType/defaultHdd"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_kkxVEXpMEem6LP4EDiey6Q" labelAlignment="LEFT" description="_kku40HpMEem6LP4EDiey6Q">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_kkxVEnpMEem6LP4EDiey6Q" name="cost : EInt" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="model/cps.ecore#//HostType/cost"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="model/cps.ecore#//HostType/cost"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_kkx8IHpMEem6LP4EDiey6Q" labelAlignment="LEFT" description="_kku40HpMEem6LP4EDiey6Q">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_kkhdcHpMEem6LP4EDiey6Q" name="Request" tooltipText="" outgoingEdges="_klDo-XpMEem6LP4EDiey6Q" incomingEdges="_kk4p0HpMEem6LP4EDiey6Q" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cps.ecore#//Request"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cps.ecore#//Request"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_kkhdcXpMEem6LP4EDiey6Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_kkirkHpMEem6LP4EDiey6Q" name="Requirement" tooltipText="" outgoingEdges="_kk-wcHpMEem6LP4EDiey6Q _klFeIHpMEem6LP4EDiey6Q" incomingEdges="_klDo-XpMEem6LP4EDiey6Q" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cps.ecore#//Requirement"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cps.ecore#//Requirement"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_kkirkXpMEem6LP4EDiey6Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_kkyjMHpMEem6LP4EDiey6Q" name="count : EInt" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="model/cps.ecore#//Requirement/count"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="model/cps.ecore#//Requirement/count"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_kkyjMXpMEem6LP4EDiey6Q" labelAlignment="LEFT" description="_kku40HpMEem6LP4EDiey6Q">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_kkjSoXpMEem6LP4EDiey6Q" name="ApplicationInstance" tooltipText="" outgoingEdges="_klBMsHpMEem6LP4EDiey6Q" incomingEdges="_klEQBnpMEem6LP4EDiey6Q _klFeIHpMEem6LP4EDiey6Q" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cps.ecore#//ApplicationInstance"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cps.ecore#//ApplicationInstance"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_kkj5sHpMEem6LP4EDiey6Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_kkkgwHpMEem6LP4EDiey6Q" name="ResourceRequirement" tooltipText="" outgoingEdges="_kk_Xg3pMEem6LP4EDiey6Q" incomingEdges="_kk9iVnpMEem6LP4EDiey6Q" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cps.ecore#//ResourceRequirement"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cps.ecore#//ResourceRequirement"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_kkkgwXpMEem6LP4EDiey6Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_kkzKQHpMEem6LP4EDiey6Q" name="requiredMemory : EInt" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="model/cps.ecore#//ResourceRequirement/requiredMemory"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="model/cps.ecore#//ResourceRequirement/requiredMemory"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_kkzxUHpMEem6LP4EDiey6Q" labelAlignment="LEFT" description="_kku40HpMEem6LP4EDiey6Q">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_kkzxUXpMEem6LP4EDiey6Q" name="requiredHdd : EInt" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="model/cps.ecore#//ResourceRequirement/requiredHdd"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="model/cps.ecore#//ResourceRequirement/requiredHdd"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_kk0YYHpMEem6LP4EDiey6Q" labelAlignment="LEFT" description="_kku40HpMEem6LP4EDiey6Q">
+          <labelFormat>bold</labelFormat>
+        </ownedStyle>
+        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>
+      </ownedElements>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_kklH0HpMEem6LP4EDiey6Q" name="HostInstance" tooltipText="" incomingEdges="_klBMsHpMEem6LP4EDiey6Q _klDB4HpMEem6LP4EDiey6Q" width="12" height="10">
+      <target xmi:type="ecore:EClass" href="model/cps.ecore#//HostInstance"/>
+      <semanticElements xmi:type="ecore:EClass" href="model/cps.ecore#//HostInstance"/>
+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_kklH0XpMEem6LP4EDiey6Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">
+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_kk4p0HpMEem6LP4EDiey6Q" name="[0..*] requests" sourceNode="_kkaIsHpMEem6LP4EDiey6Q" targetNode="_kkhdcHpMEem6LP4EDiey6Q">
+      <target xmi:type="ecore:EReference" href="model/cps.ecore#//CyberPhysicalSystem/requests"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cps.ecore#//CyberPhysicalSystem/requests"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_kk7GEHpMEem6LP4EDiey6Q" description="_kk538HpMEem6LP4EDiey6Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_kk7tIXpMEem6LP4EDiey6Q" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_kk7tIHpMEem6LP4EDiey6Q" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_kk8UMHpMEem6LP4EDiey6Q" name="[0..*] applicationTypes" sourceNode="_kkaIsHpMEem6LP4EDiey6Q" targetNode="_kkeaIHpMEem6LP4EDiey6Q">
+      <target xmi:type="ecore:EReference" href="model/cps.ecore#//CyberPhysicalSystem/applicationTypes"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cps.ecore#//CyberPhysicalSystem/applicationTypes"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_kk87QHpMEem6LP4EDiey6Q" description="_kk538HpMEem6LP4EDiey6Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_kk87QnpMEem6LP4EDiey6Q" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_kk87QXpMEem6LP4EDiey6Q" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_kk87RnpMEem6LP4EDiey6Q" name="[0..*] hostTypes" sourceNode="_kkaIsHpMEem6LP4EDiey6Q" targetNode="_kkfoQXpMEem6LP4EDiey6Q">
+      <target xmi:type="ecore:EReference" href="model/cps.ecore#//CyberPhysicalSystem/hostTypes"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cps.ecore#//CyberPhysicalSystem/hostTypes"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_kk9iUHpMEem6LP4EDiey6Q" description="_kk538HpMEem6LP4EDiey6Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_kk9iUnpMEem6LP4EDiey6Q" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_kk9iUXpMEem6LP4EDiey6Q" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_kk9iVnpMEem6LP4EDiey6Q" name="[0..*] requirements" sourceNode="_kkeaIHpMEem6LP4EDiey6Q" targetNode="_kkkgwHpMEem6LP4EDiey6Q">
+      <target xmi:type="ecore:EReference" href="model/cps.ecore#//ApplicationType/requirements"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cps.ecore#//ApplicationType/requirements"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_kk-JYHpMEem6LP4EDiey6Q" description="_kk538HpMEem6LP4EDiey6Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_kk-JYnpMEem6LP4EDiey6Q" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_kk-JYXpMEem6LP4EDiey6Q" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_kk-wcHpMEem6LP4EDiey6Q" name="[0..1] type" sourceNode="_kkirkHpMEem6LP4EDiey6Q" targetNode="_kkeaIHpMEem6LP4EDiey6Q">
+      <target xmi:type="ecore:EReference" href="model/cps.ecore#//Requirement/type"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cps.ecore#//Requirement/type"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_kk-wcXpMEem6LP4EDiey6Q" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_kk-wc3pMEem6LP4EDiey6Q" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_kk-wcnpMEem6LP4EDiey6Q" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_kk_Xg3pMEem6LP4EDiey6Q" name="[1..1] hostType" sourceNode="_kkkgwHpMEem6LP4EDiey6Q" targetNode="_kkfoQXpMEem6LP4EDiey6Q">
+      <target xmi:type="ecore:EReference" href="model/cps.ecore#//ResourceRequirement/hostType"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cps.ecore#//ResourceRequirement/hostType"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_kk_-k3pMEem6LP4EDiey6Q" description="_kk_-kHpMEem6LP4EDiey6Q" routingStyle="manhattan" strokeColor="0,0,0">
+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_kk_-lXpMEem6LP4EDiey6Q" showIcon="false">
+          <customFeatures>labelSize</customFeatures>
+        </centerLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_kk_-lHpMEem6LP4EDiey6Q" showIcon="false" labelColor="39,76,114">
+          <customFeatures>labelSize</customFeatures>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_klBMsHpMEem6LP4EDiey6Q" sourceNode="_kkjSoXpMEem6LP4EDiey6Q" targetNode="_kklH0HpMEem6LP4EDiey6Q" beginLabel="[0..*] applications" endLabel="[1..1] allocatedTo">
+      <target xmi:type="ecore:EReference" href="model/cps.ecore#//ApplicationInstance/allocatedTo"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cps.ecore#//ApplicationInstance/allocatedTo"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cps.ecore#//HostInstance/applications"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_klBzw3pMEem6LP4EDiey6Q" description="_klBzwHpMEem6LP4EDiey6Q" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_klCa0HpMEem6LP4EDiey6Q" showIcon="false">
+          <labelFormat>bold</labelFormat>
+        </beginLabelStyle>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_klCa0XpMEem6LP4EDiey6Q" showIcon="false">
+          <labelFormat>bold</labelFormat>
+        </endLabelStyle>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_klDB4HpMEem6LP4EDiey6Q" sourceNode="_kkfoQXpMEem6LP4EDiey6Q" targetNode="_kklH0HpMEem6LP4EDiey6Q" beginLabel="[1..1] type" endLabel="[0..*] instances">
+      <target xmi:type="ecore:EReference" href="model/cps.ecore#//HostType/instances"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cps.ecore#//HostType/instances"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cps.ecore#//HostInstance/type"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_klDo83pMEem6LP4EDiey6Q" description="_klDo8HpMEem6LP4EDiey6Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_klDo9HpMEem6LP4EDiey6Q" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_klDo9XpMEem6LP4EDiey6Q" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_klDo-XpMEem6LP4EDiey6Q" sourceNode="_kkhdcHpMEem6LP4EDiey6Q" targetNode="_kkirkHpMEem6LP4EDiey6Q" beginLabel="[1..1] request" endLabel="[0..*] requirements">
+      <target xmi:type="ecore:EReference" href="model/cps.ecore#//Request/requirements"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cps.ecore#//Requirement/request"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cps.ecore#//Request/requirements"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_klEQAHpMEem6LP4EDiey6Q" description="_klDo8HpMEem6LP4EDiey6Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_klEQAXpMEem6LP4EDiey6Q" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_klEQAnpMEem6LP4EDiey6Q" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_klEQBnpMEem6LP4EDiey6Q" sourceNode="_kkeaIHpMEem6LP4EDiey6Q" targetNode="_kkjSoXpMEem6LP4EDiey6Q" beginLabel="[1..1] type" endLabel="[0..*] instances">
+      <target xmi:type="ecore:EReference" href="model/cps.ecore#//ApplicationType/instances"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cps.ecore#//ApplicationType/instances"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cps.ecore#//ApplicationInstance/type"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_klE3EHpMEem6LP4EDiey6Q" description="_klDo8HpMEem6LP4EDiey6Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_klE3EXpMEem6LP4EDiey6Q" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_klE3EnpMEem6LP4EDiey6Q" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
+    </ownedDiagramElements>
+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_klFeIHpMEem6LP4EDiey6Q" sourceNode="_kkirkHpMEem6LP4EDiey6Q" targetNode="_kkjSoXpMEem6LP4EDiey6Q" beginLabel="[0..1] requirement" endLabel="[0..*] instances">
+      <target xmi:type="ecore:EReference" href="model/cps.ecore#//Requirement/instances"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cps.ecore#//Requirement/instances"/>
+      <semanticElements xmi:type="ecore:EReference" href="model/cps.ecore#//ApplicationInstance/requirement"/>
+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_klFeIXpMEem6LP4EDiey6Q" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">
+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']/@style"/>
+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_klFeInpMEem6LP4EDiey6Q" showIcon="false"/>
+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_klFeI3pMEem6LP4EDiey6Q" showIcon="false"/>
+      </ownedStyle>
+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>
+    </ownedDiagramElements>
+    <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_kAqicHpMEem6LP4EDiey6Q"/>
+    <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>
+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>
+    <target xmi:type="ecore:EPackage" href="model/cps.ecore#/"/>
+  </diagram:DSemanticDiagram>
+</xmi:XMI>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/.gitignore
new file mode 100644
index 00000000..d3114d9d
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/.gitignore
@@ -0,0 +1,44 @@
+/.CpsApplications.java._trace
+/.CpsQueries.java._trace
+/.CpsHosts.java._trace
+/.TotalMemory.java._trace
+/.TotalHdd.java._trace
+/.AvailableMemory.java._trace
+/.AvailableHdd.java._trace
+/.AllocationWithoutResourceRequirement.java._trace
+/.NotEnoughAvailableMemory.java._trace
+/.NotEnoughAvailableHdd.java._trace
+/.InstanceDoesNotSatisfyRequirement.java._trace
+/.RequirementNotSatisfied.java._trace
+/.AverageFreeMemoryMetric.java._trace
+/.AverageFreeHddMetric.java._trace
+/.CostMetric.java._trace
+/.CpsCost.java._trace
+/.RedundantInstancesOnSameHost.java._trace
+/.Allocate.java._trace
+/.CpsTransformationRules.java._trace
+/.ResourceRequirement.java._trace
+/.CreateInstance.java._trace
+/.CreateHostInstance.java._trace
+/.UnallocatedAppInstance.java._trace
+/.RequiredAppInstances.java._trace
+/.GuidanceObjective.java._trace
+/.RemoveHostInstance.java._trace
+/.UnallocateAppInstance.java._trace
+/Allocate.java
+/AllocationWithoutResourceRequirement.java
+/AverageFreeHddMetric.java
+/AverageFreeMemoryMetric.java
+/CostMetric.java
+/CpsCost.java
+/CpsQueries.java
+/CreateHostInstance.java
+/GuidanceObjective.java
+/InstanceDoesNotSatisfyRequirement.java
+/NotEnoughAvailableHdd.java
+/NotEnoughAvailableMemory.java
+/RedundantInstancesOnSameHost.java
+/RemoveHostInstance.java
+/RequirementNotSatisfied.java
+/ResourceRequirement.java
+/UnallocateAppInstance.java
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/Allocate.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/Allocate.java
new file mode 100644
index 00000000..1fc70124
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/Allocate.java
@@ -0,0 +1,873 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.AvailableHdd;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.AvailableMemory;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.UnallocatedAppInstance;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         //
+ *         // Transformation rule preconditions for rule-based DSE
+ *         //
+ *         
+ *         pattern allocate(App : ApplicationInstance, Host : HostInstance) {
+ *              ApplicationInstance.type.requirements(App, Req);
+ *              ResourceRequirement.hostType.instances(Req, Host);
+ *              find unallocatedAppInstance(App);
+ *              find availableMemory(Host, AvailableMem);
+ *              find availableHdd(Host, AvailableHdd);
+ *              ResourceRequirement.requiredMemory(Req, RequiredMem);
+ *              ResourceRequirement.requiredHdd(Req, RequiredHdd);
+ *              check(AvailableMem {@literal >}= RequiredMem);
+ *              check(AvailableHdd {@literal >}= RequiredHdd);
+ *              neg ApplicationInstance.requirement.instances.allocatedTo(App, Host);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class Allocate extends BaseGeneratedEMFQuerySpecification<Allocate.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.allocate pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private ApplicationInstance fApp;
+    
+    private HostInstance fHost;
+    
+    private static List<String> parameterNames = makeImmutableList("App", "Host");
+    
+    private Match(final ApplicationInstance pApp, final HostInstance pHost) {
+      this.fApp = pApp;
+      this.fHost = pHost;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "App": return this.fApp;
+          case "Host": return this.fHost;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fApp;
+          case 1: return this.fHost;
+          default: return null;
+      }
+    }
+    
+    public ApplicationInstance getApp() {
+      return this.fApp;
+    }
+    
+    public HostInstance getHost() {
+      return this.fHost;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("App".equals(parameterName) ) {
+          this.fApp = (ApplicationInstance) newValue;
+          return true;
+      }
+      if ("Host".equals(parameterName) ) {
+          this.fHost = (HostInstance) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setApp(final ApplicationInstance pApp) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fApp = pApp;
+    }
+    
+    public void setHost(final HostInstance pHost) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fHost = pHost;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.allocate";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return Allocate.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fApp, fHost};
+    }
+    
+    @Override
+    public Allocate.Match toImmutable() {
+      return isMutable() ? newMatch(fApp, fHost) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"App\"=" + prettyPrintValue(fApp) + ", ");
+      result.append("\"Host\"=" + prettyPrintValue(fHost));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fApp, fHost);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof Allocate.Match)) {
+          Allocate.Match other = (Allocate.Match) obj;
+          return Objects.equals(fApp, other.fApp) && Objects.equals(fHost, other.fHost);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public Allocate specification() {
+      return Allocate.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static Allocate.Match newEmptyMatch() {
+      return new Mutable(null, null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static Allocate.Match newMutableMatch(final ApplicationInstance pApp, final HostInstance pHost) {
+      return new Mutable(pApp, pHost);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static Allocate.Match newMatch(final ApplicationInstance pApp, final HostInstance pHost) {
+      return new Immutable(pApp, pHost);
+    }
+    
+    private static final class Mutable extends Allocate.Match {
+      Mutable(final ApplicationInstance pApp, final HostInstance pHost) {
+        super(pApp, pHost);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends Allocate.Match {
+      Immutable(final ApplicationInstance pApp, final HostInstance pHost) {
+        super(pApp, pHost);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.allocate pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * //
+   * // Transformation rule preconditions for rule-based DSE
+   * //
+   * 
+   * pattern allocate(App : ApplicationInstance, Host : HostInstance) {
+   *    ApplicationInstance.type.requirements(App, Req);
+   *    ResourceRequirement.hostType.instances(Req, Host);
+   *    find unallocatedAppInstance(App);
+   *    find availableMemory(Host, AvailableMem);
+   *    find availableHdd(Host, AvailableHdd);
+   *    ResourceRequirement.requiredMemory(Req, RequiredMem);
+   *    ResourceRequirement.requiredHdd(Req, RequiredHdd);
+   *    check(AvailableMem {@literal >}= RequiredMem);
+   *    check(AvailableHdd {@literal >}= RequiredHdd);
+   *    neg ApplicationInstance.requirement.instances.allocatedTo(App, Host);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see Allocate
+   * 
+   */
+  public static class Matcher extends BaseMatcher<Allocate.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static Allocate.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static Allocate.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_APP = 0;
+    
+    private static final int POSITION_HOST = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(Allocate.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<Allocate.Match> getAllMatches(final ApplicationInstance pApp, final HostInstance pHost) {
+      return rawStreamAllMatches(new Object[]{pApp, pHost}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<Allocate.Match> streamAllMatches(final ApplicationInstance pApp, final HostInstance pHost) {
+      return rawStreamAllMatches(new Object[]{pApp, pHost});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<Allocate.Match> getOneArbitraryMatch(final ApplicationInstance pApp, final HostInstance pHost) {
+      return rawGetOneArbitraryMatch(new Object[]{pApp, pHost});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final ApplicationInstance pApp, final HostInstance pHost) {
+      return rawHasMatch(new Object[]{pApp, pHost});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final ApplicationInstance pApp, final HostInstance pHost) {
+      return rawCountMatches(new Object[]{pApp, pHost});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final ApplicationInstance pApp, final HostInstance pHost, final Consumer<? super Allocate.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pApp, pHost}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public Allocate.Match newMatch(final ApplicationInstance pApp, final HostInstance pHost) {
+      return Allocate.Match.newMatch(pApp, pHost);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<ApplicationInstance> rawStreamAllValuesOfApp(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_APP, parameters).map(ApplicationInstance.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<ApplicationInstance> getAllValuesOfApp() {
+      return rawStreamAllValuesOfApp(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<ApplicationInstance> streamAllValuesOfApp() {
+      return rawStreamAllValuesOfApp(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<ApplicationInstance> streamAllValuesOfApp(final Allocate.Match partialMatch) {
+      return rawStreamAllValuesOfApp(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<ApplicationInstance> streamAllValuesOfApp(final HostInstance pHost) {
+      return rawStreamAllValuesOfApp(new Object[]{null, pHost});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<ApplicationInstance> getAllValuesOfApp(final Allocate.Match partialMatch) {
+      return rawStreamAllValuesOfApp(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<ApplicationInstance> getAllValuesOfApp(final HostInstance pHost) {
+      return rawStreamAllValuesOfApp(new Object[]{null, pHost}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<HostInstance> rawStreamAllValuesOfHost(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_HOST, parameters).map(HostInstance.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<HostInstance> getAllValuesOfHost() {
+      return rawStreamAllValuesOfHost(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<HostInstance> streamAllValuesOfHost() {
+      return rawStreamAllValuesOfHost(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<HostInstance> streamAllValuesOfHost(final Allocate.Match partialMatch) {
+      return rawStreamAllValuesOfHost(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<HostInstance> streamAllValuesOfHost(final ApplicationInstance pApp) {
+      return rawStreamAllValuesOfHost(new Object[]{pApp, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<HostInstance> getAllValuesOfHost(final Allocate.Match partialMatch) {
+      return rawStreamAllValuesOfHost(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<HostInstance> getAllValuesOfHost(final ApplicationInstance pApp) {
+      return rawStreamAllValuesOfHost(new Object[]{pApp, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected Allocate.Match tupleToMatch(final Tuple t) {
+      try {
+          return Allocate.Match.newMatch((ApplicationInstance) t.get(POSITION_APP), (HostInstance) t.get(POSITION_HOST));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Allocate.Match arrayToMatch(final Object[] match) {
+      try {
+          return Allocate.Match.newMatch((ApplicationInstance) match[POSITION_APP], (HostInstance) match[POSITION_HOST]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected Allocate.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return Allocate.Match.newMutableMatch((ApplicationInstance) match[POSITION_APP], (HostInstance) match[POSITION_HOST]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<Allocate.Matcher> querySpecification() {
+      return Allocate.instance();
+    }
+  }
+  
+  private Allocate() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static Allocate instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected Allocate.Matcher instantiate(final ViatraQueryEngine engine) {
+    return Allocate.Matcher.on(engine);
+  }
+  
+  @Override
+  public Allocate.Matcher instantiate() {
+    return Allocate.Matcher.create();
+  }
+  
+  @Override
+  public Allocate.Match newEmptyMatch() {
+    return Allocate.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public Allocate.Match newMatch(final Object... parameters) {
+    return Allocate.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance) parameters[0], (hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link Allocate} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link Allocate#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final Allocate INSTANCE = new Allocate();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final Allocate.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_App = new PParameter("App", "hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "ApplicationInstance")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_Host = new PParameter("Host", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_App, parameter_Host);
+    
+    private class Embedded_1_ApplicationInstance_requirement_instances_allocatedTo extends BaseGeneratedEMFPQuery {
+      private final PParameter parameter_p0 = new PParameter("p0", "hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "ApplicationInstance")), PParameterDirection.INOUT);
+      
+      private final PParameter parameter_p1 = new PParameter("p1", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+      
+      private final List<PParameter> embeddedParameters = Arrays.asList(parameter_p0, parameter_p1);
+      
+      public Embedded_1_ApplicationInstance_requirement_instances_allocatedTo() {
+        super(PVisibility.EMBEDDED);
+      }
+      
+      @Override
+      public String getFullyQualifiedName() {
+        return GeneratedPQuery.this.getFullyQualifiedName() + "$Embedded_1_ApplicationInstance_requirement_instances_allocatedTo";
+      }
+      
+      @Override
+      public List<PParameter> getParameters() {
+        return embeddedParameters;
+      }
+      
+      @Override
+      public Set<PBody> doGetContainedBodies() {
+        PBody body = new PBody(this);
+        PVariable var_p0 = body.getOrCreateVariableByName("p0");
+        PVariable var_p1 = body.getOrCreateVariableByName("p1");
+        body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+           new ExportedParameter(body, var_p0, parameter_p0),
+           new ExportedParameter(body, var_p1, parameter_p1)
+        ));
+        //  ApplicationInstance.requirement.instances.allocatedTo(App, Host)
+        new TypeConstraint(body, Tuples.flatTupleOf(var_p0), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+        PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+        new TypeConstraint(body, Tuples.flatTupleOf(var_p0, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ApplicationInstance", "requirement")));
+        new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "Requirement")));
+        PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+        new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "Requirement", "instances")));
+        new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+        PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
+        new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ApplicationInstance", "allocatedTo")));
+        new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+        new Equality(body, var__virtual_2_, var_p1);
+        return Collections.singleton(body);
+      }
+    }
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.allocate";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("App","Host");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_App = body.getOrCreateVariableByName("App");
+          PVariable var_Host = body.getOrCreateVariableByName("Host");
+          PVariable var_Req = body.getOrCreateVariableByName("Req");
+          PVariable var_AvailableMem = body.getOrCreateVariableByName("AvailableMem");
+          PVariable var_AvailableHdd = body.getOrCreateVariableByName("AvailableHdd");
+          PVariable var_RequiredMem = body.getOrCreateVariableByName("RequiredMem");
+          PVariable var_RequiredHdd = body.getOrCreateVariableByName("RequiredHdd");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_App, parameter_App),
+             new ExportedParameter(body, var_Host, parameter_Host)
+          ));
+          //    ApplicationInstance.type.requirements(App, Req)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ApplicationInstance", "type")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationType")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ApplicationType", "requirements")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ResourceRequirement")));
+          new Equality(body, var__virtual_1_, var_Req);
+          //    ResourceRequirement.hostType.instances(Req, Host)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ResourceRequirement")));
+          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ResourceRequirement", "hostType")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostType")));
+          PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "HostType", "instances")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_3_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          new Equality(body, var__virtual_3_, var_Host);
+          //    find unallocatedAppInstance(App)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_App), UnallocatedAppInstance.instance().getInternalQueryRepresentation());
+          //    find availableMemory(Host, AvailableMem)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_Host, var_AvailableMem), AvailableMemory.instance().getInternalQueryRepresentation());
+          //    find availableHdd(Host, AvailableHdd)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_Host, var_AvailableHdd), AvailableHdd.instance().getInternalQueryRepresentation());
+          //    ResourceRequirement.requiredMemory(Req, RequiredMem)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ResourceRequirement")));
+          PVariable var__virtual_4_ = body.getOrCreateVariableByName(".virtual{4}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req, var__virtual_4_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ResourceRequirement", "requiredMemory")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_4_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EInt")));
+          new Equality(body, var__virtual_4_, var_RequiredMem);
+          //    ResourceRequirement.requiredHdd(Req, RequiredHdd)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ResourceRequirement")));
+          PVariable var__virtual_5_ = body.getOrCreateVariableByName(".virtual{5}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req, var__virtual_5_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ResourceRequirement", "requiredHdd")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_5_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EInt")));
+          new Equality(body, var__virtual_5_, var_RequiredHdd);
+          //    check(AvailableMem >= RequiredMem)
+          new ExpressionEvaluation(body, new IExpressionEvaluator() {
+          
+              @Override
+              public String getShortDescription() {
+                  return "Expression evaluation from pattern allocate";
+              }
+              
+              @Override
+              public Iterable<String> getInputParameterNames() {
+                  return Arrays.asList("AvailableMem", "RequiredMem");}
+          
+              @Override
+              public Object evaluateExpression(IValueProvider provider) throws Exception {
+                  Integer AvailableMem = (Integer) provider.getValue("AvailableMem");
+                  Integer RequiredMem = (Integer) provider.getValue("RequiredMem");
+                  return evaluateExpression_1_1(AvailableMem, RequiredMem);
+              }
+          },  null); 
+          //    check(AvailableHdd >= RequiredHdd)
+          new ExpressionEvaluation(body, new IExpressionEvaluator() {
+          
+              @Override
+              public String getShortDescription() {
+                  return "Expression evaluation from pattern allocate";
+              }
+              
+              @Override
+              public Iterable<String> getInputParameterNames() {
+                  return Arrays.asList("AvailableHdd", "RequiredHdd");}
+          
+              @Override
+              public Object evaluateExpression(IValueProvider provider) throws Exception {
+                  Integer AvailableHdd = (Integer) provider.getValue("AvailableHdd");
+                  Integer RequiredHdd = (Integer) provider.getValue("RequiredHdd");
+                  return evaluateExpression_1_2(AvailableHdd, RequiredHdd);
+              }
+          },  null); 
+          //    neg ApplicationInstance.requirement.instances.allocatedTo(App, Host)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var_App, var_Host), new Allocate.GeneratedPQuery.Embedded_1_ApplicationInstance_requirement_instances_allocatedTo());
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+  
+  private static boolean evaluateExpression_1_1(final Integer AvailableMem, final Integer RequiredMem) {
+    boolean _greaterEqualsThan = (AvailableMem.compareTo(RequiredMem) >= 0);
+    return _greaterEqualsThan;
+  }
+  
+  private static boolean evaluateExpression_1_2(final Integer AvailableHdd, final Integer RequiredHdd) {
+    boolean _greaterEqualsThan = (AvailableHdd.compareTo(RequiredHdd) >= 0);
+    return _greaterEqualsThan;
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/AllocationWithoutResourceRequirement.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/AllocationWithoutResourceRequirement.java
new file mode 100644
index 00000000..b49fee74
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/AllocationWithoutResourceRequirement.java
@@ -0,0 +1,728 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.ResourceRequirement;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(severity = "error", key = {Host, App},
+ *              message = "Application instance must be allocated to a supported host type.")
+ *         pattern allocationWithoutResourceRequirement(Host : HostInstance, App : ApplicationInstance) {
+ *              ApplicationInstance.allocatedTo(App, Host);
+ *              neg find resourceRequirement(Host, App, _);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class AllocationWithoutResourceRequirement extends BaseGeneratedEMFQuerySpecification<AllocationWithoutResourceRequirement.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.allocationWithoutResourceRequirement pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private HostInstance fHost;
+    
+    private ApplicationInstance fApp;
+    
+    private static List<String> parameterNames = makeImmutableList("Host", "App");
+    
+    private Match(final HostInstance pHost, final ApplicationInstance pApp) {
+      this.fHost = pHost;
+      this.fApp = pApp;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "Host": return this.fHost;
+          case "App": return this.fApp;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fHost;
+          case 1: return this.fApp;
+          default: return null;
+      }
+    }
+    
+    public HostInstance getHost() {
+      return this.fHost;
+    }
+    
+    public ApplicationInstance getApp() {
+      return this.fApp;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("Host".equals(parameterName) ) {
+          this.fHost = (HostInstance) newValue;
+          return true;
+      }
+      if ("App".equals(parameterName) ) {
+          this.fApp = (ApplicationInstance) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setHost(final HostInstance pHost) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fHost = pHost;
+    }
+    
+    public void setApp(final ApplicationInstance pApp) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fApp = pApp;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.allocationWithoutResourceRequirement";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return AllocationWithoutResourceRequirement.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fHost, fApp};
+    }
+    
+    @Override
+    public AllocationWithoutResourceRequirement.Match toImmutable() {
+      return isMutable() ? newMatch(fHost, fApp) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"Host\"=" + prettyPrintValue(fHost) + ", ");
+      result.append("\"App\"=" + prettyPrintValue(fApp));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fHost, fApp);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof AllocationWithoutResourceRequirement.Match)) {
+          AllocationWithoutResourceRequirement.Match other = (AllocationWithoutResourceRequirement.Match) obj;
+          return Objects.equals(fHost, other.fHost) && Objects.equals(fApp, other.fApp);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public AllocationWithoutResourceRequirement specification() {
+      return AllocationWithoutResourceRequirement.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static AllocationWithoutResourceRequirement.Match newEmptyMatch() {
+      return new Mutable(null, null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static AllocationWithoutResourceRequirement.Match newMutableMatch(final HostInstance pHost, final ApplicationInstance pApp) {
+      return new Mutable(pHost, pApp);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static AllocationWithoutResourceRequirement.Match newMatch(final HostInstance pHost, final ApplicationInstance pApp) {
+      return new Immutable(pHost, pApp);
+    }
+    
+    private static final class Mutable extends AllocationWithoutResourceRequirement.Match {
+      Mutable(final HostInstance pHost, final ApplicationInstance pApp) {
+        super(pHost, pApp);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends AllocationWithoutResourceRequirement.Match {
+      Immutable(final HostInstance pHost, final ApplicationInstance pApp) {
+        super(pHost, pApp);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.allocationWithoutResourceRequirement pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(severity = "error", key = {Host, App},
+   *    message = "Application instance must be allocated to a supported host type.")
+   * pattern allocationWithoutResourceRequirement(Host : HostInstance, App : ApplicationInstance) {
+   *    ApplicationInstance.allocatedTo(App, Host);
+   *    neg find resourceRequirement(Host, App, _);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see AllocationWithoutResourceRequirement
+   * 
+   */
+  public static class Matcher extends BaseMatcher<AllocationWithoutResourceRequirement.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static AllocationWithoutResourceRequirement.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static AllocationWithoutResourceRequirement.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_HOST = 0;
+    
+    private static final int POSITION_APP = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(AllocationWithoutResourceRequirement.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<AllocationWithoutResourceRequirement.Match> getAllMatches(final HostInstance pHost, final ApplicationInstance pApp) {
+      return rawStreamAllMatches(new Object[]{pHost, pApp}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<AllocationWithoutResourceRequirement.Match> streamAllMatches(final HostInstance pHost, final ApplicationInstance pApp) {
+      return rawStreamAllMatches(new Object[]{pHost, pApp});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<AllocationWithoutResourceRequirement.Match> getOneArbitraryMatch(final HostInstance pHost, final ApplicationInstance pApp) {
+      return rawGetOneArbitraryMatch(new Object[]{pHost, pApp});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final HostInstance pHost, final ApplicationInstance pApp) {
+      return rawHasMatch(new Object[]{pHost, pApp});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final HostInstance pHost, final ApplicationInstance pApp) {
+      return rawCountMatches(new Object[]{pHost, pApp});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final HostInstance pHost, final ApplicationInstance pApp, final Consumer<? super AllocationWithoutResourceRequirement.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pHost, pApp}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public AllocationWithoutResourceRequirement.Match newMatch(final HostInstance pHost, final ApplicationInstance pApp) {
+      return AllocationWithoutResourceRequirement.Match.newMatch(pHost, pApp);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<HostInstance> rawStreamAllValuesOfHost(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_HOST, parameters).map(HostInstance.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<HostInstance> getAllValuesOfHost() {
+      return rawStreamAllValuesOfHost(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<HostInstance> streamAllValuesOfHost() {
+      return rawStreamAllValuesOfHost(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<HostInstance> streamAllValuesOfHost(final AllocationWithoutResourceRequirement.Match partialMatch) {
+      return rawStreamAllValuesOfHost(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<HostInstance> streamAllValuesOfHost(final ApplicationInstance pApp) {
+      return rawStreamAllValuesOfHost(new Object[]{null, pApp});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<HostInstance> getAllValuesOfHost(final AllocationWithoutResourceRequirement.Match partialMatch) {
+      return rawStreamAllValuesOfHost(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<HostInstance> getAllValuesOfHost(final ApplicationInstance pApp) {
+      return rawStreamAllValuesOfHost(new Object[]{null, pApp}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<ApplicationInstance> rawStreamAllValuesOfApp(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_APP, parameters).map(ApplicationInstance.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<ApplicationInstance> getAllValuesOfApp() {
+      return rawStreamAllValuesOfApp(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<ApplicationInstance> streamAllValuesOfApp() {
+      return rawStreamAllValuesOfApp(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<ApplicationInstance> streamAllValuesOfApp(final AllocationWithoutResourceRequirement.Match partialMatch) {
+      return rawStreamAllValuesOfApp(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<ApplicationInstance> streamAllValuesOfApp(final HostInstance pHost) {
+      return rawStreamAllValuesOfApp(new Object[]{pHost, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<ApplicationInstance> getAllValuesOfApp(final AllocationWithoutResourceRequirement.Match partialMatch) {
+      return rawStreamAllValuesOfApp(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<ApplicationInstance> getAllValuesOfApp(final HostInstance pHost) {
+      return rawStreamAllValuesOfApp(new Object[]{pHost, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected AllocationWithoutResourceRequirement.Match tupleToMatch(final Tuple t) {
+      try {
+          return AllocationWithoutResourceRequirement.Match.newMatch((HostInstance) t.get(POSITION_HOST), (ApplicationInstance) t.get(POSITION_APP));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected AllocationWithoutResourceRequirement.Match arrayToMatch(final Object[] match) {
+      try {
+          return AllocationWithoutResourceRequirement.Match.newMatch((HostInstance) match[POSITION_HOST], (ApplicationInstance) match[POSITION_APP]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected AllocationWithoutResourceRequirement.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return AllocationWithoutResourceRequirement.Match.newMutableMatch((HostInstance) match[POSITION_HOST], (ApplicationInstance) match[POSITION_APP]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<AllocationWithoutResourceRequirement.Matcher> querySpecification() {
+      return AllocationWithoutResourceRequirement.instance();
+    }
+  }
+  
+  private AllocationWithoutResourceRequirement() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static AllocationWithoutResourceRequirement instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected AllocationWithoutResourceRequirement.Matcher instantiate(final ViatraQueryEngine engine) {
+    return AllocationWithoutResourceRequirement.Matcher.on(engine);
+  }
+  
+  @Override
+  public AllocationWithoutResourceRequirement.Matcher instantiate() {
+    return AllocationWithoutResourceRequirement.Matcher.create();
+  }
+  
+  @Override
+  public AllocationWithoutResourceRequirement.Match newEmptyMatch() {
+    return AllocationWithoutResourceRequirement.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public AllocationWithoutResourceRequirement.Match newMatch(final Object... parameters) {
+    return AllocationWithoutResourceRequirement.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance) parameters[0], (hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link AllocationWithoutResourceRequirement} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link AllocationWithoutResourceRequirement#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final AllocationWithoutResourceRequirement INSTANCE = new AllocationWithoutResourceRequirement();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final AllocationWithoutResourceRequirement.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Host = new PParameter("Host", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_App = new PParameter("App", "hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "ApplicationInstance")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Host, parameter_App);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.allocationWithoutResourceRequirement";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Host","App");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Host = body.getOrCreateVariableByName("Host");
+          PVariable var_App = body.getOrCreateVariableByName("App");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Host, parameter_Host),
+             new ExportedParameter(body, var_App, parameter_App)
+          ));
+          //    ApplicationInstance.allocatedTo(App, Host)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ApplicationInstance", "allocatedTo")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          new Equality(body, var__virtual_0_, var_Host);
+          //    neg find resourceRequirement(Host, App, _)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var_Host, var_App, var___0_), ResourceRequirement.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("Host"), 
+                              new ParameterReference("App")
+                              }));
+          annotation.addAttribute("message", "Application instance must be allocated to a supported host type.");
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/AverageFreeHddMetric.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/AverageFreeHddMetric.java
new file mode 100644
index 00000000..607854bf
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/AverageFreeHddMetric.java
@@ -0,0 +1,554 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.FreeHddPercentage;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.matchers.aggregators.avg;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         // Free HDD
+ *         
+ *         pattern averageFreeHddMetric(Average : java Double) {
+ *              Average == avg find freeHddPercentage(_, #_);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class AverageFreeHddMetric extends BaseGeneratedEMFQuerySpecification<AverageFreeHddMetric.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.averageFreeHddMetric pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Double fAverage;
+    
+    private static List<String> parameterNames = makeImmutableList("Average");
+    
+    private Match(final Double pAverage) {
+      this.fAverage = pAverage;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "Average": return this.fAverage;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fAverage;
+          default: return null;
+      }
+    }
+    
+    public Double getAverage() {
+      return this.fAverage;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("Average".equals(parameterName) ) {
+          this.fAverage = (Double) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setAverage(final Double pAverage) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fAverage = pAverage;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.averageFreeHddMetric";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return AverageFreeHddMetric.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fAverage};
+    }
+    
+    @Override
+    public AverageFreeHddMetric.Match toImmutable() {
+      return isMutable() ? newMatch(fAverage) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"Average\"=" + prettyPrintValue(fAverage));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fAverage);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof AverageFreeHddMetric.Match)) {
+          AverageFreeHddMetric.Match other = (AverageFreeHddMetric.Match) obj;
+          return Objects.equals(fAverage, other.fAverage);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public AverageFreeHddMetric specification() {
+      return AverageFreeHddMetric.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static AverageFreeHddMetric.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pAverage the fixed value of pattern parameter Average, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static AverageFreeHddMetric.Match newMutableMatch(final Double pAverage) {
+      return new Mutable(pAverage);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pAverage the fixed value of pattern parameter Average, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static AverageFreeHddMetric.Match newMatch(final Double pAverage) {
+      return new Immutable(pAverage);
+    }
+    
+    private static final class Mutable extends AverageFreeHddMetric.Match {
+      Mutable(final Double pAverage) {
+        super(pAverage);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends AverageFreeHddMetric.Match {
+      Immutable(final Double pAverage) {
+        super(pAverage);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.averageFreeHddMetric pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * // Free HDD
+   * 
+   * pattern averageFreeHddMetric(Average : java Double) {
+   *    Average == avg find freeHddPercentage(_, #_);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see AverageFreeHddMetric
+   * 
+   */
+  public static class Matcher extends BaseMatcher<AverageFreeHddMetric.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static AverageFreeHddMetric.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static AverageFreeHddMetric.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_AVERAGE = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(AverageFreeHddMetric.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pAverage the fixed value of pattern parameter Average, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<AverageFreeHddMetric.Match> getAllMatches(final Double pAverage) {
+      return rawStreamAllMatches(new Object[]{pAverage}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pAverage the fixed value of pattern parameter Average, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<AverageFreeHddMetric.Match> streamAllMatches(final Double pAverage) {
+      return rawStreamAllMatches(new Object[]{pAverage});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pAverage the fixed value of pattern parameter Average, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<AverageFreeHddMetric.Match> getOneArbitraryMatch(final Double pAverage) {
+      return rawGetOneArbitraryMatch(new Object[]{pAverage});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pAverage the fixed value of pattern parameter Average, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Double pAverage) {
+      return rawHasMatch(new Object[]{pAverage});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pAverage the fixed value of pattern parameter Average, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Double pAverage) {
+      return rawCountMatches(new Object[]{pAverage});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pAverage the fixed value of pattern parameter Average, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Double pAverage, final Consumer<? super AverageFreeHddMetric.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pAverage}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pAverage the fixed value of pattern parameter Average, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public AverageFreeHddMetric.Match newMatch(final Double pAverage) {
+      return AverageFreeHddMetric.Match.newMatch(pAverage);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Average.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Double> rawStreamAllValuesOfAverage(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_AVERAGE, parameters).map(Double.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Average.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Double> getAllValuesOfAverage() {
+      return rawStreamAllValuesOfAverage(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Average.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Double> streamAllValuesOfAverage() {
+      return rawStreamAllValuesOfAverage(emptyArray());
+    }
+    
+    @Override
+    protected AverageFreeHddMetric.Match tupleToMatch(final Tuple t) {
+      try {
+          return AverageFreeHddMetric.Match.newMatch((Double) t.get(POSITION_AVERAGE));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected AverageFreeHddMetric.Match arrayToMatch(final Object[] match) {
+      try {
+          return AverageFreeHddMetric.Match.newMatch((Double) match[POSITION_AVERAGE]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected AverageFreeHddMetric.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return AverageFreeHddMetric.Match.newMutableMatch((Double) match[POSITION_AVERAGE]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<AverageFreeHddMetric.Matcher> querySpecification() {
+      return AverageFreeHddMetric.instance();
+    }
+  }
+  
+  private AverageFreeHddMetric() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static AverageFreeHddMetric instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected AverageFreeHddMetric.Matcher instantiate(final ViatraQueryEngine engine) {
+    return AverageFreeHddMetric.Matcher.on(engine);
+  }
+  
+  @Override
+  public AverageFreeHddMetric.Matcher instantiate() {
+    return AverageFreeHddMetric.Matcher.create();
+  }
+  
+  @Override
+  public AverageFreeHddMetric.Match newEmptyMatch() {
+    return AverageFreeHddMetric.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public AverageFreeHddMetric.Match newMatch(final Object... parameters) {
+    return AverageFreeHddMetric.Match.newMatch((java.lang.Double) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link AverageFreeHddMetric} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link AverageFreeHddMetric#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final AverageFreeHddMetric INSTANCE = new AverageFreeHddMetric();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final AverageFreeHddMetric.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Average = new PParameter("Average", "java.lang.Double", new JavaTransitiveInstancesKey(java.lang.Double.class), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Average);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.averageFreeHddMetric";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Average");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Average = body.getOrCreateVariableByName("Average");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");
+          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Average), new JavaTransitiveInstancesKey(java.lang.Double.class));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Average, parameter_Average)
+          ));
+          //    Average == avg find freeHddPercentage(_, #_)
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new AggregatorConstraint(new avg().getAggregatorLogic(Double.class), body, Tuples.flatTupleOf(var___0_, var___1_), FreeHddPercentage.instance().getInternalQueryRepresentation(), var__virtual_0_, 1);
+          new Equality(body, var_Average, var__virtual_0_);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/AverageFreeMemoryMetric.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/AverageFreeMemoryMetric.java
new file mode 100644
index 00000000..627a5f89
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/AverageFreeMemoryMetric.java
@@ -0,0 +1,562 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.FreeMemoryPercentage;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.matchers.aggregators.avg;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         //
+ *         // Metrics
+ *         //
+ *         
+ *         // Free memory
+ *         
+ *         pattern averageFreeMemoryMetric(Average : java Double) {
+ *              Average == avg find freeMemoryPercentage(_, #_);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class AverageFreeMemoryMetric extends BaseGeneratedEMFQuerySpecification<AverageFreeMemoryMetric.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.averageFreeMemoryMetric pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Double fAverage;
+    
+    private static List<String> parameterNames = makeImmutableList("Average");
+    
+    private Match(final Double pAverage) {
+      this.fAverage = pAverage;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "Average": return this.fAverage;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fAverage;
+          default: return null;
+      }
+    }
+    
+    public Double getAverage() {
+      return this.fAverage;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("Average".equals(parameterName) ) {
+          this.fAverage = (Double) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setAverage(final Double pAverage) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fAverage = pAverage;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.averageFreeMemoryMetric";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return AverageFreeMemoryMetric.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fAverage};
+    }
+    
+    @Override
+    public AverageFreeMemoryMetric.Match toImmutable() {
+      return isMutable() ? newMatch(fAverage) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"Average\"=" + prettyPrintValue(fAverage));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fAverage);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof AverageFreeMemoryMetric.Match)) {
+          AverageFreeMemoryMetric.Match other = (AverageFreeMemoryMetric.Match) obj;
+          return Objects.equals(fAverage, other.fAverage);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public AverageFreeMemoryMetric specification() {
+      return AverageFreeMemoryMetric.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static AverageFreeMemoryMetric.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pAverage the fixed value of pattern parameter Average, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static AverageFreeMemoryMetric.Match newMutableMatch(final Double pAverage) {
+      return new Mutable(pAverage);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pAverage the fixed value of pattern parameter Average, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static AverageFreeMemoryMetric.Match newMatch(final Double pAverage) {
+      return new Immutable(pAverage);
+    }
+    
+    private static final class Mutable extends AverageFreeMemoryMetric.Match {
+      Mutable(final Double pAverage) {
+        super(pAverage);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends AverageFreeMemoryMetric.Match {
+      Immutable(final Double pAverage) {
+        super(pAverage);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.averageFreeMemoryMetric pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * //
+   * // Metrics
+   * //
+   * 
+   * // Free memory
+   * 
+   * pattern averageFreeMemoryMetric(Average : java Double) {
+   *    Average == avg find freeMemoryPercentage(_, #_);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see AverageFreeMemoryMetric
+   * 
+   */
+  public static class Matcher extends BaseMatcher<AverageFreeMemoryMetric.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static AverageFreeMemoryMetric.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static AverageFreeMemoryMetric.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_AVERAGE = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(AverageFreeMemoryMetric.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pAverage the fixed value of pattern parameter Average, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<AverageFreeMemoryMetric.Match> getAllMatches(final Double pAverage) {
+      return rawStreamAllMatches(new Object[]{pAverage}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pAverage the fixed value of pattern parameter Average, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<AverageFreeMemoryMetric.Match> streamAllMatches(final Double pAverage) {
+      return rawStreamAllMatches(new Object[]{pAverage});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pAverage the fixed value of pattern parameter Average, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<AverageFreeMemoryMetric.Match> getOneArbitraryMatch(final Double pAverage) {
+      return rawGetOneArbitraryMatch(new Object[]{pAverage});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pAverage the fixed value of pattern parameter Average, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Double pAverage) {
+      return rawHasMatch(new Object[]{pAverage});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pAverage the fixed value of pattern parameter Average, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Double pAverage) {
+      return rawCountMatches(new Object[]{pAverage});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pAverage the fixed value of pattern parameter Average, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Double pAverage, final Consumer<? super AverageFreeMemoryMetric.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pAverage}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pAverage the fixed value of pattern parameter Average, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public AverageFreeMemoryMetric.Match newMatch(final Double pAverage) {
+      return AverageFreeMemoryMetric.Match.newMatch(pAverage);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Average.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Double> rawStreamAllValuesOfAverage(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_AVERAGE, parameters).map(Double.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Average.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Double> getAllValuesOfAverage() {
+      return rawStreamAllValuesOfAverage(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Average.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Double> streamAllValuesOfAverage() {
+      return rawStreamAllValuesOfAverage(emptyArray());
+    }
+    
+    @Override
+    protected AverageFreeMemoryMetric.Match tupleToMatch(final Tuple t) {
+      try {
+          return AverageFreeMemoryMetric.Match.newMatch((Double) t.get(POSITION_AVERAGE));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected AverageFreeMemoryMetric.Match arrayToMatch(final Object[] match) {
+      try {
+          return AverageFreeMemoryMetric.Match.newMatch((Double) match[POSITION_AVERAGE]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected AverageFreeMemoryMetric.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return AverageFreeMemoryMetric.Match.newMutableMatch((Double) match[POSITION_AVERAGE]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<AverageFreeMemoryMetric.Matcher> querySpecification() {
+      return AverageFreeMemoryMetric.instance();
+    }
+  }
+  
+  private AverageFreeMemoryMetric() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static AverageFreeMemoryMetric instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected AverageFreeMemoryMetric.Matcher instantiate(final ViatraQueryEngine engine) {
+    return AverageFreeMemoryMetric.Matcher.on(engine);
+  }
+  
+  @Override
+  public AverageFreeMemoryMetric.Matcher instantiate() {
+    return AverageFreeMemoryMetric.Matcher.create();
+  }
+  
+  @Override
+  public AverageFreeMemoryMetric.Match newEmptyMatch() {
+    return AverageFreeMemoryMetric.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public AverageFreeMemoryMetric.Match newMatch(final Object... parameters) {
+    return AverageFreeMemoryMetric.Match.newMatch((java.lang.Double) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link AverageFreeMemoryMetric} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link AverageFreeMemoryMetric#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final AverageFreeMemoryMetric INSTANCE = new AverageFreeMemoryMetric();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final AverageFreeMemoryMetric.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Average = new PParameter("Average", "java.lang.Double", new JavaTransitiveInstancesKey(java.lang.Double.class), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Average);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.averageFreeMemoryMetric";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Average");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Average = body.getOrCreateVariableByName("Average");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");
+          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Average), new JavaTransitiveInstancesKey(java.lang.Double.class));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Average, parameter_Average)
+          ));
+          //    Average == avg find freeMemoryPercentage(_, #_)
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new AggregatorConstraint(new avg().getAggregatorLogic(Double.class), body, Tuples.flatTupleOf(var___0_, var___1_), FreeMemoryPercentage.instance().getInternalQueryRepresentation(), var__virtual_0_, 1);
+          new Equality(body, var_Average, var__virtual_0_);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CostMetric.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CostMetric.java
new file mode 100644
index 00000000..eff44f0a
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CostMetric.java
@@ -0,0 +1,554 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.CpsCost;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.matchers.aggregators.sum;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         // Total cost
+ *         
+ *         pattern costMetric(Cost : java Integer) {
+ *              Cost == sum find cpsCost(_, #_);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class CostMetric extends BaseGeneratedEMFQuerySpecification<CostMetric.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.costMetric pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Integer fCost;
+    
+    private static List<String> parameterNames = makeImmutableList("Cost");
+    
+    private Match(final Integer pCost) {
+      this.fCost = pCost;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "Cost": return this.fCost;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fCost;
+          default: return null;
+      }
+    }
+    
+    public Integer getCost() {
+      return this.fCost;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("Cost".equals(parameterName) ) {
+          this.fCost = (Integer) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setCost(final Integer pCost) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fCost = pCost;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.costMetric";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return CostMetric.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fCost};
+    }
+    
+    @Override
+    public CostMetric.Match toImmutable() {
+      return isMutable() ? newMatch(fCost) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"Cost\"=" + prettyPrintValue(fCost));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fCost);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof CostMetric.Match)) {
+          CostMetric.Match other = (CostMetric.Match) obj;
+          return Objects.equals(fCost, other.fCost);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public CostMetric specification() {
+      return CostMetric.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static CostMetric.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static CostMetric.Match newMutableMatch(final Integer pCost) {
+      return new Mutable(pCost);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static CostMetric.Match newMatch(final Integer pCost) {
+      return new Immutable(pCost);
+    }
+    
+    private static final class Mutable extends CostMetric.Match {
+      Mutable(final Integer pCost) {
+        super(pCost);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends CostMetric.Match {
+      Immutable(final Integer pCost) {
+        super(pCost);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.costMetric pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * // Total cost
+   * 
+   * pattern costMetric(Cost : java Integer) {
+   *    Cost == sum find cpsCost(_, #_);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see CostMetric
+   * 
+   */
+  public static class Matcher extends BaseMatcher<CostMetric.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static CostMetric.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static CostMetric.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_COST = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(CostMetric.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<CostMetric.Match> getAllMatches(final Integer pCost) {
+      return rawStreamAllMatches(new Object[]{pCost}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<CostMetric.Match> streamAllMatches(final Integer pCost) {
+      return rawStreamAllMatches(new Object[]{pCost});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<CostMetric.Match> getOneArbitraryMatch(final Integer pCost) {
+      return rawGetOneArbitraryMatch(new Object[]{pCost});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Integer pCost) {
+      return rawHasMatch(new Object[]{pCost});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Integer pCost) {
+      return rawCountMatches(new Object[]{pCost});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Integer pCost, final Consumer<? super CostMetric.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pCost}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public CostMetric.Match newMatch(final Integer pCost) {
+      return CostMetric.Match.newMatch(pCost);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Cost.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Integer> rawStreamAllValuesOfCost(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_COST, parameters).map(Integer.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Cost.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Integer> getAllValuesOfCost() {
+      return rawStreamAllValuesOfCost(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Cost.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Integer> streamAllValuesOfCost() {
+      return rawStreamAllValuesOfCost(emptyArray());
+    }
+    
+    @Override
+    protected CostMetric.Match tupleToMatch(final Tuple t) {
+      try {
+          return CostMetric.Match.newMatch((Integer) t.get(POSITION_COST));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected CostMetric.Match arrayToMatch(final Object[] match) {
+      try {
+          return CostMetric.Match.newMatch((Integer) match[POSITION_COST]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected CostMetric.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return CostMetric.Match.newMutableMatch((Integer) match[POSITION_COST]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<CostMetric.Matcher> querySpecification() {
+      return CostMetric.instance();
+    }
+  }
+  
+  private CostMetric() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static CostMetric instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected CostMetric.Matcher instantiate(final ViatraQueryEngine engine) {
+    return CostMetric.Matcher.on(engine);
+  }
+  
+  @Override
+  public CostMetric.Matcher instantiate() {
+    return CostMetric.Matcher.create();
+  }
+  
+  @Override
+  public CostMetric.Match newEmptyMatch() {
+    return CostMetric.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public CostMetric.Match newMatch(final Object... parameters) {
+    return CostMetric.Match.newMatch((java.lang.Integer) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link CostMetric} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link CostMetric#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final CostMetric INSTANCE = new CostMetric();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final CostMetric.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Cost = new PParameter("Cost", "java.lang.Integer", new JavaTransitiveInstancesKey(java.lang.Integer.class), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Cost);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.costMetric";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Cost");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Cost = body.getOrCreateVariableByName("Cost");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");
+          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Cost), new JavaTransitiveInstancesKey(java.lang.Integer.class));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Cost, parameter_Cost)
+          ));
+          //    Cost == sum find cpsCost(_, #_)
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new AggregatorConstraint(new sum().getAggregatorLogic(Integer.class), body, Tuples.flatTupleOf(var___0_, var___1_), CpsCost.instance().getInternalQueryRepresentation(), var__virtual_0_, 1);
+          new Equality(body, var_Cost, var__virtual_0_);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsCost.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsCost.java
new file mode 100644
index 00000000..1cf09b0d
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsCost.java
@@ -0,0 +1,749 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.CpsApplications;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.HostInstanceCost;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.aggregators.sum;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.PatternMatchCounter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern cpsCost(Cps : CyberPhysicalSystem, Cost : java Integer) {
+ *              AppCount == count find cpsApplications(Cps, _);
+ *              HostCost == sum find hostInstanceCost(Cps, _, #_);
+ *              Cost == eval(5  AppCount + HostCost);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class CpsCost extends BaseGeneratedEMFQuerySpecification<CpsCost.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.cpsCost pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private CyberPhysicalSystem fCps;
+    
+    private Integer fCost;
+    
+    private static List<String> parameterNames = makeImmutableList("Cps", "Cost");
+    
+    private Match(final CyberPhysicalSystem pCps, final Integer pCost) {
+      this.fCps = pCps;
+      this.fCost = pCost;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "Cps": return this.fCps;
+          case "Cost": return this.fCost;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fCps;
+          case 1: return this.fCost;
+          default: return null;
+      }
+    }
+    
+    public CyberPhysicalSystem getCps() {
+      return this.fCps;
+    }
+    
+    public Integer getCost() {
+      return this.fCost;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("Cps".equals(parameterName) ) {
+          this.fCps = (CyberPhysicalSystem) newValue;
+          return true;
+      }
+      if ("Cost".equals(parameterName) ) {
+          this.fCost = (Integer) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setCps(final CyberPhysicalSystem pCps) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fCps = pCps;
+    }
+    
+    public void setCost(final Integer pCost) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fCost = pCost;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.cpsCost";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return CpsCost.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fCps, fCost};
+    }
+    
+    @Override
+    public CpsCost.Match toImmutable() {
+      return isMutable() ? newMatch(fCps, fCost) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"Cps\"=" + prettyPrintValue(fCps) + ", ");
+      result.append("\"Cost\"=" + prettyPrintValue(fCost));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fCps, fCost);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof CpsCost.Match)) {
+          CpsCost.Match other = (CpsCost.Match) obj;
+          return Objects.equals(fCps, other.fCps) && Objects.equals(fCost, other.fCost);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public CpsCost specification() {
+      return CpsCost.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static CpsCost.Match newEmptyMatch() {
+      return new Mutable(null, null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pCps the fixed value of pattern parameter Cps, or null if not bound.
+     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static CpsCost.Match newMutableMatch(final CyberPhysicalSystem pCps, final Integer pCost) {
+      return new Mutable(pCps, pCost);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pCps the fixed value of pattern parameter Cps, or null if not bound.
+     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static CpsCost.Match newMatch(final CyberPhysicalSystem pCps, final Integer pCost) {
+      return new Immutable(pCps, pCost);
+    }
+    
+    private static final class Mutable extends CpsCost.Match {
+      Mutable(final CyberPhysicalSystem pCps, final Integer pCost) {
+        super(pCps, pCost);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends CpsCost.Match {
+      Immutable(final CyberPhysicalSystem pCps, final Integer pCost) {
+        super(pCps, pCost);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.cpsCost pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern cpsCost(Cps : CyberPhysicalSystem, Cost : java Integer) {
+   *    AppCount == count find cpsApplications(Cps, _);
+   *    HostCost == sum find hostInstanceCost(Cps, _, #_);
+   *    Cost == eval(5  AppCount + HostCost);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see CpsCost
+   * 
+   */
+  public static class Matcher extends BaseMatcher<CpsCost.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static CpsCost.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static CpsCost.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_CPS = 0;
+    
+    private static final int POSITION_COST = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(CpsCost.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pCps the fixed value of pattern parameter Cps, or null if not bound.
+     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<CpsCost.Match> getAllMatches(final CyberPhysicalSystem pCps, final Integer pCost) {
+      return rawStreamAllMatches(new Object[]{pCps, pCost}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pCps the fixed value of pattern parameter Cps, or null if not bound.
+     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<CpsCost.Match> streamAllMatches(final CyberPhysicalSystem pCps, final Integer pCost) {
+      return rawStreamAllMatches(new Object[]{pCps, pCost});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pCps the fixed value of pattern parameter Cps, or null if not bound.
+     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<CpsCost.Match> getOneArbitraryMatch(final CyberPhysicalSystem pCps, final Integer pCost) {
+      return rawGetOneArbitraryMatch(new Object[]{pCps, pCost});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pCps the fixed value of pattern parameter Cps, or null if not bound.
+     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final CyberPhysicalSystem pCps, final Integer pCost) {
+      return rawHasMatch(new Object[]{pCps, pCost});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pCps the fixed value of pattern parameter Cps, or null if not bound.
+     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final CyberPhysicalSystem pCps, final Integer pCost) {
+      return rawCountMatches(new Object[]{pCps, pCost});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pCps the fixed value of pattern parameter Cps, or null if not bound.
+     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final CyberPhysicalSystem pCps, final Integer pCost, final Consumer<? super CpsCost.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pCps, pCost}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pCps the fixed value of pattern parameter Cps, or null if not bound.
+     * @param pCost the fixed value of pattern parameter Cost, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public CpsCost.Match newMatch(final CyberPhysicalSystem pCps, final Integer pCost) {
+      return CpsCost.Match.newMatch(pCps, pCost);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Cps.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<CyberPhysicalSystem> rawStreamAllValuesOfCps(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_CPS, parameters).map(CyberPhysicalSystem.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Cps.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<CyberPhysicalSystem> getAllValuesOfCps() {
+      return rawStreamAllValuesOfCps(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Cps.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<CyberPhysicalSystem> streamAllValuesOfCps() {
+      return rawStreamAllValuesOfCps(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Cps.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<CyberPhysicalSystem> streamAllValuesOfCps(final CpsCost.Match partialMatch) {
+      return rawStreamAllValuesOfCps(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Cps.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<CyberPhysicalSystem> streamAllValuesOfCps(final Integer pCost) {
+      return rawStreamAllValuesOfCps(new Object[]{null, pCost});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Cps.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<CyberPhysicalSystem> getAllValuesOfCps(final CpsCost.Match partialMatch) {
+      return rawStreamAllValuesOfCps(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Cps.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<CyberPhysicalSystem> getAllValuesOfCps(final Integer pCost) {
+      return rawStreamAllValuesOfCps(new Object[]{null, pCost}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Cost.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Integer> rawStreamAllValuesOfCost(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_COST, parameters).map(Integer.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Cost.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Integer> getAllValuesOfCost() {
+      return rawStreamAllValuesOfCost(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Cost.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Integer> streamAllValuesOfCost() {
+      return rawStreamAllValuesOfCost(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Cost.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Integer> streamAllValuesOfCost(final CpsCost.Match partialMatch) {
+      return rawStreamAllValuesOfCost(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Cost.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Integer> streamAllValuesOfCost(final CyberPhysicalSystem pCps) {
+      return rawStreamAllValuesOfCost(new Object[]{pCps, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Cost.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Integer> getAllValuesOfCost(final CpsCost.Match partialMatch) {
+      return rawStreamAllValuesOfCost(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Cost.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Integer> getAllValuesOfCost(final CyberPhysicalSystem pCps) {
+      return rawStreamAllValuesOfCost(new Object[]{pCps, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected CpsCost.Match tupleToMatch(final Tuple t) {
+      try {
+          return CpsCost.Match.newMatch((CyberPhysicalSystem) t.get(POSITION_CPS), (Integer) t.get(POSITION_COST));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected CpsCost.Match arrayToMatch(final Object[] match) {
+      try {
+          return CpsCost.Match.newMatch((CyberPhysicalSystem) match[POSITION_CPS], (Integer) match[POSITION_COST]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected CpsCost.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return CpsCost.Match.newMutableMatch((CyberPhysicalSystem) match[POSITION_CPS], (Integer) match[POSITION_COST]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<CpsCost.Matcher> querySpecification() {
+      return CpsCost.instance();
+    }
+  }
+  
+  private CpsCost() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static CpsCost instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected CpsCost.Matcher instantiate(final ViatraQueryEngine engine) {
+    return CpsCost.Matcher.on(engine);
+  }
+  
+  @Override
+  public CpsCost.Matcher instantiate() {
+    return CpsCost.Matcher.create();
+  }
+  
+  @Override
+  public CpsCost.Match newEmptyMatch() {
+    return CpsCost.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public CpsCost.Match newMatch(final Object... parameters) {
+    return CpsCost.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem) parameters[0], (java.lang.Integer) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link CpsCost} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link CpsCost#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final CpsCost INSTANCE = new CpsCost();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final CpsCost.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Cps = new PParameter("Cps", "hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "CyberPhysicalSystem")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_Cost = new PParameter("Cost", "java.lang.Integer", new JavaTransitiveInstancesKey(java.lang.Integer.class), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Cps, parameter_Cost);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.cpsCost";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Cps","Cost");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Cps = body.getOrCreateVariableByName("Cps");
+          PVariable var_Cost = body.getOrCreateVariableByName("Cost");
+          PVariable var_AppCount = body.getOrCreateVariableByName("AppCount");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          PVariable var_HostCost = body.getOrCreateVariableByName("HostCost");
+          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");
+          PVariable var___2_ = body.getOrCreateVariableByName("_<2>");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Cps), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "CyberPhysicalSystem")));
+          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Cost), new JavaTransitiveInstancesKey(java.lang.Integer.class));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Cps, parameter_Cps),
+             new ExportedParameter(body, var_Cost, parameter_Cost)
+          ));
+          //    AppCount == count find cpsApplications(Cps, _)
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new PatternMatchCounter(body, Tuples.flatTupleOf(var_Cps, var___0_), CpsApplications.instance().getInternalQueryRepresentation(), var__virtual_0_);
+          new Equality(body, var_AppCount, var__virtual_0_);
+          //    HostCost == sum find hostInstanceCost(Cps, _, #_)
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new AggregatorConstraint(new sum().getAggregatorLogic(Integer.class), body, Tuples.flatTupleOf(var_Cps, var___1_, var___2_), HostInstanceCost.instance().getInternalQueryRepresentation(), var__virtual_1_, 2);
+          new Equality(body, var_HostCost, var__virtual_1_);
+          //    Cost == eval(5 * AppCount + HostCost)
+          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
+          new ExpressionEvaluation(body, new IExpressionEvaluator() {
+          
+              @Override
+              public String getShortDescription() {
+                  return "Expression evaluation from pattern cpsCost";
+              }
+              
+              @Override
+              public Iterable<String> getInputParameterNames() {
+                  return Arrays.asList("AppCount", "HostCost");}
+          
+              @Override
+              public Object evaluateExpression(IValueProvider provider) throws Exception {
+                  Integer AppCount = (Integer) provider.getValue("AppCount");
+                  Integer HostCost = (Integer) provider.getValue("HostCost");
+                  return evaluateExpression_1_1(AppCount, HostCost);
+              }
+          },  var__virtual_2_ ); 
+          new Equality(body, var_Cost, var__virtual_2_);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+  
+  private static int evaluateExpression_1_1(final Integer AppCount, final Integer HostCost) {
+    return ((5 * (AppCount).intValue()) + (HostCost).intValue());
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.java
new file mode 100644
index 00000000..c889fbe0
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.java
@@ -0,0 +1,218 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.Allocate;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.AllocationWithoutResourceRequirement;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.AverageFreeHddMetric;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.AverageFreeMemoryMetric;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.CostMetric;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.CpsCost;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.CreateHostInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.GuidanceObjective;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.InstanceDoesNotSatisfyRequirement;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.NotEnoughAvailableHdd;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.NotEnoughAvailableMemory;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.RedundantInstancesOnSameHost;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.RemoveHostInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.RequirementNotSatisfied;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.ResourceRequirement;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.UnallocateAppInstance;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
+
+/**
+ * A pattern group formed of all public patterns defined in CpsQueries.vql.
+ * 
+ * <p>Use the static instance as any {@link interface org.eclipse.viatra.query.runtime.api.IQueryGroup}, to conveniently prepare
+ * a VIATRA Query engine for matching all patterns originally defined in file CpsQueries.vql,
+ * in order to achieve better performance than one-by-one on-demand matcher initialization.
+ * 
+ * <p> From package hu.bme.mit.inf.dslreasoner.domains.cps.queries, the group contains the definition of the following patterns: <ul>
+ * <li>resourceRequirement</li>
+ * <li>allocationWithoutResourceRequirement</li>
+ * <li>notEnoughAvailableMemory</li>
+ * <li>notEnoughAvailableHdd</li>
+ * <li>instanceDoesNotSatisfyRequirement</li>
+ * <li>requirementNotSatisfied</li>
+ * <li>redundantInstancesOnSameHost</li>
+ * <li>averageFreeMemoryMetric</li>
+ * <li>averageFreeHddMetric</li>
+ * <li>costMetric</li>
+ * <li>cpsCost</li>
+ * <li>allocate</li>
+ * <li>unallocateAppInstance</li>
+ * <li>createHostInstance</li>
+ * <li>removeHostInstance</li>
+ * <li>guidanceObjective</li>
+ * </ul>
+ * 
+ * @see IQueryGroup
+ * 
+ */
+@SuppressWarnings("all")
+public final class CpsQueries extends BaseGeneratedPatternGroup {
+  /**
+   * Access the pattern group.
+   * 
+   * @return the singleton instance of the group
+   * @throws ViatraQueryRuntimeException if there was an error loading the generated code of pattern specifications
+   * 
+   */
+  public static CpsQueries instance() {
+    if (INSTANCE == null) {
+        INSTANCE = new CpsQueries();
+    }
+    return INSTANCE;
+  }
+  
+  private static CpsQueries INSTANCE;
+  
+  private CpsQueries() {
+    querySpecifications.add(ResourceRequirement.instance());
+    querySpecifications.add(AllocationWithoutResourceRequirement.instance());
+    querySpecifications.add(NotEnoughAvailableMemory.instance());
+    querySpecifications.add(NotEnoughAvailableHdd.instance());
+    querySpecifications.add(InstanceDoesNotSatisfyRequirement.instance());
+    querySpecifications.add(RequirementNotSatisfied.instance());
+    querySpecifications.add(RedundantInstancesOnSameHost.instance());
+    querySpecifications.add(AverageFreeMemoryMetric.instance());
+    querySpecifications.add(AverageFreeHddMetric.instance());
+    querySpecifications.add(CostMetric.instance());
+    querySpecifications.add(CpsCost.instance());
+    querySpecifications.add(Allocate.instance());
+    querySpecifications.add(UnallocateAppInstance.instance());
+    querySpecifications.add(CreateHostInstance.instance());
+    querySpecifications.add(RemoveHostInstance.instance());
+    querySpecifications.add(GuidanceObjective.instance());
+  }
+  
+  public ResourceRequirement getResourceRequirement() {
+    return ResourceRequirement.instance();
+  }
+  
+  public ResourceRequirement.Matcher getResourceRequirement(final ViatraQueryEngine engine) {
+    return ResourceRequirement.Matcher.on(engine);
+  }
+  
+  public AllocationWithoutResourceRequirement getAllocationWithoutResourceRequirement() {
+    return AllocationWithoutResourceRequirement.instance();
+  }
+  
+  public AllocationWithoutResourceRequirement.Matcher getAllocationWithoutResourceRequirement(final ViatraQueryEngine engine) {
+    return AllocationWithoutResourceRequirement.Matcher.on(engine);
+  }
+  
+  public NotEnoughAvailableMemory getNotEnoughAvailableMemory() {
+    return NotEnoughAvailableMemory.instance();
+  }
+  
+  public NotEnoughAvailableMemory.Matcher getNotEnoughAvailableMemory(final ViatraQueryEngine engine) {
+    return NotEnoughAvailableMemory.Matcher.on(engine);
+  }
+  
+  public NotEnoughAvailableHdd getNotEnoughAvailableHdd() {
+    return NotEnoughAvailableHdd.instance();
+  }
+  
+  public NotEnoughAvailableHdd.Matcher getNotEnoughAvailableHdd(final ViatraQueryEngine engine) {
+    return NotEnoughAvailableHdd.Matcher.on(engine);
+  }
+  
+  public InstanceDoesNotSatisfyRequirement getInstanceDoesNotSatisfyRequirement() {
+    return InstanceDoesNotSatisfyRequirement.instance();
+  }
+  
+  public InstanceDoesNotSatisfyRequirement.Matcher getInstanceDoesNotSatisfyRequirement(final ViatraQueryEngine engine) {
+    return InstanceDoesNotSatisfyRequirement.Matcher.on(engine);
+  }
+  
+  public RequirementNotSatisfied getRequirementNotSatisfied() {
+    return RequirementNotSatisfied.instance();
+  }
+  
+  public RequirementNotSatisfied.Matcher getRequirementNotSatisfied(final ViatraQueryEngine engine) {
+    return RequirementNotSatisfied.Matcher.on(engine);
+  }
+  
+  public RedundantInstancesOnSameHost getRedundantInstancesOnSameHost() {
+    return RedundantInstancesOnSameHost.instance();
+  }
+  
+  public RedundantInstancesOnSameHost.Matcher getRedundantInstancesOnSameHost(final ViatraQueryEngine engine) {
+    return RedundantInstancesOnSameHost.Matcher.on(engine);
+  }
+  
+  public AverageFreeMemoryMetric getAverageFreeMemoryMetric() {
+    return AverageFreeMemoryMetric.instance();
+  }
+  
+  public AverageFreeMemoryMetric.Matcher getAverageFreeMemoryMetric(final ViatraQueryEngine engine) {
+    return AverageFreeMemoryMetric.Matcher.on(engine);
+  }
+  
+  public AverageFreeHddMetric getAverageFreeHddMetric() {
+    return AverageFreeHddMetric.instance();
+  }
+  
+  public AverageFreeHddMetric.Matcher getAverageFreeHddMetric(final ViatraQueryEngine engine) {
+    return AverageFreeHddMetric.Matcher.on(engine);
+  }
+  
+  public CostMetric getCostMetric() {
+    return CostMetric.instance();
+  }
+  
+  public CostMetric.Matcher getCostMetric(final ViatraQueryEngine engine) {
+    return CostMetric.Matcher.on(engine);
+  }
+  
+  public CpsCost getCpsCost() {
+    return CpsCost.instance();
+  }
+  
+  public CpsCost.Matcher getCpsCost(final ViatraQueryEngine engine) {
+    return CpsCost.Matcher.on(engine);
+  }
+  
+  public Allocate getAllocate() {
+    return Allocate.instance();
+  }
+  
+  public Allocate.Matcher getAllocate(final ViatraQueryEngine engine) {
+    return Allocate.Matcher.on(engine);
+  }
+  
+  public UnallocateAppInstance getUnallocateAppInstance() {
+    return UnallocateAppInstance.instance();
+  }
+  
+  public UnallocateAppInstance.Matcher getUnallocateAppInstance(final ViatraQueryEngine engine) {
+    return UnallocateAppInstance.Matcher.on(engine);
+  }
+  
+  public CreateHostInstance getCreateHostInstance() {
+    return CreateHostInstance.instance();
+  }
+  
+  public CreateHostInstance.Matcher getCreateHostInstance(final ViatraQueryEngine engine) {
+    return CreateHostInstance.Matcher.on(engine);
+  }
+  
+  public RemoveHostInstance getRemoveHostInstance() {
+    return RemoveHostInstance.instance();
+  }
+  
+  public RemoveHostInstance.Matcher getRemoveHostInstance(final ViatraQueryEngine engine) {
+    return RemoveHostInstance.Matcher.on(engine);
+  }
+  
+  public GuidanceObjective getGuidanceObjective() {
+    return GuidanceObjective.instance();
+  }
+  
+  public GuidanceObjective.Matcher getGuidanceObjective(final ViatraQueryEngine engine) {
+    return GuidanceObjective.Matcher.on(engine);
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CreateHostInstance.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CreateHostInstance.java
new file mode 100644
index 00000000..04036e11
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CreateHostInstance.java
@@ -0,0 +1,563 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostType;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.UnallocatedAppInstance;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern createHostInstance(HostType : HostType) {
+ *              find unallocatedAppInstance(App);
+ *              ApplicationInstance.type.requirements.hostType(App, HostType);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class CreateHostInstance extends BaseGeneratedEMFQuerySpecification<CreateHostInstance.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.createHostInstance pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private HostType fHostType;
+    
+    private static List<String> parameterNames = makeImmutableList("HostType");
+    
+    private Match(final HostType pHostType) {
+      this.fHostType = pHostType;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "HostType": return this.fHostType;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fHostType;
+          default: return null;
+      }
+    }
+    
+    public HostType getHostType() {
+      return this.fHostType;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("HostType".equals(parameterName) ) {
+          this.fHostType = (HostType) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setHostType(final HostType pHostType) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fHostType = pHostType;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.createHostInstance";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return CreateHostInstance.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fHostType};
+    }
+    
+    @Override
+    public CreateHostInstance.Match toImmutable() {
+      return isMutable() ? newMatch(fHostType) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"HostType\"=" + prettyPrintValue(fHostType));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fHostType);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof CreateHostInstance.Match)) {
+          CreateHostInstance.Match other = (CreateHostInstance.Match) obj;
+          return Objects.equals(fHostType, other.fHostType);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public CreateHostInstance specification() {
+      return CreateHostInstance.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static CreateHostInstance.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pHostType the fixed value of pattern parameter HostType, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static CreateHostInstance.Match newMutableMatch(final HostType pHostType) {
+      return new Mutable(pHostType);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pHostType the fixed value of pattern parameter HostType, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static CreateHostInstance.Match newMatch(final HostType pHostType) {
+      return new Immutable(pHostType);
+    }
+    
+    private static final class Mutable extends CreateHostInstance.Match {
+      Mutable(final HostType pHostType) {
+        super(pHostType);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends CreateHostInstance.Match {
+      Immutable(final HostType pHostType) {
+        super(pHostType);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.createHostInstance pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern createHostInstance(HostType : HostType) {
+   *    find unallocatedAppInstance(App);
+   *    ApplicationInstance.type.requirements.hostType(App, HostType);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see CreateHostInstance
+   * 
+   */
+  public static class Matcher extends BaseMatcher<CreateHostInstance.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static CreateHostInstance.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static CreateHostInstance.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_HOSTTYPE = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(CreateHostInstance.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pHostType the fixed value of pattern parameter HostType, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<CreateHostInstance.Match> getAllMatches(final HostType pHostType) {
+      return rawStreamAllMatches(new Object[]{pHostType}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pHostType the fixed value of pattern parameter HostType, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<CreateHostInstance.Match> streamAllMatches(final HostType pHostType) {
+      return rawStreamAllMatches(new Object[]{pHostType});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pHostType the fixed value of pattern parameter HostType, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<CreateHostInstance.Match> getOneArbitraryMatch(final HostType pHostType) {
+      return rawGetOneArbitraryMatch(new Object[]{pHostType});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pHostType the fixed value of pattern parameter HostType, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final HostType pHostType) {
+      return rawHasMatch(new Object[]{pHostType});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pHostType the fixed value of pattern parameter HostType, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final HostType pHostType) {
+      return rawCountMatches(new Object[]{pHostType});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pHostType the fixed value of pattern parameter HostType, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final HostType pHostType, final Consumer<? super CreateHostInstance.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pHostType}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pHostType the fixed value of pattern parameter HostType, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public CreateHostInstance.Match newMatch(final HostType pHostType) {
+      return CreateHostInstance.Match.newMatch(pHostType);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for HostType.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<HostType> rawStreamAllValuesOfHostType(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_HOSTTYPE, parameters).map(HostType.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for HostType.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<HostType> getAllValuesOfHostType() {
+      return rawStreamAllValuesOfHostType(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for HostType.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<HostType> streamAllValuesOfHostType() {
+      return rawStreamAllValuesOfHostType(emptyArray());
+    }
+    
+    @Override
+    protected CreateHostInstance.Match tupleToMatch(final Tuple t) {
+      try {
+          return CreateHostInstance.Match.newMatch((HostType) t.get(POSITION_HOSTTYPE));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected CreateHostInstance.Match arrayToMatch(final Object[] match) {
+      try {
+          return CreateHostInstance.Match.newMatch((HostType) match[POSITION_HOSTTYPE]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected CreateHostInstance.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return CreateHostInstance.Match.newMutableMatch((HostType) match[POSITION_HOSTTYPE]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<CreateHostInstance.Matcher> querySpecification() {
+      return CreateHostInstance.instance();
+    }
+  }
+  
+  private CreateHostInstance() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static CreateHostInstance instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected CreateHostInstance.Matcher instantiate(final ViatraQueryEngine engine) {
+    return CreateHostInstance.Matcher.on(engine);
+  }
+  
+  @Override
+  public CreateHostInstance.Matcher instantiate() {
+    return CreateHostInstance.Matcher.create();
+  }
+  
+  @Override
+  public CreateHostInstance.Match newEmptyMatch() {
+    return CreateHostInstance.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public CreateHostInstance.Match newMatch(final Object... parameters) {
+    return CreateHostInstance.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.cps.HostType) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link CreateHostInstance} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link CreateHostInstance#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final CreateHostInstance INSTANCE = new CreateHostInstance();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final CreateHostInstance.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_HostType = new PParameter("HostType", "hu.bme.mit.inf.dslreasoner.domains.cps.HostType", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostType")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_HostType);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.createHostInstance";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("HostType");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_HostType = body.getOrCreateVariableByName("HostType");
+          PVariable var_App = body.getOrCreateVariableByName("App");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_HostType), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostType")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_HostType, parameter_HostType)
+          ));
+          //    find unallocatedAppInstance(App)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_App), UnallocatedAppInstance.instance().getInternalQueryRepresentation());
+          //    ApplicationInstance.type.requirements.hostType(App, HostType)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ApplicationInstance", "type")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationType")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ApplicationType", "requirements")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ResourceRequirement")));
+          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ResourceRequirement", "hostType")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostType")));
+          new Equality(body, var__virtual_2_, var_HostType);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/GuidanceObjective.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/GuidanceObjective.java
new file mode 100644
index 00000000..1ed6c9cc
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/GuidanceObjective.java
@@ -0,0 +1,601 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.NoHostToAllocateTo;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.RequiredAppInstances;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.UnallocatedAppInstance;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.matchers.aggregators.sum;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.PatternMatchCounter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern guidanceObjective(Value : java Integer) {
+ *              UnallocatedInstances == count find unallocatedAppInstance(_);
+ *              RequiredInstances == sum find requiredAppInstances(_, #_);
+ *              NoHostToAllocate == count find noHostToAllocateTo(_);
+ *              Value == eval(2  UnallocatedInstances + 4  RequiredInstances + NoHostToAllocate);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class GuidanceObjective extends BaseGeneratedEMFQuerySpecification<GuidanceObjective.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.guidanceObjective pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Integer fValue;
+    
+    private static List<String> parameterNames = makeImmutableList("Value");
+    
+    private Match(final Integer pValue) {
+      this.fValue = pValue;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "Value": return this.fValue;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fValue;
+          default: return null;
+      }
+    }
+    
+    public Integer getValue() {
+      return this.fValue;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("Value".equals(parameterName) ) {
+          this.fValue = (Integer) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setValue(final Integer pValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fValue = pValue;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.guidanceObjective";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return GuidanceObjective.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fValue};
+    }
+    
+    @Override
+    public GuidanceObjective.Match toImmutable() {
+      return isMutable() ? newMatch(fValue) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"Value\"=" + prettyPrintValue(fValue));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fValue);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof GuidanceObjective.Match)) {
+          GuidanceObjective.Match other = (GuidanceObjective.Match) obj;
+          return Objects.equals(fValue, other.fValue);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public GuidanceObjective specification() {
+      return GuidanceObjective.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static GuidanceObjective.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pValue the fixed value of pattern parameter Value, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static GuidanceObjective.Match newMutableMatch(final Integer pValue) {
+      return new Mutable(pValue);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pValue the fixed value of pattern parameter Value, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static GuidanceObjective.Match newMatch(final Integer pValue) {
+      return new Immutable(pValue);
+    }
+    
+    private static final class Mutable extends GuidanceObjective.Match {
+      Mutable(final Integer pValue) {
+        super(pValue);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends GuidanceObjective.Match {
+      Immutable(final Integer pValue) {
+        super(pValue);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.guidanceObjective pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern guidanceObjective(Value : java Integer) {
+   *    UnallocatedInstances == count find unallocatedAppInstance(_);
+   *    RequiredInstances == sum find requiredAppInstances(_, #_);
+   *    NoHostToAllocate == count find noHostToAllocateTo(_);
+   *    Value == eval(2  UnallocatedInstances + 4  RequiredInstances + NoHostToAllocate);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see GuidanceObjective
+   * 
+   */
+  public static class Matcher extends BaseMatcher<GuidanceObjective.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static GuidanceObjective.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static GuidanceObjective.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_VALUE = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(GuidanceObjective.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pValue the fixed value of pattern parameter Value, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<GuidanceObjective.Match> getAllMatches(final Integer pValue) {
+      return rawStreamAllMatches(new Object[]{pValue}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pValue the fixed value of pattern parameter Value, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<GuidanceObjective.Match> streamAllMatches(final Integer pValue) {
+      return rawStreamAllMatches(new Object[]{pValue});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pValue the fixed value of pattern parameter Value, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<GuidanceObjective.Match> getOneArbitraryMatch(final Integer pValue) {
+      return rawGetOneArbitraryMatch(new Object[]{pValue});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pValue the fixed value of pattern parameter Value, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Integer pValue) {
+      return rawHasMatch(new Object[]{pValue});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pValue the fixed value of pattern parameter Value, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Integer pValue) {
+      return rawCountMatches(new Object[]{pValue});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pValue the fixed value of pattern parameter Value, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Integer pValue, final Consumer<? super GuidanceObjective.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pValue}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pValue the fixed value of pattern parameter Value, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public GuidanceObjective.Match newMatch(final Integer pValue) {
+      return GuidanceObjective.Match.newMatch(pValue);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Value.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Integer> rawStreamAllValuesOfValue(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_VALUE, parameters).map(Integer.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Value.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Integer> getAllValuesOfValue() {
+      return rawStreamAllValuesOfValue(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Value.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Integer> streamAllValuesOfValue() {
+      return rawStreamAllValuesOfValue(emptyArray());
+    }
+    
+    @Override
+    protected GuidanceObjective.Match tupleToMatch(final Tuple t) {
+      try {
+          return GuidanceObjective.Match.newMatch((Integer) t.get(POSITION_VALUE));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected GuidanceObjective.Match arrayToMatch(final Object[] match) {
+      try {
+          return GuidanceObjective.Match.newMatch((Integer) match[POSITION_VALUE]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected GuidanceObjective.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return GuidanceObjective.Match.newMutableMatch((Integer) match[POSITION_VALUE]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<GuidanceObjective.Matcher> querySpecification() {
+      return GuidanceObjective.instance();
+    }
+  }
+  
+  private GuidanceObjective() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static GuidanceObjective instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected GuidanceObjective.Matcher instantiate(final ViatraQueryEngine engine) {
+    return GuidanceObjective.Matcher.on(engine);
+  }
+  
+  @Override
+  public GuidanceObjective.Matcher instantiate() {
+    return GuidanceObjective.Matcher.create();
+  }
+  
+  @Override
+  public GuidanceObjective.Match newEmptyMatch() {
+    return GuidanceObjective.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public GuidanceObjective.Match newMatch(final Object... parameters) {
+    return GuidanceObjective.Match.newMatch((java.lang.Integer) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link GuidanceObjective} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link GuidanceObjective#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final GuidanceObjective INSTANCE = new GuidanceObjective();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final GuidanceObjective.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Value = new PParameter("Value", "java.lang.Integer", new JavaTransitiveInstancesKey(java.lang.Integer.class), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Value);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.guidanceObjective";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Value");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Value = body.getOrCreateVariableByName("Value");
+          PVariable var_UnallocatedInstances = body.getOrCreateVariableByName("UnallocatedInstances");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          PVariable var_RequiredInstances = body.getOrCreateVariableByName("RequiredInstances");
+          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");
+          PVariable var___2_ = body.getOrCreateVariableByName("_<2>");
+          PVariable var_NoHostToAllocate = body.getOrCreateVariableByName("NoHostToAllocate");
+          PVariable var___3_ = body.getOrCreateVariableByName("_<3>");
+          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Value), new JavaTransitiveInstancesKey(java.lang.Integer.class));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Value, parameter_Value)
+          ));
+          //    UnallocatedInstances == count find unallocatedAppInstance(_)
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new PatternMatchCounter(body, Tuples.flatTupleOf(var___0_), UnallocatedAppInstance.instance().getInternalQueryRepresentation(), var__virtual_0_);
+          new Equality(body, var_UnallocatedInstances, var__virtual_0_);
+          //    RequiredInstances == sum find requiredAppInstances(_, #_)
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new AggregatorConstraint(new sum().getAggregatorLogic(Integer.class), body, Tuples.flatTupleOf(var___1_, var___2_), RequiredAppInstances.instance().getInternalQueryRepresentation(), var__virtual_1_, 1);
+          new Equality(body, var_RequiredInstances, var__virtual_1_);
+          //    NoHostToAllocate == count find noHostToAllocateTo(_)
+          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
+          new PatternMatchCounter(body, Tuples.flatTupleOf(var___3_), NoHostToAllocateTo.instance().getInternalQueryRepresentation(), var__virtual_2_);
+          new Equality(body, var_NoHostToAllocate, var__virtual_2_);
+          //    Value == eval(2 * UnallocatedInstances + 4 * RequiredInstances + NoHostToAllocate)
+          PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");
+          new ExpressionEvaluation(body, new IExpressionEvaluator() {
+          
+              @Override
+              public String getShortDescription() {
+                  return "Expression evaluation from pattern guidanceObjective";
+              }
+              
+              @Override
+              public Iterable<String> getInputParameterNames() {
+                  return Arrays.asList("NoHostToAllocate", "RequiredInstances", "UnallocatedInstances");}
+          
+              @Override
+              public Object evaluateExpression(IValueProvider provider) throws Exception {
+                  Integer NoHostToAllocate = (Integer) provider.getValue("NoHostToAllocate");
+                  Integer RequiredInstances = (Integer) provider.getValue("RequiredInstances");
+                  Integer UnallocatedInstances = (Integer) provider.getValue("UnallocatedInstances");
+                  return evaluateExpression_1_1(NoHostToAllocate, RequiredInstances, UnallocatedInstances);
+              }
+          },  var__virtual_3_ ); 
+          new Equality(body, var_Value, var__virtual_3_);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+  
+  private static int evaluateExpression_1_1(final Integer NoHostToAllocate, final Integer RequiredInstances, final Integer UnallocatedInstances) {
+    return (((2 * (UnallocatedInstances).intValue()) + (4 * (RequiredInstances).intValue())) + (NoHostToAllocate).intValue());
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/InstanceDoesNotSatisfyRequirement.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/InstanceDoesNotSatisfyRequirement.java
new file mode 100644
index 00000000..932501ff
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/InstanceDoesNotSatisfyRequirement.java
@@ -0,0 +1,727 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.Requirement;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.SatisfyingInstance;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(severity = "error", key = {Req, App},
+ *              message = "Requirement must be satisfied by the required application type.")
+ *         pattern instanceDoesNotSatisfyRequirement(Req : Requirement, App : ApplicationInstance) {
+ *              Requirement.instances(Req, App);
+ *              neg find satisfyingInstance(Req, App);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class InstanceDoesNotSatisfyRequirement extends BaseGeneratedEMFQuerySpecification<InstanceDoesNotSatisfyRequirement.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.instanceDoesNotSatisfyRequirement pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Requirement fReq;
+    
+    private ApplicationInstance fApp;
+    
+    private static List<String> parameterNames = makeImmutableList("Req", "App");
+    
+    private Match(final Requirement pReq, final ApplicationInstance pApp) {
+      this.fReq = pReq;
+      this.fApp = pApp;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "Req": return this.fReq;
+          case "App": return this.fApp;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fReq;
+          case 1: return this.fApp;
+          default: return null;
+      }
+    }
+    
+    public Requirement getReq() {
+      return this.fReq;
+    }
+    
+    public ApplicationInstance getApp() {
+      return this.fApp;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("Req".equals(parameterName) ) {
+          this.fReq = (Requirement) newValue;
+          return true;
+      }
+      if ("App".equals(parameterName) ) {
+          this.fApp = (ApplicationInstance) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setReq(final Requirement pReq) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fReq = pReq;
+    }
+    
+    public void setApp(final ApplicationInstance pApp) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fApp = pApp;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.instanceDoesNotSatisfyRequirement";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return InstanceDoesNotSatisfyRequirement.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fReq, fApp};
+    }
+    
+    @Override
+    public InstanceDoesNotSatisfyRequirement.Match toImmutable() {
+      return isMutable() ? newMatch(fReq, fApp) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"Req\"=" + prettyPrintValue(fReq) + ", ");
+      result.append("\"App\"=" + prettyPrintValue(fApp));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fReq, fApp);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof InstanceDoesNotSatisfyRequirement.Match)) {
+          InstanceDoesNotSatisfyRequirement.Match other = (InstanceDoesNotSatisfyRequirement.Match) obj;
+          return Objects.equals(fReq, other.fReq) && Objects.equals(fApp, other.fApp);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public InstanceDoesNotSatisfyRequirement specification() {
+      return InstanceDoesNotSatisfyRequirement.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static InstanceDoesNotSatisfyRequirement.Match newEmptyMatch() {
+      return new Mutable(null, null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static InstanceDoesNotSatisfyRequirement.Match newMutableMatch(final Requirement pReq, final ApplicationInstance pApp) {
+      return new Mutable(pReq, pApp);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static InstanceDoesNotSatisfyRequirement.Match newMatch(final Requirement pReq, final ApplicationInstance pApp) {
+      return new Immutable(pReq, pApp);
+    }
+    
+    private static final class Mutable extends InstanceDoesNotSatisfyRequirement.Match {
+      Mutable(final Requirement pReq, final ApplicationInstance pApp) {
+        super(pReq, pApp);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends InstanceDoesNotSatisfyRequirement.Match {
+      Immutable(final Requirement pReq, final ApplicationInstance pApp) {
+        super(pReq, pApp);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.instanceDoesNotSatisfyRequirement pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(severity = "error", key = {Req, App},
+   *    message = "Requirement must be satisfied by the required application type.")
+   * pattern instanceDoesNotSatisfyRequirement(Req : Requirement, App : ApplicationInstance) {
+   *    Requirement.instances(Req, App);
+   *    neg find satisfyingInstance(Req, App);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see InstanceDoesNotSatisfyRequirement
+   * 
+   */
+  public static class Matcher extends BaseMatcher<InstanceDoesNotSatisfyRequirement.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static InstanceDoesNotSatisfyRequirement.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static InstanceDoesNotSatisfyRequirement.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_REQ = 0;
+    
+    private static final int POSITION_APP = 1;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(InstanceDoesNotSatisfyRequirement.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<InstanceDoesNotSatisfyRequirement.Match> getAllMatches(final Requirement pReq, final ApplicationInstance pApp) {
+      return rawStreamAllMatches(new Object[]{pReq, pApp}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<InstanceDoesNotSatisfyRequirement.Match> streamAllMatches(final Requirement pReq, final ApplicationInstance pApp) {
+      return rawStreamAllMatches(new Object[]{pReq, pApp});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<InstanceDoesNotSatisfyRequirement.Match> getOneArbitraryMatch(final Requirement pReq, final ApplicationInstance pApp) {
+      return rawGetOneArbitraryMatch(new Object[]{pReq, pApp});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Requirement pReq, final ApplicationInstance pApp) {
+      return rawHasMatch(new Object[]{pReq, pApp});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Requirement pReq, final ApplicationInstance pApp) {
+      return rawCountMatches(new Object[]{pReq, pApp});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Requirement pReq, final ApplicationInstance pApp, final Consumer<? super InstanceDoesNotSatisfyRequirement.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pReq, pApp}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public InstanceDoesNotSatisfyRequirement.Match newMatch(final Requirement pReq, final ApplicationInstance pApp) {
+      return InstanceDoesNotSatisfyRequirement.Match.newMatch(pReq, pApp);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Requirement> rawStreamAllValuesOfReq(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_REQ, parameters).map(Requirement.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Requirement> getAllValuesOfReq() {
+      return rawStreamAllValuesOfReq(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Requirement> streamAllValuesOfReq() {
+      return rawStreamAllValuesOfReq(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Requirement> streamAllValuesOfReq(final InstanceDoesNotSatisfyRequirement.Match partialMatch) {
+      return rawStreamAllValuesOfReq(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Requirement> streamAllValuesOfReq(final ApplicationInstance pApp) {
+      return rawStreamAllValuesOfReq(new Object[]{null, pApp});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Requirement> getAllValuesOfReq(final InstanceDoesNotSatisfyRequirement.Match partialMatch) {
+      return rawStreamAllValuesOfReq(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Requirement> getAllValuesOfReq(final ApplicationInstance pApp) {
+      return rawStreamAllValuesOfReq(new Object[]{null, pApp}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<ApplicationInstance> rawStreamAllValuesOfApp(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_APP, parameters).map(ApplicationInstance.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<ApplicationInstance> getAllValuesOfApp() {
+      return rawStreamAllValuesOfApp(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<ApplicationInstance> streamAllValuesOfApp() {
+      return rawStreamAllValuesOfApp(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<ApplicationInstance> streamAllValuesOfApp(final InstanceDoesNotSatisfyRequirement.Match partialMatch) {
+      return rawStreamAllValuesOfApp(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<ApplicationInstance> streamAllValuesOfApp(final Requirement pReq) {
+      return rawStreamAllValuesOfApp(new Object[]{pReq, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<ApplicationInstance> getAllValuesOfApp(final InstanceDoesNotSatisfyRequirement.Match partialMatch) {
+      return rawStreamAllValuesOfApp(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<ApplicationInstance> getAllValuesOfApp(final Requirement pReq) {
+      return rawStreamAllValuesOfApp(new Object[]{pReq, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected InstanceDoesNotSatisfyRequirement.Match tupleToMatch(final Tuple t) {
+      try {
+          return InstanceDoesNotSatisfyRequirement.Match.newMatch((Requirement) t.get(POSITION_REQ), (ApplicationInstance) t.get(POSITION_APP));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected InstanceDoesNotSatisfyRequirement.Match arrayToMatch(final Object[] match) {
+      try {
+          return InstanceDoesNotSatisfyRequirement.Match.newMatch((Requirement) match[POSITION_REQ], (ApplicationInstance) match[POSITION_APP]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected InstanceDoesNotSatisfyRequirement.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return InstanceDoesNotSatisfyRequirement.Match.newMutableMatch((Requirement) match[POSITION_REQ], (ApplicationInstance) match[POSITION_APP]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<InstanceDoesNotSatisfyRequirement.Matcher> querySpecification() {
+      return InstanceDoesNotSatisfyRequirement.instance();
+    }
+  }
+  
+  private InstanceDoesNotSatisfyRequirement() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static InstanceDoesNotSatisfyRequirement instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected InstanceDoesNotSatisfyRequirement.Matcher instantiate(final ViatraQueryEngine engine) {
+    return InstanceDoesNotSatisfyRequirement.Matcher.on(engine);
+  }
+  
+  @Override
+  public InstanceDoesNotSatisfyRequirement.Matcher instantiate() {
+    return InstanceDoesNotSatisfyRequirement.Matcher.create();
+  }
+  
+  @Override
+  public InstanceDoesNotSatisfyRequirement.Match newEmptyMatch() {
+    return InstanceDoesNotSatisfyRequirement.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public InstanceDoesNotSatisfyRequirement.Match newMatch(final Object... parameters) {
+    return InstanceDoesNotSatisfyRequirement.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.cps.Requirement) parameters[0], (hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance) parameters[1]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link InstanceDoesNotSatisfyRequirement} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link InstanceDoesNotSatisfyRequirement#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final InstanceDoesNotSatisfyRequirement INSTANCE = new InstanceDoesNotSatisfyRequirement();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final InstanceDoesNotSatisfyRequirement.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Req = new PParameter("Req", "hu.bme.mit.inf.dslreasoner.domains.cps.Requirement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "Requirement")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_App = new PParameter("App", "hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "ApplicationInstance")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Req, parameter_App);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.instanceDoesNotSatisfyRequirement";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Req","App");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Req = body.getOrCreateVariableByName("Req");
+          PVariable var_App = body.getOrCreateVariableByName("App");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "Requirement")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Req, parameter_Req),
+             new ExportedParameter(body, var_App, parameter_App)
+          ));
+          //    Requirement.instances(Req, App)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "Requirement")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "Requirement", "instances")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          new Equality(body, var__virtual_0_, var_App);
+          //    neg find satisfyingInstance(Req, App)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var_Req, var_App), SatisfyingInstance.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("Req"), 
+                              new ParameterReference("App")
+                              }));
+          annotation.addAttribute("message", "Requirement must be satisfied by the required application type.");
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/NotEnoughAvailableHdd.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/NotEnoughAvailableHdd.java
new file mode 100644
index 00000000..4077c103
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/NotEnoughAvailableHdd.java
@@ -0,0 +1,589 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.AvailableHdd;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(severity = "error", key = {Host},
+ *              message = "Insufficient HDD available on host.")
+ *         pattern notEnoughAvailableHdd(Host : HostInstance) {
+ *              find availableHdd(Host, Hdd);
+ *              check(Hdd {@literal <} 0);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class NotEnoughAvailableHdd extends BaseGeneratedEMFQuerySpecification<NotEnoughAvailableHdd.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.notEnoughAvailableHdd pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private HostInstance fHost;
+    
+    private static List<String> parameterNames = makeImmutableList("Host");
+    
+    private Match(final HostInstance pHost) {
+      this.fHost = pHost;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "Host": return this.fHost;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fHost;
+          default: return null;
+      }
+    }
+    
+    public HostInstance getHost() {
+      return this.fHost;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("Host".equals(parameterName) ) {
+          this.fHost = (HostInstance) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setHost(final HostInstance pHost) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fHost = pHost;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.notEnoughAvailableHdd";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return NotEnoughAvailableHdd.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fHost};
+    }
+    
+    @Override
+    public NotEnoughAvailableHdd.Match toImmutable() {
+      return isMutable() ? newMatch(fHost) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"Host\"=" + prettyPrintValue(fHost));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fHost);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof NotEnoughAvailableHdd.Match)) {
+          NotEnoughAvailableHdd.Match other = (NotEnoughAvailableHdd.Match) obj;
+          return Objects.equals(fHost, other.fHost);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public NotEnoughAvailableHdd specification() {
+      return NotEnoughAvailableHdd.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static NotEnoughAvailableHdd.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static NotEnoughAvailableHdd.Match newMutableMatch(final HostInstance pHost) {
+      return new Mutable(pHost);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static NotEnoughAvailableHdd.Match newMatch(final HostInstance pHost) {
+      return new Immutable(pHost);
+    }
+    
+    private static final class Mutable extends NotEnoughAvailableHdd.Match {
+      Mutable(final HostInstance pHost) {
+        super(pHost);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends NotEnoughAvailableHdd.Match {
+      Immutable(final HostInstance pHost) {
+        super(pHost);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.notEnoughAvailableHdd pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(severity = "error", key = {Host},
+   *    message = "Insufficient HDD available on host.")
+   * pattern notEnoughAvailableHdd(Host : HostInstance) {
+   *    find availableHdd(Host, Hdd);
+   *    check(Hdd {@literal <} 0);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see NotEnoughAvailableHdd
+   * 
+   */
+  public static class Matcher extends BaseMatcher<NotEnoughAvailableHdd.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static NotEnoughAvailableHdd.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static NotEnoughAvailableHdd.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_HOST = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(NotEnoughAvailableHdd.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<NotEnoughAvailableHdd.Match> getAllMatches(final HostInstance pHost) {
+      return rawStreamAllMatches(new Object[]{pHost}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<NotEnoughAvailableHdd.Match> streamAllMatches(final HostInstance pHost) {
+      return rawStreamAllMatches(new Object[]{pHost});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<NotEnoughAvailableHdd.Match> getOneArbitraryMatch(final HostInstance pHost) {
+      return rawGetOneArbitraryMatch(new Object[]{pHost});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final HostInstance pHost) {
+      return rawHasMatch(new Object[]{pHost});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final HostInstance pHost) {
+      return rawCountMatches(new Object[]{pHost});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final HostInstance pHost, final Consumer<? super NotEnoughAvailableHdd.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pHost}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public NotEnoughAvailableHdd.Match newMatch(final HostInstance pHost) {
+      return NotEnoughAvailableHdd.Match.newMatch(pHost);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<HostInstance> rawStreamAllValuesOfHost(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_HOST, parameters).map(HostInstance.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<HostInstance> getAllValuesOfHost() {
+      return rawStreamAllValuesOfHost(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<HostInstance> streamAllValuesOfHost() {
+      return rawStreamAllValuesOfHost(emptyArray());
+    }
+    
+    @Override
+    protected NotEnoughAvailableHdd.Match tupleToMatch(final Tuple t) {
+      try {
+          return NotEnoughAvailableHdd.Match.newMatch((HostInstance) t.get(POSITION_HOST));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected NotEnoughAvailableHdd.Match arrayToMatch(final Object[] match) {
+      try {
+          return NotEnoughAvailableHdd.Match.newMatch((HostInstance) match[POSITION_HOST]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected NotEnoughAvailableHdd.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return NotEnoughAvailableHdd.Match.newMutableMatch((HostInstance) match[POSITION_HOST]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<NotEnoughAvailableHdd.Matcher> querySpecification() {
+      return NotEnoughAvailableHdd.instance();
+    }
+  }
+  
+  private NotEnoughAvailableHdd() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static NotEnoughAvailableHdd instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected NotEnoughAvailableHdd.Matcher instantiate(final ViatraQueryEngine engine) {
+    return NotEnoughAvailableHdd.Matcher.on(engine);
+  }
+  
+  @Override
+  public NotEnoughAvailableHdd.Matcher instantiate() {
+    return NotEnoughAvailableHdd.Matcher.create();
+  }
+  
+  @Override
+  public NotEnoughAvailableHdd.Match newEmptyMatch() {
+    return NotEnoughAvailableHdd.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public NotEnoughAvailableHdd.Match newMatch(final Object... parameters) {
+    return NotEnoughAvailableHdd.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link NotEnoughAvailableHdd} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link NotEnoughAvailableHdd#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final NotEnoughAvailableHdd INSTANCE = new NotEnoughAvailableHdd();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final NotEnoughAvailableHdd.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Host = new PParameter("Host", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Host);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.notEnoughAvailableHdd";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Host");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Host = body.getOrCreateVariableByName("Host");
+          PVariable var_Hdd = body.getOrCreateVariableByName("Hdd");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Host, parameter_Host)
+          ));
+          //    find availableHdd(Host, Hdd)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_Host, var_Hdd), AvailableHdd.instance().getInternalQueryRepresentation());
+          //    check(Hdd < 0)
+          new ExpressionEvaluation(body, new IExpressionEvaluator() {
+          
+              @Override
+              public String getShortDescription() {
+                  return "Expression evaluation from pattern notEnoughAvailableHdd";
+              }
+              
+              @Override
+              public Iterable<String> getInputParameterNames() {
+                  return Arrays.asList("Hdd");}
+          
+              @Override
+              public Object evaluateExpression(IValueProvider provider) throws Exception {
+                  Integer Hdd = (Integer) provider.getValue("Hdd");
+                  return evaluateExpression_1_1(Hdd);
+              }
+          },  null); 
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("Host")
+                              }));
+          annotation.addAttribute("message", "Insufficient HDD available on host.");
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+  
+  private static boolean evaluateExpression_1_1(final Integer Hdd) {
+    return ((Hdd).intValue() < 0);
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/NotEnoughAvailableMemory.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/NotEnoughAvailableMemory.java
new file mode 100644
index 00000000..6e52bee8
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/NotEnoughAvailableMemory.java
@@ -0,0 +1,589 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.AvailableMemory;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(severity = "error", key = {Host},
+ *              message = "Insufficient memory available on host.")
+ *         pattern notEnoughAvailableMemory(Host : HostInstance) {
+ *              find availableMemory(Host, Memory);
+ *              check(Memory {@literal <} 0);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class NotEnoughAvailableMemory extends BaseGeneratedEMFQuerySpecification<NotEnoughAvailableMemory.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.notEnoughAvailableMemory pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private HostInstance fHost;
+    
+    private static List<String> parameterNames = makeImmutableList("Host");
+    
+    private Match(final HostInstance pHost) {
+      this.fHost = pHost;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "Host": return this.fHost;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fHost;
+          default: return null;
+      }
+    }
+    
+    public HostInstance getHost() {
+      return this.fHost;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("Host".equals(parameterName) ) {
+          this.fHost = (HostInstance) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setHost(final HostInstance pHost) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fHost = pHost;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.notEnoughAvailableMemory";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return NotEnoughAvailableMemory.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fHost};
+    }
+    
+    @Override
+    public NotEnoughAvailableMemory.Match toImmutable() {
+      return isMutable() ? newMatch(fHost) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"Host\"=" + prettyPrintValue(fHost));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fHost);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof NotEnoughAvailableMemory.Match)) {
+          NotEnoughAvailableMemory.Match other = (NotEnoughAvailableMemory.Match) obj;
+          return Objects.equals(fHost, other.fHost);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public NotEnoughAvailableMemory specification() {
+      return NotEnoughAvailableMemory.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static NotEnoughAvailableMemory.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static NotEnoughAvailableMemory.Match newMutableMatch(final HostInstance pHost) {
+      return new Mutable(pHost);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static NotEnoughAvailableMemory.Match newMatch(final HostInstance pHost) {
+      return new Immutable(pHost);
+    }
+    
+    private static final class Mutable extends NotEnoughAvailableMemory.Match {
+      Mutable(final HostInstance pHost) {
+        super(pHost);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends NotEnoughAvailableMemory.Match {
+      Immutable(final HostInstance pHost) {
+        super(pHost);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.notEnoughAvailableMemory pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(severity = "error", key = {Host},
+   *    message = "Insufficient memory available on host.")
+   * pattern notEnoughAvailableMemory(Host : HostInstance) {
+   *    find availableMemory(Host, Memory);
+   *    check(Memory {@literal <} 0);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see NotEnoughAvailableMemory
+   * 
+   */
+  public static class Matcher extends BaseMatcher<NotEnoughAvailableMemory.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static NotEnoughAvailableMemory.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static NotEnoughAvailableMemory.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_HOST = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(NotEnoughAvailableMemory.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<NotEnoughAvailableMemory.Match> getAllMatches(final HostInstance pHost) {
+      return rawStreamAllMatches(new Object[]{pHost}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<NotEnoughAvailableMemory.Match> streamAllMatches(final HostInstance pHost) {
+      return rawStreamAllMatches(new Object[]{pHost});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<NotEnoughAvailableMemory.Match> getOneArbitraryMatch(final HostInstance pHost) {
+      return rawGetOneArbitraryMatch(new Object[]{pHost});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final HostInstance pHost) {
+      return rawHasMatch(new Object[]{pHost});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final HostInstance pHost) {
+      return rawCountMatches(new Object[]{pHost});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final HostInstance pHost, final Consumer<? super NotEnoughAvailableMemory.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pHost}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public NotEnoughAvailableMemory.Match newMatch(final HostInstance pHost) {
+      return NotEnoughAvailableMemory.Match.newMatch(pHost);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<HostInstance> rawStreamAllValuesOfHost(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_HOST, parameters).map(HostInstance.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<HostInstance> getAllValuesOfHost() {
+      return rawStreamAllValuesOfHost(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<HostInstance> streamAllValuesOfHost() {
+      return rawStreamAllValuesOfHost(emptyArray());
+    }
+    
+    @Override
+    protected NotEnoughAvailableMemory.Match tupleToMatch(final Tuple t) {
+      try {
+          return NotEnoughAvailableMemory.Match.newMatch((HostInstance) t.get(POSITION_HOST));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected NotEnoughAvailableMemory.Match arrayToMatch(final Object[] match) {
+      try {
+          return NotEnoughAvailableMemory.Match.newMatch((HostInstance) match[POSITION_HOST]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected NotEnoughAvailableMemory.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return NotEnoughAvailableMemory.Match.newMutableMatch((HostInstance) match[POSITION_HOST]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<NotEnoughAvailableMemory.Matcher> querySpecification() {
+      return NotEnoughAvailableMemory.instance();
+    }
+  }
+  
+  private NotEnoughAvailableMemory() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static NotEnoughAvailableMemory instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected NotEnoughAvailableMemory.Matcher instantiate(final ViatraQueryEngine engine) {
+    return NotEnoughAvailableMemory.Matcher.on(engine);
+  }
+  
+  @Override
+  public NotEnoughAvailableMemory.Matcher instantiate() {
+    return NotEnoughAvailableMemory.Matcher.create();
+  }
+  
+  @Override
+  public NotEnoughAvailableMemory.Match newEmptyMatch() {
+    return NotEnoughAvailableMemory.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public NotEnoughAvailableMemory.Match newMatch(final Object... parameters) {
+    return NotEnoughAvailableMemory.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link NotEnoughAvailableMemory} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link NotEnoughAvailableMemory#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final NotEnoughAvailableMemory INSTANCE = new NotEnoughAvailableMemory();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final NotEnoughAvailableMemory.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Host = new PParameter("Host", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Host);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.notEnoughAvailableMemory";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Host");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Host = body.getOrCreateVariableByName("Host");
+          PVariable var_Memory = body.getOrCreateVariableByName("Memory");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Host, parameter_Host)
+          ));
+          //    find availableMemory(Host, Memory)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_Host, var_Memory), AvailableMemory.instance().getInternalQueryRepresentation());
+          //    check(Memory < 0)
+          new ExpressionEvaluation(body, new IExpressionEvaluator() {
+          
+              @Override
+              public String getShortDescription() {
+                  return "Expression evaluation from pattern notEnoughAvailableMemory";
+              }
+              
+              @Override
+              public Iterable<String> getInputParameterNames() {
+                  return Arrays.asList("Memory");}
+          
+              @Override
+              public Object evaluateExpression(IValueProvider provider) throws Exception {
+                  Integer Memory = (Integer) provider.getValue("Memory");
+                  return evaluateExpression_1_1(Memory);
+              }
+          },  null); 
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("Host")
+                              }));
+          annotation.addAttribute("message", "Insufficient memory available on host.");
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+  
+  private static boolean evaluateExpression_1_1(final Integer Memory) {
+    return ((Memory).intValue() < 0);
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/RedundantInstancesOnSameHost.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/RedundantInstancesOnSameHost.java
new file mode 100644
index 00000000..2a40ac57
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/RedundantInstancesOnSameHost.java
@@ -0,0 +1,597 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.Requirement;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(severity = "error", key = {Req},
+ *              message = "Redundant instances must not be allocated to the same host.")
+ *         pattern redundantInstancesOnSameHost(Req : Requirement) {
+ *              Requirement.instances(Req, App1);
+ *              Requirement.instances(Req, App2);
+ *              App1 != App2;
+ *              ApplicationInstance.allocatedTo(App1, Host);
+ *              ApplicationInstance.allocatedTo(App2, Host);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class RedundantInstancesOnSameHost extends BaseGeneratedEMFQuerySpecification<RedundantInstancesOnSameHost.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.redundantInstancesOnSameHost pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Requirement fReq;
+    
+    private static List<String> parameterNames = makeImmutableList("Req");
+    
+    private Match(final Requirement pReq) {
+      this.fReq = pReq;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "Req": return this.fReq;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fReq;
+          default: return null;
+      }
+    }
+    
+    public Requirement getReq() {
+      return this.fReq;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("Req".equals(parameterName) ) {
+          this.fReq = (Requirement) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setReq(final Requirement pReq) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fReq = pReq;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.redundantInstancesOnSameHost";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return RedundantInstancesOnSameHost.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fReq};
+    }
+    
+    @Override
+    public RedundantInstancesOnSameHost.Match toImmutable() {
+      return isMutable() ? newMatch(fReq) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"Req\"=" + prettyPrintValue(fReq));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fReq);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof RedundantInstancesOnSameHost.Match)) {
+          RedundantInstancesOnSameHost.Match other = (RedundantInstancesOnSameHost.Match) obj;
+          return Objects.equals(fReq, other.fReq);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public RedundantInstancesOnSameHost specification() {
+      return RedundantInstancesOnSameHost.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static RedundantInstancesOnSameHost.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static RedundantInstancesOnSameHost.Match newMutableMatch(final Requirement pReq) {
+      return new Mutable(pReq);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static RedundantInstancesOnSameHost.Match newMatch(final Requirement pReq) {
+      return new Immutable(pReq);
+    }
+    
+    private static final class Mutable extends RedundantInstancesOnSameHost.Match {
+      Mutable(final Requirement pReq) {
+        super(pReq);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends RedundantInstancesOnSameHost.Match {
+      Immutable(final Requirement pReq) {
+        super(pReq);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.redundantInstancesOnSameHost pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(severity = "error", key = {Req},
+   *    message = "Redundant instances must not be allocated to the same host.")
+   * pattern redundantInstancesOnSameHost(Req : Requirement) {
+   *    Requirement.instances(Req, App1);
+   *    Requirement.instances(Req, App2);
+   *    App1 != App2;
+   *    ApplicationInstance.allocatedTo(App1, Host);
+   *    ApplicationInstance.allocatedTo(App2, Host);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see RedundantInstancesOnSameHost
+   * 
+   */
+  public static class Matcher extends BaseMatcher<RedundantInstancesOnSameHost.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static RedundantInstancesOnSameHost.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static RedundantInstancesOnSameHost.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_REQ = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(RedundantInstancesOnSameHost.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<RedundantInstancesOnSameHost.Match> getAllMatches(final Requirement pReq) {
+      return rawStreamAllMatches(new Object[]{pReq}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<RedundantInstancesOnSameHost.Match> streamAllMatches(final Requirement pReq) {
+      return rawStreamAllMatches(new Object[]{pReq});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<RedundantInstancesOnSameHost.Match> getOneArbitraryMatch(final Requirement pReq) {
+      return rawGetOneArbitraryMatch(new Object[]{pReq});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Requirement pReq) {
+      return rawHasMatch(new Object[]{pReq});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Requirement pReq) {
+      return rawCountMatches(new Object[]{pReq});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Requirement pReq, final Consumer<? super RedundantInstancesOnSameHost.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pReq}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public RedundantInstancesOnSameHost.Match newMatch(final Requirement pReq) {
+      return RedundantInstancesOnSameHost.Match.newMatch(pReq);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Requirement> rawStreamAllValuesOfReq(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_REQ, parameters).map(Requirement.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Requirement> getAllValuesOfReq() {
+      return rawStreamAllValuesOfReq(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Requirement> streamAllValuesOfReq() {
+      return rawStreamAllValuesOfReq(emptyArray());
+    }
+    
+    @Override
+    protected RedundantInstancesOnSameHost.Match tupleToMatch(final Tuple t) {
+      try {
+          return RedundantInstancesOnSameHost.Match.newMatch((Requirement) t.get(POSITION_REQ));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected RedundantInstancesOnSameHost.Match arrayToMatch(final Object[] match) {
+      try {
+          return RedundantInstancesOnSameHost.Match.newMatch((Requirement) match[POSITION_REQ]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected RedundantInstancesOnSameHost.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return RedundantInstancesOnSameHost.Match.newMutableMatch((Requirement) match[POSITION_REQ]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<RedundantInstancesOnSameHost.Matcher> querySpecification() {
+      return RedundantInstancesOnSameHost.instance();
+    }
+  }
+  
+  private RedundantInstancesOnSameHost() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static RedundantInstancesOnSameHost instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected RedundantInstancesOnSameHost.Matcher instantiate(final ViatraQueryEngine engine) {
+    return RedundantInstancesOnSameHost.Matcher.on(engine);
+  }
+  
+  @Override
+  public RedundantInstancesOnSameHost.Matcher instantiate() {
+    return RedundantInstancesOnSameHost.Matcher.create();
+  }
+  
+  @Override
+  public RedundantInstancesOnSameHost.Match newEmptyMatch() {
+    return RedundantInstancesOnSameHost.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public RedundantInstancesOnSameHost.Match newMatch(final Object... parameters) {
+    return RedundantInstancesOnSameHost.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.cps.Requirement) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link RedundantInstancesOnSameHost} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link RedundantInstancesOnSameHost#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final RedundantInstancesOnSameHost INSTANCE = new RedundantInstancesOnSameHost();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final RedundantInstancesOnSameHost.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Req = new PParameter("Req", "hu.bme.mit.inf.dslreasoner.domains.cps.Requirement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "Requirement")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Req);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.redundantInstancesOnSameHost";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Req");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Req = body.getOrCreateVariableByName("Req");
+          PVariable var_App1 = body.getOrCreateVariableByName("App1");
+          PVariable var_App2 = body.getOrCreateVariableByName("App2");
+          PVariable var_Host = body.getOrCreateVariableByName("Host");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "Requirement")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Req, parameter_Req)
+          ));
+          //    Requirement.instances(Req, App1)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "Requirement")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "Requirement", "instances")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          new Equality(body, var__virtual_0_, var_App1);
+          //    Requirement.instances(Req, App2)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "Requirement")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "Requirement", "instances")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          new Equality(body, var__virtual_1_, var_App2);
+          //    App1 != App2
+          new Inequality(body, var_App1, var_App2);
+          //    ApplicationInstance.allocatedTo(App1, Host)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App1, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ApplicationInstance", "allocatedTo")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          new Equality(body, var__virtual_2_, var_Host);
+          //    ApplicationInstance.allocatedTo(App2, Host)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App2, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ApplicationInstance", "allocatedTo")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_3_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          new Equality(body, var__virtual_3_, var_Host);
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("Req")
+                              }));
+          annotation.addAttribute("message", "Redundant instances must not be allocated to the same host.");
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/RemoveHostInstance.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/RemoveHostInstance.java
new file mode 100644
index 00000000..ed3c903c
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/RemoveHostInstance.java
@@ -0,0 +1,589 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern removeHostInstance(HostInstance : HostInstance) {
+ *              neg HostInstance.applications(HostInstance, _);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class RemoveHostInstance extends BaseGeneratedEMFQuerySpecification<RemoveHostInstance.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.removeHostInstance pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private HostInstance fHostInstance;
+    
+    private static List<String> parameterNames = makeImmutableList("HostInstance");
+    
+    private Match(final HostInstance pHostInstance) {
+      this.fHostInstance = pHostInstance;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "HostInstance": return this.fHostInstance;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fHostInstance;
+          default: return null;
+      }
+    }
+    
+    public HostInstance getHostInstance() {
+      return this.fHostInstance;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("HostInstance".equals(parameterName) ) {
+          this.fHostInstance = (HostInstance) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setHostInstance(final HostInstance pHostInstance) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fHostInstance = pHostInstance;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.removeHostInstance";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return RemoveHostInstance.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fHostInstance};
+    }
+    
+    @Override
+    public RemoveHostInstance.Match toImmutable() {
+      return isMutable() ? newMatch(fHostInstance) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"HostInstance\"=" + prettyPrintValue(fHostInstance));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fHostInstance);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof RemoveHostInstance.Match)) {
+          RemoveHostInstance.Match other = (RemoveHostInstance.Match) obj;
+          return Objects.equals(fHostInstance, other.fHostInstance);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public RemoveHostInstance specification() {
+      return RemoveHostInstance.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static RemoveHostInstance.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pHostInstance the fixed value of pattern parameter HostInstance, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static RemoveHostInstance.Match newMutableMatch(final HostInstance pHostInstance) {
+      return new Mutable(pHostInstance);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pHostInstance the fixed value of pattern parameter HostInstance, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static RemoveHostInstance.Match newMatch(final HostInstance pHostInstance) {
+      return new Immutable(pHostInstance);
+    }
+    
+    private static final class Mutable extends RemoveHostInstance.Match {
+      Mutable(final HostInstance pHostInstance) {
+        super(pHostInstance);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends RemoveHostInstance.Match {
+      Immutable(final HostInstance pHostInstance) {
+        super(pHostInstance);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.removeHostInstance pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern removeHostInstance(HostInstance : HostInstance) {
+   *    neg HostInstance.applications(HostInstance, _);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see RemoveHostInstance
+   * 
+   */
+  public static class Matcher extends BaseMatcher<RemoveHostInstance.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static RemoveHostInstance.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static RemoveHostInstance.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_HOSTINSTANCE = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(RemoveHostInstance.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pHostInstance the fixed value of pattern parameter HostInstance, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<RemoveHostInstance.Match> getAllMatches(final HostInstance pHostInstance) {
+      return rawStreamAllMatches(new Object[]{pHostInstance}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pHostInstance the fixed value of pattern parameter HostInstance, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<RemoveHostInstance.Match> streamAllMatches(final HostInstance pHostInstance) {
+      return rawStreamAllMatches(new Object[]{pHostInstance});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pHostInstance the fixed value of pattern parameter HostInstance, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<RemoveHostInstance.Match> getOneArbitraryMatch(final HostInstance pHostInstance) {
+      return rawGetOneArbitraryMatch(new Object[]{pHostInstance});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pHostInstance the fixed value of pattern parameter HostInstance, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final HostInstance pHostInstance) {
+      return rawHasMatch(new Object[]{pHostInstance});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pHostInstance the fixed value of pattern parameter HostInstance, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final HostInstance pHostInstance) {
+      return rawCountMatches(new Object[]{pHostInstance});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pHostInstance the fixed value of pattern parameter HostInstance, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final HostInstance pHostInstance, final Consumer<? super RemoveHostInstance.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pHostInstance}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pHostInstance the fixed value of pattern parameter HostInstance, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public RemoveHostInstance.Match newMatch(final HostInstance pHostInstance) {
+      return RemoveHostInstance.Match.newMatch(pHostInstance);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for HostInstance.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<HostInstance> rawStreamAllValuesOfHostInstance(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_HOSTINSTANCE, parameters).map(HostInstance.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for HostInstance.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<HostInstance> getAllValuesOfHostInstance() {
+      return rawStreamAllValuesOfHostInstance(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for HostInstance.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<HostInstance> streamAllValuesOfHostInstance() {
+      return rawStreamAllValuesOfHostInstance(emptyArray());
+    }
+    
+    @Override
+    protected RemoveHostInstance.Match tupleToMatch(final Tuple t) {
+      try {
+          return RemoveHostInstance.Match.newMatch((HostInstance) t.get(POSITION_HOSTINSTANCE));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected RemoveHostInstance.Match arrayToMatch(final Object[] match) {
+      try {
+          return RemoveHostInstance.Match.newMatch((HostInstance) match[POSITION_HOSTINSTANCE]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected RemoveHostInstance.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return RemoveHostInstance.Match.newMutableMatch((HostInstance) match[POSITION_HOSTINSTANCE]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<RemoveHostInstance.Matcher> querySpecification() {
+      return RemoveHostInstance.instance();
+    }
+  }
+  
+  private RemoveHostInstance() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static RemoveHostInstance instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected RemoveHostInstance.Matcher instantiate(final ViatraQueryEngine engine) {
+    return RemoveHostInstance.Matcher.on(engine);
+  }
+  
+  @Override
+  public RemoveHostInstance.Matcher instantiate() {
+    return RemoveHostInstance.Matcher.create();
+  }
+  
+  @Override
+  public RemoveHostInstance.Match newEmptyMatch() {
+    return RemoveHostInstance.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public RemoveHostInstance.Match newMatch(final Object... parameters) {
+    return RemoveHostInstance.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link RemoveHostInstance} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link RemoveHostInstance#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final RemoveHostInstance INSTANCE = new RemoveHostInstance();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final RemoveHostInstance.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_HostInstance = new PParameter("HostInstance", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_HostInstance);
+    
+    private class Embedded_1_HostInstance_applications extends BaseGeneratedEMFPQuery {
+      private final PParameter parameter_p0 = new PParameter("p0", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+      
+      private final PParameter parameter_p1 = new PParameter("p1", "hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "ApplicationInstance")), PParameterDirection.INOUT);
+      
+      private final List<PParameter> embeddedParameters = Arrays.asList(parameter_p0, parameter_p1);
+      
+      public Embedded_1_HostInstance_applications() {
+        super(PVisibility.EMBEDDED);
+      }
+      
+      @Override
+      public String getFullyQualifiedName() {
+        return GeneratedPQuery.this.getFullyQualifiedName() + "$Embedded_1_HostInstance_applications";
+      }
+      
+      @Override
+      public List<PParameter> getParameters() {
+        return embeddedParameters;
+      }
+      
+      @Override
+      public Set<PBody> doGetContainedBodies() {
+        PBody body = new PBody(this);
+        PVariable var_p0 = body.getOrCreateVariableByName("p0");
+        PVariable var_p1 = body.getOrCreateVariableByName("p1");
+        body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+           new ExportedParameter(body, var_p0, parameter_p0),
+           new ExportedParameter(body, var_p1, parameter_p1)
+        ));
+        //  HostInstance.applications(HostInstance, _)
+        new TypeConstraint(body, Tuples.flatTupleOf(var_p0), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+        PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+        new TypeConstraint(body, Tuples.flatTupleOf(var_p0, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "HostInstance", "applications")));
+        new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+        new Equality(body, var__virtual_0_, var_p1);
+        return Collections.singleton(body);
+      }
+    }
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.removeHostInstance";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("HostInstance");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_HostInstance = body.getOrCreateVariableByName("HostInstance");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_HostInstance), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_HostInstance, parameter_HostInstance)
+          ));
+          //    neg HostInstance.applications(HostInstance, _)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var_HostInstance, var___0_), new RemoveHostInstance.GeneratedPQuery.Embedded_1_HostInstance_applications());
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/RequirementNotSatisfied.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/RequirementNotSatisfied.java
new file mode 100644
index 00000000..eaceec5f
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/RequirementNotSatisfied.java
@@ -0,0 +1,607 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.Requirement;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.SatisfyingInstance;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.PatternMatchCounter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         {@literal @}Constraint(severity = "error", key = {Req},
+ *              message = "Requirement is not satisfied by enough application instances.")
+ *         pattern requirementNotSatisfied(Req : Requirement) {
+ *              Instances == count find satisfyingInstance(Req, _);
+ *              Requirement.count(Req, RequiredCount);
+ *              check(Instances {@literal <} RequiredCount);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class RequirementNotSatisfied extends BaseGeneratedEMFQuerySpecification<RequirementNotSatisfied.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.requirementNotSatisfied pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private Requirement fReq;
+    
+    private static List<String> parameterNames = makeImmutableList("Req");
+    
+    private Match(final Requirement pReq) {
+      this.fReq = pReq;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "Req": return this.fReq;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fReq;
+          default: return null;
+      }
+    }
+    
+    public Requirement getReq() {
+      return this.fReq;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("Req".equals(parameterName) ) {
+          this.fReq = (Requirement) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setReq(final Requirement pReq) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fReq = pReq;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.requirementNotSatisfied";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return RequirementNotSatisfied.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fReq};
+    }
+    
+    @Override
+    public RequirementNotSatisfied.Match toImmutable() {
+      return isMutable() ? newMatch(fReq) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"Req\"=" + prettyPrintValue(fReq));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fReq);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof RequirementNotSatisfied.Match)) {
+          RequirementNotSatisfied.Match other = (RequirementNotSatisfied.Match) obj;
+          return Objects.equals(fReq, other.fReq);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public RequirementNotSatisfied specification() {
+      return RequirementNotSatisfied.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static RequirementNotSatisfied.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static RequirementNotSatisfied.Match newMutableMatch(final Requirement pReq) {
+      return new Mutable(pReq);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static RequirementNotSatisfied.Match newMatch(final Requirement pReq) {
+      return new Immutable(pReq);
+    }
+    
+    private static final class Mutable extends RequirementNotSatisfied.Match {
+      Mutable(final Requirement pReq) {
+        super(pReq);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends RequirementNotSatisfied.Match {
+      Immutable(final Requirement pReq) {
+        super(pReq);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.requirementNotSatisfied pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * {@literal @}Constraint(severity = "error", key = {Req},
+   *    message = "Requirement is not satisfied by enough application instances.")
+   * pattern requirementNotSatisfied(Req : Requirement) {
+   *    Instances == count find satisfyingInstance(Req, _);
+   *    Requirement.count(Req, RequiredCount);
+   *    check(Instances {@literal <} RequiredCount);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see RequirementNotSatisfied
+   * 
+   */
+  public static class Matcher extends BaseMatcher<RequirementNotSatisfied.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static RequirementNotSatisfied.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static RequirementNotSatisfied.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_REQ = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(RequirementNotSatisfied.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<RequirementNotSatisfied.Match> getAllMatches(final Requirement pReq) {
+      return rawStreamAllMatches(new Object[]{pReq}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<RequirementNotSatisfied.Match> streamAllMatches(final Requirement pReq) {
+      return rawStreamAllMatches(new Object[]{pReq});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<RequirementNotSatisfied.Match> getOneArbitraryMatch(final Requirement pReq) {
+      return rawGetOneArbitraryMatch(new Object[]{pReq});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final Requirement pReq) {
+      return rawHasMatch(new Object[]{pReq});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final Requirement pReq) {
+      return rawCountMatches(new Object[]{pReq});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final Requirement pReq, final Consumer<? super RequirementNotSatisfied.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pReq}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public RequirementNotSatisfied.Match newMatch(final Requirement pReq) {
+      return RequirementNotSatisfied.Match.newMatch(pReq);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<Requirement> rawStreamAllValuesOfReq(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_REQ, parameters).map(Requirement.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<Requirement> getAllValuesOfReq() {
+      return rawStreamAllValuesOfReq(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<Requirement> streamAllValuesOfReq() {
+      return rawStreamAllValuesOfReq(emptyArray());
+    }
+    
+    @Override
+    protected RequirementNotSatisfied.Match tupleToMatch(final Tuple t) {
+      try {
+          return RequirementNotSatisfied.Match.newMatch((Requirement) t.get(POSITION_REQ));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected RequirementNotSatisfied.Match arrayToMatch(final Object[] match) {
+      try {
+          return RequirementNotSatisfied.Match.newMatch((Requirement) match[POSITION_REQ]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected RequirementNotSatisfied.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return RequirementNotSatisfied.Match.newMutableMatch((Requirement) match[POSITION_REQ]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<RequirementNotSatisfied.Matcher> querySpecification() {
+      return RequirementNotSatisfied.instance();
+    }
+  }
+  
+  private RequirementNotSatisfied() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static RequirementNotSatisfied instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected RequirementNotSatisfied.Matcher instantiate(final ViatraQueryEngine engine) {
+    return RequirementNotSatisfied.Matcher.on(engine);
+  }
+  
+  @Override
+  public RequirementNotSatisfied.Matcher instantiate() {
+    return RequirementNotSatisfied.Matcher.create();
+  }
+  
+  @Override
+  public RequirementNotSatisfied.Match newEmptyMatch() {
+    return RequirementNotSatisfied.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public RequirementNotSatisfied.Match newMatch(final Object... parameters) {
+    return RequirementNotSatisfied.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.cps.Requirement) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link RequirementNotSatisfied} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link RequirementNotSatisfied#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final RequirementNotSatisfied INSTANCE = new RequirementNotSatisfied();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final RequirementNotSatisfied.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Req = new PParameter("Req", "hu.bme.mit.inf.dslreasoner.domains.cps.Requirement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "Requirement")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Req);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.requirementNotSatisfied";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Req");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Req = body.getOrCreateVariableByName("Req");
+          PVariable var_Instances = body.getOrCreateVariableByName("Instances");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          PVariable var_RequiredCount = body.getOrCreateVariableByName("RequiredCount");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "Requirement")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Req, parameter_Req)
+          ));
+          //    Instances == count find satisfyingInstance(Req, _)
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new PatternMatchCounter(body, Tuples.flatTupleOf(var_Req, var___0_), SatisfyingInstance.instance().getInternalQueryRepresentation(), var__virtual_0_);
+          new Equality(body, var_Instances, var__virtual_0_);
+          //    Requirement.count(Req, RequiredCount)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "Requirement")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "Requirement", "count")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EInt")));
+          new Equality(body, var__virtual_1_, var_RequiredCount);
+          //    check(Instances < RequiredCount)
+          new ExpressionEvaluation(body, new IExpressionEvaluator() {
+          
+              @Override
+              public String getShortDescription() {
+                  return "Expression evaluation from pattern requirementNotSatisfied";
+              }
+              
+              @Override
+              public Iterable<String> getInputParameterNames() {
+                  return Arrays.asList("Instances", "RequiredCount");}
+          
+              @Override
+              public Object evaluateExpression(IValueProvider provider) throws Exception {
+                  Integer Instances = (Integer) provider.getValue("Instances");
+                  Integer RequiredCount = (Integer) provider.getValue("RequiredCount");
+                  return evaluateExpression_1_1(Instances, RequiredCount);
+              }
+          },  null); 
+          bodies.add(body);
+      }
+      {
+          PAnnotation annotation = new PAnnotation("Constraint");
+          annotation.addAttribute("severity", "error");
+          annotation.addAttribute("key", Arrays.asList(new Object[] {
+                              new ParameterReference("Req")
+                              }));
+          annotation.addAttribute("message", "Requirement is not satisfied by enough application instances.");
+          addAnnotation(annotation);
+      }
+      return bodies;
+    }
+  }
+  
+  private static boolean evaluateExpression_1_1(final Integer Instances, final Integer RequiredCount) {
+    boolean _lessThan = (Instances.compareTo(RequiredCount) < 0);
+    return _lessThan;
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/ResourceRequirement.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/ResourceRequirement.java
new file mode 100644
index 00000000..23b578ea
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/ResourceRequirement.java
@@ -0,0 +1,841 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern resourceRequirement(Host : HostInstance, App : ApplicationInstance, Req : ResourceRequirement) {
+ *              ApplicationInstance.allocatedTo(App, Host);
+ *              ApplicationInstance.type.requirements(App, Req);
+ *              HostInstance.type(Host, HostType);
+ *              ResourceRequirement.hostType(Req, HostType);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class ResourceRequirement extends BaseGeneratedEMFQuerySpecification<ResourceRequirement.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.resourceRequirement pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private HostInstance fHost;
+    
+    private ApplicationInstance fApp;
+    
+    private hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement fReq;
+    
+    private static List<String> parameterNames = makeImmutableList("Host", "App", "Req");
+    
+    private Match(final HostInstance pHost, final ApplicationInstance pApp, final hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement pReq) {
+      this.fHost = pHost;
+      this.fApp = pApp;
+      this.fReq = pReq;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "Host": return this.fHost;
+          case "App": return this.fApp;
+          case "Req": return this.fReq;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fHost;
+          case 1: return this.fApp;
+          case 2: return this.fReq;
+          default: return null;
+      }
+    }
+    
+    public HostInstance getHost() {
+      return this.fHost;
+    }
+    
+    public ApplicationInstance getApp() {
+      return this.fApp;
+    }
+    
+    public hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement getReq() {
+      return this.fReq;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("Host".equals(parameterName) ) {
+          this.fHost = (HostInstance) newValue;
+          return true;
+      }
+      if ("App".equals(parameterName) ) {
+          this.fApp = (ApplicationInstance) newValue;
+          return true;
+      }
+      if ("Req".equals(parameterName) ) {
+          this.fReq = (hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setHost(final HostInstance pHost) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fHost = pHost;
+    }
+    
+    public void setApp(final ApplicationInstance pApp) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fApp = pApp;
+    }
+    
+    public void setReq(final hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement pReq) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fReq = pReq;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.resourceRequirement";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return ResourceRequirement.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fHost, fApp, fReq};
+    }
+    
+    @Override
+    public ResourceRequirement.Match toImmutable() {
+      return isMutable() ? newMatch(fHost, fApp, fReq) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"Host\"=" + prettyPrintValue(fHost) + ", ");
+      result.append("\"App\"=" + prettyPrintValue(fApp) + ", ");
+      result.append("\"Req\"=" + prettyPrintValue(fReq));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fHost, fApp, fReq);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof ResourceRequirement.Match)) {
+          ResourceRequirement.Match other = (ResourceRequirement.Match) obj;
+          return Objects.equals(fHost, other.fHost) && Objects.equals(fApp, other.fApp) && Objects.equals(fReq, other.fReq);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public ResourceRequirement specification() {
+      return ResourceRequirement.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static ResourceRequirement.Match newEmptyMatch() {
+      return new Mutable(null, null, null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static ResourceRequirement.Match newMutableMatch(final HostInstance pHost, final ApplicationInstance pApp, final hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement pReq) {
+      return new Mutable(pHost, pApp, pReq);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static ResourceRequirement.Match newMatch(final HostInstance pHost, final ApplicationInstance pApp, final hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement pReq) {
+      return new Immutable(pHost, pApp, pReq);
+    }
+    
+    private static final class Mutable extends ResourceRequirement.Match {
+      Mutable(final HostInstance pHost, final ApplicationInstance pApp, final hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement pReq) {
+        super(pHost, pApp, pReq);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends ResourceRequirement.Match {
+      Immutable(final HostInstance pHost, final ApplicationInstance pApp, final hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement pReq) {
+        super(pHost, pApp, pReq);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.resourceRequirement pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern resourceRequirement(Host : HostInstance, App : ApplicationInstance, Req : ResourceRequirement) {
+   *    ApplicationInstance.allocatedTo(App, Host);
+   *    ApplicationInstance.type.requirements(App, Req);
+   *    HostInstance.type(Host, HostType);
+   *    ResourceRequirement.hostType(Req, HostType);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see ResourceRequirement
+   * 
+   */
+  public static class Matcher extends BaseMatcher<ResourceRequirement.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static ResourceRequirement.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static ResourceRequirement.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_HOST = 0;
+    
+    private static final int POSITION_APP = 1;
+    
+    private static final int POSITION_REQ = 2;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(ResourceRequirement.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<ResourceRequirement.Match> getAllMatches(final HostInstance pHost, final ApplicationInstance pApp, final hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement pReq) {
+      return rawStreamAllMatches(new Object[]{pHost, pApp, pReq}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<ResourceRequirement.Match> streamAllMatches(final HostInstance pHost, final ApplicationInstance pApp, final hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement pReq) {
+      return rawStreamAllMatches(new Object[]{pHost, pApp, pReq});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<ResourceRequirement.Match> getOneArbitraryMatch(final HostInstance pHost, final ApplicationInstance pApp, final hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement pReq) {
+      return rawGetOneArbitraryMatch(new Object[]{pHost, pApp, pReq});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final HostInstance pHost, final ApplicationInstance pApp, final hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement pReq) {
+      return rawHasMatch(new Object[]{pHost, pApp, pReq});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final HostInstance pHost, final ApplicationInstance pApp, final hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement pReq) {
+      return rawCountMatches(new Object[]{pHost, pApp, pReq});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final HostInstance pHost, final ApplicationInstance pApp, final hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement pReq, final Consumer<? super ResourceRequirement.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pHost, pApp, pReq}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pHost the fixed value of pattern parameter Host, or null if not bound.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param pReq the fixed value of pattern parameter Req, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public ResourceRequirement.Match newMatch(final HostInstance pHost, final ApplicationInstance pApp, final hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement pReq) {
+      return ResourceRequirement.Match.newMatch(pHost, pApp, pReq);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<HostInstance> rawStreamAllValuesOfHost(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_HOST, parameters).map(HostInstance.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<HostInstance> getAllValuesOfHost() {
+      return rawStreamAllValuesOfHost(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<HostInstance> streamAllValuesOfHost() {
+      return rawStreamAllValuesOfHost(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<HostInstance> streamAllValuesOfHost(final ResourceRequirement.Match partialMatch) {
+      return rawStreamAllValuesOfHost(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<HostInstance> streamAllValuesOfHost(final ApplicationInstance pApp, final hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement pReq) {
+      return rawStreamAllValuesOfHost(new Object[]{null, pApp, pReq});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<HostInstance> getAllValuesOfHost(final ResourceRequirement.Match partialMatch) {
+      return rawStreamAllValuesOfHost(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Host.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<HostInstance> getAllValuesOfHost(final ApplicationInstance pApp, final hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement pReq) {
+      return rawStreamAllValuesOfHost(new Object[]{null, pApp, pReq}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<ApplicationInstance> rawStreamAllValuesOfApp(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_APP, parameters).map(ApplicationInstance.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<ApplicationInstance> getAllValuesOfApp() {
+      return rawStreamAllValuesOfApp(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<ApplicationInstance> streamAllValuesOfApp() {
+      return rawStreamAllValuesOfApp(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<ApplicationInstance> streamAllValuesOfApp(final ResourceRequirement.Match partialMatch) {
+      return rawStreamAllValuesOfApp(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<ApplicationInstance> streamAllValuesOfApp(final HostInstance pHost, final hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement pReq) {
+      return rawStreamAllValuesOfApp(new Object[]{pHost, null, pReq});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<ApplicationInstance> getAllValuesOfApp(final ResourceRequirement.Match partialMatch) {
+      return rawStreamAllValuesOfApp(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<ApplicationInstance> getAllValuesOfApp(final HostInstance pHost, final hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement pReq) {
+      return rawStreamAllValuesOfApp(new Object[]{pHost, null, pReq}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement> rawStreamAllValuesOfReq(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_REQ, parameters).map(hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement> getAllValuesOfReq() {
+      return rawStreamAllValuesOfReq(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement> streamAllValuesOfReq() {
+      return rawStreamAllValuesOfReq(emptyArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement> streamAllValuesOfReq(final ResourceRequirement.Match partialMatch) {
+      return rawStreamAllValuesOfReq(partialMatch.toArray());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     *      
+     * @return the Stream of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement> streamAllValuesOfReq(final HostInstance pHost, final ApplicationInstance pApp) {
+      return rawStreamAllValuesOfReq(new Object[]{pHost, pApp, null});
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement> getAllValuesOfReq(final ResourceRequirement.Match partialMatch) {
+      return rawStreamAllValuesOfReq(partialMatch.toArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for Req.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement> getAllValuesOfReq(final HostInstance pHost, final ApplicationInstance pApp) {
+      return rawStreamAllValuesOfReq(new Object[]{pHost, pApp, null}).collect(Collectors.toSet());
+    }
+    
+    @Override
+    protected ResourceRequirement.Match tupleToMatch(final Tuple t) {
+      try {
+          return ResourceRequirement.Match.newMatch((HostInstance) t.get(POSITION_HOST), (ApplicationInstance) t.get(POSITION_APP), (hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement) t.get(POSITION_REQ));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected ResourceRequirement.Match arrayToMatch(final Object[] match) {
+      try {
+          return ResourceRequirement.Match.newMatch((HostInstance) match[POSITION_HOST], (ApplicationInstance) match[POSITION_APP], (hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement) match[POSITION_REQ]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected ResourceRequirement.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return ResourceRequirement.Match.newMutableMatch((HostInstance) match[POSITION_HOST], (ApplicationInstance) match[POSITION_APP], (hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement) match[POSITION_REQ]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<ResourceRequirement.Matcher> querySpecification() {
+      return ResourceRequirement.instance();
+    }
+  }
+  
+  private ResourceRequirement() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static ResourceRequirement instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected ResourceRequirement.Matcher instantiate(final ViatraQueryEngine engine) {
+    return ResourceRequirement.Matcher.on(engine);
+  }
+  
+  @Override
+  public ResourceRequirement.Matcher instantiate() {
+    return ResourceRequirement.Matcher.create();
+  }
+  
+  @Override
+  public ResourceRequirement.Match newEmptyMatch() {
+    return ResourceRequirement.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public ResourceRequirement.Match newMatch(final Object... parameters) {
+    return ResourceRequirement.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance) parameters[0], (hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance) parameters[1], (hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement) parameters[2]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link ResourceRequirement} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link ResourceRequirement#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final ResourceRequirement INSTANCE = new ResourceRequirement();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final ResourceRequirement.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Host = new PParameter("Host", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_App = new PParameter("App", "hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "ApplicationInstance")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_Req = new PParameter("Req", "hu.bme.mit.inf.dslreasoner.domains.cps.ResourceRequirement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "ResourceRequirement")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Host, parameter_App, parameter_Req);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.resourceRequirement";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Host","App","Req");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Host = body.getOrCreateVariableByName("Host");
+          PVariable var_App = body.getOrCreateVariableByName("App");
+          PVariable var_Req = body.getOrCreateVariableByName("Req");
+          PVariable var_HostType = body.getOrCreateVariableByName("HostType");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ResourceRequirement")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Host, parameter_Host),
+             new ExportedParameter(body, var_App, parameter_App),
+             new ExportedParameter(body, var_Req, parameter_Req)
+          ));
+          //    ApplicationInstance.allocatedTo(App, Host)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ApplicationInstance", "allocatedTo")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          new Equality(body, var__virtual_0_, var_Host);
+          //    ApplicationInstance.type.requirements(App, Req)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ApplicationInstance", "type")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationType")));
+          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ApplicationType", "requirements")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ResourceRequirement")));
+          new Equality(body, var__virtual_2_, var_Req);
+          //    HostInstance.type(Host, HostType)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "HostInstance", "type")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_3_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostType")));
+          new Equality(body, var__virtual_3_, var_HostType);
+          //    ResourceRequirement.hostType(Req, HostType)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ResourceRequirement")));
+          PVariable var__virtual_4_ = body.getOrCreateVariableByName(".virtual{4}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req, var__virtual_4_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ResourceRequirement", "hostType")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_4_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostType")));
+          new Equality(body, var__virtual_4_, var_HostType);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/UnallocateAppInstance.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/UnallocateAppInstance.java
new file mode 100644
index 00000000..9f3d74b6
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/UnallocateAppInstance.java
@@ -0,0 +1,551 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.log4j.Logger;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.IPatternMatch;
+import org.eclipse.viatra.query.runtime.api.IQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;
+import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;
+import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;
+
+/**
+ * A pattern-specific query specification that can instantiate Matcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         pattern unallocateAppInstance(App : ApplicationInstance) {
+ *              ApplicationInstance.allocatedTo(App, _);
+ *         }
+ * </pre></code>
+ * 
+ * @see Matcher
+ * @see Match
+ * 
+ */
+@SuppressWarnings("all")
+public final class UnallocateAppInstance extends BaseGeneratedEMFQuerySpecification<UnallocateAppInstance.Matcher> {
+  /**
+   * Pattern-specific match representation of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.unallocateAppInstance pattern,
+   * to be used in conjunction with {@link Matcher}.
+   * 
+   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.
+   * Each instance is a (possibly partial) substitution of pattern parameters,
+   * usable to represent a match of the pattern in the result of a query,
+   * or to specify the bound (fixed) input parameters when issuing a query.
+   * 
+   * @see Matcher
+   * 
+   */
+  public static abstract class Match extends BasePatternMatch {
+    private ApplicationInstance fApp;
+    
+    private static List<String> parameterNames = makeImmutableList("App");
+    
+    private Match(final ApplicationInstance pApp) {
+      this.fApp = pApp;
+    }
+    
+    @Override
+    public Object get(final String parameterName) {
+      switch(parameterName) {
+          case "App": return this.fApp;
+          default: return null;
+      }
+    }
+    
+    @Override
+    public Object get(final int index) {
+      switch(index) {
+          case 0: return this.fApp;
+          default: return null;
+      }
+    }
+    
+    public ApplicationInstance getApp() {
+      return this.fApp;
+    }
+    
+    @Override
+    public boolean set(final String parameterName, final Object newValue) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      if ("App".equals(parameterName) ) {
+          this.fApp = (ApplicationInstance) newValue;
+          return true;
+      }
+      return false;
+    }
+    
+    public void setApp(final ApplicationInstance pApp) {
+      if (!isMutable()) throw new java.lang.UnsupportedOperationException();
+      this.fApp = pApp;
+    }
+    
+    @Override
+    public String patternName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.unallocateAppInstance";
+    }
+    
+    @Override
+    public List<String> parameterNames() {
+      return UnallocateAppInstance.Match.parameterNames;
+    }
+    
+    @Override
+    public Object[] toArray() {
+      return new Object[]{fApp};
+    }
+    
+    @Override
+    public UnallocateAppInstance.Match toImmutable() {
+      return isMutable() ? newMatch(fApp) : this;
+    }
+    
+    @Override
+    public String prettyPrint() {
+      StringBuilder result = new StringBuilder();
+      result.append("\"App\"=" + prettyPrintValue(fApp));
+      return result.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+      return Objects.hash(fApp);
+    }
+    
+    @Override
+    public boolean equals(final Object obj) {
+      if (this == obj)
+          return true;
+      if (obj == null) {
+          return false;
+      }
+      if ((obj instanceof UnallocateAppInstance.Match)) {
+          UnallocateAppInstance.Match other = (UnallocateAppInstance.Match) obj;
+          return Objects.equals(fApp, other.fApp);
+      } else {
+          // this should be infrequent
+          if (!(obj instanceof IPatternMatch)) {
+              return false;
+          }
+          IPatternMatch otherSig  = (IPatternMatch) obj;
+          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());
+      }
+    }
+    
+    @Override
+    public UnallocateAppInstance specification() {
+      return UnallocateAppInstance.instance();
+    }
+    
+    /**
+     * Returns an empty, mutable match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @return the empty match.
+     * 
+     */
+    public static UnallocateAppInstance.Match newEmptyMatch() {
+      return new Mutable(null);
+    }
+    
+    /**
+     * Returns a mutable (partial) match.
+     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.
+     * 
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return the new, mutable (partial) match object.
+     * 
+     */
+    public static UnallocateAppInstance.Match newMutableMatch(final ApplicationInstance pApp) {
+      return new Mutable(pApp);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public static UnallocateAppInstance.Match newMatch(final ApplicationInstance pApp) {
+      return new Immutable(pApp);
+    }
+    
+    private static final class Mutable extends UnallocateAppInstance.Match {
+      Mutable(final ApplicationInstance pApp) {
+        super(pApp);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return true;
+      }
+    }
+    
+    private static final class Immutable extends UnallocateAppInstance.Match {
+      Immutable(final ApplicationInstance pApp) {
+        super(pApp);
+      }
+      
+      @Override
+      public boolean isMutable() {
+        return false;
+      }
+    }
+  }
+  
+  /**
+   * Generated pattern matcher API of the hu.bme.mit.inf.dslreasoner.domains.cps.queries.unallocateAppInstance pattern,
+   * providing pattern-specific query methods.
+   * 
+   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},
+   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.
+   * 
+   * <p>Matches of the pattern will be represented as {@link Match}.
+   * 
+   * <p>Original source:
+   * <code><pre>
+   * pattern unallocateAppInstance(App : ApplicationInstance) {
+   *    ApplicationInstance.allocatedTo(App, _);
+   * }
+   * </pre></code>
+   * 
+   * @see Match
+   * @see UnallocateAppInstance
+   * 
+   */
+  public static class Matcher extends BaseMatcher<UnallocateAppInstance.Match> {
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    public static UnallocateAppInstance.Matcher on(final ViatraQueryEngine engine) {
+      // check if matcher already exists
+      Matcher matcher = engine.getExistingMatcher(querySpecification());
+      if (matcher == null) {
+          matcher = (Matcher)engine.getMatcher(querySpecification());
+      }
+      return matcher;
+    }
+    
+    /**
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * @return an initialized matcher
+     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.
+     * 
+     */
+    public static UnallocateAppInstance.Matcher create() {
+      return new Matcher();
+    }
+    
+    private static final int POSITION_APP = 0;
+    
+    private static final Logger LOGGER = ViatraQueryLoggingUtil.getLogger(UnallocateAppInstance.Matcher.class);
+    
+    /**
+     * Initializes the pattern matcher within an existing VIATRA Query engine.
+     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.
+     * 
+     * @param engine the existing VIATRA Query engine in which this matcher will be created.
+     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation
+     * 
+     */
+    private Matcher() {
+      super(querySpecification());
+    }
+    
+    /**
+     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return matches represented as a Match object.
+     * 
+     */
+    public Collection<UnallocateAppInstance.Match> getAllMatches(final ApplicationInstance pApp) {
+      return rawStreamAllMatches(new Object[]{pApp}).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.
+     * </p>
+     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.
+     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.
+     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return a stream of matches represented as a Match object.
+     * 
+     */
+    public Stream<UnallocateAppInstance.Match> streamAllMatches(final ApplicationInstance pApp) {
+      return rawStreamAllMatches(new Object[]{pApp});
+    }
+    
+    /**
+     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return a match represented as a Match object, or null if no match is found.
+     * 
+     */
+    public Optional<UnallocateAppInstance.Match> getOneArbitraryMatch(final ApplicationInstance pApp) {
+      return rawGetOneArbitraryMatch(new Object[]{pApp});
+    }
+    
+    /**
+     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,
+     * under any possible substitution of the unspecified parameters (if any).
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return true if the input is a valid (partial) match of the pattern.
+     * 
+     */
+    public boolean hasMatch(final ApplicationInstance pApp) {
+      return rawHasMatch(new Object[]{pApp});
+    }
+    
+    /**
+     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return the number of pattern matches found.
+     * 
+     */
+    public int countMatches(final ApplicationInstance pApp) {
+      return rawCountMatches(new Object[]{pApp});
+    }
+    
+    /**
+     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.
+     * Neither determinism nor randomness of selection is guaranteed.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @param processor the action that will process the selected match.
+     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked
+     * 
+     */
+    public boolean forOneArbitraryMatch(final ApplicationInstance pApp, final Consumer<? super UnallocateAppInstance.Match> processor) {
+      return rawForOneArbitraryMatch(new Object[]{pApp}, processor);
+    }
+    
+    /**
+     * Returns a new (partial) match.
+     * This can be used e.g. to call the matcher with a partial match.
+     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.
+     * @param pApp the fixed value of pattern parameter App, or null if not bound.
+     * @return the (partial) match object.
+     * 
+     */
+    public UnallocateAppInstance.Match newMatch(final ApplicationInstance pApp) {
+      return UnallocateAppInstance.Match.newMatch(pApp);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    protected Stream<ApplicationInstance> rawStreamAllValuesOfApp(final Object[] parameters) {
+      return rawStreamAllValues(POSITION_APP, parameters).map(ApplicationInstance.class::cast);
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Set<ApplicationInstance> getAllValuesOfApp() {
+      return rawStreamAllValuesOfApp(emptyArray()).collect(Collectors.toSet());
+    }
+    
+    /**
+     * Retrieve the set of values that occur in matches for App.
+     * @return the Set of all values or empty set if there are no matches
+     * 
+     */
+    public Stream<ApplicationInstance> streamAllValuesOfApp() {
+      return rawStreamAllValuesOfApp(emptyArray());
+    }
+    
+    @Override
+    protected UnallocateAppInstance.Match tupleToMatch(final Tuple t) {
+      try {
+          return UnallocateAppInstance.Match.newMatch((ApplicationInstance) t.get(POSITION_APP));
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in tuple not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected UnallocateAppInstance.Match arrayToMatch(final Object[] match) {
+      try {
+          return UnallocateAppInstance.Match.newMatch((ApplicationInstance) match[POSITION_APP]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    @Override
+    protected UnallocateAppInstance.Match arrayToMatchMutable(final Object[] match) {
+      try {
+          return UnallocateAppInstance.Match.newMutableMatch((ApplicationInstance) match[POSITION_APP]);
+      } catch(ClassCastException e) {
+          LOGGER.error("Element(s) in array not properly typed!",e);
+          return null;
+      }
+    }
+    
+    /**
+     * @return the singleton instance of the query specification of this pattern
+     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+     * 
+     */
+    public static IQuerySpecification<UnallocateAppInstance.Matcher> querySpecification() {
+      return UnallocateAppInstance.instance();
+    }
+  }
+  
+  private UnallocateAppInstance() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static UnallocateAppInstance instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  @Override
+  protected UnallocateAppInstance.Matcher instantiate(final ViatraQueryEngine engine) {
+    return UnallocateAppInstance.Matcher.on(engine);
+  }
+  
+  @Override
+  public UnallocateAppInstance.Matcher instantiate() {
+    return UnallocateAppInstance.Matcher.create();
+  }
+  
+  @Override
+  public UnallocateAppInstance.Match newEmptyMatch() {
+    return UnallocateAppInstance.Match.newEmptyMatch();
+  }
+  
+  @Override
+  public UnallocateAppInstance.Match newMatch(final Object... parameters) {
+    return UnallocateAppInstance.Match.newMatch((hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance) parameters[0]);
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link UnallocateAppInstance} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link UnallocateAppInstance#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final UnallocateAppInstance INSTANCE = new UnallocateAppInstance();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final UnallocateAppInstance.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_App = new PParameter("App", "hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "ApplicationInstance")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_App);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PUBLIC);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.unallocateAppInstance";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("App");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_App = body.getOrCreateVariableByName("App");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_App, parameter_App)
+          ));
+          //    ApplicationInstance.allocatedTo(App, _)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ApplicationInstance", "allocatedTo")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          new Equality(body, var__virtual_0_, var___0_);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/.gitignore b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/.gitignore
new file mode 100644
index 00000000..a4f039d9
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/.gitignore
@@ -0,0 +1,36 @@
+/.CpsQueriesAll.java._trace
+/.ResourceRequirement.java._trace
+/.MemoryRequirement.java._trace
+/.HddRequirement.java._trace
+/.AllocationWithoutResourceRequirement.java._trace
+/.RequiredType.java._trace
+/.SatisfyingInstance.java._trace
+/.FreeMemoryPercentage.java._trace
+/.FreeHddPercentage.java._trace
+/.ApplicationInstance.java._trace
+/.HostInstanceCost.java._trace
+/.AvailableHdd.java._trace
+/.AvailableMemory.java._trace
+/.CpsApplications.java._trace
+/.CpsHosts.java._trace
+/.TotalHdd.java._trace
+/.TotalMemory.java._trace
+/.RequiredAppInstances.java._trace
+/.UnallocatedAppInstance.java._trace
+/.NoHostToAllocateTo.java._trace
+/AvailableHdd.java
+/AvailableMemory.java
+/CpsApplications.java
+/CpsHosts.java
+/CpsQueriesAll.java
+/FreeHddPercentage.java
+/FreeMemoryPercentage.java
+/HddRequirement.java
+/HostInstanceCost.java
+/MemoryRequirement.java
+/NoHostToAllocateTo.java
+/RequiredAppInstances.java
+/SatisfyingInstance.java
+/TotalHdd.java
+/TotalMemory.java
+/UnallocatedAppInstance.java
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/AvailableHdd.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/AvailableHdd.java
new file mode 100644
index 00000000..8a150288
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/AvailableHdd.java
@@ -0,0 +1,178 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.HddRequirement;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.TotalHdd;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.aggregators.sum;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern availableHdd(Host : HostInstance, Hdd : java Integer) {
+ *              find totalHdd(Host, TotalHdd);
+ *              RequiredHdd == sum find hddRequirement(Host, _, #_);
+ *              Hdd == eval(TotalHdd - RequiredHdd);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class AvailableHdd extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private AvailableHdd() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static AvailableHdd instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link AvailableHdd} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link AvailableHdd#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final AvailableHdd INSTANCE = new AvailableHdd();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final AvailableHdd.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Host = new PParameter("Host", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_Hdd = new PParameter("Hdd", "java.lang.Integer", new JavaTransitiveInstancesKey(java.lang.Integer.class), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Host, parameter_Hdd);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.availableHdd";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Host","Hdd");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Host = body.getOrCreateVariableByName("Host");
+          PVariable var_Hdd = body.getOrCreateVariableByName("Hdd");
+          PVariable var_TotalHdd = body.getOrCreateVariableByName("TotalHdd");
+          PVariable var_RequiredHdd = body.getOrCreateVariableByName("RequiredHdd");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Hdd), new JavaTransitiveInstancesKey(java.lang.Integer.class));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Host, parameter_Host),
+             new ExportedParameter(body, var_Hdd, parameter_Hdd)
+          ));
+          //    find totalHdd(Host, TotalHdd)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_Host, var_TotalHdd), TotalHdd.instance().getInternalQueryRepresentation());
+          //    RequiredHdd == sum find hddRequirement(Host, _, #_)
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new AggregatorConstraint(new sum().getAggregatorLogic(Integer.class), body, Tuples.flatTupleOf(var_Host, var___0_, var___1_), HddRequirement.instance().getInternalQueryRepresentation(), var__virtual_0_, 2);
+          new Equality(body, var_RequiredHdd, var__virtual_0_);
+          //    Hdd == eval(TotalHdd - RequiredHdd)
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new ExpressionEvaluation(body, new IExpressionEvaluator() {
+          
+              @Override
+              public String getShortDescription() {
+                  return "Expression evaluation from pattern availableHdd";
+              }
+              
+              @Override
+              public Iterable<String> getInputParameterNames() {
+                  return Arrays.asList("RequiredHdd", "TotalHdd");}
+          
+              @Override
+              public Object evaluateExpression(IValueProvider provider) throws Exception {
+                  Integer RequiredHdd = (Integer) provider.getValue("RequiredHdd");
+                  Integer TotalHdd = (Integer) provider.getValue("TotalHdd");
+                  return evaluateExpression_1_1(RequiredHdd, TotalHdd);
+              }
+          },  var__virtual_1_ ); 
+          new Equality(body, var_Hdd, var__virtual_1_);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+  
+  private static int evaluateExpression_1_1(final Integer RequiredHdd, final Integer TotalHdd) {
+    return ((TotalHdd).intValue() - (RequiredHdd).intValue());
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/AvailableMemory.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/AvailableMemory.java
new file mode 100644
index 00000000..c89872e6
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/AvailableMemory.java
@@ -0,0 +1,178 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.MemoryRequirement;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.TotalMemory;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.aggregators.sum;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.AggregatorConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern availableMemory(Host : HostInstance, Memory : java Integer) {
+ *              find totalMemory(Host, TotalMemory);
+ *              RequiredMemory == sum find memoryRequirement(Host, _, #_);
+ *              Memory == eval(TotalMemory - RequiredMemory);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class AvailableMemory extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private AvailableMemory() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static AvailableMemory instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link AvailableMemory} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link AvailableMemory#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final AvailableMemory INSTANCE = new AvailableMemory();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final AvailableMemory.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Host = new PParameter("Host", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_Memory = new PParameter("Memory", "java.lang.Integer", new JavaTransitiveInstancesKey(java.lang.Integer.class), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Host, parameter_Memory);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.availableMemory";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Host","Memory");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Host = body.getOrCreateVariableByName("Host");
+          PVariable var_Memory = body.getOrCreateVariableByName("Memory");
+          PVariable var_TotalMemory = body.getOrCreateVariableByName("TotalMemory");
+          PVariable var_RequiredMemory = body.getOrCreateVariableByName("RequiredMemory");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Memory), new JavaTransitiveInstancesKey(java.lang.Integer.class));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Host, parameter_Host),
+             new ExportedParameter(body, var_Memory, parameter_Memory)
+          ));
+          //    find totalMemory(Host, TotalMemory)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_Host, var_TotalMemory), TotalMemory.instance().getInternalQueryRepresentation());
+          //    RequiredMemory == sum find memoryRequirement(Host, _, #_)
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new AggregatorConstraint(new sum().getAggregatorLogic(Integer.class), body, Tuples.flatTupleOf(var_Host, var___0_, var___1_), MemoryRequirement.instance().getInternalQueryRepresentation(), var__virtual_0_, 2);
+          new Equality(body, var_RequiredMemory, var__virtual_0_);
+          //    Memory == eval(TotalMemory - RequiredMemory)
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new ExpressionEvaluation(body, new IExpressionEvaluator() {
+          
+              @Override
+              public String getShortDescription() {
+                  return "Expression evaluation from pattern availableMemory";
+              }
+              
+              @Override
+              public Iterable<String> getInputParameterNames() {
+                  return Arrays.asList("RequiredMemory", "TotalMemory");}
+          
+              @Override
+              public Object evaluateExpression(IValueProvider provider) throws Exception {
+                  Integer RequiredMemory = (Integer) provider.getValue("RequiredMemory");
+                  Integer TotalMemory = (Integer) provider.getValue("TotalMemory");
+                  return evaluateExpression_1_1(RequiredMemory, TotalMemory);
+              }
+          },  var__virtual_1_ ); 
+          new Equality(body, var_Memory, var__virtual_1_);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+  
+  private static int evaluateExpression_1_1(final Integer RequiredMemory, final Integer TotalMemory) {
+    return ((TotalMemory).intValue() - (RequiredMemory).intValue());
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/CpsApplications.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/CpsApplications.java
new file mode 100644
index 00000000..fe115086
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/CpsApplications.java
@@ -0,0 +1,141 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern cpsApplications(Cps : CyberPhysicalSystem, AppInstance : ApplicationInstance) {
+ *              CyberPhysicalSystem.applicationTypes.instances(Cps, AppInstance);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class CpsApplications extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private CpsApplications() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static CpsApplications instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link CpsApplications} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link CpsApplications#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final CpsApplications INSTANCE = new CpsApplications();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final CpsApplications.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Cps = new PParameter("Cps", "hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "CyberPhysicalSystem")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_AppInstance = new PParameter("AppInstance", "hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "ApplicationInstance")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Cps, parameter_AppInstance);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.cpsApplications";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Cps","AppInstance");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Cps = body.getOrCreateVariableByName("Cps");
+          PVariable var_AppInstance = body.getOrCreateVariableByName("AppInstance");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Cps), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "CyberPhysicalSystem")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_AppInstance), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Cps, parameter_Cps),
+             new ExportedParameter(body, var_AppInstance, parameter_AppInstance)
+          ));
+          //    CyberPhysicalSystem.applicationTypes.instances(Cps, AppInstance)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Cps), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "CyberPhysicalSystem")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Cps, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "CyberPhysicalSystem", "applicationTypes")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationType")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ApplicationType", "instances")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          new Equality(body, var__virtual_1_, var_AppInstance);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/CpsHosts.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/CpsHosts.java
new file mode 100644
index 00000000..cea8c097
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/CpsHosts.java
@@ -0,0 +1,141 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern cpsHosts(Cps : CyberPhysicalSystem, HostInstance : HostInstance) {
+ *              CyberPhysicalSystem.hostTypes.instances(Cps, HostInstance);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class CpsHosts extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private CpsHosts() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static CpsHosts instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link CpsHosts} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link CpsHosts#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final CpsHosts INSTANCE = new CpsHosts();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final CpsHosts.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Cps = new PParameter("Cps", "hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "CyberPhysicalSystem")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_HostInstance = new PParameter("HostInstance", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Cps, parameter_HostInstance);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.cpsHosts";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Cps","HostInstance");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Cps = body.getOrCreateVariableByName("Cps");
+          PVariable var_HostInstance = body.getOrCreateVariableByName("HostInstance");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Cps), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "CyberPhysicalSystem")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_HostInstance), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Cps, parameter_Cps),
+             new ExportedParameter(body, var_HostInstance, parameter_HostInstance)
+          ));
+          //    CyberPhysicalSystem.hostTypes.instances(Cps, HostInstance)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Cps), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "CyberPhysicalSystem")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Cps, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "CyberPhysicalSystem", "hostTypes")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostType")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "HostType", "instances")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          new Equality(body, var__virtual_1_, var_HostInstance);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/CpsQueriesAll.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/CpsQueriesAll.java
new file mode 100644
index 00000000..67f75e1d
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/CpsQueriesAll.java
@@ -0,0 +1,132 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.Allocate;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.AllocationWithoutResourceRequirement;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.AverageFreeHddMetric;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.AverageFreeMemoryMetric;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.CostMetric;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.CpsCost;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.CreateHostInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.GuidanceObjective;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.InstanceDoesNotSatisfyRequirement;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.NotEnoughAvailableHdd;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.NotEnoughAvailableMemory;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.RedundantInstancesOnSameHost;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.RemoveHostInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.RequirementNotSatisfied;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.ResourceRequirement;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.UnallocateAppInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.AvailableHdd;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.AvailableMemory;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.CpsApplications;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.CpsHosts;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.FreeHddPercentage;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.FreeMemoryPercentage;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.HddRequirement;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.HostInstanceCost;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.MemoryRequirement;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.NoHostToAllocateTo;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.RequiredAppInstances;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.SatisfyingInstance;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.TotalHdd;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.TotalMemory;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.UnallocatedAppInstance;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedPatternGroup;
+
+/**
+ * A pattern group formed of all patterns defined in CpsQueries.vql.
+ * 
+ * <p>A private group that includes private patterns as well. Only intended use case is for pattern testing.
+ * 
+ * <p> From package hu.bme.mit.inf.dslreasoner.domains.cps.queries, the group contains the definition of the following patterns: <ul>
+ * <li>cpsApplications</li>
+ * <li>cpsHosts</li>
+ * <li>totalMemory</li>
+ * <li>totalHdd</li>
+ * <li>availableMemory</li>
+ * <li>memoryRequirement</li>
+ * <li>availableHdd</li>
+ * <li>hddRequirement</li>
+ * <li>resourceRequirement</li>
+ * <li>allocationWithoutResourceRequirement</li>
+ * <li>notEnoughAvailableMemory</li>
+ * <li>notEnoughAvailableHdd</li>
+ * <li>instanceDoesNotSatisfyRequirement</li>
+ * <li>satisfyingInstance</li>
+ * <li>requirementNotSatisfied</li>
+ * <li>redundantInstancesOnSameHost</li>
+ * <li>averageFreeMemoryMetric</li>
+ * <li>freeMemoryPercentage</li>
+ * <li>averageFreeHddMetric</li>
+ * <li>freeHddPercentage</li>
+ * <li>costMetric</li>
+ * <li>cpsCost</li>
+ * <li>hostInstanceCost</li>
+ * <li>allocate</li>
+ * <li>unallocateAppInstance</li>
+ * <li>createHostInstance</li>
+ * <li>removeHostInstance</li>
+ * <li>unallocatedAppInstance</li>
+ * <li>requiredAppInstances</li>
+ * <li>noHostToAllocateTo</li>
+ * <li>guidanceObjective</li>
+ * </ul>
+ * 
+ * @see IQueryGroup
+ * 
+ */
+@SuppressWarnings("all")
+public final class CpsQueriesAll extends BaseGeneratedPatternGroup {
+  /**
+   * Access the pattern group.
+   * 
+   * @return the singleton instance of the group
+   * @throws ViatraQueryRuntimeException if there was an error loading the generated code of pattern specifications
+   * 
+   */
+  public static CpsQueriesAll instance() {
+    if (INSTANCE == null) {
+        INSTANCE = new CpsQueriesAll();
+    }
+    return INSTANCE;
+  }
+  
+  private static CpsQueriesAll INSTANCE;
+  
+  private CpsQueriesAll() {
+    querySpecifications.add(CpsApplications.instance());
+    querySpecifications.add(CpsHosts.instance());
+    querySpecifications.add(TotalMemory.instance());
+    querySpecifications.add(TotalHdd.instance());
+    querySpecifications.add(AvailableMemory.instance());
+    querySpecifications.add(MemoryRequirement.instance());
+    querySpecifications.add(AvailableHdd.instance());
+    querySpecifications.add(HddRequirement.instance());
+    querySpecifications.add(ResourceRequirement.instance());
+    querySpecifications.add(AllocationWithoutResourceRequirement.instance());
+    querySpecifications.add(NotEnoughAvailableMemory.instance());
+    querySpecifications.add(NotEnoughAvailableHdd.instance());
+    querySpecifications.add(InstanceDoesNotSatisfyRequirement.instance());
+    querySpecifications.add(SatisfyingInstance.instance());
+    querySpecifications.add(RequirementNotSatisfied.instance());
+    querySpecifications.add(RedundantInstancesOnSameHost.instance());
+    querySpecifications.add(AverageFreeMemoryMetric.instance());
+    querySpecifications.add(FreeMemoryPercentage.instance());
+    querySpecifications.add(AverageFreeHddMetric.instance());
+    querySpecifications.add(FreeHddPercentage.instance());
+    querySpecifications.add(CostMetric.instance());
+    querySpecifications.add(CpsCost.instance());
+    querySpecifications.add(HostInstanceCost.instance());
+    querySpecifications.add(Allocate.instance());
+    querySpecifications.add(UnallocateAppInstance.instance());
+    querySpecifications.add(CreateHostInstance.instance());
+    querySpecifications.add(RemoveHostInstance.instance());
+    querySpecifications.add(UnallocatedAppInstance.instance());
+    querySpecifications.add(RequiredAppInstances.instance());
+    querySpecifications.add(NoHostToAllocateTo.instance());
+    querySpecifications.add(GuidanceObjective.instance());
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/FreeHddPercentage.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/FreeHddPercentage.java
new file mode 100644
index 00000000..ed5c9cda
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/FreeHddPercentage.java
@@ -0,0 +1,172 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.AvailableHdd;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.TotalHdd;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern freeHddPercentage(Host : HostInstance, Free : java Double) {
+ *              find totalHdd(Host, Total);
+ *              find availableHdd(Host, Available);
+ *              Free == eval((Available as double) / Total);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class FreeHddPercentage extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private FreeHddPercentage() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static FreeHddPercentage instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link FreeHddPercentage} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link FreeHddPercentage#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final FreeHddPercentage INSTANCE = new FreeHddPercentage();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final FreeHddPercentage.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Host = new PParameter("Host", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_Free = new PParameter("Free", "java.lang.Double", new JavaTransitiveInstancesKey(java.lang.Double.class), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Host, parameter_Free);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.freeHddPercentage";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Host","Free");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Host = body.getOrCreateVariableByName("Host");
+          PVariable var_Free = body.getOrCreateVariableByName("Free");
+          PVariable var_Total = body.getOrCreateVariableByName("Total");
+          PVariable var_Available = body.getOrCreateVariableByName("Available");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Free), new JavaTransitiveInstancesKey(java.lang.Double.class));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Host, parameter_Host),
+             new ExportedParameter(body, var_Free, parameter_Free)
+          ));
+          //    find totalHdd(Host, Total)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_Host, var_Total), TotalHdd.instance().getInternalQueryRepresentation());
+          //    find availableHdd(Host, Available)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_Host, var_Available), AvailableHdd.instance().getInternalQueryRepresentation());
+          //    Free == eval((Available as double) / Total)
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new ExpressionEvaluation(body, new IExpressionEvaluator() {
+          
+              @Override
+              public String getShortDescription() {
+                  return "Expression evaluation from pattern freeHddPercentage";
+              }
+              
+              @Override
+              public Iterable<String> getInputParameterNames() {
+                  return Arrays.asList("Available", "Total");}
+          
+              @Override
+              public Object evaluateExpression(IValueProvider provider) throws Exception {
+                  Integer Available = (Integer) provider.getValue("Available");
+                  Integer Total = (Integer) provider.getValue("Total");
+                  return evaluateExpression_1_1(Available, Total);
+              }
+          },  var__virtual_0_ ); 
+          new Equality(body, var_Free, var__virtual_0_);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+  
+  private static double evaluateExpression_1_1(final Integer Available, final Integer Total) {
+    return (((double) (Available).intValue()) / (Total).intValue());
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/FreeMemoryPercentage.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/FreeMemoryPercentage.java
new file mode 100644
index 00000000..b5923ba9
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/FreeMemoryPercentage.java
@@ -0,0 +1,172 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.AvailableMemory;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.TotalMemory;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern freeMemoryPercentage(Host : HostInstance, Free : java Double) {
+ *              find totalMemory(Host, Total);
+ *              find availableMemory(Host, Available);
+ *              Free == eval((Available as double) / Total);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class FreeMemoryPercentage extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private FreeMemoryPercentage() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static FreeMemoryPercentage instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link FreeMemoryPercentage} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link FreeMemoryPercentage#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final FreeMemoryPercentage INSTANCE = new FreeMemoryPercentage();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final FreeMemoryPercentage.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Host = new PParameter("Host", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_Free = new PParameter("Free", "java.lang.Double", new JavaTransitiveInstancesKey(java.lang.Double.class), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Host, parameter_Free);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.freeMemoryPercentage";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Host","Free");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Host = body.getOrCreateVariableByName("Host");
+          PVariable var_Free = body.getOrCreateVariableByName("Free");
+          PVariable var_Total = body.getOrCreateVariableByName("Total");
+          PVariable var_Available = body.getOrCreateVariableByName("Available");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Free), new JavaTransitiveInstancesKey(java.lang.Double.class));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Host, parameter_Host),
+             new ExportedParameter(body, var_Free, parameter_Free)
+          ));
+          //    find totalMemory(Host, Total)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_Host, var_Total), TotalMemory.instance().getInternalQueryRepresentation());
+          //    find availableMemory(Host, Available)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_Host, var_Available), AvailableMemory.instance().getInternalQueryRepresentation());
+          //    Free == eval((Available as double) / Total)
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new ExpressionEvaluation(body, new IExpressionEvaluator() {
+          
+              @Override
+              public String getShortDescription() {
+                  return "Expression evaluation from pattern freeMemoryPercentage";
+              }
+              
+              @Override
+              public Iterable<String> getInputParameterNames() {
+                  return Arrays.asList("Available", "Total");}
+          
+              @Override
+              public Object evaluateExpression(IValueProvider provider) throws Exception {
+                  Integer Available = (Integer) provider.getValue("Available");
+                  Integer Total = (Integer) provider.getValue("Total");
+                  return evaluateExpression_1_1(Available, Total);
+              }
+          },  var__virtual_0_ ); 
+          new Equality(body, var_Free, var__virtual_0_);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+  
+  private static double evaluateExpression_1_1(final Integer Available, final Integer Total) {
+    return (((double) (Available).intValue()) / (Total).intValue());
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/HddRequirement.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/HddRequirement.java
new file mode 100644
index 00000000..4e6a2d10
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/HddRequirement.java
@@ -0,0 +1,151 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.ResourceRequirement;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern hddRequirement(Host : HostInstance, App : ApplicationInstance, Hdd : EInt) {
+ *              find resourceRequirement(Host, App, Req);
+ *              ResourceRequirement.requiredHdd(Req, Hdd);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class HddRequirement extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private HddRequirement() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static HddRequirement instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link HddRequirement} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link HddRequirement#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final HddRequirement INSTANCE = new HddRequirement();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final HddRequirement.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Host = new PParameter("Host", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_App = new PParameter("App", "hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "ApplicationInstance")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_Hdd = new PParameter("Hdd", "java.lang.Integer", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EInt")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Host, parameter_App, parameter_Hdd);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.hddRequirement";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Host","App","Hdd");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Host = body.getOrCreateVariableByName("Host");
+          PVariable var_App = body.getOrCreateVariableByName("App");
+          PVariable var_Hdd = body.getOrCreateVariableByName("Hdd");
+          PVariable var_Req = body.getOrCreateVariableByName("Req");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Hdd), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EInt")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Host, parameter_Host),
+             new ExportedParameter(body, var_App, parameter_App),
+             new ExportedParameter(body, var_Hdd, parameter_Hdd)
+          ));
+          //    find resourceRequirement(Host, App, Req)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_Host, var_App, var_Req), ResourceRequirement.instance().getInternalQueryRepresentation());
+          //    ResourceRequirement.requiredHdd(Req, Hdd)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ResourceRequirement")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ResourceRequirement", "requiredHdd")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EInt")));
+          new Equality(body, var__virtual_0_, var_Hdd);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/HostInstanceCost.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/HostInstanceCost.java
new file mode 100644
index 00000000..429817ce
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/HostInstanceCost.java
@@ -0,0 +1,153 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.CpsHosts;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern hostInstanceCost(Cps : CyberPhysicalSystem, Host : HostInstance, Cost : EInt) {
+ *              find cpsHosts(Cps, Host);
+ *              HostInstance.type.cost(Host, Cost);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class HostInstanceCost extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private HostInstanceCost() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static HostInstanceCost instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link HostInstanceCost} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link HostInstanceCost#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final HostInstanceCost INSTANCE = new HostInstanceCost();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final HostInstanceCost.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Cps = new PParameter("Cps", "hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "CyberPhysicalSystem")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_Host = new PParameter("Host", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_Cost = new PParameter("Cost", "java.lang.Integer", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EInt")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Cps, parameter_Host, parameter_Cost);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.hostInstanceCost";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Cps","Host","Cost");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Cps = body.getOrCreateVariableByName("Cps");
+          PVariable var_Host = body.getOrCreateVariableByName("Host");
+          PVariable var_Cost = body.getOrCreateVariableByName("Cost");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Cps), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "CyberPhysicalSystem")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Cost), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EInt")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Cps, parameter_Cps),
+             new ExportedParameter(body, var_Host, parameter_Host),
+             new ExportedParameter(body, var_Cost, parameter_Cost)
+          ));
+          //    find cpsHosts(Cps, Host)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_Cps, var_Host), CpsHosts.instance().getInternalQueryRepresentation());
+          //    HostInstance.type.cost(Host, Cost)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "HostInstance", "type")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostType")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "HostType", "cost")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EInt")));
+          new Equality(body, var__virtual_1_, var_Cost);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/MemoryRequirement.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/MemoryRequirement.java
new file mode 100644
index 00000000..98924467
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/MemoryRequirement.java
@@ -0,0 +1,151 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.ResourceRequirement;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern memoryRequirement(Host : HostInstance, App : ApplicationInstance, Memory : EInt) {
+ *              find resourceRequirement(Host, App, Req);
+ *              ResourceRequirement.requiredMemory(Req, Memory);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class MemoryRequirement extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private MemoryRequirement() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static MemoryRequirement instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link MemoryRequirement} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link MemoryRequirement#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final MemoryRequirement INSTANCE = new MemoryRequirement();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final MemoryRequirement.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Host = new PParameter("Host", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_App = new PParameter("App", "hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "ApplicationInstance")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_Memory = new PParameter("Memory", "java.lang.Integer", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EInt")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Host, parameter_App, parameter_Memory);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.memoryRequirement";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Host","App","Memory");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Host = body.getOrCreateVariableByName("Host");
+          PVariable var_App = body.getOrCreateVariableByName("App");
+          PVariable var_Memory = body.getOrCreateVariableByName("Memory");
+          PVariable var_Req = body.getOrCreateVariableByName("Req");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Memory), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EInt")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Host, parameter_Host),
+             new ExportedParameter(body, var_App, parameter_App),
+             new ExportedParameter(body, var_Memory, parameter_Memory)
+          ));
+          //    find resourceRequirement(Host, App, Req)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_Host, var_App, var_Req), ResourceRequirement.instance().getInternalQueryRepresentation());
+          //    ResourceRequirement.requiredMemory(Req, Memory)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ResourceRequirement")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ResourceRequirement", "requiredMemory")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EInt")));
+          new Equality(body, var__virtual_0_, var_Memory);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/NoHostToAllocateTo.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/NoHostToAllocateTo.java
new file mode 100644
index 00000000..155ed09b
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/NoHostToAllocateTo.java
@@ -0,0 +1,135 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.Allocate;
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.UnallocatedAppInstance;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern noHostToAllocateTo(App : ApplicationInstance) {
+ *              find unallocatedAppInstance(App);
+ *              neg find allocate(App, _);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class NoHostToAllocateTo extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private NoHostToAllocateTo() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static NoHostToAllocateTo instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link NoHostToAllocateTo} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link NoHostToAllocateTo#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final NoHostToAllocateTo INSTANCE = new NoHostToAllocateTo();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final NoHostToAllocateTo.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_App = new PParameter("App", "hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "ApplicationInstance")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_App);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.noHostToAllocateTo";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("App");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_App = body.getOrCreateVariableByName("App");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_App, parameter_App)
+          ));
+          //    find unallocatedAppInstance(App)
+          new PositivePatternCall(body, Tuples.flatTupleOf(var_App), UnallocatedAppInstance.instance().getInternalQueryRepresentation());
+          //    neg find allocate(App, _)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var_App, var___0_), Allocate.instance().getInternalQueryRepresentation());
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/RequiredAppInstances.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/RequiredAppInstances.java
new file mode 100644
index 00000000..ffce9148
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/RequiredAppInstances.java
@@ -0,0 +1,181 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal;
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal.SatisfyingInstance;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.context.common.JavaTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IExpressionEvaluator;
+import org.eclipse.viatra.query.runtime.matchers.psystem.IValueProvider;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExpressionEvaluation;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.PatternMatchCounter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.TypeFilterConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern requiredAppInstances(Req : Requirement, Remaining : java Integer) {
+ *              Instances == count find satisfyingInstance(Req, _);
+ *              Requirement.count(Req, RequiredCount);
+ *              Remaining == eval(RequiredCount - Instances);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class RequiredAppInstances extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private RequiredAppInstances() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static RequiredAppInstances instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link RequiredAppInstances} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link RequiredAppInstances#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final RequiredAppInstances INSTANCE = new RequiredAppInstances();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final RequiredAppInstances.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Req = new PParameter("Req", "hu.bme.mit.inf.dslreasoner.domains.cps.Requirement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "Requirement")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_Remaining = new PParameter("Remaining", "java.lang.Integer", new JavaTransitiveInstancesKey(java.lang.Integer.class), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Req, parameter_Remaining);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.requiredAppInstances";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Req","Remaining");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Req = body.getOrCreateVariableByName("Req");
+          PVariable var_Remaining = body.getOrCreateVariableByName("Remaining");
+          PVariable var_Instances = body.getOrCreateVariableByName("Instances");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          PVariable var_RequiredCount = body.getOrCreateVariableByName("RequiredCount");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "Requirement")));
+          new TypeFilterConstraint(body, Tuples.flatTupleOf(var_Remaining), new JavaTransitiveInstancesKey(java.lang.Integer.class));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Req, parameter_Req),
+             new ExportedParameter(body, var_Remaining, parameter_Remaining)
+          ));
+          //    Instances == count find satisfyingInstance(Req, _)
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new PatternMatchCounter(body, Tuples.flatTupleOf(var_Req, var___0_), SatisfyingInstance.instance().getInternalQueryRepresentation(), var__virtual_0_);
+          new Equality(body, var_Instances, var__virtual_0_);
+          //    Requirement.count(Req, RequiredCount)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "Requirement")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "Requirement", "count")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EInt")));
+          new Equality(body, var__virtual_1_, var_RequiredCount);
+          //    Remaining == eval(RequiredCount - Instances)
+          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
+          new ExpressionEvaluation(body, new IExpressionEvaluator() {
+          
+              @Override
+              public String getShortDescription() {
+                  return "Expression evaluation from pattern requiredAppInstances";
+              }
+              
+              @Override
+              public Iterable<String> getInputParameterNames() {
+                  return Arrays.asList("Instances", "RequiredCount");}
+          
+              @Override
+              public Object evaluateExpression(IValueProvider provider) throws Exception {
+                  Integer Instances = (Integer) provider.getValue("Instances");
+                  Integer RequiredCount = (Integer) provider.getValue("RequiredCount");
+                  return evaluateExpression_1_1(Instances, RequiredCount);
+              }
+          },  var__virtual_2_ ); 
+          new Equality(body, var_Remaining, var__virtual_2_);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+  
+  private static int evaluateExpression_1_1(final Integer Instances, final Integer RequiredCount) {
+    return ((RequiredCount).intValue() - (Instances).intValue());
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/SatisfyingInstance.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/SatisfyingInstance.java
new file mode 100644
index 00000000..dea68f94
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/SatisfyingInstance.java
@@ -0,0 +1,153 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern satisfyingInstance(Req : Requirement, App : ApplicationInstance) {
+ *              Requirement.instances(Req, App);
+ *              Requirement.type(Req, Type);
+ *              ApplicationInstance.type(App, Type);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class SatisfyingInstance extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private SatisfyingInstance() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static SatisfyingInstance instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link SatisfyingInstance} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link SatisfyingInstance#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final SatisfyingInstance INSTANCE = new SatisfyingInstance();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final SatisfyingInstance.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Req = new PParameter("Req", "hu.bme.mit.inf.dslreasoner.domains.cps.Requirement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "Requirement")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_App = new PParameter("App", "hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "ApplicationInstance")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Req, parameter_App);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.satisfyingInstance";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Req","App");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Req = body.getOrCreateVariableByName("Req");
+          PVariable var_App = body.getOrCreateVariableByName("App");
+          PVariable var_Type = body.getOrCreateVariableByName("Type");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "Requirement")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Req, parameter_Req),
+             new ExportedParameter(body, var_App, parameter_App)
+          ));
+          //    Requirement.instances(Req, App)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "Requirement")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "Requirement", "instances")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          new Equality(body, var__virtual_0_, var_App);
+          //    Requirement.type(Req, Type)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "Requirement")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Req, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "Requirement", "type")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationType")));
+          new Equality(body, var__virtual_1_, var_Type);
+          //    ApplicationInstance.type(App, Type)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ApplicationInstance", "type")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationType")));
+          new Equality(body, var__virtual_2_, var_Type);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/TotalHdd.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/TotalHdd.java
new file mode 100644
index 00000000..efa13033
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/TotalHdd.java
@@ -0,0 +1,143 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern totalHdd(Host : HostInstance, Hdd : EInt) {
+ *              HostInstance.type.defaultHdd(Host, Hdd);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class TotalHdd extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private TotalHdd() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static TotalHdd instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link TotalHdd} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link TotalHdd#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final TotalHdd INSTANCE = new TotalHdd();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final TotalHdd.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Host = new PParameter("Host", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_Hdd = new PParameter("Hdd", "java.lang.Integer", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EInt")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Host, parameter_Hdd);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.totalHdd";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Host","Hdd");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Host = body.getOrCreateVariableByName("Host");
+          PVariable var_Hdd = body.getOrCreateVariableByName("Hdd");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Hdd), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EInt")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Host, parameter_Host),
+             new ExportedParameter(body, var_Hdd, parameter_Hdd)
+          ));
+          //    HostInstance.type.defaultHdd(Host, Hdd)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "HostInstance", "type")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostType")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "HostType", "defaultHdd")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EInt")));
+          new Equality(body, var__virtual_1_, var_Hdd);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/TotalMemory.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/TotalMemory.java
new file mode 100644
index 00000000..2fe3e741
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/TotalMemory.java
@@ -0,0 +1,143 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EDataTypeInSlotsKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern totalMemory(Host : HostInstance, Memory : EInt) {
+ *              HostInstance.type.defaultMemory(Host, Memory);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class TotalMemory extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private TotalMemory() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static TotalMemory instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link TotalMemory} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link TotalMemory#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final TotalMemory INSTANCE = new TotalMemory();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final TotalMemory.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_Host = new PParameter("Host", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+    
+    private final PParameter parameter_Memory = new PParameter("Memory", "java.lang.Integer", new EDataTypeInSlotsKey((EDataType)getClassifierLiteralSafe("http://www.eclipse.org/emf/2002/Ecore", "EInt")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_Host, parameter_Memory);
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.totalMemory";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("Host","Memory");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_Host = body.getOrCreateVariableByName("Host");
+          PVariable var_Memory = body.getOrCreateVariableByName("Memory");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Memory), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EInt")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_Host, parameter_Host),
+             new ExportedParameter(body, var_Memory, parameter_Memory)
+          ));
+          //    HostInstance.type.defaultMemory(Host, Memory)
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_Host, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "HostInstance", "type")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostType")));
+          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "HostType", "defaultMemory")));
+          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EDataTypeInSlotsKey((EDataType)getClassifierLiteral("http://www.eclipse.org/emf/2002/Ecore", "EInt")));
+          new Equality(body, var__virtual_1_, var_Memory);
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/UnallocatedAppInstance.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/UnallocatedAppInstance.java
new file mode 100644
index 00000000..66b315f4
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src-gen/hu/bme/mit/inf/dslreasoner/domains/cps/queries/internal/UnallocatedAppInstance.java
@@ -0,0 +1,172 @@
+/**
+ * Generated from platform:/resource/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
+ */
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries.internal;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;
+import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecificationWithGenericMatcher;
+import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;
+import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;
+import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;
+import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;
+import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;
+import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
+import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
+
+/**
+ * A pattern-specific query specification that can instantiate GenericPatternMatcher in a type-safe way.
+ * 
+ * <p>Original source:
+ *         <code><pre>
+ *         private pattern unallocatedAppInstance(App : ApplicationInstance) {
+ *              neg ApplicationInstance.allocatedTo(App, _);
+ *         }
+ * </pre></code>
+ * 
+ * @see GenericPatternMatcher
+ * @see GenericPatternMatch
+ * 
+ */
+@SuppressWarnings("all")
+public final class UnallocatedAppInstance extends BaseGeneratedEMFQuerySpecificationWithGenericMatcher {
+  private UnallocatedAppInstance() {
+    super(GeneratedPQuery.INSTANCE);
+  }
+  
+  /**
+   * @return the singleton instance of the query specification
+   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded
+   * 
+   */
+  public static UnallocatedAppInstance instance() {
+    try{
+        return LazyHolder.INSTANCE;
+    } catch (ExceptionInInitializerError err) {
+        throw processInitializerError(err);
+    }
+  }
+  
+  /**
+   * Inner class allowing the singleton instance of {@link UnallocatedAppInstance} to be created 
+   *     <b>not</b> at the class load time of the outer class, 
+   *     but rather at the first call to {@link UnallocatedAppInstance#instance()}.
+   * 
+   * <p> This workaround is required e.g. to support recursion.
+   * 
+   */
+  private static class LazyHolder {
+    private static final UnallocatedAppInstance INSTANCE = new UnallocatedAppInstance();
+    
+    /**
+     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.
+     * This initialization order is required to support indirect recursion.
+     * 
+     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.
+     * 
+     */
+    private static final Object STATIC_INITIALIZER = ensureInitialized();
+    
+    public static Object ensureInitialized() {
+      INSTANCE.ensureInitializedInternal();
+      return null;
+    }
+  }
+  
+  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {
+    private static final UnallocatedAppInstance.GeneratedPQuery INSTANCE = new GeneratedPQuery();
+    
+    private final PParameter parameter_App = new PParameter("App", "hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "ApplicationInstance")), PParameterDirection.INOUT);
+    
+    private final List<PParameter> parameters = Arrays.asList(parameter_App);
+    
+    private class Embedded_1_ApplicationInstance_allocatedTo extends BaseGeneratedEMFPQuery {
+      private final PParameter parameter_p0 = new PParameter("p0", "hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "ApplicationInstance")), PParameterDirection.INOUT);
+      
+      private final PParameter parameter_p1 = new PParameter("p1", "hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("http://www.example.org/cps", "HostInstance")), PParameterDirection.INOUT);
+      
+      private final List<PParameter> embeddedParameters = Arrays.asList(parameter_p0, parameter_p1);
+      
+      public Embedded_1_ApplicationInstance_allocatedTo() {
+        super(PVisibility.EMBEDDED);
+      }
+      
+      @Override
+      public String getFullyQualifiedName() {
+        return GeneratedPQuery.this.getFullyQualifiedName() + "$Embedded_1_ApplicationInstance_allocatedTo";
+      }
+      
+      @Override
+      public List<PParameter> getParameters() {
+        return embeddedParameters;
+      }
+      
+      @Override
+      public Set<PBody> doGetContainedBodies() {
+        PBody body = new PBody(this);
+        PVariable var_p0 = body.getOrCreateVariableByName("p0");
+        PVariable var_p1 = body.getOrCreateVariableByName("p1");
+        body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+           new ExportedParameter(body, var_p0, parameter_p0),
+           new ExportedParameter(body, var_p1, parameter_p1)
+        ));
+        //  ApplicationInstance.allocatedTo(App, _)
+        new TypeConstraint(body, Tuples.flatTupleOf(var_p0), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+        PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");
+        new TypeConstraint(body, Tuples.flatTupleOf(var_p0, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("http://www.example.org/cps", "ApplicationInstance", "allocatedTo")));
+        new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "HostInstance")));
+        new Equality(body, var__virtual_0_, var_p1);
+        return Collections.singleton(body);
+      }
+    }
+    
+    private GeneratedPQuery() {
+      super(PVisibility.PRIVATE);
+    }
+    
+    @Override
+    public String getFullyQualifiedName() {
+      return "hu.bme.mit.inf.dslreasoner.domains.cps.queries.unallocatedAppInstance";
+    }
+    
+    @Override
+    public List<String> getParameterNames() {
+      return Arrays.asList("App");
+    }
+    
+    @Override
+    public List<PParameter> getParameters() {
+      return parameters;
+    }
+    
+    @Override
+    public Set<PBody> doGetContainedBodies() {
+      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));
+      Set<PBody> bodies = new LinkedHashSet<>();
+      {
+          PBody body = new PBody(this);
+          PVariable var_App = body.getOrCreateVariableByName("App");
+          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");
+          new TypeConstraint(body, Tuples.flatTupleOf(var_App), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("http://www.example.org/cps", "ApplicationInstance")));
+          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(
+             new ExportedParameter(body, var_App, parameter_App)
+          ));
+          //    neg ApplicationInstance.allocatedTo(App, _)
+          new NegativePatternCall(body, Tuples.flatTupleOf(var_App, var___0_), new UnallocatedAppInstance.GeneratedPQuery.Embedded_1_ApplicationInstance_allocatedTo());
+          bodies.add(body);
+      }
+      return bodies;
+    }
+  }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/cplex/CbcCpsMain.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/cplex/CbcCpsMain.xtend
new file mode 100644
index 00000000..1a07e26e
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/cplex/CbcCpsMain.xtend
@@ -0,0 +1,67 @@
+package hu.bme.mit.inf.dslreasoner.domains.cps.cplex
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage
+import hu.bme.mit.inf.dslreasoner.domains.cps.generator.CpsGenerator
+import java.io.BufferedReader
+import java.io.BufferedWriter
+import java.io.FileReader
+import java.io.FileWriter
+import java.util.concurrent.TimeUnit
+import java.util.regex.Pattern
+import org.eclipse.emf.ecore.EPackage
+import org.eclipse.emf.ecore.resource.Resource
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
+
+class CbcCpsMain {
+        static val PROBLEM_FILE = "problem.lp"
+        static val SOLUTION_FILE = "solution.txt"
+        static val VALUE_REGEX = Pattern.compile("Optimal - objective value\\s*([0-9]+(\\.[0-9]+)?)")
+
+        private new() {
+                new IllegalStateException("This is a static utility class and should not be instantiated directly.")
+        }
+
+        public static def void main(String[] args) {
+                Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put(Resource.Factory.Registry.DEFAULT_EXTENSION,
+                        new XMIResourceFactoryImpl)
+                EPackage.Registry.INSTANCE.put(CpsPackage.eNS_URI, CpsPackage.eINSTANCE)
+                val generator = new CpsGenerator(1, 4, 1)
+                val problem = generator.generateCpsProblem
+                val toLp = new CpsToLpTranslator(problem, 10, true)
+                val lp = toLp.lpProblem
+                val writer = new BufferedWriter(new FileWriter(PROBLEM_FILE))
+                try {
+                        writer.append(lp)
+                } finally {
+                        writer.close
+                }
+                val process = new ProcessBuilder().inheritIO.command("cbc", PROBLEM_FILE, "solve", "solu", SOLUTION_FILE).start
+                if (!process.waitFor(120, TimeUnit.SECONDS)) {
+                        System.err.println("Timeout reached")
+                        process.destroyForcibly
+                        System.exit(-1)
+                }
+                if (process.exitValue != 0) {
+                        System.err.println("Unexpected exit value " + process.exitValue)
+                        System.exit(-1)
+                }
+                val reader = new BufferedReader(new FileReader(SOLUTION_FILE))
+                var double value = Double.NaN
+                try {
+                        var String line
+                        while ((line = reader.readLine) !== null) {
+                                println(line)
+                                val matcher = VALUE_REGEX.matcher(line)
+                                if (matcher.matches) {
+                                        value = Double.parseDouble(matcher.group(1))
+                                }
+                        }
+                } finally {
+                        reader.close
+                }
+                val applicationCost = problem.requests.flatMap[requirements.map[count]].reduce[p1, p2|p1 + p2] * 5
+                val cost = applicationCost + value
+                println
+                println("Cost: " + cost)
+        }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/cplex/CpsToLpTranslator.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/cplex/CpsToLpTranslator.xtend
new file mode 100644
index 00000000..c38af3a0
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/cplex/CpsToLpTranslator.xtend
@@ -0,0 +1,171 @@
+package hu.bme.mit.inf.dslreasoner.domains.cps.cplex
+
+import com.google.common.collect.ImmutableList
+import com.google.common.collect.ImmutableMap
+import hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationType
+import hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostType
+import hu.bme.mit.inf.dslreasoner.domains.cps.Requirement
+import java.util.List
+import java.util.Map
+
+class CpsToLpTranslator {
+        static val MINIMUM_MEMORY_USAGE = 0.25
+        static val MINIMUM_HDD_USAGE = 0.25
+
+        val CyberPhysicalSystem cps
+        val Map<Requirement, ? extends List<String>> appInstances
+        val Map<HostType, ? extends List<String>> hostInstances
+        val boolean breakSymmetry
+
+        new(CyberPhysicalSystem cps, int hostInstanceCount, boolean breakSymmetry) {
+                this.cps = cps
+                appInstances = createAppInstances
+                hostInstances = createHostInstances(hostInstanceCount)
+                this.breakSymmetry = breakSymmetry
+        }
+
+        private def createAppInstances() {
+                val builder = ImmutableMap.builder
+                var int i = 0
+                for (req : requirements) {
+                        val listBuilder = ImmutableList.builder
+                        for (var int j = 0; j < req.count; j++) {
+                                listBuilder.add('''r«i»a«j»''')
+                        }
+                        builder.put(req, listBuilder.build)
+                        i++
+                }
+                builder.build
+        }
+
+        private def createHostInstances(int hostInstanceCount) {
+                val builder = ImmutableMap.builder
+                var int i = 0
+                for (hostType : cps.hostTypes) {
+                        val listBuilder = ImmutableList.builder
+                        for (var int j = 0; j < hostInstanceCount; j++) {
+                                listBuilder.add('''h«i»i«j»''')
+                        }
+                        builder.put(hostType, listBuilder.build)
+                        i++
+                }
+                builder.build
+        }
+
+        def getLpProblem() {
+                '''
+                        Minimize
+                                total_cost: «objective»
+                        Subject To
+                                «constraints»
+                        Bounds
+                                «bounds»
+                        Binary
+                                «binaryVariables»
+                        End
+                '''
+        }
+
+        private def getObjective() {
+                '''«FOR pair : hostInstancesWithType SEPARATOR " + "»«pair.key.cost» «pair.value.existsVariable»«ENDFOR»'''
+        }
+
+        private def getConstraints() {
+                '''
+                        «FOR appPair : appInstancesWithType»
+                                «appPair.value»_allocated: «FOR host : appPair.key.possibleHostInstances SEPARATOR " + "»«getAllocatedToVariable(appPair.value, host)»«ENDFOR» = 1
+                                «FOR host : appPair.key.possibleHostInstances»
+                                        «appPair.value»_to_«host»_exists: «host.existsVariable» - «getAllocatedToVariable(appPair.value, host)» >= 0
+                                «ENDFOR»
+                        «ENDFOR»
+                        «FOR hostPair : hostInstancesWithType»
+                                «hostPair.value»_mem_use: «FOR appPair : hostPair.key.possibleAppInstancesWithRequirements SEPARATOR " + "»«appPair.key.requiredMemory» «getAllocatedToVariable(appPair.value, hostPair.value)»«ENDFOR» - «hostPair.key.defaultMemory» «hostPair.value.memoryUsageVariable» = 0
+                                «hostPair.value»_hdd_use: «FOR appPair : hostPair.key.possibleAppInstancesWithRequirements SEPARATOR " + "»«appPair.key.requiredHdd» «getAllocatedToVariable(appPair.value, hostPair.value)»«ENDFOR» - «hostPair.key.defaultHdd» «hostPair.value.hddUsageVariable» = 0
+                        «ENDFOR»
+                        average_mem: «FOR host : allHostInstances SEPARATOR " + "»«host.memoryUsageVariable» - «MINIMUM_MEMORY_USAGE» «host.existsVariable»«ENDFOR» >= 0
+                        average_hdd: «FOR host : allHostInstances SEPARATOR " + "»«host.memoryUsageVariable» - «MINIMUM_HDD_USAGE» «host.existsVariable»«ENDFOR» >= 0
+                        «FOR reqPair : requirements.filter[count > 1].indexed»
+                                «FOR host : reqPair.value.type.requirements.flatMap[hostInstances.get(hostType)]»
+                                        r«reqPair.key»_«host»_redundant: «FOR app : appInstances.get(reqPair.value) SEPARATOR " + "»«getAllocatedToVariable(app, host)»«ENDFOR» <= 1
+                                «ENDFOR»
+                        «ENDFOR»
+                        «IF breakSymmetry»
+                                «FOR hosts : hostInstances.values»
+                                        «FOR i : 0 ..< (hosts.size - 1)»
+                                                «hosts.get(i + 1)»_after_«hosts.get(i)»: «hosts.get(i).existsVariable» - «hosts.get(i + 1).existsVariable» >= 0
+                                        «ENDFOR»
+                                «ENDFOR»
+                        «ENDIF»
+                '''
+        }
+
+        private def getBounds() {
+                '''
+                        «FOR host : allHostInstances»
+                                0 <= «host.memoryUsageVariable» <= 1
+                                0 <= «host.hddUsageVariable» <= 1
+                        «ENDFOR»
+                '''
+        }
+
+        private def getBinaryVariables() {
+                '''
+                        «FOR host : allHostInstances»
+                                «host.existsVariable»
+                        «ENDFOR»
+                        «FOR appPair : appInstancesWithType»
+                                «FOR host : appPair.key.possibleHostInstances»
+                                        «getAllocatedToVariable(appPair.value, host)»
+                                «ENDFOR»
+                        «ENDFOR»
+                '''
+        }
+
+        private def getRequirements() {
+                cps.requests.flatMap[requirements]
+        }
+
+        private def getAllHostInstances() {
+                hostInstances.values.flatMap[it]
+        }
+
+        private def getHostInstancesWithType() {
+                hostInstances.entrySet.flatMap[pair|pair.value.map[pair.key -> it]]
+        }
+
+        private def getAppInstancesWithType() {
+                appInstances.entrySet.flatMap[pair|pair.value.map[pair.key.type -> it]]
+        }
+
+        private def getPossibleHostInstances(ApplicationType appType) {
+                appType.requirements.flatMap[req|hostInstances.get(req.hostType)]
+        }
+
+        private def getPossibleAppInstancesWithRequirements(HostType hostType) {
+                appInstances.entrySet.flatMap [ pair |
+                        val resourceReq = pair.key.type.requirements.findFirst[it.hostType == hostType]
+                        if (resourceReq === null) {
+                                emptyList
+                        } else {
+                                pair.value.map[resourceReq -> it]
+                        }
+                ]
+        }
+
+        private def getExistsVariable(String hostInstance) {
+                '''«hostInstance»_exists'''
+        }
+
+        private def getMemoryUsageVariable(String hostInstance) {
+                '''«hostInstance»_mem'''
+        }
+
+        private def getHddUsageVariable(String hostInstance) {
+                '''«hostInstance»_hdd'''
+        }
+
+        private def getAllocatedToVariable(String appInstance, String hostInstance) {
+                '''«appInstance»_to_«hostInstance»'''
+        }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/dse/CpsStateCoder.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/dse/CpsStateCoder.xtend
new file mode 100644
index 00000000..223cee03
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/dse/CpsStateCoder.xtend
@@ -0,0 +1,134 @@
+package hu.bme.mit.inf.dslreasoner.domains.cps.dse
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.ApplicationInstance
+import hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostInstance
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostType
+import hu.bme.mit.inf.dslreasoner.domains.cps.Request
+import hu.bme.mit.inf.dslreasoner.domains.cps.Requirement
+import org.eclipse.emf.common.notify.Notifier
+import org.eclipse.emf.ecore.resource.Resource
+import org.eclipse.emf.ecore.resource.ResourceSet
+import org.eclipse.viatra.dse.statecode.IStateCoder
+import org.eclipse.viatra.dse.statecode.IStateCoderFactory
+import org.eclipse.viatra.query.runtime.api.IPatternMatch
+import org.eclipse.xtend2.lib.StringConcatenationClient
+
+class CpsStateCoder implements IStateCoder {
+        CyberPhysicalSystem cps
+
+        protected new() {
+        }
+
+        override init(Notifier notifier) {
+                cps = switch (notifier) {
+                        ResourceSet: getCpsFromResourceSet(notifier)
+                        Resource: getCpsFromResource(notifier)
+                        CyberPhysicalSystem: notifier
+                        default: throw new IllegalArgumentException("notifier is not a CyberPhysicalSystem")
+                }
+        }
+
+        private def getCpsFromResourceSet(ResourceSet resourceSet) {
+                if (resourceSet.resources.empty) {
+                        throw new IllegalArgumentException("No Resource in ResourceSet")
+                }
+                val resource = resourceSet.resources.head
+                getCpsFromResource(resource)
+        }
+
+        private def getCpsFromResource(Resource resource) {
+                if (resource.contents.empty) {
+                        throw new IllegalArgumentException("No EObject in Resource")
+                }
+                val cps = resource.contents.head
+                if (cps instanceof CyberPhysicalSystem) {
+                        cps
+                } else {
+                        throw new IllegalArgumentException("EObject in Resource is not a CyberPhysicalSystem")
+                }
+        }
+
+        override String createStateCode() {
+                '''«createRequestsCode»«createHostTypesCode»'''
+        }
+
+        private def StringConcatenationClient createRequestsCode() {
+                '''«FOR request : cps.requests»«createRequestCode(request)»«ENDFOR»'''
+        }
+
+        private def StringConcatenationClient createRequestCode(Request request) {
+                '''[«FOR requirement : request.requirements»«createRequirementCode(requirement)»«ENDFOR»]'''
+        }
+
+        private def StringConcatenationClient createRequirementCode(Requirement requirement) {
+                '''[«FOR app : requirement.instances SEPARATOR ","»«createAppCode(app)»«ENDFOR»]'''
+        }
+
+        private def createAppCode(ApplicationInstance app) {
+                if (app.allocatedTo === null) {
+                        "-"
+                } else {
+                        createMatchArgumentCode(app.allocatedTo)
+                }
+        }
+
+        private def createHostTypesCode() {
+                '''(«FOR hostType : cps.hostTypes SEPARATOR ","»«hostType.instances.size»«ENDFOR»)'''
+        }
+
+        override String createActivationCode(IPatternMatch match) {
+                '''«match.specification.simpleName»(«FOR arg : match.toArray SEPARATOR ","»«createMatchArgumentCode(arg)»«ENDFOR»)'''
+        }
+
+        protected dispatch def String createMatchArgumentCode(Requirement requirement) {
+                val request = requirement.eContainer
+                if (request instanceof Request) {
+                        if (request.eContainer != cps) {
+                                throw new IllegalArgumentException("Request is not contained in the CPS")
+                        }
+                        val requestIndex = cps.requests.indexOf(request)
+                        val requirementIndex = request.requirements.indexOf(requirement)
+                        requestIndex + "." + requirementIndex
+                } else {
+                        throw new IllegalArgumentException("Requirement is not contained in a request")
+                }
+        }
+
+        protected dispatch def String createMatchArgumentCode(ApplicationInstance app) {
+                val requirement = app.requirement
+                if (requirement === null) {
+                        throw new IllegalArgumentException("Application instance is not associated with a requirement")
+                }
+                val instanceIndex = requirement.instances.indexOf(app)
+                createMatchArgumentCode(requirement) + "." + instanceIndex
+        }
+
+        protected dispatch def String createMatchArgumentCode(HostInstance host) {
+                val hostType = host.eContainer
+                if (hostType instanceof HostType) {
+                        val hostIndex = hostType.instances.indexOf(host)
+                        createMatchArgumentCode(hostType) + "." + hostIndex
+                } else {
+                        throw new IllegalArgumentException("Host is not contained in a host type")
+                }
+        }
+
+        protected dispatch def String createMatchArgumentCode(HostType hostType) {
+                if (hostType.eContainer != cps) {
+                        throw new IllegalArgumentException("Host type is not contained in the CPS")
+                }
+                val hostTypeIndex = cps.hostTypes.indexOf(hostType)
+                hostTypeIndex.toString
+        }
+
+        protected dispatch def createMatchArgumentCode(Object object) {
+                throw new IllegalArgumentException("Unknown match argument: ")
+        }
+
+        static class Factory implements IStateCoderFactory {
+                override createStateCoder() {
+                        new CpsStateCoder
+                }
+        }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/dse/RuleBasedCpsMain.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/dse/RuleBasedCpsMain.xtend
new file mode 100644
index 00000000..35b3b1df
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/dse/RuleBasedCpsMain.xtend
@@ -0,0 +1,39 @@
+package hu.bme.mit.inf.dslreasoner.domains.cps.dse
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage
+import hu.bme.mit.inf.dslreasoner.domains.cps.generator.CpsGenerator
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.CpsQueries
+import org.eclipse.emf.ecore.EPackage
+import org.eclipse.emf.ecore.EStructuralFeature
+import org.eclipse.emf.ecore.resource.Resource
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
+import org.eclipse.viatra.addon.querybasedfeatures.runtime.QueryBasedFeatureSettingDelegateFactory
+import org.eclipse.viatra.addon.querybasedfeatures.runtime.handler.QueryBasedFeatures
+import org.eclipse.viatra.dse.api.DesignSpaceExplorer
+import org.eclipse.viatra.dse.api.DesignSpaceExplorer.DseLoggingLevel
+import org.eclipse.viatra.query.runtime.extensibility.SingletonQueryGroupProvider
+import org.eclipse.viatra.query.runtime.registry.QuerySpecificationRegistry
+import org.eclipse.viatra.query.runtime.registry.connector.QueryGroupProviderSourceConnector
+
+class RuleBasedCpsMain {
+        private new() {
+                new IllegalStateException("This is a static utility class and should not be instantiated directly.")
+        }
+
+        public static def void main(String[] args) {
+                DesignSpaceExplorer.turnOnLogging(DseLoggingLevel.VERBOSE_FULL)
+                Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put(Resource.Factory.Registry.DEFAULT_EXTENSION,
+                        new XMIResourceFactoryImpl)
+                EStructuralFeature.Internal.SettingDelegate.Factory.Registry.INSTANCE.put(QueryBasedFeatures.ANNOTATION_SOURCE,
+                        new QueryBasedFeatureSettingDelegateFactory)
+                EPackage.Registry.INSTANCE.put(CpsPackage.eNS_URI, CpsPackage.eINSTANCE)
+                QuerySpecificationRegistry.instance.addSource(
+                        new QueryGroupProviderSourceConnector("CpsQueries", new SingletonQueryGroupProvider(CpsQueries.instance),
+                                true))
+                val generator = new CpsGenerator(1, 4, 1)
+                val problem = generator.generateCpsProblem
+//              problem.eResource.save(emptyMap)
+                val solver = new RuleBasedCpsSolver
+                solver.solve(problem)
+        }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/dse/RuleBasedCpsSolver.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/dse/RuleBasedCpsSolver.xtend
new file mode 100644
index 00000000..503c06ea
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/dse/RuleBasedCpsSolver.xtend
@@ -0,0 +1,74 @@
+package hu.bme.mit.inf.dslreasoner.domains.cps.dse
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.CpsFactory
+import hu.bme.mit.inf.dslreasoner.domains.cps.CpsPackage
+import hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.Allocate
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.AverageFreeHddMetric
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.AverageFreeMemoryMetric
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.CostMetric
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.CreateHostInstance
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.GuidanceObjective
+import hu.bme.mit.inf.dslreasoner.domains.cps.queries.RequirementNotSatisfied
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.CompositeDirectionalThresholdObjective
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.ObjectiveKind
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.ObjectiveThreshold
+import hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner.optimization.QueryBasedObjective
+import org.eclipse.viatra.dse.api.DesignSpaceExplorer
+import org.eclipse.viatra.dse.evolutionary.EvolutionaryStrategyBuilder
+import org.eclipse.viatra.transformation.runtime.emf.rules.batch.BatchTransformationRuleFactory
+
+class RuleBasedCpsSolver {
+        extension val BatchTransformationRuleFactory = new BatchTransformationRuleFactory
+        extension val CpsFactory = CpsFactory.eINSTANCE
+
+        def solve(CyberPhysicalSystem problem) {
+//              for (request : problem.requests) {
+//                      for (req : request.requirements) {
+//                              for (i : 0 ..< req.count) {
+//                                      val app = createApplicationInstance
+//                                      req.type.instances += app
+//                                      req.instances += app
+//                              }
+//                      }
+//              }
+                val dse = new DesignSpaceExplorer
+                dse.addMetaModelPackage(CpsPackage.eINSTANCE)
+                dse.initialModel = problem.eResource.resourceSet
+                dse.addTransformationRule(createRule.precondition(RequirementNotSatisfied.instance).action [
+                        val app = createApplicationInstance
+                        req.type.instances += app
+                        req.instances += app
+                ].build)
+                dse.addTransformationRule(createRule.precondition(Allocate.instance).action [
+                        app.allocatedTo = host
+                ].build)
+//              dse.addTransformationRule(createRule(UnallocateAppInstance.instance).action [
+//                      app.allocatedTo = null
+//              ].build)
+                dse.addTransformationRule(createRule.precondition(CreateHostInstance.instance).action [
+                        hostType.instances += createHostInstance
+                ].build)
+//              dse.addTransformationRule(createRule(RemoveHostInstance.instance).action [
+//                      hostInstance.type.instances -= hostInstance
+//              ].build)
+                dse.addObjective(
+                        new CompositeDirectionalThresholdObjective("Composite",
+                                new QueryBasedObjective(GuidanceObjective.instance, ObjectiveKind.LOWER_IS_BETTER,
+                                        new ObjectiveThreshold.Inclusive(0), 0),
+                                new QueryBasedObjective(AverageFreeMemoryMetric.instance, ObjectiveKind.LOWER_IS_BETTER,
+                                        new ObjectiveThreshold.Inclusive(0.75), 0),
+                                new QueryBasedObjective(AverageFreeHddMetric.instance, ObjectiveKind.LOWER_IS_BETTER,
+                                        new ObjectiveThreshold.Inclusive(0.75), 0)))
+                dse.addObjective(
+                        new QueryBasedObjective(CostMetric.instance, ObjectiveKind.LOWER_IS_BETTER,
+                                ObjectiveThreshold.NO_THRESHOLD, 0))
+                dse.maxNumberOfThreads = 1
+                dse.stateCoderFactory = new CpsStateCoder.Factory
+                val strategy = EvolutionaryStrategyBuilder.createNsga2Strategy(25)
+                dse.startExplorationWithTimeout(strategy, 2 * 60 * 1000)
+                for (solution : dse.solutions) {
+                        println("Found solution: " + solution.stateCode + " " + solution.arbitraryTrajectory.fitness)
+                }
+        }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/generator/CpsGenerator.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/generator/CpsGenerator.xtend
new file mode 100644
index 00000000..e8d29949
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/generator/CpsGenerator.xtend
@@ -0,0 +1,117 @@
+package hu.bme.mit.inf.dslreasoner.domains.cps.generator
+
+import hu.bme.mit.inf.dslreasoner.domains.cps.CpsFactory
+import hu.bme.mit.inf.dslreasoner.domains.cps.CyberPhysicalSystem
+import hu.bme.mit.inf.dslreasoner.domains.cps.HostType
+import java.util.Collection
+import java.util.Random
+import org.eclipse.emf.common.util.URI
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl
+
+class CpsGenerator {
+        extension val CpsFactory = CpsFactory.eINSTANCE
+
+        static val MIN_MEMORY = 1
+        static val MAX_MEMORY = 6
+        static val MIN_HDD = 1
+        static val MAX_HDD = 30
+        static val HIGH_CPU_FRACTION = 4
+        static val MIN_REPLICAS = 1
+        static val MAX_REPLICAS = 4
+
+        val Random random
+        val int applicationTypeCount
+        val int demandFactor
+        val boolean populateAppInstances
+
+        new(long randomSeed, int applicationTypeCount, int demandFactor) {
+                this(randomSeed, applicationTypeCount, demandFactor, false)
+        }
+
+        new(long randomSeed, int applicationTypeCount, int demandFactor, boolean populateAppInstances) {
+                this.random = new Random(randomSeed)
+                this.applicationTypeCount = applicationTypeCount
+                this.demandFactor = demandFactor
+                this.populateAppInstances = populateAppInstances
+        }
+
+        def generateCpsProblem() {
+                val resourceSet = new ResourceSetImpl
+                val resource = resourceSet.createResource(URI.createFileURI("dummy.dummyext"))
+                createCyberPhysicalSystem => [
+                        val cps = it
+                        resource.contents += cps
+                        createLowCpuHostTypes
+                        val highCpuHostTypes = createHighCpuHostTypes
+                        for (var int i = 0; i < applicationTypeCount; i++) {
+                                if (i % HIGH_CPU_FRACTION == 0) {
+                                        createRandomApplicationType(highCpuHostTypes)
+                                } else {
+                                        createRandomApplicationType(hostTypes)
+                                }
+                        }
+                        for (var int i = 0; i < demandFactor; i++) {
+                                requests += createRequest => [
+                                        for (appType : cps.applicationTypes) {
+                                                requirements += createRequirement => [
+                                                        count = nextInt(CpsGenerator.MIN_REPLICAS, CpsGenerator.MAX_REPLICAS)
+                                                        type = appType
+                                                        if (populateAppInstances) {
+                                                                for (j : 0 ..< count) {
+                                                                        val app = createApplicationInstance
+                                                                        app.type = appType
+                                                                        appType.instances += app
+                                                                        instances += app
+                                                                }
+                                                        }
+                                                ]
+                                        }
+                                ]
+                        }
+                ]
+        }
+
+        private def void createRandomApplicationType(CyberPhysicalSystem it, Collection<HostType> allowedHostTypes) {
+                val appType = createApplicationType
+                val memory = nextInt(MIN_MEMORY, MAX_MEMORY)
+                val hdd = nextInt(MIN_HDD, MAX_HDD)
+                for (hostType : allowedHostTypes) {
+                        appType.requirements += createResourceRequirement => [
+                                it.hostType = hostType
+                                requiredMemory = memory
+                                requiredHdd = hdd
+                        ]
+                }
+                applicationTypes += appType
+        }
+
+        private def createLowCpuHostTypes(CyberPhysicalSystem it) {
+                #[
+                        createHostType(2, 8, 75), // m5d.large
+                        createHostType(4, 16, 150), // m5d.xlarge
+                        createHostType(3, 16, 75), // r5d.large
+                        createHostType(6, 32, 150) // r5d.xlarge
+                ]
+        }
+
+        private def createHighCpuHostTypes(CyberPhysicalSystem it) {
+                #[
+                        createHostType(2, 4, 50), // c5d.large
+                        createHostType(4, 8, 100) // c5d.xlarge
+                ]
+        }
+
+        private def createHostType(CyberPhysicalSystem it, int cost, int memory, int hdd) {
+                val hostType = createHostType => [
+                        it.cost = cost
+                        defaultMemory = memory
+                        defaultHdd = hdd
+                ]
+                hostTypes += hostType
+                hostType
+        }
+
+        private def nextInt(int lower, int upper) {
+                lower + random.nextInt(upper - lower + 1)
+        }
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
new file mode 100644
index 00000000..aa78dc38
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/queries/CpsQueries.vql
@@ -0,0 +1,198 @@
+package hu.bme.mit.inf.dslreasoner.domains.cps.queries
+
+import "http://www.eclipse.org/emf/2002/Ecore"
+import "http://www.example.org/cps"
+
+private pattern cpsApplications(Cps : CyberPhysicalSystem, AppInstance : ApplicationInstance) {
+        CyberPhysicalSystem.applicationTypes.instances(Cps, AppInstance);
+}
+
+private pattern cpsHosts(Cps : CyberPhysicalSystem, HostInstance : HostInstance) {
+        CyberPhysicalSystem.hostTypes.instances(Cps, HostInstance);
+}
+
+private pattern totalMemory(Host : HostInstance, Memory : EInt) {
+        HostInstance.type.defaultMemory(Host, Memory);
+}
+
+private pattern totalHdd(Host : HostInstance, Hdd : EInt) {
+        HostInstance.type.defaultHdd(Host, Hdd);
+}
+
+private pattern availableMemory(Host : HostInstance, Memory : java Integer) {
+        find totalMemory(Host, TotalMemory);
+        RequiredMemory == sum find memoryRequirement(Host, _, #_);
+        Memory == eval(TotalMemory - RequiredMemory);
+}
+
+private pattern memoryRequirement(Host : HostInstance, App : ApplicationInstance, Memory : EInt) {
+        find resourceRequirement(Host, App, Req);
+        ResourceRequirement.requiredMemory(Req, Memory);
+}
+
+private pattern availableHdd(Host : HostInstance, Hdd : java Integer) {
+        find totalHdd(Host, TotalHdd);
+        RequiredHdd == sum find hddRequirement(Host, _, #_);
+        Hdd == eval(TotalHdd - RequiredHdd);
+}
+
+private pattern hddRequirement(Host : HostInstance, App : ApplicationInstance, Hdd : EInt) {
+        find resourceRequirement(Host, App, Req);
+        ResourceRequirement.requiredHdd(Req, Hdd);
+}
+
+pattern resourceRequirement(Host : HostInstance, App : ApplicationInstance, Req : ResourceRequirement) {
+        ApplicationInstance.allocatedTo(App, Host);
+        ApplicationInstance.type.requirements(App, Req);
+        HostInstance.type(Host, HostType);
+        ResourceRequirement.hostType(Req, HostType);
+}
+
+@Constraint(severity = "error", key = {Host, App},
+        message = "Application instance must be allocated to a supported host type.")
+pattern allocationWithoutResourceRequirement(Host : HostInstance, App : ApplicationInstance) {
+        ApplicationInstance.allocatedTo(App, Host);
+        neg find resourceRequirement(Host, App, _);
+}
+
+@Constraint(severity = "error", key = {Host},
+        message = "Insufficient memory available on host.")
+pattern notEnoughAvailableMemory(Host : HostInstance) {
+        find availableMemory(Host, Memory);
+        check(Memory < 0);
+}
+
+@Constraint(severity = "error", key = {Host},
+        message = "Insufficient HDD available on host.")
+pattern notEnoughAvailableHdd(Host : HostInstance) {
+        find availableHdd(Host, Hdd);
+        check(Hdd < 0);
+}
+
+@Constraint(severity = "error", key = {Req, App},
+        message = "Requirement must be satisfied by the required application type.")
+pattern instanceDoesNotSatisfyRequirement(Req : Requirement, App : ApplicationInstance) {
+        Requirement.instances(Req, App);
+        neg find satisfyingInstance(Req, App);
+}
+
+private pattern satisfyingInstance(Req : Requirement, App : ApplicationInstance) {
+        Requirement.instances(Req, App);
+        Requirement.type(Req, Type);
+        ApplicationInstance.type(App, Type);
+}
+
+@Constraint(severity = "error", key = {Req},
+        message = "Requirement is not satisfied by enough application instances.")
+pattern requirementNotSatisfied(Req : Requirement) {
+        Instances == count find satisfyingInstance(Req, _);
+        Requirement.count(Req, RequiredCount);
+        check(Instances < RequiredCount);
+}
+
+@Constraint(severity = "error", key = {Req},
+        message = "Redundant instances must not be allocated to the same host.")
+pattern redundantInstancesOnSameHost(Req : Requirement) {
+        Requirement.instances(Req, App1);
+        Requirement.instances(Req, App2);
+        App1 != App2;
+        ApplicationInstance.allocatedTo(App1, Host);
+        ApplicationInstance.allocatedTo(App2, Host);
+}
+
+//
+// Metrics
+//
+
+// Free memory
+
+pattern averageFreeMemoryMetric(Average : java Double) {
+        Average == avg find freeMemoryPercentage(_, #_);
+}
+
+private pattern freeMemoryPercentage(Host : HostInstance, Free : java Double) {
+        find totalMemory(Host, Total);
+        find availableMemory(Host, Available);
+        Free == eval((Available as double) / Total);
+}
+
+// Free HDD
+
+pattern averageFreeHddMetric(Average : java Double) {
+        Average == avg find freeHddPercentage(_, #_);
+}
+
+private pattern freeHddPercentage(Host : HostInstance, Free : java Double) {
+        find totalHdd(Host, Total);
+        find availableHdd(Host, Available);
+        Free == eval((Available as double) / Total);
+}
+
+// Total cost
+
+pattern costMetric(Cost : java Integer) {
+        Cost == sum find cpsCost(_, #_);
+}
+
+pattern cpsCost(Cps : CyberPhysicalSystem, Cost : java Integer) {
+        AppCount == count find cpsApplications(Cps, _);
+        HostCost == sum find hostInstanceCost(Cps, _, #_);
+        Cost == eval(5 * AppCount + HostCost);
+}
+
+private pattern hostInstanceCost(Cps : CyberPhysicalSystem, Host : HostInstance, Cost : EInt) {
+        find cpsHosts(Cps, Host);
+        HostInstance.type.cost(Host, Cost);
+}
+
+//
+// Transformation rule preconditions for rule-based DSE
+//
+
+pattern allocate(App : ApplicationInstance, Host : HostInstance) {
+        ApplicationInstance.type.requirements(App, Req);
+        ResourceRequirement.hostType.instances(Req, Host);
+        find unallocatedAppInstance(App);
+        find availableMemory(Host, AvailableMem);
+        find availableHdd(Host, AvailableHdd);
+        ResourceRequirement.requiredMemory(Req, RequiredMem);
+        ResourceRequirement.requiredHdd(Req, RequiredHdd);
+        check(AvailableMem >= RequiredMem);
+        check(AvailableHdd >= RequiredHdd);
+        neg ApplicationInstance.requirement.instances.allocatedTo(App, Host);
+}
+
+pattern unallocateAppInstance(App : ApplicationInstance) {
+        ApplicationInstance.allocatedTo(App, _);
+}
+
+pattern createHostInstance(HostType : HostType) {
+        find unallocatedAppInstance(App);
+        ApplicationInstance.type.requirements.hostType(App, HostType);
+}
+
+pattern removeHostInstance(HostInstance : HostInstance) {
+        neg HostInstance.applications(HostInstance, _);
+}
+
+private pattern unallocatedAppInstance(App : ApplicationInstance) {
+        neg ApplicationInstance.allocatedTo(App, _);
+}
+
+private pattern requiredAppInstances(Req : Requirement, Remaining : java Integer) {
+        Instances == count find satisfyingInstance(Req, _);
+        Requirement.count(Req, RequiredCount);
+        Remaining == eval(RequiredCount - Instances);
+}
+
+private pattern noHostToAllocateTo(App : ApplicationInstance) {
+        find unallocatedAppInstance(App);
+        neg find allocate(App, _);
+}
+
+pattern guidanceObjective(Value : java Integer) {
+        UnallocatedInstances == count find unallocatedAppInstance(_);
+        RequiredInstances == sum find requiredAppInstances(_, #_);
+        NoHostToAllocate == count find noHostToAllocateTo(_);
+        Value == eval(2 * UnallocatedInstances + 4 * RequiredInstances + NoHostToAllocate);
+}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/META-INF/MANIFEST.MF b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/META-INF/MANIFEST.MF
index 81ee8677..2666dc5e 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/META-INF/MANIFEST.MF
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@ Bundle-Localization: plugin
 Export-Package: hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm,
  hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.impl,
  hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.util,
- hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu,
- hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated
+ hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu
 Require-Bundle: org.eclipse.viatra.query.runtime,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/CompositeElementImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/CompositeElementImpl.java
index 0e298b95..96c642fb 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/CompositeElementImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/CompositeElementImpl.java
@@ -68,6 +68,7 @@ public abstract class CompositeElementImpl extends MinimalEObjectImpl.Container
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Region> getRegions() {

                 if (regions == null) {

                         regions = new EObjectContainmentEList<Region>(Region.class, this, YakindummPackage.COMPOSITE_ELEMENT__REGIONS);

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/RegionImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/RegionImpl.java
index 232e5ab6..06ae652a 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/RegionImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/RegionImpl.java
@@ -68,6 +68,7 @@ public class RegionImpl extends MinimalEObjectImpl.Container implements Region {
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Vertex> getVertices() {

                 if (vertices == null) {

                         vertices = new EObjectContainmentEList<Vertex>(Vertex.class, this, YakindummPackage.REGION__VERTICES);

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/StateImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/StateImpl.java
index 6da0caec..bb1715f8 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/StateImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/StateImpl.java
@@ -67,6 +67,7 @@ public class StateImpl extends RegularStateImpl implements State {
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Region> getRegions() {

                 if (regions == null) {

                         regions = new EObjectContainmentEList<Region>(Region.class, this, YakindummPackage.STATE__REGIONS);

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/TransitionImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/TransitionImpl.java
index ff957869..1a7a275b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/TransitionImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/TransitionImpl.java
@@ -66,6 +66,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Vertex getTarget() {

                 if (target != null && target.eIsProxy()) {

                         InternalEObject oldTarget = (InternalEObject)target;

@@ -107,6 +108,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setTarget(Vertex newTarget) {

                 if (newTarget != target) {

                         NotificationChain msgs = null;

@@ -126,6 +128,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Vertex getSource() {

                 if (eContainerFeatureID() != YakindummPackage.TRANSITION__SOURCE) return null;

                 return (Vertex)eInternalContainer();

@@ -146,6 +149,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setSource(Vertex newSource) {

                 if (newSource != eInternalContainer() || (eContainerFeatureID() != YakindummPackage.TRANSITION__SOURCE && newSource != null)) {

                         if (EcoreUtil.isAncestor(this, newSource))

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/VertexImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/VertexImpl.java
index 13df20ee..a2989ade 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/VertexImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/VertexImpl.java
@@ -80,6 +80,7 @@ public abstract class VertexImpl extends MinimalEObjectImpl.Container implements
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Transition> getIncomingTransitions() {

                 if (incomingTransitions == null) {

                         incomingTransitions = new EObjectWithInverseResolvingEList<Transition>(Transition.class, this, YakindummPackage.VERTEX__INCOMING_TRANSITIONS, YakindummPackage.TRANSITION__TARGET);

@@ -92,6 +93,7 @@ public abstract class VertexImpl extends MinimalEObjectImpl.Container implements
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Transition> getOutgoingTransitions() {

                 if (outgoingTransitions == null) {

                         outgoingTransitions = new EObjectContainmentWithInverseEList<Transition>(Transition.class, this, YakindummPackage.VERTEX__OUTGOING_TRANSITIONS, YakindummPackage.TRANSITION__SOURCE);

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummFactoryImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummFactoryImpl.java
index 9c4fc4f1..79dd5b80 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummFactoryImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummFactoryImpl.java
@@ -75,6 +75,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Region createRegion() {

                 RegionImpl region = new RegionImpl();

                 return region;

@@ -85,6 +86,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Transition createTransition() {

                 TransitionImpl transition = new TransitionImpl();

                 return transition;

@@ -95,6 +97,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Statechart createStatechart() {

                 StatechartImpl statechart = new StatechartImpl();

                 return statechart;

@@ -105,6 +108,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Entry createEntry() {

                 EntryImpl entry = new EntryImpl();

                 return entry;

@@ -115,6 +119,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Synchronization createSynchronization() {

                 SynchronizationImpl synchronization = new SynchronizationImpl();

                 return synchronization;

@@ -125,6 +130,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public State createState() {

                 StateImpl state = new StateImpl();

                 return state;

@@ -135,6 +141,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Choice createChoice() {

                 ChoiceImpl choice = new ChoiceImpl();

                 return choice;

@@ -145,6 +152,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Exit createExit() {

                 ExitImpl exit = new ExitImpl();

                 return exit;

@@ -155,6 +163,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FinalState createFinalState() {

                 FinalStateImpl finalState = new FinalStateImpl();

                 return finalState;

@@ -165,6 +174,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public YakindummPackage getYakindummPackage() {

                 return (YakindummPackage)getEPackage();

         }

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummPackageImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummPackageImpl.java
index 77092c17..ccb5cb6a 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummPackageImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummPackageImpl.java
@@ -150,7 +150,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
 

         /**

          * 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 YakindummPackage#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 -->

@@ -164,7 +164,8 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
                 if (isInited) return (YakindummPackage)EPackage.Registry.INSTANCE.getEPackage(YakindummPackage.eNS_URI);

 

                 // Obtain or create and register package

-                YakindummPackageImpl theYakindummPackage = (YakindummPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof YakindummPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new YakindummPackageImpl());

+                Object registeredYakindummPackage = EPackage.Registry.INSTANCE.get(eNS_URI);

+                YakindummPackageImpl theYakindummPackage = registeredYakindummPackage instanceof YakindummPackageImpl ? (YakindummPackageImpl)registeredYakindummPackage : new YakindummPackageImpl();

 

                 isInited = true;

 

@@ -177,7 +178,6 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
                 // Mark meta-data to indicate it can't be changed

                 theYakindummPackage.freeze();

 

-  

                 // Update the registry and return the package

                 EPackage.Registry.INSTANCE.put(YakindummPackage.eNS_URI, theYakindummPackage);

                 return theYakindummPackage;

@@ -188,6 +188,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getPseudostate() {

                 return pseudostateEClass;

         }

@@ -197,6 +198,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getVertex() {

                 return vertexEClass;

         }

@@ -206,6 +208,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getVertex_IncomingTransitions() {

                 return (EReference)vertexEClass.getEStructuralFeatures().get(0);

         }

@@ -215,6 +218,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getVertex_OutgoingTransitions() {

                 return (EReference)vertexEClass.getEStructuralFeatures().get(1);

         }

@@ -224,6 +228,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getRegion() {

                 return regionEClass;

         }

@@ -233,6 +238,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getRegion_Vertices() {

                 return (EReference)regionEClass.getEStructuralFeatures().get(0);

         }

@@ -242,6 +248,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getTransition() {

                 return transitionEClass;

         }

@@ -251,6 +258,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getTransition_Target() {

                 return (EReference)transitionEClass.getEStructuralFeatures().get(0);

         }

@@ -260,6 +268,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getTransition_Source() {

                 return (EReference)transitionEClass.getEStructuralFeatures().get(1);

         }

@@ -269,6 +278,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getStatechart() {

                 return statechartEClass;

         }

@@ -278,6 +288,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getEntry() {

                 return entryEClass;

         }

@@ -287,6 +298,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getSynchronization() {

                 return synchronizationEClass;

         }

@@ -296,6 +308,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getState() {

                 return stateEClass;

         }

@@ -305,6 +318,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getRegularState() {

                 return regularStateEClass;

         }

@@ -314,6 +328,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getCompositeElement() {

                 return compositeElementEClass;

         }

@@ -323,6 +338,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getCompositeElement_Regions() {

                 return (EReference)compositeElementEClass.getEStructuralFeatures().get(0);

         }

@@ -332,6 +348,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getChoice() {

                 return choiceEClass;

         }

@@ -341,6 +358,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getExit() {

                 return exitEClass;

         }

@@ -350,6 +368,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFinalState() {

                 return finalStateEClass;

         }

@@ -359,6 +378,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public YakindummFactory getYakindummFactory() {

                 return (YakindummFactory)getEFactoryInstance();

         }

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/model/yakindu_simplified.genmodel b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/model/yakindu_simplified.genmodel
index 4e34cf1d..0a658e2c 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/model/yakindu_simplified.genmodel
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/model/yakindu_simplified.genmodel
@@ -29,5 +29,6 @@
     </genClasses>

     <genClasses ecoreClass="yakindu_simplified.ecore#//Choice"/>

     <genClasses ecoreClass="yakindu_simplified.ecore#//Exit"/>

+    <genClasses ecoreClass="yakindu_simplified.ecore#//FinalState"/>

   </genPackages>

 </genmodel:GenModel>

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml
index 5fd865dc..6941efca 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml
@@ -22,72 +22,4 @@
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.hasMultipleRegions"/>
     </group>
   </extension>
-  <extension id="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.Mutated" point="org.eclipse.viatra.query.runtime.queryspecification">
-    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.Mutated" id="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.Mutated">
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.entryInRegion_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.entryInRegion_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.entryInRegion_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noEntryInRegion_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noEntryInRegion_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noEntryInRegion_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noEntryInRegion_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noEntryInRegion_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noEntryInRegion_M5"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleEntryInRegion_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleEntryInRegion_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleEntryInRegion_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleEntryInRegion_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleEntryInRegion_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleEntryInRegion_M5"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.transition_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.transition_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.transition_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.transition_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.transition_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.incomingToEntry_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.incomingToEntry_1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.incomingToEntry_2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.incomingToEntry_3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.incomingToEntry_4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.incomingToEntry_5"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noOutgoingTransitionFromEntry_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noOutgoingTransitionFromEntry_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noOutgoingTransitionFromEntry_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noOutgoingTransitionFromEntry_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noOutgoingTransitionFromEntry_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noOutgoingTransitionFromEntry_M5"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleTransitionFromEntry_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleTransitionFromEntry_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleTransitionFromEntry_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleTransitionFromEntry_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleTransitionFromEntry_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.outgoingFromExit_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.outgoingFromExit_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.outgoingFromExit_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.outgoingFromFinal_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.outgoingFromFinal_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.outgoingFromFinal_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noStateInRegion_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noStateInRegion_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noStateInRegion_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noStateInRegion_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.StateInRegion_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.StateInRegion_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.StateInRegion_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M5"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M6"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M5"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M6"/>
-    </group>
-  </extension>
 </plugin>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/mutated/mutated.vql b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/mutated/mutated.vql
deleted file mode 100644
index 58f66fe2..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/mutated/mutated.vql
+++ /dev/null
@@ -1,270 +0,0 @@
-package hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated

-

-import epackage "hu.bme.mit.inf.yakindumm"

-

-/////////

-// Entry

-/////////

-

-pattern entryInRegion_M0(r1 : Region, e1 : Entry) {

-        Region.vertices(r1, e1);

-}

-pattern entryInRegion_M1(r1 : Region, e1) {

-        Region.vertices(r1, e1);

-}

-pattern entryInRegion_M2(r1 : Region, e1: Entry) {

-        // For positive constraint

-        Region(r1);Entry(e1);

-}

-

-

-//@Constraint(severity="error", message="error", key = {r1})

-pattern noEntryInRegion_M0(r1 : Region) {

-        neg find entryInRegion_M0(r1, _);

-}

-pattern noEntryInRegion_M1(r1 : Region) {

-        neg find entryInRegion_M1(r1, _);

-}

-pattern noEntryInRegion_M2(r1 : Region) {

-        neg find entryInRegion_M2(r1, _);

-}

-pattern noEntryInRegion_M3(r1 : Region) {

-        find entryInRegion_M0(r1, _);

-}

-pattern noEntryInRegion_M4(r1 : Region) {

-        find entryInRegion_M1(r1, _);

-}

-pattern noEntryInRegion_M5(r1 : Region) {

-        find entryInRegion_M2(r1, _);

-}

-

-//@Constraint(severity="error", message="error", key = {r})

-pattern multipleEntryInRegion_M0(r : Region) {

-        find entryInRegion_M0(r, e1);

-        find entryInRegion_M0(r, e2);

-        e1 != e2;

-}

-pattern multipleEntryInRegion_M1(r : Region) {

-        find entryInRegion_M1(r, e1);

-        find entryInRegion_M0(r, e2);

-        e1 != e2;

-}

-pattern multipleEntryInRegion_M2(r : Region) {

-        find entryInRegion_M2(r, e1);

-        find entryInRegion_M0(r, e2);

-        e1 != e2;

-}

-pattern multipleEntryInRegion_M3(r : Region) {

-        find entryInRegion_M0(r, e1);

-        find entryInRegion_M1(r, e2);

-        e1 != e2;

-}

-pattern multipleEntryInRegion_M4(r : Region) {

-        find entryInRegion_M2(r, e1);

-        find entryInRegion_M2(r, e2);

-        e1 != e2;

-}

-pattern multipleEntryInRegion_M5(r : Region) {

-        find entryInRegion_M0(r, e1);

-        find entryInRegion_M0(r, e2);

-}

-

-

-pattern transition_M0(t : Transition, src : Vertex, trg : Vertex) {

-        Transition.source(t, src);

-        Transition.target(t, trg);

-}

-pattern transition_M1(t : Transition, src : Vertex, trg : Vertex) {

-        Transition.source(t, src);

-        Vertex(trg);

-}

-pattern transition_M2(t : Transition, src : Vertex, trg : Vertex) {

-        Vertex(src);

-        Transition.target(t, trg);

-}

-pattern transition_M3(t : Transition, src : Vertex, trg : Vertex) {

-        Transition.source(t_x, src);

-        Transition.target(t, trg);

-}

-pattern transition_M4(t : Transition, src : Vertex, trg : Vertex) {

-        Transition.source(t, src);

-        Transition.target(t_x, trg);

-}

-

-//@Constraint(severity="error", message="error", key = {e})

-pattern incomingToEntry_M0(t : Transition, e : Entry) {

-        find transition_M0(t, _, e);

-}

-pattern incomingToEntry_1(t : Transition, e) {

-        find transition_M0(t, _, e);

-}

-pattern incomingToEntry_2(t : Transition, e : Entry) {

-        find transition_M1(t, _, e);

-}

-pattern incomingToEntry_3(t : Transition, e : Entry) {

-        find transition_M2(t, _, e);

-}

-pattern incomingToEntry_4(t : Transition, e : Entry) {

-        find transition_M3(t, _, e);

-}

-pattern incomingToEntry_5(t : Transition, e : Entry) {

-        find transition_M4(t, _, e);

-}

-

-pattern noOutgoingTransitionFromEntry_M0(e : Entry) {

-        neg find transition_M0(_, e, _);

-}

-

-pattern noOutgoingTransitionFromEntry_M1(e) {

-        Vertex(e);

-        neg find transition_M0(_, e, _);

-}

-pattern noOutgoingTransitionFromEntry_M2(e : Entry) {

-        neg find transition_M1(_, e, _);

-}

-pattern noOutgoingTransitionFromEntry_M3(e : Entry) {

-        neg find transition_M2(_, e, _);

-}

-pattern noOutgoingTransitionFromEntry_M4(e : Entry) {

-        neg find transition_M3(_, e, _);

-}

-pattern noOutgoingTransitionFromEntry_M5(e : Entry) {

-        neg find transition_M4(_, e, _);

-}

-

-

-//@Constraint(severity="error", message="error", key = {e})

-pattern multipleTransitionFromEntry_M0(e : Entry, t1 : Transition, t2: Transition) {

-        Entry.outgoingTransitions(e,t1);

-        Entry.outgoingTransitions(e,t2);

-        t1!=t2;

-}

-pattern multipleTransitionFromEntry_M1(e, t1 : Transition, t2: Transition) {

-        Entry.outgoingTransitions(e,t1);

-        Entry.outgoingTransitions(e,t2);

-        t1!=t2;

-}

-pattern multipleTransitionFromEntry_M2(e : Entry, t1 : Transition, t2: Transition) {

-        Transition(t1);

-        Entry.outgoingTransitions(e,t2);

-        t1!=t2;

-}

-pattern multipleTransitionFromEntry_M3(e : Entry, t1 : Transition, t2: Transition) {

-        Entry.outgoingTransitions(e,t1);

-        Transition(t2);

-        t1!=t2;

-}

-pattern multipleTransitionFromEntry_M4(e : Entry, t1 : Transition, t2: Transition) {

-        Entry.outgoingTransitions(e,t1);

-        Entry.outgoingTransitions(e,t2);

-}

-

-/////////

-// Exit

-/////////

-

-//@Constraint(severity="error", message="error", key = {e})

-pattern outgoingFromExit_M0(t : Transition, e : Exit) {

-        Exit.outgoingTransitions(e,t);

-}

-pattern outgoingFromExit_M1(t : Transition, e) {

-        Vertex.outgoingTransitions(e,t);

-}

-pattern outgoingFromExit_M2(t : Transition, e : Exit) {

-        Transition(t);

-        Exit(e);

-}

-

-/////////

-// Final

-/////////

-

-//@Constraint(severity="error", message="error", key = {f})

-pattern outgoingFromFinal_M0(t : Transition, f : FinalState) {

-        FinalState.outgoingTransitions(f,t);

-}

-pattern outgoingFromFinal_M1(t : Transition, f) {

-        Vertex.outgoingTransitions(f,t);

-}

-pattern outgoingFromFinal_M2(t : Transition, f : FinalState) {

-        Transition(t);

-        FinalState(f);

-}

-

-/////////

-// State vs Region

-/////////

-

-//@Constraint(severity="error", message="error", key = {region})

-pattern noStateInRegion_M0(region: Region) {

-        neg find StateInRegion_M0(region,_);

-}

-pattern noStateInRegion_M1(region: Region) {

-        neg find StateInRegion_M1(region,_);

-}

-pattern noStateInRegion_M2(region: Region) {

-        neg find StateInRegion_M2(region,_);

-}

-pattern noStateInRegion_M3(region: Region) {

-        find StateInRegion_M0(region,_);

-}

-

-pattern StateInRegion_M0(region: Region, state: State) {

-        Region.vertices(region,state);

-}

-pattern StateInRegion_M1(region: Region, state) {

-        Region.vertices(region,state);

-}

-pattern StateInRegion_M2(region: Region, state:State) {

-        Region(region);State(state);

-}

-

-/////////

-// Choice

-/////////

-

-@Constraint(severity="error", message="error", key = {c})

-pattern choiceHasNoOutgoing_M0(c : Choice) {

-        neg find transition_M0(_, c, _);

-}

-pattern choiceHasNoOutgoing_M1(c:Vertex) {

-        neg find transition_M0(_, c, _);

-}

-pattern choiceHasNoOutgoing_M2(c : Choice) {

-        neg find transition_M1(_, c, _);

-}

-pattern choiceHasNoOutgoing_M3(c : Choice) {

-        neg find transition_M2(_, c, _);

-}

-pattern choiceHasNoOutgoing_M4(c : Choice) {

-        neg find transition_M3(_, c, _);

-}

-pattern choiceHasNoOutgoing_M5(c : Choice) {

-        neg find transition_M4(_, c, _);

-}

-pattern choiceHasNoOutgoing_M6(c : Choice) {

-        find transition_M0(_, c, _);

-}

-

-@Constraint(severity="error", message="error", key = {c})

-pattern choiceHasNoIncoming_M0(c: Choice) {

-        neg find transition_M0(_, _, c);

-}

-pattern choiceHasNoIncoming_M1(c:Vertex) {

-        neg find transition_M0(_, _, c);

-}

-pattern choiceHasNoIncoming_M2(c: Choice) {

-        neg find transition_M1(_, _, c);

-}

-pattern choiceHasNoIncoming_M3(c: Choice) {

-        neg find transition_M2(_, _, c);

-}

-pattern choiceHasNoIncoming_M4(c: Choice) {

-        neg find transition_M3(_, _, c);

-}

-pattern choiceHasNoIncoming_M5(c: Choice) {

-        neg find transition_M4(_, _, c);

-}

-pattern choiceHasNoIncoming_M6(c: Choice) {

-        find transition_M0(_, _, c);

-}

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/patterns.vql b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/patterns.vql
index 69689899..82b908b3 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/patterns.vql
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/patterns.vql
@@ -1,5 +1,4 @@
 package hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu

-

 import epackage "hu.bme.mit.inf.yakindumm"

 

 /////////

@@ -122,7 +121,7 @@ pattern choiceHasNoIncoming(c: Choice) {
 //      neg find hasMultipleOutgoingTrainsition(s);

 //      neg find hasMultipleIncomingTrainsition(s);

 //}

-//

+

 //pattern hasMultipleOutgoingTrainsition(v : Synchronization) {

 //      find transition(_, v, trg1);

 //      find transition(_, v, trg2);

@@ -203,10 +202,10 @@ pattern hasMultipleRegions(composite: CompositeElement) {
 //      t2!=t3;

 //      t1!=t3;

 //}

-//

-///**

-// * Simplifying model generation

-// */

+

+/**

+ * Simplifying model generation

+ */

 //@Constraint(severity="error", message="error", key = {s1,s2})

 //pattern twoSynch(s1 : Synchronization, s2 : Synchronization) {

 //      Synchronization(s1);